From 47d89a69594b76a61dcb1674e07b9e37a2520958 Mon Sep 17 00:00:00 2001
From: RetroPooh <RetroPooh@users.noreply.github.com>
Date: Mon, 22 Feb 2021 21:43:42 +0300
Subject: [PATCH 001/503] keyring - make accepted keys removing correct; allow
 multi-select

---
 retroshare-gui/src/gui/NetworkDialog.cpp | 44 ++++++++++++++----------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index 1b02cbc7c..539e103fd 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -83,7 +83,7 @@ NetworkDialog::NetworkDialog(QWidget */*parent*/)
     ui.connectTreeWidget->setUpdatesEnabled(true);
     ui.connectTreeWidget->setSortingEnabled(true);
     ui.connectTreeWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
-    ui.connectTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
+    ui.connectTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
     connect(ui.connectTreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( connectTreeWidgetCostumPopupMenu( QPoint ) ) );
     connect(ui.connectTreeWidget, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(peerdetails()));
 
@@ -117,24 +117,11 @@ void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ )
 	{
 		return;
 	}
-
 	QMenu *contextMnu = new QMenu;
-
-	RsPgpId peer_id(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()) ;
-
-	// That's what context menus are made for
-	RsPeerDetails detail;
-	if(!rsPeers->getGPGDetails(peer_id, detail))		// that is not suppose to fail.
-		return ;
-
-	if(peer_id == rsPeers->getGPGOwnId())
-		contextMnu->addAction(QIcon(), tr("Export/create a new node"), this, SLOT(on_actionExportKey_activated()));
-
 	contextMnu->addAction(QIcon(IMAGE_PEERDETAILS), tr("Profile details..."), this, SLOT(peerdetails()));
 	contextMnu->addSeparator() ;
 	contextMnu->addAction(QIcon(), tr("Remove unused keys..."), this, SLOT(removeUnusedKeys()));
 	contextMnu->addAction(QIcon(), tr("Remove this key"), this, SLOT(removeSelectedKeys()));
-
 	contextMnu->exec(QCursor::pos());
 }
 
@@ -177,11 +164,32 @@ void NetworkDialog::removeSelectedKeys()
 	QModelIndexList l = ui.connectTreeWidget->selectionModel()->selection().indexes();
 	if(l.empty())
 		return;
-
 	std::set<RsPgpId> selected;
-	selected.insert(RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()));
-
-	removeKeys(selected);
+	std::set<RsPgpId> friends;
+	for (int i = 0; i < l.size(); i++)
+	{
+		RsPgpId peer_id = RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l[i].row(), COLUMN_PEERID)).toString().toStdString());
+		RsPeerDetails details ;
+		if(rsPeers->getGPGDetails(peer_id,details))
+		{
+			if(details.accept_connection)
+				friends.insert(peer_id);
+			else
+				selected.insert(peer_id);
+		}
+	}
+	if(!friends.empty())
+	{
+		if ((QMessageBox::question(this, "RetroShare", tr("You have selected %1 accepted peers among others,\n Are you sure you want to un-friend them?").arg(friends.size()), QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes)) == QMessageBox::Yes)
+		{
+			for(std::set<RsPgpId>::const_iterator it(friends.begin());it!=friends.end();++it)
+				rsPeers->removeFriend(*it);
+			selected.insert(friends.begin(),friends.end());
+		}
+	}
+	if(!selected.empty())
+		removeKeys(selected);
+	updateDisplay();
 }
 
 void NetworkDialog::removeKeys(std::set<RsPgpId> selected)

From b9f389c8bb47793caf9cdbd25ec653c9960b14bd Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 15 Jan 2022 21:44:54 +0100
Subject: [PATCH 002/503] added webp support for stickers load

---
 retroshare-gui/src/gui/common/Emoticons.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/common/Emoticons.cpp b/retroshare-gui/src/gui/common/Emoticons.cpp
index 0f37eebfc..9da7530b1 100644
--- a/retroshare-gui/src/gui/common/Emoticons.cpp
+++ b/retroshare-gui/src/gui/common/Emoticons.cpp
@@ -51,7 +51,7 @@ static QHash<QString, QPixmap> iconcache;
 void Emoticons::load()
 {
 	loadSmiley();
-	filters << "*.png" << "*.jpg" << "*.gif";
+	filters << "*.png" << "*.jpg" << "*.gif" << "*.webp";
 	stickerFolders << (QString::fromStdString(RsAccounts::AccountDirectory()) + "/stickers");		//under account, unique for user
 	stickerFolders << (QString::fromStdString(RsAccounts::ConfigDirectory()) + "/stickers");		//under .retroshare, shared between users
 	stickerFolders << (QString::fromStdString(RsAccounts::systemDataDirectory()) + "/stickers");	//exe's folder, shipped with RS

From 9e4903c9b80ebb5c0f6101ea96c9fab51b6db4ae Mon Sep 17 00:00:00 2001
From: Phenom <retrosharephenom@gmail.com>
Date: Sat, 15 Jan 2022 15:19:05 +0100
Subject: [PATCH 003/503] Add General Font Size Factor

---
 retroshare-gui/src/gui/ChatLobbyWidget.cpp    | 167 +++++++++---------
 retroshare-gui/src/gui/ChatLobbyWidget.h      |  10 +-
 .../src/gui/FileTransfer/TransfersDialog.cpp  |  74 ++++----
 retroshare-gui/src/gui/FriendsDialog.cpp      |  28 +--
 retroshare-gui/src/gui/HomePage.cpp           |  40 ++---
 retroshare-gui/src/gui/Identity/IdDialog.cpp  |  28 +--
 retroshare-gui/src/gui/MainPage.cpp           |  16 +-
 retroshare-gui/src/gui/NewsFeed.cpp           |  34 ++--
 .../src/gui/Posted/PostedDialog.cpp           |  22 ++-
 .../src/gui/gxschannels/GxsChannelDialog.cpp  |  68 +++----
 .../src/gui/gxsforums/GxsForumsDialog.cpp     |  23 ++-
 .../src/gui/msgs/MessagesDialog.cpp           |  25 +--
 retroshare-gui/src/util/misc.cpp              |  98 +++++-----
 retroshare-gui/src/util/misc.h                |  22 ++-
 14 files changed, 345 insertions(+), 310 deletions(-)

diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
index 13fdc4329..0b5350110 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@@ -22,19 +22,20 @@
 #include "ChatLobbyWidget.h"
 
 #include "notifyqt.h"
+#include "RetroShareLink.h"
 #include "chat/ChatLobbyDialog.h"
 #include "chat/ChatLobbyUserNotify.h"
 #include "chat/ChatTabWidget.h"
 #include "chat/CreateLobbyDialog.h"
+#include "common/FilesDefs.h"
 #include "common/RSTreeWidgetItem.h"
 #include "common/RSElidedItemDelegate.h"
-#include "gui/RetroShareLink.h"
-#include "gui/gxs/GxsIdDetails.h"
-#include "gui/Identity/IdEditDialog.h"
-#include "gui/settings/rsharesettings.h"
+#include "gxs/GxsIdDetails.h"
+#include "Identity/IdEditDialog.h"
+#include "settings/rsharesettings.h"
 #include "util/HandleRichText.h"
+#include "util/misc.h"
 #include "util/QtVersion.h"
-#include "gui/common/FilesDefs.h"
 
 #include "retroshare/rsmsgs.h"
 #include "retroshare/rspeers.h"
@@ -206,28 +207,29 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
 	// load settings
 	processSettings(true);
 
-	QString help_str = tr("\
-	                      <h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Chat Rooms</h1>                           \
-	                      <p>Chat rooms work pretty much like IRC.                                                                \
-	                       They allow you to talk anonymously with tons of people without the need to make friends.</p>           \
-	                      <p>A chat room can be public (your friends see it) or private (your friends can't see it, unless you    \
-	                       invite them with <img src=\":/icons/png/add.png\" width=%2/>).                                         \
-	                       Once you have been invited to a private room, you will be able to see it when your friends             \
-	                       are using it.</p>                                                                                      \
-	                      <p>The list at left shows                                                                               \
-	                       chat lobbies your friends are participating in. You can either                                         \
-	                       <ul>                                                                                                   \
-	                        <li>Right click to create a new chat room</li>                                                        \
-	                        <li>Double click a chat room to enter, chat, and show it to your friends</li>                         \
-	                       </ul>                                                                                                  \
-	                       Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!\
-	                      </p>                                                                                                    \
-	                      "
-	                      ).arg(QString::number(4*W), QString::number(2*W)) ;
+	int hbH = misc::getFontSizeFactor("HelpButton").height();
+	QString help_str = tr(
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Chat Rooms</h1>"
+	    "<p>Chat rooms work pretty much like IRC."
+	    "   They allow you to talk anonymously with tons of people without the need to make friends.</p>"
+	    "<p>A chat room can be public (your friends see it) or private (your friends can't see it, unless you"
+	    "   invite them with <img src=\":/icons/png/add.png\" width=%2/>)."
+	    "   Once you have been invited to a private room, you will be able to see it when your friends"
+	    "   are using it.</p>"
+	    "<p>The list at left shows"
+	    "   chat lobbies your friends are participating in. You can either"
+	    "   <ul>"
+	    "     <li>Right click to create a new chat room</li>"
+	    "     <li>Double click a chat room to enter, chat, and show it to your friends</li>"
+	    "   </ul>"
+	    "   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!"
+	    "</p>"
+	                     ).arg(QString::number(2*hbH), QString::number(hbH)) ;
 
 	registerHelpButton(ui.helpButton,help_str,"ChatLobbyDialog") ;
-
-	ui.lobbyTreeWidget->setIconSize(QSize(H*1.5,H*1.5));
+	
+	int ltwH = misc::getFontSizeFactor("LobbyTreeWidget", 1.5).height();
+	ui.lobbyTreeWidget->setIconSize(QSize(ltwH,ltwH));
 }
 
 ChatLobbyWidget::~ChatLobbyWidget()
@@ -293,87 +295,84 @@ void ChatLobbyWidget::lobbyTreeWidgetCustomPopupMenu(QPoint)
 	QMenu contextMnu(this);
 
 	if (item && item->type() == TYPE_FOLDER) {
-        QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_CREATE), tr("Create chat room"), this, SLOT(createChatLobby()));
+		QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_CREATE), tr("Create chat room"), this, SLOT(createChatLobby()));
 		action->setData(item->data(COLUMN_DATA, ROLE_PRIVACYLEVEL).toInt());
 	}
 
-    if (item && item->type() == TYPE_LOBBY)
-    {
-        std::list<RsGxsId> own_identities ;
-        rsIdentity->getOwnIds(own_identities) ;
+	if (item && item->type() == TYPE_LOBBY)
+	{
+		std::list<RsGxsId> own_identities ;
+		rsIdentity->getOwnIds(own_identities) ;
 
-        if (item->data(COLUMN_DATA, ROLE_SUBSCRIBED).toBool())
-            contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_UNSUBSCRIBE), tr("Leave this room"), this, SLOT(unsubscribeItem()));
-        else
-        {
-            QTreeWidgetItem *item = ui.lobbyTreeWidget->currentItem();
+		if (item->data(COLUMN_DATA, ROLE_SUBSCRIBED).toBool())
+			contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_UNSUBSCRIBE), tr("Leave this room"), this, SLOT(unsubscribeItem()));
+		else
+		{
+			ChatLobbyFlags flags(item->data(COLUMN_DATA, ROLE_FLAGS).toUInt());
 
-	    //ChatLobbyId id = item->data(COLUMN_DATA, ROLE_ID).toULongLong();
-        ChatLobbyFlags flags(item->data(COLUMN_DATA, ROLE_FLAGS).toUInt());
+			bool removed = false ;
+			if(flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED)
+				removed = trimAnonIds(own_identities) ;
 
-            bool removed = false ;
-            if(flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED)
-                removed = trimAnonIds(own_identities) ;
-                        
-            if(own_identities.empty())
-            {
-                if(removed)
-                contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_SUBSCRIBE), tr("Create a non anonymous identity and enter this room"), this, SLOT(createIdentityAndSubscribe()));
-                    else
-                contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_SUBSCRIBE), tr("Create an identity and enter this chat room"), this, SLOT(createIdentityAndSubscribe()));
-            }
-            else if(own_identities.size() == 1)
-            {
-                QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_SUBSCRIBE), tr("Enter this chat room"), this, SLOT(subscribeChatLobbyAs()));
-                action->setData(QString::fromStdString((own_identities.front()).toStdString())) ;
-            }
-            else
-            {
-                QMenu *mnu = contextMnu.addMenu(FilesDefs::getIconFromQtResourcePath(IMAGE_SUBSCRIBE),tr("Enter this chat room as...")) ;
+			if(own_identities.empty())
+			{
+				if(removed)
+					contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_SUBSCRIBE), tr("Create a non anonymous identity and enter this room"), this, SLOT(createIdentityAndSubscribe()));
+				else
+					contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_SUBSCRIBE), tr("Create an identity and enter this chat room"), this, SLOT(createIdentityAndSubscribe()));
+			}
+			else if(own_identities.size() == 1)
+			{
+				QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_SUBSCRIBE), tr("Enter this chat room"), this, SLOT(subscribeChatLobbyAs()));
+				action->setData(QString::fromStdString((own_identities.front()).toStdString())) ;
+			}
+			else
+			{
+				QMenu *mnu = contextMnu.addMenu(FilesDefs::getIconFromQtResourcePath(IMAGE_SUBSCRIBE),tr("Enter this chat room as...")) ;
 
-                for(std::list<RsGxsId>::const_iterator it=own_identities.begin();it!=own_identities.end();++it)
-                {
-                    RsIdentityDetails idd ;
-                    rsIdentity->getIdDetails(*it,idd) ;
+				for(std::list<RsGxsId>::const_iterator it=own_identities.begin();it!=own_identities.end();++it)
+				{
+					RsIdentityDetails idd ;
+					rsIdentity->getIdDetails(*it,idd) ;
 
-                    QPixmap pixmap ;
+					QPixmap pixmap ;
 
-                    if(idd.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idd.mAvatar.mData, idd.mAvatar.mSize, pixmap, GxsIdDetails::SMALL))
-                        pixmap = GxsIdDetails::makeDefaultIcon(*it,GxsIdDetails::SMALL) ;
+					if(idd.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idd.mAvatar.mData, idd.mAvatar.mSize, pixmap, GxsIdDetails::SMALL))
+						pixmap = GxsIdDetails::makeDefaultIcon(*it,GxsIdDetails::SMALL) ;
 
-                    QAction *action = mnu->addAction(QIcon(pixmap), QString("%1 (%2)").arg(QString::fromUtf8(idd.mNickname.c_str()), QString::fromStdString((*it).toStdString())), this, SLOT(subscribeChatLobbyAs()));
-                    action->setData(QString::fromStdString((*it).toStdString())) ;
-                }
-            }
-        }
+					QAction *action = mnu->addAction(QIcon(pixmap), QString("%1 (%2)").arg(QString::fromUtf8(idd.mNickname.c_str()), QString::fromStdString((*it).toStdString())), this, SLOT(subscribeChatLobbyAs()));
+					action->setData(QString::fromStdString((*it).toStdString())) ;
+				}
+			}
+		}
 
 #ifdef TO_BE_REMOVED
-        // This code is not needed anymore because AutoSubscribe is now automatically handled with chat room subscription.
+		// This code is not needed anymore because AutoSubscribe is now automatically handled with chat room subscription.
 
-        if (item->data(COLUMN_DATA, ROLE_AUTOSUBSCRIBE).toBool())
-            contextMnu.addAction(QIcon(IMAGE_AUTOSUBSCRIBE), tr("Remove Auto Subscribe"), this, SLOT(autoSubscribeItem()));
-        else if(!own_identities.empty())
-            contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Add Auto Subscribe"), this, SLOT(autoSubscribeItem()));
+		if (item->data(COLUMN_DATA, ROLE_AUTOSUBSCRIBE).toBool())
+			contextMnu.addAction(QIcon(IMAGE_AUTOSUBSCRIBE), tr("Remove Auto Subscribe"), this, SLOT(autoSubscribeItem()));
+		else if(!own_identities.empty())
+			contextMnu.addAction(QIcon(IMAGE_SUBSCRIBE), tr("Add Auto Subscribe"), this, SLOT(autoSubscribeItem()));
 #endif
 
-        contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COPYRSLINK), tr("Copy RetroShare Link"), this, SLOT(copyItemLink()));
-    }
+		contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COPYRSLINK), tr("Copy RetroShare Link"), this, SLOT(copyItemLink()));
+	}
 
-        contextMnu.addSeparator();//-------------------------------------------------------------------
+	contextMnu.addSeparator();//-------------------------------------------------------------------
 
-        showUserCountAct->setChecked(!ui.lobbyTreeWidget->isColumnHidden(COLUMN_USER_COUNT));
-        showTopicAct->setChecked(!ui.lobbyTreeWidget->isColumnHidden(COLUMN_TOPIC));
+	showUserCountAct->setChecked(!ui.lobbyTreeWidget->isColumnHidden(COLUMN_USER_COUNT));
+	showTopicAct->setChecked(!ui.lobbyTreeWidget->isColumnHidden(COLUMN_TOPIC));
 
-        QMenu *menu = contextMnu.addMenu(tr("Columns"));
-        menu->addAction(showUserCountAct);
-        menu->addAction(showTopicAct);
+	QMenu *menu = contextMnu.addMenu(tr("Columns"));
+	menu->addAction(showUserCountAct);
+	menu->addAction(showTopicAct);
 
-        contextMnu.exec(QCursor::pos());
+	contextMnu.exec(QCursor::pos());
 }
 
 void ChatLobbyWidget::lobbyChanged()
 {
-	updateDisplay();
+	ChatLobbyWidget::updateDisplay();
 }
 
 static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobbyId id, const std::string &name, const std::string &topic, int count, bool subscribed, bool autoSubscribe,ChatLobbyFlags lobby_flags)
@@ -607,7 +606,7 @@ void ChatLobbyWidget::updateDisplay()
 			QTreeWidgetItem *itemLoop = lobby_other_item->child(childIndex);
 			if (itemLoop->type() == TYPE_LOBBY && itemLoop->data(COLUMN_DATA, ROLE_ID).toULongLong() == lobby.lobby_id) {
 				delete(lobby_other_item->takeChild(lobby_other_item->indexOfChild(itemLoop)));
-				childCnt = lobby_other_item->childCount();
+				//childCnt = lobby_other_item->childCount();
 				break;
 			}
 		}
diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.h b/retroshare-gui/src/gui/ChatLobbyWidget.h
index a9bb01895..a5055788e 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.h
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.h
@@ -56,18 +56,18 @@ class ChatLobbyWidget : public RsAutoUpdatePage
 
 public:
 	/** Default constructor */
-	ChatLobbyWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+	ChatLobbyWidget(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags());
 
 	/** Default destructor */
 	~ChatLobbyWidget();
 
-	virtual QIcon iconPixmap() const { return QIcon(IMAGE_CHATLOBBY) ; } //MainPage
-	virtual QString pageName() const { return tr("Chats") ; } //MainPage
-	virtual QString helpText() const { return ""; } //MainPage
+	virtual QIcon iconPixmap() const override { return QIcon(IMAGE_CHATLOBBY) ; } //MainPage
+	virtual QString pageName() const override { return tr("Chats") ; } //MainPage
+	virtual QString helpText() const override { return ""; } //MainPage
 
 	virtual UserNotify *createUserNotify(QObject *parent) override; //MainPage
 
-	virtual void updateDisplay();
+	virtual void updateDisplay() override; //RsAutoUpdatePage
 
 	void setCurrentChatPage(ChatLobbyDialog *) ;	// used by ChatLobbyDialog to raise.
 	void addChatPage(ChatLobbyDialog *) ;
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 9fa03f3fd..035ed2ca6 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -449,7 +449,7 @@ public:
 			case COLUMN_SOURCES:
 			{
 				int active = 0;
-				QString fileHash = QString::fromStdString(fileInfo.hash.toStdString());
+				//QString fileHash = QString::fromStdString(fileInfo.hash.toStdString());
 
 				if (fileInfo.downloadStatus != FT_STATE_COMPLETE)
 					for (std::vector<TransferInfo>::const_iterator pit = fileInfo.peers.begin() ; pit != fileInfo.peers.end(); ++pit)
@@ -635,27 +635,27 @@ public:
 		for(auto it(downHashes.begin());it!=downHashes.end();++it,++i)
 		{
 			FileInfo fileInfo(mDownloads[i]);	// we dont update the data itself but only a copy of it....
-			int old_size = fileInfo.peers.size() ;
+			int old_peers_size = fileInfo.peers.size() ;
 
 			rsFiles->FileDetails(*it, RS_FILE_HINTS_DOWNLOAD, fileInfo);
 
 			int new_size = fileInfo.peers.size() ;
 
-			if(old_size < new_size)
+			if(old_peers_size < new_size)
 			{
-				beginInsertRows(index(i,0), old_size, new_size-1);
-				insertRows(old_size, new_size - old_size,index(i,0));
+				beginInsertRows(index(i,0), old_peers_size, new_size-1);
+				insertRows(old_peers_size, new_size - old_peers_size,index(i,0));
 #ifdef DEBUG_DOWNLOADLIST
-				std::cerr << "called insert rows ( " << old_size << ", " << new_size - old_size << ",index(" << index(i,0)<< "))" << std::endl;
+				std::cerr << "called insert rows ( " << old_peers_size << ", " << new_size - old_peers_size << ",index(" << index(i,0)<< "))" << std::endl;
 #endif
 				endInsertRows();
 			}
-			else if(new_size < old_size)
+			else if(new_size < old_peers_size)
 			{
-				beginRemoveRows(index(i,0), new_size, old_size-1);
-				removeRows(new_size, old_size - new_size,index(i,0));
+				beginRemoveRows(index(i,0), new_size, old_peers_size-1);
+				removeRows(new_size, old_peers_size - new_size,index(i,0));
 #ifdef DEBUG_DOWNLOADLIST
-				std::cerr << "called remove rows ( " << old_size << ", " << old_size - new_size << ",index(" << index(i,0)<< "))" << std::endl;
+				std::cerr << "called remove rows ( " << old_peers_size << ", " << old_peers_size - new_size << ",index(" << index(i,0)<< "))" << std::endl;
 #endif
 				endRemoveRows();
 			}
@@ -742,7 +742,7 @@ private:
 class SortByNameItem : public QStandardItem
 {
 public:
-	SortByNameItem(QHeaderView *header) : QStandardItem()
+	explicit SortByNameItem(QHeaderView *header) : QStandardItem()
 	{
 		this->header = header;
 	}
@@ -780,9 +780,9 @@ private:
 class ProgressItem : public SortByNameItem
 {
 public:
-	ProgressItem(QHeaderView *header) : SortByNameItem(header) {}
+	explicit ProgressItem(QHeaderView *header) : SortByNameItem(header) {}
 
-	virtual bool operator<(const QStandardItem &other) const
+	virtual bool operator<(const QStandardItem &other) const override
 	{
 		const int role = model() ? model()->sortRole() : Qt::DisplayRole;
 
@@ -1077,24 +1077,23 @@ TransfersDialog::TransfersDialog(QWidget *parent)
     // load settings
     processSettings(true);
 
-	int S = static_cast<int>(QFontMetricsF(font()).height());
+	int H = misc::getFontSizeFactor("HelpButton").height();
 	QString help_str = tr(
-	            "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;"
-	            "File Transfer</h1>"
-	            "<p>Retroshare brings two ways of transferring files: direct "
-	            "transfers from your friends, and distant anonymous tunnelled "
-	            "transfers. In addition, file transfer is multi-source and "
-	            "allows swarming (you can be a source while downloading)</p>"
-	            "<p>You can share files using the "
-	            "<img src=\":/images/directoryadd_24x24_shadow.png\" width=%2 />"
-	            " icon from the left side bar. These files will be listed in "
-	            "the My Files tab. You can decide for each friend group whether"
-	            " they can or not see these files in their Friends Files tab</p>"
-	            "<p>The search tab reports files from your friends' file lists,"
-	            " and distant files that can be reached anonymously using the "
-	            "multi-hop tunnelling system.</p>")
-	        .arg(QString::number(2*S)).arg(QString::number(S)) ;
-
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;"
+	    "    File Transfer</h1>"
+	    "<p>Retroshare brings two ways of transferring files: direct "
+	    "   transfers from your friends, and distant anonymous tunnelled "
+	    "   transfers. In addition, file transfer is multi-source and "
+	    "   allows swarming (you can be a source while downloading)</p>"
+	    "<p>You can share files using the "
+	    "   <img src=\":/images/directoryadd_24x24_shadow.png\" width=%2 />"
+	    "   icon from the left side bar. These files will be listed in "
+	    "   the My Files tab. You can decide for each friend group whether"
+	    "   they can or not see these files in their Friends Files tab</p>"
+	    "<p>The search tab reports files from your friends' file lists,"
+	    "   and distant files that can be reached anonymously using the "
+	    "   multi-hop tunnelling system.</p>"
+	                     ).arg(QString::number(2*H), QString::number(H)) ;
 
 	registerHelpButton(ui.helpButton,help_str,"TransfersDialog") ;
 
@@ -1584,7 +1583,6 @@ int TransfersDialog::addULItem(int row, const FileInfo &fileInfo)
 
 		//unique combination: fileHash + peerId, variant: hash + peerName (too long)
 		QString hashFileAndPeerId = fileHash + QString::fromStdString(transferInfo.peerId.toStdString());
-		qlonglong completed = transferInfo.transfered;
 
 		double peerULSpeed = transferInfo.tfRate * 1024.0;
 
@@ -1602,6 +1600,7 @@ int TransfersDialog::addULItem(int row, const FileInfo &fileInfo)
 		peerpinfo.type = FileProgressInfo::UPLOAD_LINE ;
 		peerpinfo.nb_chunks = peerpinfo.cmap._map.empty()?0:nb_chunks ;
 
+		qlonglong completed = 0;
 		if(filled_chunks > 0 && nb_chunks > 0)
 		{
 			completed = peerpinfo.cmap.computeProgress(fileInfo.size,chunk_size) ;
@@ -1720,9 +1719,6 @@ void TransfersDialog::insertTransfers()
 {
 	// Since downloads use an AstractItemModel, we just need to update it, while saving the selected and expanded items.
 
-	std::set<QString> expanded_hashes ;
-	std::set<QString> selected_hashes ;
-
 	DLListModel->update_transfers();
 
 	// Now show upload hashes. Here we use the "old" way, since the number of uploads is generally not so large.
@@ -1957,16 +1953,16 @@ void TransfersDialog::pasteLink()
 	RsCollection col ;
 	RSLinkClipboard::pasteLinks(links,RetroShareLink::TYPE_FILE_TREE);
 
-	for(QList<RetroShareLink>::const_iterator it(links.begin());it!=links.end();++it)
+	for(auto &it: links)
 	{
-		auto ft = RsFileTree::fromRadix64((*it).radix().toStdString());
+		auto ft = RsFileTree::fromRadix64(it.radix().toStdString());
 		col.merge_in(*ft);
 	}
 	links.clear();
 	RSLinkClipboard::pasteLinks(links,RetroShareLink::TYPE_FILE);
 
-	for(QList<RetroShareLink>::const_iterator it(links.begin());it!=links.end();++it)
-		col.merge_in((*it).name(),(*it).size(),RsFileHash((*it).hash().toStdString())) ;
+	for(auto &it : links)
+		col.merge_in(it.name(),it.size(),RsFileHash(it.hash().toStdString())) ;
 
 	col.downloadFiles();
 }
@@ -1985,7 +1981,7 @@ void TransfersDialog::getDLSelectedItems(std::set<RsFileHash> *ids, std::set<int
 	int i, imax = selectedRows.count();
 	for (i = 0; i < imax; ++i) {
 		QModelIndex index = selectedRows.at(i);
-		if (index.parent().isValid())
+		if (index.parent().isValid() && index.model())
 			index = index.model()->index(index.parent().row(), COLUMN_ID);
 
 		if (ids) {
diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp
index e3f74fcfd..5df97121a 100644
--- a/retroshare-gui/src/gui/FriendsDialog.cpp
+++ b/retroshare-gui/src/gui/FriendsDialog.cpp
@@ -127,21 +127,21 @@ FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
         ui.nicknameLabel->setText(QString::fromUtf8(pd.name.c_str()) + " (" + QString::fromUtf8(pd.location.c_str())+")");
     }
 
- QString hlp_str = tr(
-  " <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Network</h1>                                   \
-    <p>The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you. \
-    </p>                                                   \
-    <p>You can group nodes together to allow a finer level of information access, for instance to only allow      \
-    some nodes to see some of your files.</p> \
-    <p>On the right, you will find 3 useful tabs:                                                                   \
-    <ul>                                                                                                          \
-      <li>Broadcast sends messages to all connected nodes at once</li>                             \
-      <li>Local network graph shows the network around you, based on discovery information</li>                 \
-      <li>Keyring contains node keys you collected, mostly forwarded to you by your friend nodes</li>                              \
-    </ul> </p>                                                                                                      \
-  ") ;
+	int H = misc::getFontSizeFactor("HelpButton").height();
+	QString hlp_str = tr(
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Network</h1>"
+	    "<p>The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.</p>"
+	    "<p>You can group nodes together to allow a finer level of information access, for instance to only allow"
+	    "   some nodes to see some of your files.</p>"
+	    "<p>On the right, you will find 3 useful tabs:"
+	    "   <ul>"
+	    "    <li>Broadcast sends messages to all connected nodes at once</li>"
+	    "    <li>Local network graph shows the network around you, based on discovery information</li>"
+	    "    <li>Keyring contains node keys you collected, mostly forwarded to you by your friend nodes</li>"
+	    "   </ul> </p>"
+	                    ).arg(QString::number(2*H));
 
-	 registerHelpButton(ui.helpButton, hlp_str,"FriendsDialog") ;
+	registerHelpButton(ui.helpButton, hlp_str,"FriendsDialog") ;
 }
 
 FriendsDialog::~FriendsDialog ()
diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 6c1737076..ef6982e22 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -24,6 +24,7 @@
 #include "retroshare/rsinit.h"
 
 #include "util/qtthreadsutils.h"
+#include "util/misc.h"
 
 #include "gui/notifyqt.h"
 #include "gui/msgs/MessageComposer.h"
@@ -100,21 +101,20 @@ HomePage::HomePage(QWidget *parent) :
 
     connect(ui->openwebhelp,SIGNAL(clicked()), this,SLOT(openWebHelp())) ;
 
-    int S = QFontMetricsF(font()).height();
-    QString help_str = tr(
-                            " <h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Welcome to Retroshare!</h1>\
-                            <p>You need to <b>make friends</b>! After you create a network of friends or join an existing network,\
-                            you'll be able to exchange files, chat, talk in forums, etc. </p>\
-                            <div align=center>\
-                    <IMG align=\"center\" width=\"%2\" src=\":/images/network_map.png\"/> \
-                    </div>\
-                    <p>To do so, copy your Retroshare ID on this page and send it to friends, and add your friends' Retroshare ID.</p> \
-                            <p>Another option is to search the internet for \"Retroshare chat servers\" (independently administrated). These servers allow you to exchange \
-                            Retroshare ID with a dedicated Retroshare node, through which\
-                            you will be able to anonymously meet other people.</p> ").arg(QString::number(2*S)).arg(width()*0.5);
-                            registerHelpButton(ui->helpButton,help_str,"HomePage") ;
+	int H = misc::getFontSizeFactor("HelpButton").height();
+	QString help_str = tr(
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Welcome to Retroshare!</h1>"
+	    "<p>You need to <b>make friends</b>! After you create a network of friends or join an existing network,"
+	    "   you'll be able to exchange files, chat, talk in forums, etc. </p>"
+	    "<div align=\"center\"><IMG width=\"%2\" height=\"%3\" src=\":/images/network_map.png\" style=\"display: block; margin-left: auto; margin-right: auto; \"/></div>"
+	    "<p>To do so, copy your Retroshare ID on this page and send it to friends, and add your friends' Retroshare ID.</p>"
+	    "<p>Another option is to search the internet for \"Retroshare chat servers\" (independently administrated). These servers allow you to exchange"
+	    "   Retroshare ID with a dedicated Retroshare node, through which"
+	    "   you will be able to anonymously meet other people.</p>"
+	                     ).arg(QString::number(2*H), QString::number(width()*0.5), QString::number(width()*0.5*(337.0/800.0)));//<img> needs height and width defined.
+	registerHelpButton(ui->helpButton,help_str,"HomePage") ;
 
-                    // register a event handler to catch IP updates
+	// register a event handler to catch IP updates
 
     mEventHandlerId = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { handleEvent(event); }, mEventHandlerId, RsEventType::NETWORK );
@@ -249,13 +249,8 @@ void HomePage::updateOwnCert()
     ui->retroshareid->setToolTip(description);
 }
 
-static void sendMail(QString sAddress, QString sSubject, QString sBody)
+static void sendMail(const QString &sAddress, const QString &sSubject, const QString &sBody)
 {
-#ifdef Q_OS_WIN
-    /* search and replace the end of lines with: "%0D%0A" */
-    sBody.replace("\n", "%0D%0A");
-#endif
-
     QUrl url = QUrl("mailto:" + sAddress);
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
@@ -265,7 +260,12 @@ static void sendMail(QString sAddress, QString sSubject, QString sBody)
 #endif
 
     urlQuery.addQueryItem("subject", sSubject);
+#ifdef Q_OS_WIN
+    /* search and replace the end of lines with: "%0D%0A" */
+    urlQuery.addQueryItem("body", QString(sBody).replace("\n", "%0D%0A"));
+#else
     urlQuery.addQueryItem("body", sBody);
+#endif
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
     url.setQuery(urlQuery);
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index a7536b048..c40bb0931 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -385,20 +385,22 @@ IdDialog::IdDialog(QWidget *parent)
 	mStateHelper->setActive(IDDIALOG_IDDETAILS, false);
     mStateHelper->setActive(IDDIALOG_REPLIST, false);
 
+	int H = misc::getFontSizeFactor("HelpButton").height();
 	QString hlp_str = tr(
-			" <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Identities</h1>    \
-			<p>In this tab you can create/edit <b>pseudo-anonymous identities</b>, and <b>circles</b>.</p>                \
-			<p><b>Identities</b> are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,\
-				receive feedback using the Retroshare built-in email system, post comments \
-				after channel posts, chat using secured tunnels, etc.</p> \
-			<p>Identities can optionally be <b>signed</b> by your Retroshare node's certificate.   \
-			Signed identities are easier to trust but are easily linked to your node's IP address.</p>  \
-			<p><b>Anonymous identities</b> allow you to anonymously interact with other users. They cannot be   \
-			spoofed, but noone can prove who really owns a given identity.</p> \
-                    <p><b>Circles</b> are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be \
-                		used to restrict the visibility to forums, channels, etc. </p> \
-                    <p>An <b>circle</b> can be restricted to another circle, thereby limiting its visibility to members of that circle \
-                        or even self-restricted, meaning that it is only visible to invited members.</p>") ;
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Identities</h1>"
+	    "<p>In this tab you can create/edit <b>pseudo-anonymous identities</b>, and <b>circles</b>.</p>"
+	    "<p><b>Identities</b> are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,"
+	    "   receive feedback using the Retroshare built-in email system, post comments"
+	    "   after channel posts, chat using secured tunnels, etc.</p>"
+	    "<p>Identities can optionally be <b>signed</b> by your Retroshare node's certificate."
+	    "   Signed identities are easier to trust but are easily linked to your node's IP address.</p>"
+	    "<p><b>Anonymous identities</b> allow you to anonymously interact with other users. They cannot be"
+	    "   spoofed, but noone can prove who really owns a given identity.</p>"
+	    "<p><b>Circles</b> are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be"
+	    "   used to restrict the visibility to forums, channels, etc. </p>"
+	    "<p>An <b>circle</b> can be restricted to another circle, thereby limiting its visibility to members of that circle"
+	    "   or even self-restricted, meaning that it is only visible to invited members.</p>"
+	                    ).arg(QString::number(2*H));
 
 	registerHelpButton(ui->helpButton, hlp_str,"PeopleDialog") ;
 
diff --git a/retroshare-gui/src/gui/MainPage.cpp b/retroshare-gui/src/gui/MainPage.cpp
index 545f1270e..6136343d7 100644
--- a/retroshare-gui/src/gui/MainPage.cpp
+++ b/retroshare-gui/src/gui/MainPage.cpp
@@ -18,12 +18,14 @@
  *                                                                             *
  *******************************************************************************/
 
-#include <QToolButton>
-#include <QTimer>
-
 #include <retroshare-gui/mainpage.h>
+
 #include "common/FloatingHelpBrowser.h"
 #include "gui/settings/rsharesettings.h"
+#include "util/misc.h"
+
+#include <QToolButton>
+#include <QTimer>
 
 MainPage::MainPage(QWidget *parent , Qt::WindowFlags flags ) : QWidget(parent, flags)
 {
@@ -44,13 +46,13 @@ UserNotify *MainPage::getUserNotify()
 
 void MainPage::registerHelpButton(QToolButton *button, const QString& help_html_text, const QString &code_name)
 {
-    mHelpCodeName = code_name ;
+	mHelpCodeName = code_name ;
 
-	if (mHelpBrowser == NULL)
+	if (mHelpBrowser == nullptr)
 		mHelpBrowser = new FloatingHelpBrowser(this, button) ;
 	
-	float S = QFontMetricsF(button->font()).height() ;
-	button->setIconSize(QSize(S,S)) ;
+	int H = misc::getFontSizeFactor("HelpButton").height();
+	button->setIconSize(QSize(H, H)) ;//Square Icon
 
 	mHelpBrowser->setHelpText(help_html_text) ;
 }
diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp
index d86ba2d7a..252560d43 100644
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@@ -32,6 +32,7 @@
 #include <retroshare/rsplugin.h>
 #include <retroshare/rsposted.h>
 
+#include "util/misc.h"
 #include "util/qtthreadsutils.h"
 #include "feeds/BoardsCommentsItem.h"
 #include "feeds/ChatMsgItem.h"
@@ -111,22 +112,23 @@ NewsFeed::NewsFeed(QWidget *parent) : MainPage(parent), ui(new Ui::NewsFeed),
 	connect(ui->feedOptionsButton, SIGNAL(clicked()), this, SLOT(feedoptions()));
     ui->feedOptionsButton->hide();	// (csoler) Hidden until we repare the system to display a specific settings page.
 
-QString hlp_str = tr(
- " <h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Activity Feed</h1>                                                          \
-   <p>The Activity Feed displays the last events on your network, sorted by the time you received them.                \
-   This gives you a summary of the activity of your friends.                                                       \
-   You can configure which events to show by pressing on <b>Options</b>. </p>                                      \
-   <p>The various events shown are:                                                                                \
-   <ul>                                                                                                         \
-   <li>Connection attempts (useful to make friends with new people and control who's trying to reach you)</li> \
-   <li>Channel, Forum and Board posts</li>                                                                            \
-   <li>Circle membership requests and invites</li>                                                                            \
-   <li>New Channels, Forums and Boards you can subscribe to</li>                                                       \
-   <li>Channel and Board comments</li>                                                                 \
-   <li>New Mail messages</li>                                                                 \
-   <li>Private messages from your friends</li>                                                                 \
-   </ul> </p>                                                                                                      \
- ") ;
+	int H = misc::getFontSizeFactor("HelpButton").height();
+	QString hlp_str = tr(
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Activity Feed</h1>"
+	    "<p>The Activity Feed displays the last events on your network, sorted by the time you received them."
+	    "   This gives you a summary of the activity of your friends."
+	    "   You can configure which events to show by pressing on <b>Options</b>. </p>"
+	    "<p>The various events shown are:"
+	    "   <ul>"
+	    "    <li>Connection attempts (useful to make friends with new people and control who's trying to reach you)</li>"
+	    "    <li>Channel, Forum and Board posts</li>"
+	    "    <li>Circle membership requests and invites</li>"
+	    "    <li>New Channels, Forums and Boards you can subscribe to</li>"
+	    "    <li>Channel and Board comments</li>"
+	    "    <li>New Mail messages</li>"
+	    "    <li>Private messages from your friends</li>"
+	    "   </ul> </p>"
+	                    ).arg(QString::number(2*H));
 
 	registerHelpButton(ui->helpButton,hlp_str,"NewFeed") ;
 
diff --git a/retroshare-gui/src/gui/Posted/PostedDialog.cpp b/retroshare-gui/src/gui/Posted/PostedDialog.cpp
index f1837da3b..33a9c5854 100644
--- a/retroshare-gui/src/gui/Posted/PostedDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedDialog.cpp
@@ -26,6 +26,7 @@
 #include "gui/gxs/GxsGroupShareKey.h"
 #include "gui/settings/rsharesettings.h"
 #include "gui/common/GroupTreeWidget.h"
+#include "util/misc.h"
 #include "util/qtthreadsutils.h"
 
 #include <retroshare/rsposted.h>
@@ -95,14 +96,19 @@ UserNotify *PostedDialog::createUserNotify(QObject *parent)
 
 QString PostedDialog::getHelpString() const
 {
-	QString hlp_str = tr("<h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Boards</h1>    \
-    <p>The Boards service allows you to share images, blog posts & internet links, that spread among Retroshare nodes like forums and \
-	 channels</p> \
-	 <p>Posts can be commented by subscribed users. A promotion system also gives the opportunity to  \
-	 enlight important links.</p> \
-     <p>There is no restriction on which links are shared. Be careful when clicking on them.</p>\
-    <p>Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.</p>\
-                ").arg(QString::number(rsPosted->getDefaultStoragePeriod()/86400)).arg(QString::number(rsPosted->getDefaultSyncPeriod()/86400));
+	int H = misc::getFontSizeFactor("HelpButton").height();
+
+	QString hlp_str = tr(
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Boards</h1>"
+	    "<p>The Boards service allows you to share images, blog posts & internet links, that spread among Retroshare nodes like forums and"
+	    "   channels</p>"
+	    "<p>Posts can be commented by subscribed users. A promotion system also gives the opportunity to"
+	    "   enlight important links.</p>"
+	    "<p>There is no restriction on which links are shared. Be careful when clicking on them.</p>"
+	    "<p>Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.</p>"
+	                    ).arg(  QString::number(2*H)
+	                          , QString::number(rsPosted->getDefaultStoragePeriod()/86400)
+	                          , QString::number(rsPosted->getDefaultSyncPeriod()/86400));
 
 	return hlp_str ;
 }
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
index 5c6d1ae31..1abed7c64 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
@@ -35,6 +35,7 @@
 #include "gui/notifyqt.h"
 #include "gui/common/GroupTreeWidget.h"
 #include "util/qtthreadsutils.h"
+#include "util/misc.h"
 
 // class GxsChannelGroupInfoData : public RsUserdata
 // {
@@ -90,8 +91,8 @@ void GxsChannelDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> ev
 
     const RsGxsChannelSearchResultEvent*f = dynamic_cast<const RsGxsChannelSearchResultEvent*>(event.get());
 
-	if(nullptr != f)
-        for(auto it:f->mSearchResultsMap)
+		if(nullptr != f)
+			for(auto &it:f->mSearchResultsMap)
 			updateSearchResults(it.first);
 }
 
@@ -102,18 +103,23 @@ GxsChannelDialog::~GxsChannelDialog()
 
 QString GxsChannelDialog::getHelpString() const
 {
-	QString hlp_str = tr("<h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Channels</h1>    \
-    <p>Channels allow you to post data (e.g. movies, music) that will spread in the network</p>            \
-    <p>You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to \
-    your friends. This promotes good channels in the network.</p>\
-    <p>Only the channel's creator can post on that channel. Other peers                       \
-    in the network can only read from it, unless the channel is private. You can however share \
-	 the posting rights or the reading rights with friend Retroshare nodes.</p>\
-	 <p>Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.\
-	 Enable \"Allow Comments\" if you want to let users comment on your posts.</p>\
-    <p>Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.</p>\
-    <p>UI Tip: use Control + mouse wheel to control image size in the thumbnail view.</p>\
-                ").arg(QString::number(rsGxsChannels->getDefaultStoragePeriod()/86400)).arg(QString::number(rsGxsChannels->getDefaultSyncPeriod()/86400));
+	int H = misc::getFontSizeFactor("HelpButton").height();
+
+	QString hlp_str = tr(
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Channels</h1>"
+	    "<p>Channels allow you to post data (e.g. movies, music) that will spread in the network</p>"
+	    "<p>You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to"
+	    "   your friends. This promotes good channels in the network.</p>"
+	    "<p>Only the channel's creator can post on that channel. Other peers"
+	    "   in the network can only read from it, unless the channel is private. You can however share"
+	    "   the posting rights or the reading rights with friend Retroshare nodes.</p>"
+	    "<p>Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed."
+	    "   Enable \"Allow Comments\" if you want to let users comment on your posts.</p>"
+	    "<p>Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.</p>"
+	    "<p>UI Tip: use Control + mouse wheel to control image size in the thumbnail view.</p>"
+	                    ).arg(  QString::number(2*H)
+	                          , QString::number(rsGxsChannels->getDefaultStoragePeriod()/86400)
+	                          , QString::number(rsGxsChannels->getDefaultSyncPeriod()/86400));
 
 	return hlp_str ;
 }
@@ -260,11 +266,13 @@ void GxsChannelDialog::groupTreeCustomActions(RsGxsGroupId grpId, int subscribeF
 
     if (isSubscribed)
     {
-        QAction *action = autoDownload ? (new QAction(FilesDefs::getIconFromQtResourcePath(":/images/redled.png"), tr("Disable Auto-Download"), this))
-                                       : (new QAction(FilesDefs::getIconFromQtResourcePath(":/images/start.png"),tr("Enable Auto-Download"), this));
+        {
+            QAction *action = autoDownload ? (new QAction(FilesDefs::getIconFromQtResourcePath(":/images/redled.png"), tr("Disable Auto-Download"), this))
+                                           : (new QAction(FilesDefs::getIconFromQtResourcePath(":/images/start.png"),tr("Enable Auto-Download"), this));
 
-        connect(action, SIGNAL(triggered()), this, SLOT(toggleAutoDownload()));
-        actions.append(action);
+            connect(action, SIGNAL(triggered()), this, SLOT(toggleAutoDownload()));
+            actions.append(action);
+        }
 
         std::string dl_directory;
         rsGxsChannels->getChannelDownloadDirectory(grpId,dl_directory) ;
@@ -282,20 +290,20 @@ void GxsChannelDialog::groupTreeCustomActions(RsGxsGroupId grpId, int subscribeF
 
         for(std::list<SharedDirInfo>::const_iterator it(lst.begin());it!=lst.end();++it)
         {
-            QAction *action = NULL;
+            QAction *fileAction = NULL;
 
             if(dl_directory == it->filename)
             {
-                action = new QAction(FilesDefs::getIconFromQtResourcePath(":/images/start.png"),QString::fromUtf8(it->filename.c_str()),NULL) ;
+                fileAction = new QAction(FilesDefs::getIconFromQtResourcePath(":/images/start.png"),QString::fromUtf8(it->filename.c_str()),NULL) ;
                 found = true ;
             }
             else
-                action = new QAction(QString::fromUtf8(it->filename.c_str()),NULL) ;
+                fileAction = new QAction(QString::fromUtf8(it->filename.c_str()),NULL) ;
 
-            connect(action,SIGNAL(triggered()),this,SLOT(setDownloadDirectory())) ;
-            action->setData(QString::fromUtf8(it->filename.c_str())) ;
+            connect(fileAction,SIGNAL(triggered()),this,SLOT(setDownloadDirectory())) ;
+            fileAction->setData(QString::fromUtf8(it->filename.c_str())) ;
 
-            mnu->addAction(action) ;
+            mnu->addAction(fileAction) ;
         }
 
         if(!found && !dl_directory.empty())
@@ -368,17 +376,17 @@ bool GxsChannelDialog::getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo
 {
 	std::vector<RsGxsChannelGroup> groups;
 
-    // request all group infos at once
+	// request all group infos at once
 
-    if(! rsGxsChannels->getChannelsInfo(std::list<RsGxsGroupId>(),groups))
-        return false;
+	if(! rsGxsChannels->getChannelsInfo(std::list<RsGxsGroupId>(),groups))
+		return false;
 
- 	/* Save groups to fill icons and description */
+	/* Save groups to fill icons and description */
 
 	for (auto& group: groups)
-       groupInfo.push_back(new RsGxsChannelGroup(group));
+		groupInfo.push_back(new RsGxsChannelGroup(group));
 
-    return true;
+	return true;
 }
 
 void GxsChannelDialog::groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo)
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
index 9527d8675..367935382 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
@@ -24,9 +24,10 @@
 #include "CreateGxsForumMsg.h"
 #include "GxsForumUserNotify.h"
 #include "gui/notifyqt.h"
-#include "gui/gxs/GxsGroupShareKey.h"
-#include "util/qtthreadsutils.h"
 #include "gui/common/GroupTreeWidget.h"
+#include "gui/gxs/GxsGroupShareKey.h"
+#include "util/misc.h"
+#include "util/qtthreadsutils.h"
 
 class GxsForumGroupInfoData : public RsUserdata
 {
@@ -110,13 +111,17 @@ bool GxsForumsDialog::getGroupStatistics(const RsGxsGroupId& groupId,GxsGroupSta
 
 QString GxsForumsDialog::getHelpString() const
 {
+	int H = misc::getFontSizeFactor("HelpButton").height();
+
 	QString hlp_str = tr(
-			"<h1><img width=\"32\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Forums</h1>               \
-			<p>Retroshare Forums look like internet forums, but they work in a decentralized way</p>    \
-			<p>You see forums your friends are subscribed to, and you forward subscribed forums to      \
-			your friends. This automatically promotes interesting forums in the network.</p>            \
-            <p>Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.</p>\
-                ").arg(QString::number(rsGxsForums->getDefaultStoragePeriod()/86400)).arg(QString::number(rsGxsForums->getDefaultSyncPeriod()/86400));
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Forums</h1>"
+	    "<p>Retroshare Forums look like internet forums, but they work in a decentralized way</p>"
+	    "<p>You see forums your friends are subscribed to, and you forward subscribed forums to"
+	    "   your friends. This automatically promotes interesting forums in the network.</p>"
+	    "<p>Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.</p>"
+	                    ).arg(  QString::number(2*H)
+	                          , QString::number(rsGxsForums->getDefaultStoragePeriod()/86400)
+	                          , QString::number(rsGxsForums->getDefaultSyncPeriod()/86400));
 
 	return hlp_str ;	
 }
@@ -233,9 +238,11 @@ void GxsForumsDialog::groupInfoToGroupItemInfo(const RsGxsGenericGroupData *grou
 	groupItemInfo.description = QString::fromUtf8(forumGroupData->mDescription.c_str());
 
 	if (!groupData->mMeta.mCircleId.isNull() )
+	{
 		if (details.mRestrictedCircleId == details.mCircleId)
 			groupItemInfo.icon = FilesDefs::getIconFromQtResourcePath(":icons/png/forums-red.png");
 		else
 			groupItemInfo.icon = FilesDefs::getIconFromQtResourcePath(":icons/png/forums-signed.png");
+	}
 }
 
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index c5c3c543c..d39baf6d5 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -44,9 +44,10 @@
 #include "gui/settings/rsharesettings.h"
 
 #include "util/DateTime.h"
-#include "util/RsProtectedTimer.h"
+#include "util/misc.h"
 #include "util/QtVersion.h"
 #include "util/qtthreadsutils.h"
+#include "util/RsProtectedTimer.h"
 
 #include <retroshare/rspeers.h>
 #include <retroshare/rsmsgs.h>
@@ -254,17 +255,17 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 	ui.tabWidget->hideCloseButton(0);
 	ui.tabWidget->setHideTabBarWithOneTab(true);
 
-    int S = QFontMetricsF(font()).height();
- QString help_str = tr(
- " <h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Messages</h1>                         \
- <p>Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.</p> \
- <p>It is also possible to send messages to other people's Identities using the global routing system. These messages \
-    are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. </p>\
-    <p>Distant messages stay into your Outbox until an acknowledgement of receipt has been received.</p>\
- <p>Generally, you may use messages to recommend files to your friends by pasting file links, \
- or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback \
- to a channel's owner.</p>                   \
- ").arg(QString::number(2*S), QString::number(S)) ;
+	int H = misc::getFontSizeFactor("HelpButton").height();
+	QString help_str = tr(
+	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Messages</h1>"
+	    "<p>Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.</p>"
+	    "<p>It is also possible to send messages to other people's Identities using the global routing system. These messages"
+	    "   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. </p>"
+	    "<p>Distant messages stay into your Outbox until an acknowledgement of receipt has been received.</p>"
+	    "<p>Generally, you may use messages to recommend files to your friends by pasting file links,"
+	    "   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback"
+	    "   to a channel's owner.</p>"
+	                     ).arg(QString::number(2*H)) ;
 
 	 registerHelpButton(ui.helpButton,help_str,"MessagesDialog") ;
 
diff --git a/retroshare-gui/src/util/misc.cpp b/retroshare-gui/src/util/misc.cpp
index e63ad2fd6..c24ea2d11 100644
--- a/retroshare-gui/src/util/misc.cpp
+++ b/retroshare-gui/src/util/misc.cpp
@@ -19,17 +19,20 @@
  *                                                                             *
  *******************************************************************************/
 
-#include <QString>
+#include "misc.h"
+
+#include "gui/common/FilesDefs.h"
+#include "util/rsdebug.h"
+
+#include <QApplication>
+#include <QBuffer>
+#include <QByteArray>
 #include <QDir>
 #include <QFileDialog>
-#include <QByteArray>
-#include <QBuffer>
-#include <time.h>
 #include <QFontDialog>
+#include <QString>
 
-#include "misc.h"
-#include "util/rsdebug.h"
-#include "gui/common/FilesDefs.h"
+#include <time.h>
 
 // return best userfriendly storage unit (B, KiB, MiB, GiB, TiB)
 // use Binary prefix standards from IEC 60027-2
@@ -67,46 +70,44 @@ QString misc::fingerPrintStyleSplit(const QString& in)
 bool misc::isPreviewable(QString extension)
 {
     extension = extension.toUpper();
-    if(extension == "AVI") return true;
-    if(extension == "MP3") return true;
-    if(extension == "OGG") return true;
-    if(extension == "OGM") return true;
-    if(extension == "WMV") return true;
-    if(extension == "WMA") return true;
-    if(extension == "MPEG") return true;
-    if(extension == "MPG") return true;
-    if(extension == "ASF") return true;
-    if(extension == "QT") return true;
-    if(extension == "RM") return true;
-    if(extension == "RMVB") return true;
-    if(extension == "RMV") return true;
-    if(extension == "SWF") return true;
-    if(extension == "FLV") return true;
-    if(extension == "WAV") return true;
-    if(extension == "MOV") return true;
-    if(extension == "VOB") return true;
-    if(extension == "MID") return true;
-    if(extension == "AC3") return true;
-    if(extension == "MP4") return true;
-    if(extension == "MP2") return true;
-    if(extension == "AVI") return true;
-    if(extension == "FLAC") return true;
-    if(extension == "AU") return true;
-    if(extension == "MPE") return true;
-    if(extension == "MOV") return true;
-    if(extension == "MKV") return true;
-    if(extension == "AIF") return true;
-    if(extension == "AIFF") return true;
-    if(extension == "AIFC") return true;
-    if(extension == "RA") return true;
-    if(extension == "RAM") return true;
-    if(extension == "M4P") return true;
-    if(extension == "M4A") return true;
     if(extension == "3GP") return true;
     if(extension == "AAC") return true;
-    if(extension == "SWA") return true;
+    if(extension == "AC3") return true;
+    if(extension == "AIF") return true;
+    if(extension == "AIFC") return true;
+    if(extension == "AIFF") return true;
+    if(extension == "ASF") return true;
+    if(extension == "AU") return true;
+    if(extension == "AVI") return true;
+    if(extension == "FLAC") return true;
+    if(extension == "FLV") return true;
+    if(extension == "M4P") return true;
+    if(extension == "M4A") return true;
+    if(extension == "MOV") return true;
+    if(extension == "MID") return true;
+    if(extension == "MKV") return true;
+    if(extension == "MP2") return true;
+    if(extension == "MP3") return true;
+    if(extension == "MP4") return true;
     if(extension == "MPC") return true;
+    if(extension == "MPE") return true;
+    if(extension == "MPEG") return true;
+    if(extension == "MPG") return true;
     if(extension == "MPP") return true;
+    if(extension == "OGG") return true;
+    if(extension == "OGM") return true;
+    if(extension == "QT") return true;
+    if(extension == "RA") return true;
+    if(extension == "RAM") return true;
+    if(extension == "RM") return true;
+    if(extension == "RMV") return true;
+    if(extension == "RMVB") return true;
+    if(extension == "SWA") return true;
+    if(extension == "SWF") return true;
+    if(extension == "VOB") return true;
+    if(extension == "WAV") return true;
+    if(extension == "WMA") return true;
+    if(extension == "WMV") return true;
     return false;
 }
 
@@ -227,8 +228,6 @@ QString misc::userFriendlyUnit(double count, unsigned int decimal, double factor
         return "0";
     }
 
-    QString output;
-
     int i;
     for (i = 0; i < 5; ++i) {
         if (count < factor) {
@@ -434,3 +433,12 @@ void misc::clearLayout(QLayout * layout) {
 		//delete item;//Auto deleted by Qt.
 	}
 }
+
+QSizeF misc::getFontSizeFactor(const QString &group, const qreal defaultFactor /*= 1.0*/)
+{
+	static qreal appFontWidth  = QFontMetrics(QApplication::font()).maxWidth();
+	static qreal appFontHeight = QFontMetrics(QApplication::font()).height();
+	qreal factor = Settings->valueFromGroup("FontHeighFactor",group,defaultFactor).toReal();
+	return QSizeF(appFontWidth*factor,appFontHeight*factor);
+}
+
diff --git a/retroshare-gui/src/util/misc.h b/retroshare-gui/src/util/misc.h
index f09280ecf..2863a867c 100644
--- a/retroshare-gui/src/util/misc.h
+++ b/retroshare-gui/src/util/misc.h
@@ -22,14 +22,15 @@
 #ifndef MISC_H
 #define MISC_H
 
-#include <stdexcept>
+#include "gui/settings/rsharesettings.h"
+
+#include <QFileDialog>
+#include <QLayout>
 #include <QObject>
 #include <QPair>
 #include <QThread>
-#include <QFileDialog>
-#include <QLayout>
 
-#include "gui/settings/rsharesettings.h"
+#include <stdexcept>
 
 /*  Miscellaneaous functions that can be useful */
 class misc : public QObject
@@ -165,15 +166,15 @@ class misc : public QObject
     static QPixmap getOpenThumbnailedPicture(QWidget *parent, const QString &caption, int width, int height);
     static bool getOpenFileName(QWidget *parent, RshareSettings::enumLastDir type
                                 , const QString &caption, const QString &filter
-                                , QString &file, QFileDialog::Options options = 0);
+                                , QString &file, QFileDialog::Options options = QFileDialog::Options());
     static bool getOpenFileNames(QWidget *parent, RshareSettings::enumLastDir type
                                  , const QString &caption, const QString &filter
-                                 , QStringList &files, QFileDialog::Options options = 0);
+                                 , QStringList &files, QFileDialog::Options options = QFileDialog::Options());
 
     static bool getSaveFileName(QWidget *parent, RshareSettings::enumLastDir type
                                 , const QString &caption , const QString &filter
-								, QString &file, QString *selectedFilter = NULL
-                                , QFileDialog::Options options = 0);
+                                , QString &file, QString *selectedFilter = NULL
+                                , QFileDialog::Options options = QFileDialog::Options());
 
 	static QFont getFont(bool *ok
 						 , const QFont &initial
@@ -187,6 +188,9 @@ class misc : public QObject
 	//Clear QLayout
 	static void clearLayout(QLayout *layout);
 
+	static QSizeF getFontSizeFactor(const QString &group, const qreal defaultFactor = 1.0);
+	static QSizeF getFontSizeFactor() {return getFontSizeFactor("Main");}
+
 };
 
 //  Trick to get a portable sleep() function
@@ -201,7 +205,7 @@ class SleeperThread : public QThread{
 template<class T> class SignalsBlocker
 {
 public:
-	SignalsBlocker(T *blocked) : blocked(blocked), previous(blocked->blockSignals(true)) {}
+	explicit SignalsBlocker(T *blocked) : blocked(blocked), previous(blocked->blockSignals(true)) {}
 	~SignalsBlocker() { blocked->blockSignals(previous); }
 
 	T *operator->() { return blocked; }

From 365682d7719f7db8221da7981af63bcbb94fc371 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 16 Jan 2022 15:50:21 +0100
Subject: [PATCH 004/503] added PGP-encryption to server communication to avoid
 data harvesting

---
 libretroshare                                 |   2 +-
 retroshare-friendserver/src/friendserver.cc   | 109 +++++++++++++-----
 retroshare-friendserver/src/friendserver.h    |   5 +-
 retroshare-gui/src/gui/settings/ServerPage.ui |   2 +-
 4 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/libretroshare b/libretroshare
index a7a430008..89b4d9c33 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit a7a430008b76e53727598c4d13106e7ce95221d7
+Subproject commit 89b4d9c3352c02630cd555918515b1412b3264ff
diff --git a/retroshare-friendserver/src/friendserver.cc b/retroshare-friendserver/src/friendserver.cc
index b3c5d55ec..577730e73 100644
--- a/retroshare-friendserver/src/friendserver.cc
+++ b/retroshare-friendserver/src/friendserver.cc
@@ -4,6 +4,8 @@
 #include "util/rsbase64.h"
 #include "util/radix64.h"
 
+#include "crypto/hashstream.h"
+
 #include "pgp/pgpkeyutil.h"
 #include "pgp/rscertificate.h"
 #include "pgp/openpgpsdkhandler.h"
@@ -60,7 +62,7 @@ void FriendServer::threadTick()
     if(last_debugprint_TS + DELAY_BETWEEN_TWO_DEBUG_PRINT < now)
     {
         last_debugprint_TS = now;
-        debugPrint();
+        debugPrint(false);
     }
 }
 
@@ -82,12 +84,12 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
 
         RsDbg() << "Sending response item to " << item->PeerId() ;
 
-        RsFriendServerServerResponseItem *sr_item = new RsFriendServerServerResponseItem;
+        RsFriendServerServerResponseItem sr_item;
 
         std::map<RsPeerId,RsPgpFingerprint> friends;
-        sr_item->nonce = pi->second.last_nonce;
-        sr_item->friend_invites = computeListOfFriendInvites(item->n_requested_friends,pi->first,friends);
-        sr_item->PeerId(item->PeerId());
+        sr_item.nonce = pi->second.last_nonce;
+        sr_item.friend_invites = computeListOfFriendInvites(item->n_requested_friends,pi->first,friends);
+        sr_item.PeerId(item->PeerId());
 
         // Update the have_added_as_friend for the list of each peer. We do that before sending because sending destroys
         // the item.
@@ -100,10 +102,29 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
 
         // Now encrypt the item with the public PGP key of the destination. This prevents the wrong person to request for
         // someone else's data.
-#warning TODO
+        RsFriendServerEncryptedServerResponseItem *encrypted_response_item = new RsFriendServerEncryptedServerResponseItem;
+        uint32_t serialized_clear_size = FsSerializer().size(&sr_item);
+        RsTemporaryMemory serialized_clear_mem(serialized_clear_size);
+        FsSerializer().serialise(&sr_item,serialized_clear_mem,&serialized_clear_size);
+
+        uint32_t encrypted_mem_size = serialized_clear_size+1000;	// leave some extra space
+        RsTemporaryMemory encrypted_mem(encrypted_mem_size);
+
+        if(!mPgpHandler->encryptDataBin(PGPHandler::pgpIdFromFingerprint(pi->second.pgp_fingerprint),
+                                        serialized_clear_mem,serialized_clear_size,
+                                        encrypted_mem,&encrypted_mem_size))
+        {
+            RsErr() << "Cannot encrypt item for PGP Id/FPR " << pi->second.pgp_fingerprint << ". Something went wrong." ;
+            return;
+        }
+        encrypted_response_item->PeerId(item->PeerId());
+        encrypted_response_item->bin_len = encrypted_mem_size;
+        encrypted_response_item->bin_data = malloc(encrypted_mem_size);
+
+        memcpy(encrypted_response_item->bin_data,encrypted_mem,encrypted_mem_size);
 
         // Send the item.
-        mni->SendItem(sr_item);
+        mni->SendItem(encrypted_response_item);
 
         // Update the list of closest peers for all peers currently in the database.
 
@@ -349,8 +370,6 @@ void FriendServer::run()
 void FriendServer::autoWash()
 {
     rstime_t now = time(nullptr);
-    RsDbg() << "autoWash..." ;
-
     std::list<RsPeerId> to_remove;
 
     for(std::map<RsPeerId,PeerInfo>::iterator it(mCurrentClientPeers.begin());it!=mCurrentClientPeers.end();++it)
@@ -380,32 +399,68 @@ void FriendServer::updateClosestPeers(const RsPeerId& pid,const RsPgpFingerprint
         }
 }
 
-void FriendServer::debugPrint()
+Sha1CheckSum FriendServer::computeDataHash()
 {
-    RsDbg() << "========== FriendServer statistics ============";
-    RsDbg() << "  Base directory: "<< mBaseDirectory;
-    RsDbg() << "  Random peer bias: "<< mRandomPeerBias;
-    RsDbg() << "  Network interface: ";
-    RsDbg() << "  Max peers in n-closest list: " << MAXIMUM_PEERS_TO_REQUEST;
-    RsDbg() << "  Current active peers: " << mCurrentClientPeers.size() ;
+    librs::crypto::HashStream s(librs::crypto::HashStream::SHA1);
 
-    rstime_t now = time(nullptr);
-
-    for(const auto& it:mCurrentClientPeers)
+    for(auto p(mCurrentClientPeers.begin());p!=mCurrentClientPeers.end();++p)
     {
-        RsDbg() << "   " << it.first << ": nonce=" << std::hex << it.second.last_nonce << std::dec << " fpr: " << it.second.pgp_fingerprint << ", last contact: " << now - it.second.last_connection_TS << " secs ago.";
-        RsDbg() << "   Closest peers:" ;
+        s << p->first;
 
-        for(const auto& pit:it.second.closest_peers)
-            RsDbg() << "      " << pit.second << " distance=" << pit.first ;
+        const auto& inf(p->second);
 
-        RsDbg() << "   Have added this peer:" ;
+        s << inf.pgp_fingerprint;
+        s << inf.short_certificate;
+        s << (uint64_t)inf.last_connection_TS;
+        s << inf.last_nonce;
 
-        for(const auto& pit:it.second.have_added_this_peer)
-            RsDbg() << "      " << pit.second << " distance=" << pit.first ;
+        for(auto d(inf.closest_peers.begin());d!=inf.closest_peers.end();++d)
+        {
+            s << d->first ;
+            s << d->second;
+        }
+        for(auto d(inf.have_added_this_peer.begin());d!=inf.have_added_this_peer.end();++d)
+        {
+            s << d->first ;
+            s << d->second;
+        }
     }
+    return s.hash();
+}
+void FriendServer::debugPrint(bool force)
+{
+    auto h = computeDataHash();
 
-    RsDbg() << "===============================================";
+    if((h != mCurrentDataHash) || force)
+    {
+        RsDbg() << "========== FriendServer statistics ============";
+        RsDbg() << "  Base directory: "<< mBaseDirectory;
+        RsDbg() << "  Random peer bias: "<< mRandomPeerBias;
+        RsDbg() << "  Current hash: "<< h;
+        RsDbg() << "  Network interface: ";
+        RsDbg() << "  Max peers in n-closest list: " << MAXIMUM_PEERS_TO_REQUEST;
+        RsDbg() << "  Current active peers: " << mCurrentClientPeers.size() ;
+
+        rstime_t now = time(nullptr);
+
+        for(const auto& it:mCurrentClientPeers)
+        {
+            RsDbg() << "   " << it.first << ": nonce=" << std::hex << it.second.last_nonce << std::dec << " fpr: " << it.second.pgp_fingerprint << ", last contact: " << now - it.second.last_connection_TS << " secs ago.";
+            RsDbg() << "   Closest peers:" ;
+
+            for(const auto& pit:it.second.closest_peers)
+                RsDbg() << "      " << pit.second << " distance=" << pit.first ;
+
+            RsDbg() << "   Have added this peer:" ;
+
+            for(const auto& pit:it.second.have_added_this_peer)
+                RsDbg() << "      " << pit.second << " distance=" << pit.first ;
+        }
+
+        RsDbg() << "===============================================";
+
+        mCurrentDataHash = h;
+    }
 
 }
 
diff --git a/retroshare-friendserver/src/friendserver.h b/retroshare-friendserver/src/friendserver.h
index 202f6a1e0..4f46bebdc 100644
--- a/retroshare-friendserver/src/friendserver.h
+++ b/retroshare-friendserver/src/friendserver.h
@@ -75,7 +75,8 @@ private:
     PeerInfo::PeerDistance computePeerDistance(const RsPgpFingerprint &p1, const RsPgpFingerprint &p2);
 
     void autoWash();
-    void debugPrint();
+    void debugPrint(bool force);
+    Sha1CheckSum computeDataHash();
 
     // Local members
 
@@ -88,4 +89,6 @@ private:
     std::map<RsPeerId, PeerInfo> mCurrentClientPeers;
     std::string mListeningAddress;
     uint16_t mListeningPort;
+
+    Sha1CheckSum mCurrentDataHash;
 };
diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index 6b78b988c..60abc5fd8 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>726</width>
+    <width>738</width>
     <height>579</height>
    </rect>
   </property>

From eefbd8a71086d07827a3fd8797f90ea14e5461b3 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 16 Jan 2022 21:17:10 +0100
Subject: [PATCH 005/503] fixed initing of profile passphrase for friend server
 manager

---
 libretroshare                                 |   2 +-
 .../src/gui/FileTransfer/SearchDialog.h       |   4 +-
 .../src/gui/FriendServerControl.cpp           |  41 +++++--
 retroshare-gui/src/gui/FriendServerControl.h  |   4 +-
 retroshare-gui/src/gui/FriendServerControl.ui | 112 ++++++++++++------
 retroshare-gui/src/gui/StartDialog.cpp        |   2 +-
 6 files changed, 107 insertions(+), 58 deletions(-)

diff --git a/libretroshare b/libretroshare
index 89b4d9c33..f03008485 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 89b4d9c3352c02630cd555918515b1412b3264ff
+Subproject commit f0300848539b3decd7034e5c221eed33c1c784bc
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
index 55db103ca..25925c36d 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
@@ -21,9 +21,9 @@
 #ifndef _SEARCHDIALOG_H
 #define _SEARCHDIALOG_H
 
-#include <retroshare/rstypes.h>
+#include "retroshare/rstypes.h"
 #include "ui_SearchDialog.h"
-#include <retroshare-gui/mainpage.h>
+#include "retroshare-gui/mainpage.h"
 
 class AdvancedSearchDialog;
 class RSTreeWidgetItemCompareRole;
diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index c946521e6..3cc029ecd 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -20,12 +20,14 @@
 
 #include <QTimer>
 #include <QMovie>
+#include <QMessageBox>
 #include <QTcpSocket>
 
 #include "retroshare/rsfriendserver.h"
 #include "retroshare/rstor.h"
 
 #include "util/qtthreadsutils.h"
+#include "util/misc.h"
 #include "gui/common/FilesDefs.h"
 
 #include "FriendServerControl.h"
@@ -37,7 +39,7 @@
 
 /** Constructor */
 FriendServerControl::FriendServerControl(QWidget *parent)
-    : QWidget(parent)
+    : MainPage(parent)
 {
     /* Invoke the Qt Designer generated object setup routine */
     setupUi(this);
@@ -48,6 +50,22 @@ FriendServerControl::FriendServerControl(QWidget *parent)
         return;
     }
 
+    int H = QFontMetricsF(torServerAddress_LE->font()).height();
+
+    QString help_str = tr("\
+                          <h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Friend Server</h1>                           \
+                          <p>This configuration panel allows you to specify the onion address of a                                   \
+                            friend server. Retroshare will talk to that server anonymously through Tor                               \
+                            and use it to acquire a fixed number of friends.</p>                                                     \
+                          <p>The friend server will continue supplying new friends until that number is reached                      \
+                            in particular if you add your own friends manually, the friend server may become useless                 \
+                            and you will save bandwidth disabling it. When disabling it, you will keep existing friends.</p>                                                            \
+                          <p>The friend server only knows your peer ID and profile public key. It doesn't know your IP address.</p>  \
+                          "
+                          ).arg(QString::number(2*H), QString::number(2*H)) ;
+
+    registerHelpButton(helpButton,help_str,"Friend Server") ;
+
     mConnectionCheckTimer = new QTimer;
 
     // init values
@@ -69,18 +87,6 @@ FriendServerControl::FriendServerControl(QWidget *parent)
     serverStatusCheckResult_LB->setMovie(mCheckingServerMovie);
 
     updateFriendServerStatusIcon(false);
-    updateTorProxyInfo();
-}
-
-void FriendServerControl::updateTorProxyInfo()
-{
-    std::string friend_proxy_address;
-    uint16_t friend_proxy_port;
-
-    RsTor::getProxyServerInfo(friend_proxy_address,friend_proxy_port);
-
-    torProxyPort_SB->setValue(friend_proxy_port);
-    torProxyAddress_LE->setText(QString::fromStdString(friend_proxy_address));
 }
 
 FriendServerControl::~FriendServerControl()
@@ -92,7 +98,16 @@ FriendServerControl::~FriendServerControl()
 void FriendServerControl::onOnOffClick(bool b)
 {
     if(b)
+    {
+        if(passphrase_LE->text().isNull())
+        {
+            QMessageBox::critical(nullptr,tr("Missing profile passphrase."),tr("Your profile passphrase is missing. Please enter is in the field below before enabling the friend server."));
+            whileBlocking(friendServerOnOff_CB)->setCheckState(Qt::Unchecked);
+            return;
+        }
+        rsFriendServer->setProfilePassphrase(passphrase_LE->text().toStdString());
         rsFriendServer->startServer();
+    }
     else
         rsFriendServer->stopServer();
 }
diff --git a/retroshare-gui/src/gui/FriendServerControl.h b/retroshare-gui/src/gui/FriendServerControl.h
index 7217bcd5d..465c5d1ec 100644
--- a/retroshare-gui/src/gui/FriendServerControl.h
+++ b/retroshare-gui/src/gui/FriendServerControl.h
@@ -22,9 +22,10 @@
 
 #include <QGraphicsScene>
 
+#include "retroshare-gui/mainpage.h"
 #include "ui_FriendServerControl.h"
 
-class FriendServerControl : public QWidget, public Ui::FriendServerControl
+class FriendServerControl : public MainPage, public Ui::FriendServerControl
 {
     Q_OBJECT
 
@@ -37,7 +38,6 @@ protected slots:
     void onOnionAddressEdit(const QString&);
     void onOnionPortEdit(int);
     void onNbFriendsToRequestsChanged(int n);
-    void updateTorProxyInfo();
     void checkServerAddress();
 
 private:
diff --git a/retroshare-gui/src/gui/FriendServerControl.ui b/retroshare-gui/src/gui/FriendServerControl.ui
index 73a5625d6..2ac69969b 100644
--- a/retroshare-gui/src/gui/FriendServerControl.ui
+++ b/retroshare-gui/src/gui/FriendServerControl.ui
@@ -12,11 +12,48 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QCheckBox" name="friendServerOnOff_CB">
-     <property name="text">
-      <string>On/Off</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <item>
+      <widget class="QCheckBox" name="friendServerOnOff_CB">
+       <property name="text">
+        <string>On/Off</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QToolButton" name="helpButton">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="icon">
+        <iconset resource="images.qrc">
+         <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -72,13 +109,22 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="text">
         <string>.onion</string>
        </property>
+       <property name="placeholderText">
+        <string>Onion address of the friend server</string>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QSpinBox" name="torServerPort_SB">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="minimum">
         <number>1025</number>
        </property>
@@ -107,49 +153,35 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
-      <widget class="QLabel" name="label_3">
+      <widget class="QLabel" name="label_4">
        <property name="text">
-        <string>Tor proxy address:</string>
+        <string>Retroshare passphrase:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="torProxyAddress_LE">
-       <property name="text">
-        <string>127.0.0.1</string>
+      <widget class="QLineEdit" name="passphrase_LE">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
+       </property>
+       <property name="placeholderText">
+        <string>Your retroshare passphrase</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QSpinBox" name="torProxyPort_SB">
-       <property name="minimum">
-        <number>1025</number>
-       </property>
-       <property name="maximum">
-        <number>65535</number>
-       </property>
-       <property name="value">
-        <number>9050</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
+      <spacer name="horizontalSpacer_4">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -178,6 +210,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="images.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index 4a07d43c8..d6f9f707d 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -123,7 +123,7 @@ void StartDialog::loadPerson()
 	rsNotify->cachePgpPassphrase(ui.password_input->text().toUtf8().constData()) ;
 	rsNotify->setDisableAskPassword(true);
 
-	bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
+    bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
 
 	rsNotify->setDisableAskPassword(false);
     rsNotify->clearPgpPassphrase();

From e7b822d1cb1679ab34afdb96120fca5a021319bf Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 17 Jan 2022 23:01:07 +0100
Subject: [PATCH 006/503] fixed bug in friend server auto wash

---
 libretroshare                               | 2 +-
 retroshare-friendserver/src/friendserver.cc | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libretroshare b/libretroshare
index f03008485..47548627a 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit f0300848539b3decd7034e5c221eed33c1c784bc
+Subproject commit 47548627adddc444a5d36368bd7a5f5baeed17ba
diff --git a/retroshare-friendserver/src/friendserver.cc b/retroshare-friendserver/src/friendserver.cc
index 577730e73..523a76640 100644
--- a/retroshare-friendserver/src/friendserver.cc
+++ b/retroshare-friendserver/src/friendserver.cc
@@ -323,7 +323,7 @@ void FriendServer::removePeer(const RsPeerId& peer_id)
 
                 auto tmp(fit);
                 ++tmp;
-                it.second.closest_peers.erase(fit);
+                it.second.have_added_this_peer.erase(fit);
                 fit=tmp;
             }
             else
@@ -381,8 +381,6 @@ void FriendServer::autoWash()
 
     for(auto peer_id:to_remove)
         removePeer(peer_id);
-
-    RsDbg() << "done." ;
 }
 
 void FriendServer::updateClosestPeers(const RsPeerId& pid,const RsPgpFingerprint& fpr)

From 57cee64966009cf8f1e3f7081b4a7bce7ae9c9c5 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 21 Jan 2022 11:35:08 +0100
Subject: [PATCH 007/503] Fix default fonts & font metrics for Shared Files
 Tree

---
 .../gui/FileTransfer/SharedFilesDialog.cpp    |   4 ++
 .../src/gui/FileTransfer/SharedFilesDialog.ui |   5 +++
 retroshare-gui/src/gui/RemoteDirModel.cpp     |   2 +-
 retroshare-gui/src/gui/icons.qrc              |   1 +
 .../src/gui/icons/folder-account.svg          |  38 ++++++++++++++++++
 retroshare-gui/src/gui/icons/folder-open.svg  |  38 ++++++++++++++++++
 retroshare-gui/src/gui/icons/folder.png       | Bin 903 -> 1036 bytes
 retroshare-gui/src/gui/icons/folder.svg       |  38 ++++++++++++++++++
 retroshare-gui/src/gui/icons/folderopen.png   | Bin 1704 -> 1627 bytes
 9 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 retroshare-gui/src/gui/icons/folder-account.svg
 create mode 100644 retroshare-gui/src/gui/icons/folder-open.svg
 create mode 100644 retroshare-gui/src/gui/icons/folder.svg

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 61e01ab24..9ca80dea4 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -231,6 +231,10 @@ SharedFilesDialog::SharedFilesDialog(bool remote_mode, QWidget *parent)
     /* Set Multi Selection */
     ui.dirTreeView->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
+	QFontMetricsF fontMetrics(ui.dirTreeView->font());
+	int iconHeight = fontMetrics.height() * 1.5;
+	ui.dirTreeView->setIconSize(QSize(iconHeight, iconHeight));
+
   /* Hide platform specific features */
   copylinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Copy retroshare Links to Clipboard" ), this );
   connect( copylinkAct , SIGNAL( triggered() ), this, SLOT( copyLink() ) );
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
index 6915c1c44..4207aa042 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
@@ -352,6 +352,11 @@ border-image: url(:/images/closepressed.png)
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
          <property name="contextMenuPolicy">
           <enum>Qt::CustomContextMenu</enum>
          </property>
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index 0cfcc9772..a6f31a428 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -136,7 +136,7 @@ void RetroshareDirModel::treeStyle()
 {
 	categoryIcon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/folder.png"), QIcon::Normal, QIcon::Off);
 	categoryIcon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/folderopen.png"), QIcon::Normal, QIcon::On);
-	peerIcon = FilesDefs::getIconFromQtResourcePath(":/images/user/identity16.png");
+	peerIcon = FilesDefs::getIconFromQtResourcePath(":/icons/folder-account.svg");
 }
 void TreeStyle_RDM::update()
 {
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 48071b201..d28594130 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -340,5 +340,6 @@
         <file>icons/notification.png</file>
         <file>icons/wire.png</file>
         <file>icons/wire-circle.png</file>
+        <file>icons/folder-account.svg</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/folder-account.svg b/retroshare-gui/src/gui/icons/folder-account.svg
new file mode 100644
index 000000000..1247cb476
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/folder-account.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="folder-account.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M19,17H11V16C11,14.67 13.67,14 15,14C16.33,14 19,14.67 19,16M15,9A2,2 0 0,1 17,11A2,2 0 0,1 15,13A2,2 0 0,1 13,11C13,9.89 13.9,9 15,9M20,6H12L10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6Z"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/folder-open.svg b/retroshare-gui/src/gui/icons/folder-open.svg
new file mode 100644
index 000000000..2cd0d4905
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/folder-open.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="folder-open.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M19,20H4C2.89,20 2,19.1 2,18V6C2,4.89 2.89,4 4,4H10L12,6H19A2,2 0 0,1 21,8H21L4,8V18L6.14,10H23.21L20.93,18.5C20.7,19.37 19.92,20 19,20Z"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/folder.png b/retroshare-gui/src/gui/icons/folder.png
index 01f9426283672e5f1b6e79ad74104caed3781c65..50b84dc5678adb0c613c4f96ad0ac1e6892982a1 100644
GIT binary patch
literal 1036
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9F7dqJ47I4eU0C@5Lt
z8c`CQpH@<ySd_|8US6)3nU`IhoLG>mmtT}V`<;yx0|WC+PZ!6KiaBp@?eCUJl{x<L
zys@$L6B7lE<&GlUj>XdzS|VJM-~3@_x_C*c`q&{S*Pa_GN8MJ7C@tFEo-kAG8(VL>
zpzh(F-d)1dopZVtHG1^jeV)B=0i)sPGiTrQ|J)b<)rLQQ#`kl!#&cMJPC^0=t>RfX
zmwvAdyi@-DV#d#l0wwEHPH%k^J&|>{$Zqy?=Ze}~H|}Pz+gDRvw)k_<guOa1*HyW#
za-VQdX8qc4X|~7rtd?<j-h6T4jGL97{8ude*LFO(ro|etCf_dC&{{up<+I8xcb5P9
zwhdpk`JWeln!3dLwfu5P#g_78cc)%Yw>@riDoFfE;irjWFP?c%nmJdGZSi)Hs27*Q
z`+T|SB}*1YN~NYP@BX*J{I%sX-&?{8DR<kR&ET4R?t{vX$e+dsst;R#vi;?GDfeuz
zv8)Ww|G;0I7hb+l-1^{|w+-jNwIvLJx2``?xP0v32mPi0S)MdM<eYiV)RHIfrMvN8
zfhGFR%lwb2huZ~nY@5wHIiA@t__X4SK-Rq(%ea3gd?_`QkiC7jjb+0PIpfXUuJt!2
zM=o8zi)F))L-*TnZC|CM)-cWBW$&NE4~<v8=2&3c)O7Fauc>=AyEzubPTMRI?-A+1
zpevkmep!q^!`oty_wjmv^($E}*e$%QDW_9y$hak7%cuEoIT!RceVej(3d0;_hUXjy
zESU=W1_5(j34`OVYfltb_;Y;RzUlfjK84K{TW?v+*mmaArSGds7_2`Yo3_MW%eN(S
z*S^oc@8zG4i}}Y>@ajXUr}!$LmX*Ik*58T$)jq3?gXfyR9Q)<e!U;u{9(V2E^P8*K
z&fLWpywNZ+x>hUI@l*B#m!HLx>ilBckNq{`w3@j~<FECBTgvxYj|xB9S}-q$dzx%`
zd8u}3;!=Lc$6K4lKhLmLT=^waxcBBM=Zcy?fBxyO(pmRMwcz=ce`h^6mK+d?o4h5q
zR6b-|?xod}lU_dXD}OqB)oc}crvH~MPj|<=yC*G6KDfo-@%xoc`gv)$w)un`-#qr?
o_f_v#tro8*B4rE^(}4XS%eRAv9-duuWI2fM>FVdQ&MBb@05pWn0RR91

literal 903
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&v7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8xB0oAoIF#H0kf5E^|YQVtoDuIE)Y6b&?c)^@qfi^&iV*x%Pu0WdM|9^)0SJ`G?
zW}SVVb>=mOnRi*|US^(km3cN4F)X<aVKdFX$}sOT%dD#meUE`6OtY>r&%VYm2c!%r
z2qJ-6W?ci44AU<{v@p-U0%R~uzs?F)#xVUR^PDR{#XzG#;)^aqECOm_ntg>~=4FuJ
z>>EIm1*GvB$i~?hLF8PZ;1%XMR~e=PHG<4!o^y?1Hds9agM^yNE1*XlN`m}?85kw>
zjE(qB=Dzxt#<%oep6pf5Gx<|gel>pTim(;?dnEFdg5gu?<=vORaDRN)P^<h?aZ>;3
z^D>us7tZII{bH85%<`D`K(iQ=yxm<GI#^{rfE>;OkH}&M2EHR8%s5q>PZ}u5UgGKN
z%Kn5&jMtE-v!UQFP>+SDi(^Q|t+%&t1|2exXnUxjq_j2buK215@guc|MbG|?pK5!F
z<FU`AWj}2z?o0oe=UF{N!_~#b#jSVdvo)@3cUC>S{aH5my3_WypDBi0=jeM+Z+fr4
z{>J(1iYLP6e)B#U6>(tK<GL5dH*S=$wTR~IeBb_;YhAs=2jd&xm|Cox&*bkHc~dg?
z_TAUMj6(4Z@jw4LI*SBcvln4|;it%R!TtClhFT?F5AMVUyQyqEOBmBHG1yLFQvv#g
zF!;xR;I~!$)=l{hR?~0n|8evCo=cG%_c896!Vn|bklmlXH+1(-Q-)W1b`S2|3BT$5
z=I`-``VCUNkKWn$UU50EU%BV!pRc~Y*Q?}@&y=qhdDU;Xc3wru>YKqp-=}<It=Kw$
z#;F5~LBXn8;u=wsl30>zm0Xkxq!^40j0|)QjC75RLJW<qOf0PojkFC6tPBifIs_k}
zXvob^$xN%nts(d7${3&qNstY}`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0TnTL
My85}Sb4q9e02M7>=>Px#

diff --git a/retroshare-gui/src/gui/icons/folder.svg b/retroshare-gui/src/gui/icons/folder.svg
new file mode 100644
index 000000000..4989f5d1c
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/folder.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="folder.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/folderopen.png b/retroshare-gui/src/gui/icons/folderopen.png
index 544e5f0b74e8298701404b43ed64cf356abde0c2..9f83b25617c391750c5b7bda6e677d52a649d07a 100644
GIT binary patch
delta 1587
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

literal 1704
zcmZ`&dpML?7(esP_c7x#W!#fXk=)Iot*nY7gB^rg+7jy;ikPsmnvrfQB)QCtNU}&`
zySfxBEb%1FjBC5H$wq~!C1THqcAx!Y&vVXs&-=c=_xE1D=R51{Xe%wTN&)~NZO5>7
zfs&0M5)s~00~cqYKm)9pRsfVIOU`*?P}lHbxG(`YrVVik0DQvne*$on2Ed3H0Opwh
zD2DMXcUb^HsB!+r%?1KMR;w6Sh-M2=t_Wmxpj-iwFC_Bd7J%Xf!0RM(MMRzmWOqX&
z;0w`3FJRX!!BCzM;Xwc%f^Y>0UjV@vR{-++paptCRuAsQNgx1+fxLEPDFswvYHsHu
z0B43&%PyEbYmt^O06D)SJRz3dxyaUva79?Q0H<1HLwR^c$gorxPPJI)(gPL=*bDGp
zDiZQ6B1Ish2fkql?3xIBgdqzHOCflcjCQ=`RM-N}EQSvO4_w}S(UJ<XI>q>~U=e_p
zWo7|%VgC#SlB9Pmm&b(@76M*3%nPnS<1!oU7i4r1Ap>6ImlXI^;pm`>Gh-0L?OJ+6
z6%^wz`02WTS#1l&C6<e$E0EB)vevOJ|HvaMRurrsp!OD{IdiAmCx4DQ;<<tHCQ<I~
zuKB=0$&ji$6Xt(CN{I>Z_fW28lG@BpVnN2?nb(tjt}&i`F4B6Pu@@;hIC|{UR+Ww&
zNiO4r{1<G67V(Bkqg(IOTOBU_rfCqVUN?K<yG<kakIJMqo)xY+yq4cQ#M1C>ib(DM
zRiKvpfv#;o?Jc%XcP9eNBYf{*YYom|stl-*!x$bB08r}jL%6I@QGrHrmL1bZ{3W6w
zP1mhU$maq;l(w_Ba*OVL%N;#HwURp}?xNXhBJF@0*chC%zt&-IDrt7t<+h|>YR~2R
z(v;_+k>v(AW={Jw89#{d+Q^TZrH%cxd6qLgll@2KYBpVUd1Wu?Qii!E=0n93^1=J7
zy+jqe2lcxq^NL&o%e;M#JhDGA!t|f!cM0^U-62W0O2i$LJqR{pM+;^W3(6Ye*{NzF
zch~0Tic=h7pN>A<(=jlqXi9OHE8{mF>U%3cP+ipHPf!af_h859g(wVM-NVDCDOFfx
zui-QQ+qI?7MQB~j$9KVF?hoH2yH`q5R$J7E(MhaG!fPt$v2EF$JaQ$y<3PC<=UU6R
zRWV6I9md$iqbKpm`gzZ<m3K$&X#6A|$Z;hcxgP1P>ZxU6E%9<5oN~G`6p-^YfW*07
zq2gt|A!o9kUQwG{*j6$B`6M%--%x&&@rWeYI;`l2WYnXBYtGdAWm(qfRB6P<*=P^Q
z4xu}}Slv1+tMs1Ood-@zSm{|kYW+A*OH)Z^w|XJLmC6~-<BE}^FCbT=?=kuTSxN~z
z{7UVF#=K#3&0t^N10r>N6}FGEs~;n4T|hnz#;&N(NwY}mYv_@rW?m%a*Z-iPm0~8r
zO7!{gqtv!gqy<?~Ke48eU`plK4!UF1CLVA&;}oQR?mpw)PN{9&g?s!h&7L=8Pt%==
z9r~z=)3A29y7pEgSxfoiuu@#wU=7%y!6a9s<P=%jM1wFWfo~bCq-p7xtNeKQmJX*&
zX<j8!{rEYVXj}3$J@y!qd-*&c1g+Ct5B4_4kLhw&WQw(3lFe)+#pX{#-xW)&fG~w_
z^+ub>Wo;|tXf_ksnPSgm!A;*Ol%}t|g(Ky^Zg%@uUZlF=E%}zl2~JMnPHOwVe!@K<
zlc_nQOUl`pf~c;H8`sxOIYnwsjoqWRgESpT_$XbgZak%O=X{a6TY6f<Sc!97p=XOi
zhWiWag0%OFb0vZ4y>WVZF|Uq)HhS8o-M+tI?L1qzGU>}=&JYWuE%-N0y-MM~vW{ir
z&hqtU`I-BK`#}LrXeKm6nu(!_i5uP2+-$SC8C{=7GpEt~*qHKv0uF`x9`yg={{!Tn
zKfDeDl<^F%q5iBW?{Gg56%}Q4@NjU1k9U}#QD}Go@14ae2m*FCj@G5yz2g4{#8uDe


From dadf59ac04c4192c85611b8e784761bb3014689c Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 27 Jan 2022 22:09:47 +0100
Subject: [PATCH 008/503] Added to fix font metrics for messages tree

---
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 3 +++
 retroshare-gui/src/gui/msgs/MessagesDialog.ui  | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index d39baf6d5..b2beba606 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -228,6 +228,9 @@ MessagesDialog::MessagesDialog(QWidget *parent)
     /* Set header sizes for the fixed columns and resize modes, must be set after processSettings */
     msgwheader->setStretchLastSection(true);
 
+	QFontMetricsF fontMetrics(ui.messageTreeWidget->font());
+	int iconHeight = fontMetrics.height() * 1.4;
+	ui.messageTreeWidget->setIconSize(QSize(iconHeight, iconHeight));
 
     // fill folder list
     updateMessageSummaryList();
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.ui b/retroshare-gui/src/gui/msgs/MessagesDialog.ui
index e0bf5c9a0..5f1d83eca 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.ui
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.ui
@@ -375,6 +375,11 @@
               <enum>Qt::Vertical</enum>
              </property>
              <widget class="RSTreeView" name="messageTreeWidget">
+              <property name="font">
+               <font>
+                <pointsize>10</pointsize>
+               </font>
+              </property>
               <property name="contextMenuPolicy">
                <enum>Qt::CustomContextMenu</enum>
               </property>

From 8b5c4bc7c52c676d11fabe425f5b00a194d7e4f3 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 28 Jan 2022 20:56:06 +0100
Subject: [PATCH 009/503] fixed the notification icon

---
 retroshare-gui/src/gui/common/FilesDefs.cpp   |  2 +-
 .../src/gui/gxs/GxsIdTreeWidgetItem.cpp       |  2 +-
 retroshare-gui/src/gui/icons.qrc              |  1 +
 retroshare-gui/src/gui/icons/notification.svg | 38 +++++++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/notification.svg

diff --git a/retroshare-gui/src/gui/common/FilesDefs.cpp b/retroshare-gui/src/gui/common/FilesDefs.cpp
index b7f0192a4..4d9f9c903 100644
--- a/retroshare-gui/src/gui/common/FilesDefs.cpp
+++ b/retroshare-gui/src/gui/common/FilesDefs.cpp
@@ -156,7 +156,7 @@ QIcon FilesDefs::getIconFromGxsIdCache(const RsGxsId& id,const QIcon& setIcon, b
 	if (setIcon.isNull())
 	{
 		if (id.isNull())
-			return getIconFromQtResourcePath(":/icons/notification.png");
+			return getIconFromQtResourcePath(":/icons/notification.svg");
 
 		auto item = mIconCache.find(id);
 
diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
index 4c1715a39..97f128447 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
@@ -199,7 +199,7 @@ void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 	if(id.isNull())
 	{
 		if (ownOption.icon.isNull())
-			ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/notification.png");
+			ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/notification.svg");
 	}
 	else
 	{
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index d28594130..89c0f83d9 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -341,5 +341,6 @@
         <file>icons/wire.png</file>
         <file>icons/wire-circle.png</file>
         <file>icons/folder-account.svg</file>
+        <file>icons/notification.svg</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/notification.svg b/retroshare-gui/src/gui/icons/notification.svg
new file mode 100644
index 000000000..c0cb95ba0
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/notification.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="notification.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M14,21A2,2 0 0,1 12,23A2,2 0 0,1 10,21"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1" />
+</svg>

From 00f82602d2d71e86e3d5654bf07537a6f5fe199c Mon Sep 17 00:00:00 2001
From: hunbernd <hunbernd@outlook.com>
Date: Mon, 24 Jan 2022 22:28:01 +0100
Subject: [PATCH 010/503] Added support for other msys2 environments

---
 build_scripts/Windows-msys2/build/build.bat   |  1 +
 .../Windows-msys2/build/env-base.bat          | 76 ++++++++++++++-----
 build_scripts/Windows-msys2/build/env.bat     |  8 +-
 3 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/build_scripts/Windows-msys2/build/build.bat b/build_scripts/Windows-msys2/build/build.bat
index 4d366f28c..c9ad27f9f 100644
--- a/build_scripts/Windows-msys2/build/build.bat
+++ b/build_scripts/Windows-msys2/build/build.bat
@@ -66,6 +66,7 @@ echo %RS_QMAKE_CONFIG% > buildinfo.txt
 echo %RsBuildConfig% >> buildinfo.txt
 echo %RsArchitecture% >> buildinfo.txt
 echo Qt %QtVersion% >> buildinfo.txt
+echo %RsToolchain% >> buildinfo.txt
 echo %RsCompiler% >> buildinfo.txt
 
 call "%ToolsPath%\msys2-path.bat" "%SourcePath%" MSYS2SourcePath
diff --git a/build_scripts/Windows-msys2/build/env-base.bat b/build_scripts/Windows-msys2/build/env-base.bat
index 9d9fa5379..883884262 100644
--- a/build_scripts/Windows-msys2/build/env-base.bat
+++ b/build_scripts/Windows-msys2/build/env-base.bat
@@ -1,6 +1,4 @@
 :: Process commandline parameter
-set Param32=0
-set Param64=0
 set ParamRelease=0
 set ParamDebug=0
 set ParamAutologin=0
@@ -12,14 +10,36 @@ set ParamIndexing=0
 set ParamNoupdate=0
 set CoreCount=%NUMBER_OF_PROCESSORS%
 set RS_QMAKE_CONFIG=
+set RsToolchain=
+set tcc=0
 
 :parameter_loop
 if "%~1" NEQ "" (
 	for /f "tokens=1,2 delims==" %%a in ("%~1") do (
 		if "%%~a"=="32" (
-			set Param32=1
+			set RsToolchain=mingw32
+			set /A tcc=tcc+1
 		) else if "%%~a"=="64" (
-			set Param64=1
+			set RsToolchain=mingw64
+			set /A tcc=tcc+1
+		) else if "%%~a"=="mingw32" (
+			set RsToolchain=mingw32
+			set /A tcc=tcc+1
+		) else if "%%~a"=="mingw64" (
+			set RsToolchain=mingw64
+			set /A tcc=tcc+1
+		) else if "%%~a"=="ucrt64" (
+			set RsToolchain=ucrt64
+			set /A tcc=tcc+1
+		) else if "%%~a"=="clang64" (
+			set RsToolchain=clang64
+			set /A tcc=tcc+1
+		) else if "%%~a"=="clang32" (
+			set RsToolchain=clang32
+			set /A tcc=tcc+1
+		) else if "%%~a"=="clangarm64" (
+			set RsToolchain=clangarm64
+			set /A tcc=tcc+1
 		) else if "%%~a"=="release" (
 			set ParamRelease=1
 		) else if "%%~a"=="debug" (
@@ -52,22 +72,37 @@ if "%~1" NEQ "" (
 	goto parameter_loop
 )
 
-if "%Param32%"=="1" (
-	if "%Param64%"=="1" (
-		echo.
-		echo 32-bit or 64-bit?
-		goto :usage
-	)
-
-	set RsBit=32
-	set RsArchitecture=x86
-	set RsMSYS2Architecture=i686
+if %tcc% NEQ 1 (
+	echo Multiple or no toolchain specified
+	goto :usage
 )
 
-if "%Param64%"=="1" (
-	set RsBit=64
+if "%RsToolchain%"=="mingw32" (
+	set RsArchitecture=x86
+	set RsMSYS2Architecture=i686
+	set MSYSTEM=MINGW32
+) else if "%RsToolchain%"=="mingw64" (
 	set RsArchitecture=x64
 	set RsMSYS2Architecture=x86_64
+	set MSYSTEM=MINGW64
+) else if "%RsToolchain%"=="ucrt64" (
+	set RsArchitecture=x64
+	set RsMSYS2Architecture=ucrt-x86_64
+	set MSYSTEM=UCRT64
+) else if "%RsToolchain%"=="clang64" (
+	set RsArchitecture=x64
+	set RsMSYS2Architecture=clang-x86_64
+	set MSYSTEM=CLANG64
+	set ParamClang=1
+) else if "%RsToolchain%"=="clang32" (
+	set RsArchitecture=x86
+	set RsMSYS2Architecture=clang-i686
+	set MSYSTEM=CLANG32
+	set ParamClang=1
+) else if "%RsToolchain%"=="clangarm64" (
+	set RsArchitecture=arm64
+	set RsMSYS2Architecture=clang-aarch64
+	set MSYSTEM=CLANGARM64
 )
 
 if "%ParamClang%"=="1" (
@@ -76,8 +111,6 @@ if "%ParamClang%"=="1" (
 	set RsCompiler=GCC
 )
 
-if "%RsBit%"=="" goto :usage
-
 if "%ParamRelease%"=="1" (
 	if "%ParamDebug%"=="1" (
 		echo.
@@ -108,10 +141,13 @@ exit /B 0
 
 :usage
 echo.
-echo Usage: 32^|64 release^|debug [autologin plugins webui singlethread clang indexing noupdate] ["CONFIG+=..."]
+echo Usage: 32^|64^|other release^|debug [autologin plugins webui singlethread clang indexing noupdate] ["CONFIG+=..."]
 echo.
 echo Mandatory parameter
-echo 32^|64              32-bit or 64-bit Version
+echo 32^|64              32-bit or 64-bit version (same as mingw32 or mingw64)
+echo                    Or you can specify any other toolchain supported by msys2:
+echo                         mingw32^|mingw64^|clang32^|clang64^|ucrt64^|clangarm64
+echo                         More info: https://www.msys2.org/docs/environments
 echo release^|debug      Build release or debug version
 echo.
 echo Optional parameter (need clean when changed)
diff --git a/build_scripts/Windows-msys2/build/env.bat b/build_scripts/Windows-msys2/build/env.bat
index bfe2afeba..c8cb71ff4 100644
--- a/build_scripts/Windows-msys2/build/env.bat
+++ b/build_scripts/Windows-msys2/build/env.bat
@@ -2,8 +2,6 @@ call "%~dp0env-base.bat" %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
-set MSYSTEM=MINGW%RsBit%
-
 set BuildPath=%EnvRootPath%\builds
 set DeployPath=%EnvRootPath%\deploy
 
@@ -14,10 +12,10 @@ if not exist "%DeployPath%" mkdir "%DeployPath%"
 call "%ToolsPath%\get-qt-version.bat" QtVersion
 if "%QtVersion%"=="" %cecho% error "Cannot get Qt version." & exit /B 1
 
-set RsMinGWPath=%EnvMSYS2BasePath%\mingw%RsBit%
+set RsMinGWPath=%EnvMSYS2BasePath%\%RsToolchain%
 
-set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsArchitecture%-%RsCompiler%-%RsBuildConfig%
-set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsArchitecture%-%RsCompiler%-%RsBuildConfig%
+set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsToolchain%-%RsCompiler%-%RsBuildConfig%
+set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsToolchain%-%RsCompiler%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
 set RsWebuiPath=%RootPath%\%SourceName%-webui

From a3f6d516e793a56da31448884196ef9aee8dc828 Mon Sep 17 00:00:00 2001
From: hunbernd <hunbernd@outlook.com>
Date: Mon, 31 Jan 2022 01:05:32 +0100
Subject: [PATCH 011/503] Fix webui compilation Copy files, instead of using
 the symlink.

---
 build_scripts/Windows-msys2/build/build.bat | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build_scripts/Windows-msys2/build/build.bat b/build_scripts/Windows-msys2/build/build.bat
index c9ad27f9f..972379aad 100644
--- a/build_scripts/Windows-msys2/build/build.bat
+++ b/build_scripts/Windows-msys2/build/build.bat
@@ -32,6 +32,16 @@ if not "%ParamNoupdate%"=="1" (
 	if "%ParamIndexing%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-xapian-core mingw-w64-%RsMSYS2Architecture%-libvorbis mingw-w64-%RsMSYS2Architecture%-flac mingw-w64-%RsMSYS2Architecture%-taglib"
 )
 
+:: Fix webui compilation (TODO: remove when whole RS switched to cmake)
+if "%ParamWebui%"=="1" (
+	pushd "%SourcePath%"
+	copy "%SourcePath%\libretroshare\src\jsonapi\jsonapi-generator-doxygen.conf" "%SourcePath%\jsonapi-generator\src\jsonapi-generator-doxygen.conf" %Quite%
+	copy "%SourcePath%\libretroshare\src\jsonapi\async-method-wrapper-template.cpp.tmpl" "%SourcePath%\jsonapi-generator\src\async-method-wrapper-template.cpp.tmpl" %Quite%
+	copy "%SourcePath%\libretroshare\src\jsonapi\method-wrapper-template.cpp.tmpl" "%SourcePath%\jsonapi-generator\src\method-wrapper-template.cpp.tmpl" %Quite%
+	git update-index --assume-unchanged "jsonapi-generator\src\jsonapi-generator-doxygen.conf" "jsonapi-generator\src\async-method-wrapper-template.cpp.tmpl" "jsonapi-generator\src\method-wrapper-template.cpp.tmpl"
+	popd
+)
+
 :: Initialize environment
 call "%~dp0env.bat" %*
 if errorlevel 2 exit /B 2

From af0bea49c5efc373e12b7cb72e5532d587e01f72 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 31 Jan 2022 15:32:04 +0100
Subject: [PATCH 012/503] fixed using of rs_socket_error()

---
 libretroshare                          | 2 +-
 retroshare-friendserver/src/network.cc | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libretroshare b/libretroshare
index 47548627a..55efaf9c7 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 47548627adddc444a5d36368bd7a5f5baeed17ba
+Subproject commit 55efaf9c730859ef3fc5c6f6049595c1225f9204
diff --git a/retroshare-friendserver/src/network.cc b/retroshare-friendserver/src/network.cc
index 3ed5b22a2..a607a89c2 100644
--- a/retroshare-friendserver/src/network.cc
+++ b/retroshare-friendserver/src/network.cc
@@ -134,7 +134,9 @@ bool FsNetworkInterface::checkForNewConnections()
 
     if(clintConnt < 0)
     {
-        if(errno == EWOULDBLOCK)
+        int err = rs_socket_error();
+
+        if(err == EWOULDBLOCK || err == EAGAIN)
             ;//RsErr()<< "Incoming connection with nothing to read!" << std::endl;
         else
             RsErr()<< "Error when accepting connection." << std::endl;

From 1de12129da7cbff670eaf57b48212c861ce72e2c Mon Sep 17 00:00:00 2001
From: hunbernd <hunbernd@outlook.com>
Date: Mon, 31 Jan 2022 01:47:26 +0100
Subject: [PATCH 013/503] Friendserver support

---
 build_scripts/Windows-msys2/build/env-base.bat         | 10 +++++++++-
 build_scripts/Windows-msys2/build/pack.bat             |  3 +++
 .../src/retroshare-friendserver.pro                    |  1 +
 retroshare-service/src/retroshare-service.pro          |  7 +------
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/build_scripts/Windows-msys2/build/env-base.bat b/build_scripts/Windows-msys2/build/env-base.bat
index 883884262..01a7a8f12 100644
--- a/build_scripts/Windows-msys2/build/env-base.bat
+++ b/build_scripts/Windows-msys2/build/env-base.bat
@@ -7,6 +7,7 @@ set ParamTor=0
 set ParamWebui=0
 set ParamClang=0
 set ParamIndexing=0
+set ParamFriendserver=0
 set ParamNoupdate=0
 set CoreCount=%NUMBER_OF_PROCESSORS%
 set RS_QMAKE_CONFIG=
@@ -58,6 +59,8 @@ if "%~1" NEQ "" (
 			set ParamClang=1
 		) else if "%%~a"=="indexing" (
 			set ParamIndexing=1
+		) else if "%%~a"=="friendserver" (
+			set ParamFriendserver=1
 		) else if "%%~a"=="noupdate" (
 			set ParamNoupdate=1
 		) else if "%%~a"=="CONFIG+" (
@@ -137,11 +140,15 @@ if "%ParamIndexing%"=="1" (
 	set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_deep_channels_index" "CONFIG+=rs_deep_files_index" "CONFIG+=rs_deep_files_index_ogg" "CONFIG+=rs_deep_files_index_flac" "CONFIG+=rs_deep_files_index_taglib"
 )
 
+if "%ParamFriendserver%"=="1" (
+	set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_efs"
+)
+
 exit /B 0
 
 :usage
 echo.
-echo Usage: 32^|64^|other release^|debug [autologin plugins webui singlethread clang indexing noupdate] ["CONFIG+=..."]
+echo Usage: 32^|64^|other release^|debug [autologin plugins webui singlethread clang indexing friendserver noupdate] ["CONFIG+=..."]
 echo.
 echo Mandatory parameter
 echo 32^|64              32-bit or 64-bit version (same as mingw32 or mingw64)
@@ -157,6 +164,7 @@ echo webui              Enable JsonAPI and pack webui files
 echo singlethread       Use only 1 thread for building
 echo clang              Use clang compiler instead of GCC
 echo indexing           Build with deep channel and file indexing support
+echo friendserver       Enable friendserver support
 echo noupdate           Skip updating the libraries
 echo "CONFIG+=..."      Enable some extra features, you can find the almost complete list in retroshare.pri
 echo.
diff --git a/build_scripts/Windows-msys2/build/pack.bat b/build_scripts/Windows-msys2/build/pack.bat
index 4948c1541..ceefd0144 100644
--- a/build_scripts/Windows-msys2/build/pack.bat
+++ b/build_scripts/Windows-msys2/build/pack.bat
@@ -105,6 +105,9 @@ copy "%RsBuildPath%\retroshare-nogui\src\%RsBuildConfig%\retroshare*-nogui.exe"
 copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
 copy "%RsBuildPath%\supportlibs\cmark\build\src\libcmark.dll" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
+if exist "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" (
+	copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
+)
 
 echo copy extensions
 for /D %%D in ("%RsBuildPath%\plugins\*") do (
diff --git a/retroshare-friendserver/src/retroshare-friendserver.pro b/retroshare-friendserver/src/retroshare-friendserver.pro
index 61c604e43..a566a0927 100644
--- a/retroshare-friendserver/src/retroshare-friendserver.pro
+++ b/retroshare-friendserver/src/retroshare-friendserver.pro
@@ -44,6 +44,7 @@ unix {
 win32-g++|win32-clang-g++ {
     dLib = ws2_32 iphlpapi crypt32
     LIBS *= $$linkDynamicLibs(dLib)
+    CONFIG += console
 }
 
 ################################### COMMON stuff ##################################
diff --git a/retroshare-service/src/retroshare-service.pro b/retroshare-service/src/retroshare-service.pro
index 2c7a3d094..6458e03ed 100644
--- a/retroshare-service/src/retroshare-service.pro
+++ b/retroshare-service/src/retroshare-service.pro
@@ -87,12 +87,7 @@ macx {
 ################################# Windows ##########################################
 
 win32-g++|win32-clang-g++ {
-	CONFIG(debug, debug|release) {
-		# show console output
-		CONFIG += console
-	} else {
-		CONFIG -= console
-	}
+	CONFIG += console
 
 	CONFIG(debug, debug|release) {
 	} else {

From 631b9b5f7a09fa45595b517e87c1bbfbc70dda8b Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 1 Feb 2022 20:01:38 +0100
Subject: [PATCH 014/503] Fix default font metrics for forums tree

---
 retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp | 4 ++++
 retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index fb962ca5c..19c408336 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -321,6 +321,10 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
 
     float f = QFontMetricsF(font()).height()/14.0f ;
 
+    QFontMetricsF fontMetrics(ui->threadTreeWidget->font());
+    int iconHeight = fontMetrics.height() * 1.4;
+    ui->threadTreeWidget->setIconSize(QSize(iconHeight, iconHeight));
+
     /* Set header resize modes and initial section sizes */
 
     QHeaderView * ttheader = ui->threadTreeWidget->header () ;
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index b27354e8b..c74ea5ebb 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -233,6 +233,11 @@
        </item>
        <item>
         <widget class="QTreeView" name="threadTreeWidget">
+         <property name="font">
+          <font>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
          <property name="contextMenuPolicy">
           <enum>Qt::CustomContextMenu</enum>
          </property>

From fa9bc09cec18382f9c7f5dadc4ae227fbde77856 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 1 Feb 2022 20:38:14 +0100
Subject: [PATCH 015/503] changed default tree font color to black for
 light/builtin style

---
 retroshare-gui/src/gui/qss/stylesheet/default.qss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss
index d1730bfef..607c371ff 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/default.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss
@@ -311,7 +311,7 @@ BoardPostDisplayWidget_compact QToolButton#voteDownButton:disabled {
 
 ForumsDialog, GxsForumThreadWidget
 {
-	qproperty-textColorRead: darkgray;
+	qproperty-textColorRead: black;
 	qproperty-textColorUnread: black; 
 	qproperty-textColorUnreadChildren: darkgray;
 	qproperty-textColorNotSubscribed: black;

From f125539d79dea2642f52abd76351253c7ec70f79 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 2 Feb 2022 15:39:03 +0100
Subject: [PATCH 016/503] Added new parameter for Windows MinGW build - Service
 - Friend Server - embedded Friend Server

---
 build_scripts/Windows/build.bat               |  4 +-
 .../Windows/build/build-installer.bat         |  2 +-
 build_scripts/Windows/build/build.bat         |  7 +-
 build_scripts/Windows/build/env.bat           | 54 +++++++++++-----
 build_scripts/Windows/build/git-log.bat       |  2 +-
 build_scripts/Windows/build/pack.bat          | 18 +++++-
 .../Windows/installer/lang/ca_ES.nsh          |  4 ++
 build_scripts/Windows/installer/lang/de.nsh   |  4 ++
 build_scripts/Windows/installer/lang/en.nsh   |  4 ++
 build_scripts/Windows/installer/lang/es.nsh   |  4 ++
 build_scripts/Windows/installer/lang/fr.nsh   |  4 ++
 build_scripts/Windows/installer/lang/pl.nsh   |  4 ++
 build_scripts/Windows/installer/lang/ru.nsh   |  4 ++
 build_scripts/Windows/installer/lang/tr.nsh   |  4 ++
 build_scripts/Windows/installer/lang/ts/en.ts | 28 ++++++++
 .../Windows/installer/lang/zh_CN.nsh          |  4 ++
 .../Windows/installer/retroshare-Qt5.nsi      | 64 ++++++++++++++++++-
 17 files changed, 190 insertions(+), 25 deletions(-)

diff --git a/build_scripts/Windows/build.bat b/build_scripts/Windows/build.bat
index 9dd51cc16..352274122 100644
--- a/build_scripts/Windows/build.bat
+++ b/build_scripts/Windows/build.bat
@@ -13,11 +13,11 @@ call "%~dp0build-libs\build-libs.bat"
 if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL%
 
 %cecho% info "Build %SourceName%"
-call "%~dp0build\build.bat" release autologin jsonapi plugins nativedialogs
+call "%~dp0build\build.bat" release autologin jsonapi plugins nativedialogs service
 if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Pack %SourceName%"
-call "%~dp0build\pack.bat" release plugins
+call "%~dp0build\pack.bat" release plugins service
 if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Build installer"
diff --git a/build_scripts/Windows/build/build-installer.bat b/build_scripts/Windows/build/build-installer.bat
index b34e76157..85500ef41 100644
--- a/build_scripts/Windows/build/build-installer.bat
+++ b/build_scripts/Windows/build/build-installer.bat
@@ -9,7 +9,7 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 :: Initialize environment
-call "%~dp0env.bat" release
+call "%~dp0env.bat" installer release
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
diff --git a/build_scripts/Windows/build/build.bat b/build_scripts/Windows/build/build.bat
index 095fc6081..23a89038e 100644
--- a/build_scripts/Windows/build/build.bat
+++ b/build_scripts/Windows/build/build.bat
@@ -9,7 +9,7 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 :: Initialize environment
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" build %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
@@ -49,11 +49,14 @@ echo.
 
 title Build - %SourceName%-%RsBuildConfig% [qmake]
 
-set RS_QMAKE_CONFIG=%RsBuildConfig% no_rs_cppwarning
+set RS_QMAKE_CONFIG=%RsBuildConfig%
 if "%ParamAutologin%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_autologin
 if "%ParamJsonApi%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_jsonapi
 if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retroshare_plugins
 if "%ParamUseNativeDialogs%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_use_native_dialogs
+if "%ParamService%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_service
+if "%ParamFriendServer%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_rs_friendserver
+if "%ParamEmbeddedFriendServer%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_efs
 
 qmake "%SourcePath%\RetroShare.pro" -r -spec win32-g++ "CONFIG+=%RS_QMAKE_CONFIG%" "EXTERNAL_LIB_DIR=%BuildLibsPath%\libs"
 if errorlevel 1 goto error
diff --git a/build_scripts/Windows/build/env.bat b/build_scripts/Windows/build/env.bat
index 883077173..c1b18492f 100644
--- a/build_scripts/Windows/build/env.bat
+++ b/build_scripts/Windows/build/env.bat
@@ -4,11 +4,17 @@ set ParamDebug=0
 set ParamAutologin=0
 set ParamPlugins=0
 set ParamJsonApi=0
+set ParamService=0
+set ParamFriendServer=0
+set ParamEmbeddedFriendServer=0
 set ParamUseNativeDialogs=0
 set ParamTor=0
 set NonInteractive=0
 set CoreCount=%NUMBER_OF_PROCESSORS%
 
+set Module=%~1
+shift /1
+
 :parameter_loop
 if "%~1" NEQ "" (
 	for /f "tokens=1,2 delims==" %%a in ("%~1") do (
@@ -20,6 +26,12 @@ if "%~1" NEQ "" (
 			set ParamAutologin=1
 		) else if "%%~a"=="jsonapi" (
 			set ParamJsonApi=1
+		) else if "%%~a"=="service" (
+			set ParamService=1
+		) else if "%%~a"=="friendserver" (
+			set ParamFriendServer=1
+		) else if "%%~a"=="embedded-friendserver" (
+			set ParamEmbeddedFriendServer=1
 		) else if "%%~a"=="plugins" (
 			set ParamPlugins=1
 		) else if "%%~a"=="tor" (
@@ -32,7 +44,7 @@ if "%~1" NEQ "" (
 			set ParamUseNativeDialogs=1
 		) else (
 			echo.
-			echo Unknown parameter %1
+			echo Unknown parameter %1 for %Module%
 			goto :usage
 		)
 	)
@@ -102,21 +114,31 @@ echo.
 echo Usage: release^|debug [^<optional parameters^>]
 echo.
 echo Mandatory parameter
-echo release^|debug      Build release or debug version
+echo release^|debug         Build release or debug version
 echo.
-echo Optional parameter (need clean when changed)
-echo autologin          Build with autologin
-echo jsonapi            Build with jsonapi
-echo plugins            Build plugins
-echo nativedialogs      Build with native dialogs
-echo.
-echo Optional parameter
-echo singlethread       Use only 1 thread for building
-echo.
-echo Parameter for pack
-echo tor                Pack tor version
-echo.
-echo Parameter for git-log
-echo non-interactive    Non-interactive mode
+if "%Module%"=="build" (
+	echo Optional parameter ^(need clean when changed^)
+	echo autologin             Build with autologin
+	echo jsonapi               Build with jsonapi
+	echo service               Build service
+	echo friendserver          Build Friend Server
+	echo embedded-friendserver Build with embedded Friend Server
+	echo plugins               Build plugins
+	echo nativedialogs         Build with native dialogs
+	echo.
+	echo Optional parameter
+	echo singlethread          Use only 1 thread for building
+)
+if "%Module%"=="pack" (
+	echo Optional parameter
+	echo service               Pack service
+	echo friendserver          Pack Friend Server ^(needs Tor^)
+	echo tor                   Pack Tor version
+	echo plugins               Pack plugins
+)
+if "%Module%"=="git-log" (
+	echo Optional parameter
+	echo non-interactive       Non-interactive mode
+)
 echo.
 exit /B 2
diff --git a/build_scripts/Windows/build/git-log.bat b/build_scripts/Windows/build/git-log.bat
index 4d479fc3f..286d813e2 100644
--- a/build_scripts/Windows/build/git-log.bat
+++ b/build_scripts/Windows/build/git-log.bat
@@ -8,7 +8,7 @@ if errorlevel 1 goto error_env
 call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" git-log %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat
index 2a86b9a16..6ec70c199 100644
--- a/build_scripts/Windows/build/pack.bat
+++ b/build_scripts/Windows/build/pack.bat
@@ -11,7 +11,7 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 :: Initialize environment
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" pack %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
@@ -95,9 +95,23 @@ copy nul "%RsDeployPath%\portable" %Quite%
 
 echo copy binaries
 copy "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\retroshare*.exe" "%RsDeployPath%" %Quite%
-copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
 
+if "%ParamService%"=="1" (
+	copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
+	if errorlevel 1 %cecho% error "Service not found"& goto error
+)
+
+if "%ParamFriendServer%"=="1" (
+	if "%ParamTor%"=="1" (
+		copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
+		if errorlevel 1 %cecho% error "Friend Server not found"& goto error
+	) else (
+		%cecho% error "Friend Server needs Tor"
+		goto error
+	)
+)
+
 echo copy extensions
 if "%ParamPlugins%"=="1" (
 	for /D %%D in ("%RsBuildPath%\plugins\*") do (
diff --git a/build_scripts/Windows/installer/lang/ca_ES.nsh b/build_scripts/Windows/installer/lang/ca_ES.nsh
index 74f92ffe5..1d4d7496e 100644
--- a/build_scripts/Windows/installer/lang/ca_ES.nsh
+++ b/build_scripts/Windows/installer/lang/ca_ES.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instal·la ${APPNAME} i els components necessaris."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Pells"
 !insertmacro LANG_STRING Section_Data_Desc "Instal·la pells."
 !insertmacro LANG_STRING Section_Shortcuts "Icones d'accés directe"
diff --git a/build_scripts/Windows/installer/lang/de.nsh b/build_scripts/Windows/installer/lang/de.nsh
index 663e9e786..2d22e8be4 100644
--- a/build_scripts/Windows/installer/lang/de.nsh
+++ b/build_scripts/Windows/installer/lang/de.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installiert ${APPNAME} und die benötigten Komponenten."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installiert Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installiert Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installiert Friend Server."
 !insertmacro LANG_STRING Section_Data "Skins"
 !insertmacro LANG_STRING Section_Data_Desc "Skins installieren."
 !insertmacro LANG_STRING Section_Shortcuts "Verknüpfungssymbole"
diff --git a/build_scripts/Windows/installer/lang/en.nsh b/build_scripts/Windows/installer/lang/en.nsh
index a709eec24..b076e271f 100644
--- a/build_scripts/Windows/installer/lang/en.nsh
+++ b/build_scripts/Windows/installer/lang/en.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Skins"
 !insertmacro LANG_STRING Section_Data_Desc "Installs skins."
 !insertmacro LANG_STRING Section_Shortcuts "Shortcut icons"
diff --git a/build_scripts/Windows/installer/lang/es.nsh b/build_scripts/Windows/installer/lang/es.nsh
index 66021c14e..a105ba450 100644
--- a/build_scripts/Windows/installer/lang/es.nsh
+++ b/build_scripts/Windows/installer/lang/es.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instala ${APPNAME} y los componentes requeridos."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Coberturas (skins)"
 !insertmacro LANG_STRING Section_Data_Desc "Instalar coberturas"
 !insertmacro LANG_STRING Section_Shortcuts "Iconos de accesos directos"
diff --git a/build_scripts/Windows/installer/lang/fr.nsh b/build_scripts/Windows/installer/lang/fr.nsh
index 680746da0..bfc5a30c8 100644
--- a/build_scripts/Windows/installer/lang/fr.nsh
+++ b/build_scripts/Windows/installer/lang/fr.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installe ${APPNAME} et les composants requis."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Habillages"
 !insertmacro LANG_STRING Section_Data_Desc "Installe des habillages."
 !insertmacro LANG_STRING Section_Shortcuts "Icônes de raccourci"
diff --git a/build_scripts/Windows/installer/lang/pl.nsh b/build_scripts/Windows/installer/lang/pl.nsh
index 53fc42934..c92a4a730 100644
--- a/build_scripts/Windows/installer/lang/pl.nsh
+++ b/build_scripts/Windows/installer/lang/pl.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instaluje ${APPNAME} oraz wymagane komponenty."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Skórki"
 !insertmacro LANG_STRING Section_Data_Desc "Instaluje skórki."
 !insertmacro LANG_STRING Section_Shortcuts "Ikony skrótów"
diff --git a/build_scripts/Windows/installer/lang/ru.nsh b/build_scripts/Windows/installer/lang/ru.nsh
index b8ba2df89..33df21106 100644
--- a/build_scripts/Windows/installer/lang/ru.nsh
+++ b/build_scripts/Windows/installer/lang/ru.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "Установка ${APPNAME} и необходимых компонентов."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Оболочки"
 !insertmacro LANG_STRING Section_Data_Desc "Установка оболочек."
 !insertmacro LANG_STRING Section_Shortcuts "Ярлыки"
diff --git a/build_scripts/Windows/installer/lang/tr.nsh b/build_scripts/Windows/installer/lang/tr.nsh
index 85abeaac2..d45fe6c73 100644
--- a/build_scripts/Windows/installer/lang/tr.nsh
+++ b/build_scripts/Windows/installer/lang/tr.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "${APPNAME} ve gerekli bileşenleri kurar."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Temalar"
 !insertmacro LANG_STRING Section_Data_Desc "Tema yükleyin."
 !insertmacro LANG_STRING Section_Shortcuts "Kısayol simgeleri"
diff --git a/build_scripts/Windows/installer/lang/ts/en.ts b/build_scripts/Windows/installer/lang/ts/en.ts
index e95f6939f..e96aabc6d 100644
--- a/build_scripts/Windows/installer/lang/ts/en.ts
+++ b/build_scripts/Windows/installer/lang/ts/en.ts
@@ -22,6 +22,34 @@
     <translation type="unfinished"></translation> 
   </message> 
 </context> 
+<context> 
+  <name>Section_Service</name> 
+  <message> 
+    <source>Service</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_Service_Desc</name> 
+  <message> 
+    <source>Installs Service.</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_FriendServer</name> 
+  <message> 
+    <source>Friend Server</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_FriendServer_Desc</name> 
+  <message> 
+    <source>Installs Friend Server.</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
 <context> 
   <name>Section_Data</name> 
   <message> 
diff --git a/build_scripts/Windows/installer/lang/zh_CN.nsh b/build_scripts/Windows/installer/lang/zh_CN.nsh
index 330de33ab..e3a59a980 100644
--- a/build_scripts/Windows/installer/lang/zh_CN.nsh
+++ b/build_scripts/Windows/installer/lang/zh_CN.nsh
@@ -2,6 +2,10 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "皮肤"
 !insertmacro LANG_STRING Section_Data_Desc "安装皮肤"
 !insertmacro LANG_STRING Section_Shortcuts "快捷方式图标"
diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi
index 9fd364764..13a2b4d47 100644
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@@ -60,6 +60,9 @@
 !define /date DATE "%Y%m%d"
 !endif
 
+# Service
+${!defineifexist} SERVICE_EXISTS "${RELEASEDIR}\retroshare-service\src\release\retroshare-service.exe"
+
 # Tor
 !ifdef TORDIR
 ${!defineifexist} TOR_EXISTS "${TORDIR}\tor.exe"
@@ -68,6 +71,12 @@ ${!defineifexist} TOR_EXISTS "${TORDIR}\tor.exe"
 !endif
 !endif
 
+# Friend Server
+!ifdef TOR_EXISTS
+# Add Friend Server with Tor only
+#${!defineifexist} FRIENDSERVER_EXISTS "${RELEASEDIR}\retroshare-friendserver\src\release\retroshare-friendserver.exe"
+!endif
+
 # Application name and version
 !define APPNAME "RetroShare"
 !define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
@@ -193,7 +202,6 @@ Section $(Section_Main) Section_Main
   ; Main binaries
   SetOutPath "$INSTDIR"
   File "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe"
-  File "${RELEASEDIR}\retroshare-service\src\release\retroshare-service.exe"
   File /nonfatal "${RELEASEDIR}\libretroshare\src\lib\retroshare.dll"
 
   ; Qt binaries
@@ -282,6 +290,22 @@ Section $(Section_Main) Section_Main
   File /r "${SOURCEDIR}\retroshare-gui\src\license\*.*"
 SectionEnd
 
+# Service
+!ifdef SERVICE_EXISTS
+  Section /o $(Section_Service) Section_Service
+    SetOutPath "$INSTDIR"
+  File "${RELEASEDIR}\retroshare-service\src\release\retroshare-service.exe"
+  SectionEnd
+!endif
+
+# Friend Server
+!ifdef FRIENDSERVER_EXISTS
+  Section /o $(Section_FriendServer) Section_FriendServer
+    SetOutPath "$INSTDIR"
+    File "${RELEASEDIR}\retroshare-friendserver\src\release\retroshare-friendserver.exe"
+  SectionEnd
+!endif
+
 # Tor
 !ifdef TOR_EXISTS
   Section /o $(Section_Tor) Section_Tor
@@ -355,6 +379,22 @@ Section $(Section_StartMenu) Section_StartMenu
   CreateDirectory "$SMPROGRAMS\${APPNAME}"
   CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
   CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
+
+!ifdef SERVICE_EXISTS
+  SectionGetFlags ${Section_Service} $0
+  IntOp $0 $0 & ${SF_SELECTED}
+  ${If} $0 == ${SF_SELECTED}
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME} Service.lnk" "$INSTDIR\retroshare-service.exe" "" "$INSTDIR\retroshare-service.exe" 0
+  ${EndIf}
+!endif
+
+!ifdef FRIENDSERVER_EXISTS
+  SectionGetFlags ${Section_FriendServer} $0
+  IntOp $0 $0 & ${SF_SELECTED}
+  ${If} $0 == ${SF_SELECTED}
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME} Friend Server.lnk" "$INSTDIR\retroshare-friendserver.exe" "" "$INSTDIR\retroshare-friendserver.exe" 0
+  ${EndIf}
+!endif
 SectionEnd
 
 Section $(Section_Desktop) Section_Desktop
@@ -407,6 +447,8 @@ SectionEnd
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${Section_Link} $(Section_Link_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_AutoStart} $(Section_AutoStart_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_Tor} $(Section_Tor_Desc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Section_Service} $(Section_Service_Desc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Section_FriendServer} $(Section_FriendServer_Desc)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 # Uninstall
@@ -461,6 +503,26 @@ Function .onInit
   !insertmacro MUI_LANGDLL_DISPLAY
 FunctionEnd
 
+!ifdef FRIENDSERVER_EXISTS
+Function .onSelChange
+  SectionGetFlags ${Section_FriendServer} $0
+  IntOp $0 $0 & ${SF_SELECTED}
+  ${If} $0 == ${SF_SELECTED}
+    # Activate Tor and set readonly
+    SectionGetFlags ${Section_Tor} $1
+    IntOp $1 $1 | ${SF_SELECTED}
+    IntOp $1 $1 | ${SF_RO}
+    SectionSetFlags ${Section_Tor} $1
+  ${Else}
+    # Remove readonly from Tor
+    SectionGetFlags ${Section_Tor} $1
+    IntOp $2 ${SF_RO} ~
+    IntOp $1 $1 & $2
+    SectionSetFlags ${Section_Tor} $1
+  ${EndIf}
+FunctionEnd
+!endif
+
 # Installation mode
 
 Function RequireAdmin

From 58e3c04801b877e27da7783b496cfd2fd65f3025 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 4 Feb 2022 14:49:39 +0100
Subject: [PATCH 017/503] disable friend server on non tor node

---
 retroshare-gui/src/gui/FriendsDialog.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp
index e3f74fcfd..dbff08418 100644
--- a/retroshare-gui/src/gui/FriendsDialog.cpp
+++ b/retroshare-gui/src/gui/FriendsDialog.cpp
@@ -27,6 +27,7 @@
 
 #include <retroshare/rspeers.h>
 #include <retroshare/rshistory.h>
+#include <retroshare/rsinit.h>
 
 #include "chat/ChatUserNotify.h"
 #include "connect/ConnectFriendWizard.h"
@@ -92,7 +93,8 @@ FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
 
     ui.tabWidget->setTabPosition(QTabWidget::North);
 #ifdef RS_EMBEDED_FRIEND_SERVER
-    ui.tabWidget->addTab(friendServerControl = new FriendServerControl(),QIcon(IMAGE_PEERS), tr("Friend Server"));
+    if(RsAccounts::isTorAuto())
+        ui.tabWidget->addTab(friendServerControl = new FriendServerControl(),QIcon(IMAGE_PEERS), tr("Friend Server"));
 #endif
     ui.tabWidget->addTab(networkView = new NetworkView(),QIcon(IMAGE_NETWORK2), tr("Network graph"));
     ui.tabWidget->addTab(networkDialog = new NetworkDialog(),QIcon(IMAGE_PEERS), tr("Keyring"));

From e2cda9fded1a55de1a1151bf4e7ab6ca03df002b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 4 Feb 2022 15:12:13 +0100
Subject: [PATCH 018/503] improved UI for FS

---
 libretroshare                                 |   2 +-
 .../src/gui/FriendServerControl.cpp           |   6 +
 retroshare-gui/src/gui/FriendServerControl.ui | 174 +++++++++---------
 3 files changed, 96 insertions(+), 86 deletions(-)

diff --git a/libretroshare b/libretroshare
index 55efaf9c7..68864cbd7 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 55efaf9c730859ef3fc5c6f6049595c1225f9204
+Subproject commit 68864cbd7086dfe9346b2fb2d50b78e382a4e221
diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index 3cc029ecd..219a1e375 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -44,6 +44,8 @@ FriendServerControl::FriendServerControl(QWidget *parent)
     /* Invoke the Qt Designer generated object setup routine */
     setupUi(this);
 
+    friendServerOnOff_CB->setEnabled(false); // until FS is connected.
+
     if(!rsFriendServer)
     {
         setEnabled(false);
@@ -170,11 +172,15 @@ void FriendServerControl::updateFriendServerStatusIcon(bool ok)
     {
         torServerStatus_LB->setToolTip(tr("Friend server is currently reachable.")) ;
         mCheckingServerMovie->setFileName(ICON_STATUS_OK);
+        friendServerOnOff_CB->setEnabled(true);
     }
     else
     {
+        rsFriendServer->stopServer();
         torServerStatus_LB->setToolTip(tr("The proxy is not enabled or broken.\nAre all services up and running fine??\nAlso check your ports!")) ;
         mCheckingServerMovie->setFileName(ICON_STATUS_UNKNOWN);
+        friendServerOnOff_CB->setChecked(false);
+        friendServerOnOff_CB->setEnabled(false);
     }
     mCheckingServerMovie->start();
 }
diff --git a/retroshare-gui/src/gui/FriendServerControl.ui b/retroshare-gui/src/gui/FriendServerControl.ui
index 2ac69969b..e51b85220 100644
--- a/retroshare-gui/src/gui/FriendServerControl.ui
+++ b/retroshare-gui/src/gui/FriendServerControl.ui
@@ -11,89 +11,8 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <item>
-      <widget class="QCheckBox" name="friendServerOnOff_CB">
-       <property name="text">
-        <string>On/Off</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_5">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QToolButton" name="helpButton">
-       <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
-       </property>
-       <property name="icon">
-        <iconset resource="images.qrc">
-         <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
-       </property>
-       <property name="checkable">
-        <bool>true</bool>
-       </property>
-       <property name="checked">
-        <bool>false</bool>
-       </property>
-       <property name="autoRaise">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Friends to request: </string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="torServerFriendsToRequest_SB">
-       <property name="minimum">
-        <number>1</number>
-       </property>
-       <property name="maximum">
-        <number>15</number>
-       </property>
-       <property name="value">
-        <number>5</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
@@ -112,9 +31,6 @@
        <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
-       <property name="text">
-        <string>.onion</string>
-       </property>
        <property name="placeholderText">
         <string>Onion address of the friend server</string>
        </property>
@@ -150,8 +66,44 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QToolButton" name="helpButton">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="icon">
+        <iconset resource="icons.qrc">
+         <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout"/>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
@@ -195,6 +147,58 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <widget class="QCheckBox" name="friendServerOnOff_CB">
+        <property name="text">
+         <string>On/Off</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_5">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>302</width>
+          <height>26</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Friends to request: </string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="torServerFriendsToRequest_SB">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>15</number>
+        </property>
+        <property name="value">
+         <number>5</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -211,7 +215,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="images.qrc"/>
+  <include location="icons.qrc"/>
  </resources>
  <connections/>
 </ui>

From 63ee463086c54d85a3605edc048aaf32c57b5dbc Mon Sep 17 00:00:00 2001
From: David Gerber <dg@zapek.com>
Date: Sat, 5 Feb 2022 18:12:04 +0100
Subject: [PATCH 019/503] Display the name of short invites properly

Instead of [Unknown], since the name is actually in the short invite.
---
 retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 15456bbd5..ca56e06aa 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -599,7 +599,7 @@ void ConnectFriendWizard::initializePage(int id)
 			if(mIsShortInvite)
 			{
 				if(ui->nameEdit->text().isEmpty())
-					ui->nameEdit->setText(tr("[Unknown]"));
+					ui->nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str()));
 				ui->addKeyToKeyring_CB->setChecked(false);
 				ui->addKeyToKeyring_CB->setEnabled(false);
 				ui->signersEdit->hide();

From 2aee2f008575bd7c36278bf9a2b58e9629709b2a Mon Sep 17 00:00:00 2001
From: Phenom <retrosharephenom@gmail.com>
Date: Sat, 5 Feb 2022 18:25:19 +0100
Subject: [PATCH 020/503] Fix to follow libretroshare master

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index 55efaf9c7..c1feae8b9 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 55efaf9c730859ef3fc5c6f6049595c1225f9204
+Subproject commit c1feae8b9144adaae8cf4d6c8a441bf41a6d7a95

From ba7f072144c54db3acf84a91a46dae0fb6385bbb Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 7 Feb 2022 17:27:42 +0100
Subject: [PATCH 021/503] Fixed clean of Windows MinGW build

---
 build_scripts/Windows/build/clean.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/Windows/build/clean.bat b/build_scripts/Windows/build/clean.bat
index e8d5aa7b8..4ab752d4d 100644
--- a/build_scripts/Windows/build/clean.bat
+++ b/build_scripts/Windows/build/clean.bat
@@ -8,7 +8,7 @@ if errorlevel 1 goto error_env
 call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" clean %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 

From a1502c2742a84fd9e69a58608c0870de628bbaba Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 9 Feb 2022 13:55:59 +0100
Subject: [PATCH 022/503] added missing spacer

---
 libretroshare                                 |  2 +-
 retroshare-gui/src/gui/FriendServerControl.ui | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/libretroshare b/libretroshare
index 68864cbd7..05963ad04 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 68864cbd7086dfe9346b2fb2d50b78e382a4e221
+Subproject commit 05963ad041430bee30c1418de19aadc5320ad42c
diff --git a/retroshare-gui/src/gui/FriendServerControl.ui b/retroshare-gui/src/gui/FriendServerControl.ui
index e51b85220..4eed774ad 100644
--- a/retroshare-gui/src/gui/FriendServerControl.ui
+++ b/retroshare-gui/src/gui/FriendServerControl.ui
@@ -71,6 +71,9 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Maximum</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
@@ -132,19 +135,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
    <item>

From fc89ba0fb74819d0089e63a26cddf09a6f4ddaa7 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 9 Feb 2022 15:40:01 +0100
Subject: [PATCH 023/503] fixed calling onion address testing only when editing
 is done, and updating of DNS in certificate

---
 libretroshare                                  |  2 +-
 retroshare-gui/src/gui/FriendServerControl.cpp |  4 ++--
 retroshare-gui/src/gui/FriendServerControl.h   |  2 +-
 retroshare-gui/src/gui/FriendsDialog.cpp       | 13 +++----------
 retroshare-gui/src/gui/HomePage.cpp            |  3 ++-
 retroshare-gui/src/gui/settings/ServerPage.cpp |  6 +++---
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/libretroshare b/libretroshare
index 05963ad04..b86968cd1 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 05963ad041430bee30c1418de19aadc5320ad42c
+Subproject commit b86968cd178c06680a1d39375be4afc3e69874bf
diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index 219a1e375..5842516ed 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -80,7 +80,7 @@ FriendServerControl::FriendServerControl(QWidget *parent)
 
     QObject::connect(friendServerOnOff_CB,SIGNAL(toggled(bool)),this,SLOT(onOnOffClick(bool)));
     QObject::connect(torServerFriendsToRequest_SB,SIGNAL(valueChanged(int)),this,SLOT(onFriendsToRequestChanged(int)));
-    QObject::connect(torServerAddress_LE,SIGNAL(textChanged(const QString&)),this,SLOT(onOnionAddressEdit(const QString&)));
+    QObject::connect(torServerAddress_LE,SIGNAL(editingFinished()),this,SLOT(onOnionAddressEdit()));
     QObject::connect(torServerPort_SB,SIGNAL(valueChanged(int)),this,SLOT(onOnionPortEdit(int)));
 
     QObject::connect(mConnectionCheckTimer,SIGNAL(timeout()),this,SLOT(checkServerAddress()));
@@ -130,7 +130,7 @@ void FriendServerControl::onOnionPortEdit(int)
     }
 }
 
-void FriendServerControl::onOnionAddressEdit(const QString&)
+void FriendServerControl::onOnionAddressEdit()
 {
     // Setup timer to auto-check the friend server address
     mConnectionCheckTimer->stop();
diff --git a/retroshare-gui/src/gui/FriendServerControl.h b/retroshare-gui/src/gui/FriendServerControl.h
index 465c5d1ec..832c67f39 100644
--- a/retroshare-gui/src/gui/FriendServerControl.h
+++ b/retroshare-gui/src/gui/FriendServerControl.h
@@ -35,7 +35,7 @@ public:
 
 protected slots:
     void onOnOffClick(bool b);
-    void onOnionAddressEdit(const QString&);
+    void onOnionAddressEdit();
     void onOnionPortEdit(int);
     void onNbFriendsToRequestsChanged(int n);
     void checkServerAddress();
diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp
index dcf287f51..532a87f4a 100644
--- a/retroshare-gui/src/gui/FriendsDialog.cpp
+++ b/retroshare-gui/src/gui/FriendsDialog.cpp
@@ -125,9 +125,8 @@ FriendsDialog::FriendsDialog(QWidget *parent) : MainPage(parent)
 
     // add self nick and Avatar to Friends.
     RsPeerDetails pd ;
-    if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) {
+    if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd))
         ui.nicknameLabel->setText(QString::fromUtf8(pd.name.c_str()) + " (" + QString::fromUtf8(pd.location.c_str())+")");
-    }
 
 	int H = misc::getFontSizeFactor("HelpButton").height();
 	QString hlp_str = tr(
@@ -260,13 +259,9 @@ void FriendsDialog::loadmypersonalstatus()
 	QString statustring =  QString::fromUtf8(rsMsgs->getCustomStateString().c_str());
 
 	if (statustring.isEmpty())
-	{
 		ui.mypersonalstatusLabel->setText(tr("Set your status message here."));
-	}
 	else
-	{
 		ui.mypersonalstatusLabel->setText(statustring);
-	}
 }
 
 void FriendsDialog::clearChatNotify()
@@ -283,13 +278,11 @@ void FriendsDialog::statusmessage()
 /*static*/ bool FriendsDialog::isGroupChatActive()
 {
 	FriendsDialog *friendsDialog = dynamic_cast<FriendsDialog*>(MainWindow::getPage(MainWindow::Friends));
-	if (!friendsDialog) {
+    if (!friendsDialog)
 		return false;
-	}
 
-    if (friendsDialog->ui.tabWidget->currentWidget() == friendsDialog->ui.groupChatTab) {
+    if (friendsDialog->ui.tabWidget->currentWidget() == friendsDialog->ui.groupChatTab)
         return true;
-    }
 
     return false;
 }
diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index ef6982e22..327c8e44f 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -136,6 +136,7 @@ void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
     {
     case RsNetworkEventCode::LOCAL_IP_UPDATED:  // [fallthrough]
     case RsNetworkEventCode::EXTERNAL_IP_UPDATED:  // [fallthrough]
+    case RsNetworkEventCode::DNS_UPDATED:  // [fallthrough]
                 RsQThreadUtils::postToObject( [=]()
                 {
                     updateCertificate();
@@ -213,7 +214,7 @@ void HomePage::updateOwnCert()
     }
 
     QString invite ;
-    RetroshareInviteFlags invite_flags = RetroshareInviteFlags::CURRENT_IP;
+    RetroshareInviteFlags invite_flags = RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::DNS;
 
     if(mIncludeAllIPs)
         invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index 8addc4349..f840f90a6 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -205,9 +205,9 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
 
     connect(ui.discComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
     connect(ui.netModeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
-    connect(ui.localAddress,   SIGNAL(textChanged(QString)),this,SLOT(saveAddresses()));
-    connect(ui.extAddress,     SIGNAL(textChanged(QString)),this,SLOT(saveAddresses()));
-    connect(ui.dynDNS,         SIGNAL(textChanged(QString)),this,SLOT(saveAddresses()));
+    connect(ui.localAddress,   SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
+    connect(ui.extAddress,     SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
+    connect(ui.dynDNS,         SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
 
     connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
     connect(ui.hiddenpage_proxyAddress_tor, SIGNAL(editingFinished()),this,SLOT(saveAddresses()));

From e86e0ac05a851f3386ee57411ad4ae7580aa0914 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 9 Feb 2022 22:16:02 +0100
Subject: [PATCH 024/503] merged

---
 build_scripts/Windows/build/clean.bat                     | 2 +-
 libretroshare                                             | 2 +-
 retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp    | 2 +-
 retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp | 4 ++++
 retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui  | 5 +++++
 retroshare-gui/src/gui/qss/stylesheet/default.qss         | 2 +-
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build_scripts/Windows/build/clean.bat b/build_scripts/Windows/build/clean.bat
index e8d5aa7b8..4ab752d4d 100644
--- a/build_scripts/Windows/build/clean.bat
+++ b/build_scripts/Windows/build/clean.bat
@@ -8,7 +8,7 @@ if errorlevel 1 goto error_env
 call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" clean %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
diff --git a/libretroshare b/libretroshare
index b86968cd1..5a6f09ee1 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit b86968cd178c06680a1d39375be4afc3e69874bf
+Subproject commit 5a6f09ee11a34f1c52b5be3f0a440f185b9b2a89
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 15456bbd5..ca56e06aa 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -599,7 +599,7 @@ void ConnectFriendWizard::initializePage(int id)
 			if(mIsShortInvite)
 			{
 				if(ui->nameEdit->text().isEmpty())
-					ui->nameEdit->setText(tr("[Unknown]"));
+					ui->nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str()));
 				ui->addKeyToKeyring_CB->setChecked(false);
 				ui->addKeyToKeyring_CB->setEnabled(false);
 				ui->signersEdit->hide();
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index fb962ca5c..19c408336 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -321,6 +321,10 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
 
     float f = QFontMetricsF(font()).height()/14.0f ;
 
+    QFontMetricsF fontMetrics(ui->threadTreeWidget->font());
+    int iconHeight = fontMetrics.height() * 1.4;
+    ui->threadTreeWidget->setIconSize(QSize(iconHeight, iconHeight));
+
     /* Set header resize modes and initial section sizes */
 
     QHeaderView * ttheader = ui->threadTreeWidget->header () ;
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index b27354e8b..c74ea5ebb 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -233,6 +233,11 @@
        </item>
        <item>
         <widget class="QTreeView" name="threadTreeWidget">
+         <property name="font">
+          <font>
+           <pointsize>10</pointsize>
+          </font>
+         </property>
          <property name="contextMenuPolicy">
           <enum>Qt::CustomContextMenu</enum>
          </property>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss
index d1730bfef..607c371ff 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/default.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss
@@ -311,7 +311,7 @@ BoardPostDisplayWidget_compact QToolButton#voteDownButton:disabled {
 
 ForumsDialog, GxsForumThreadWidget
 {
-	qproperty-textColorRead: darkgray;
+	qproperty-textColorRead: black;
 	qproperty-textColorUnread: black; 
 	qproperty-textColorUnreadChildren: darkgray;
 	qproperty-textColorNotSubscribed: black;

From c3c171125dedd38e3ceb9e28a9609c9845664ccc Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 11 Feb 2022 15:10:28 +0100
Subject: [PATCH 025/503] improved the logic of certificate handling in UI

---
 libretroshare                                 |  2 +-
 retroshare-gui/src/gui/GetStartedDialog.cpp   |  2 +-
 retroshare-gui/src/gui/HomePage.cpp           | 86 ++++++++-----------
 retroshare-gui/src/gui/HomePage.h             | 14 ++-
 .../src/gui/common/NewFriendList.cpp          |  2 +-
 .../src/gui/connect/ConfCertDialog.cpp        | 15 +++-
 .../src/gui/settings/CryptoPage.cpp           |  4 +-
 7 files changed, 58 insertions(+), 67 deletions(-)

diff --git a/libretroshare b/libretroshare
index 5a6f09ee1..d26821b89 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 5a6f09ee11a34f1c52b5be3f0a440f185b9b2a89
+Subproject commit d26821b891d7b3e72da475896814a82716574e56
diff --git a/retroshare-gui/src/gui/GetStartedDialog.cpp b/retroshare-gui/src/gui/GetStartedDialog.cpp
index 21fe60be0..e3bbd7170 100644
--- a/retroshare-gui/src/gui/GetStartedDialog.cpp
+++ b/retroshare-gui/src/gui/GetStartedDialog.cpp
@@ -229,7 +229,7 @@ void GetStartedDialog::inviteFriends()
 	{
 		RsAutoUpdatePage::lockAllEvents();
 
-        cert = rsPeers->GetRetroshareInvite(RsPeerId(),RetroshareInviteFlags::DNS | RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::FULL_IP_HISTORY);
+        cert = rsPeers->GetRetroshareInvite(RsPeerId(),RsPeers::defaultCertificateFlags | RetroshareInviteFlags::FULL_IP_HISTORY);
 
 		RsAutoUpdatePage::unlockAllEvents() ;
 	}
diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 327c8e44f..7eabe9dd4 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -50,14 +50,10 @@
 
 HomePage::HomePage(QWidget *parent) :
     MainPage(parent),
-    ui(new Ui::HomePage),
-    mIncludeAllIPs(false),
-    mUseShortFormat(true)
+    ui(new Ui::HomePage)
 {
     ui->setupUi(this);
 
-    updateCertificate();
-
     connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addFriend()));
     connect(ui->copyIDButton, SIGNAL(clicked()), this, SLOT(copyId()));
 
@@ -73,29 +69,36 @@ HomePage::HomePage(QWidget *parent) :
     QAction *CopyIdAction = new QAction(QIcon(),tr("Copy your Retroshare ID to Clipboard"), this);
     connect(CopyIdAction, SIGNAL(triggered()), this, SLOT(copyId()));
 
-        QMenu *menu = new QMenu();
+    QMenu *menu = new QMenu();
     menu->addAction(CopyIdAction);
 
-    if(!RsAccounts::isHiddenNode())
-    {
-        QAction *includeIPsAct = new QAction(QIcon(), tr("Include all your known IPs"),this);
-        connect(includeIPsAct, SIGNAL(triggered()), this, SLOT(toggleIncludeAllIPs()));
-        includeIPsAct->setCheckable(true);
-        includeIPsAct->setChecked(mIncludeAllIPs);
-
-        menu->addAction(includeIPsAct);
-    }
-    QAction *useOldFormatAct = new QAction(QIcon(), tr("Use old certificate format"),this);
-    useOldFormatAct->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
-    connect(useOldFormatAct, SIGNAL(triggered()), this, SLOT(toggleUseOldFormat()));
-    useOldFormatAct->setCheckable(true);
-    useOldFormatAct->setChecked(!mUseShortFormat);
-    menu->addAction(useOldFormatAct);
-
     menu->addSeparator();
     menu->addAction(SendAction);
     menu->addAction(WebMailAction);
     menu->addAction(RecAction);
+    menu->addSeparator();
+
+    if(!RsAccounts::isHiddenNode())
+    {
+        mIncludeDNSact = new QAction(QIcon(), tr("Include my DNS"),this);
+        connect(mIncludeDNSact, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+        mIncludeDNSact->setCheckable(true);
+        mIncludeDNSact->setChecked(true);
+        menu->addAction(mIncludeDNSact);
+
+        mIncludeIPsAct = new QAction(QIcon(), tr("Include all your known IPs"),this);
+        connect(mIncludeIPsAct, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+        mIncludeIPsAct->setCheckable(true);
+        mIncludeIPsAct->setChecked(false);
+        menu->addAction(mIncludeIPsAct);
+    }
+
+    QAction *useOldFormatAct = new QAction(QIcon(), tr("Use old certificate format"),this);
+    useOldFormatAct->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
+    connect(useOldFormatAct, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+    useOldFormatAct->setCheckable(true);
+    useOldFormatAct->setChecked(false);
+    menu->addAction(useOldFormatAct);
 
     ui->shareButton->setMenu(menu);
 
@@ -118,6 +121,8 @@ HomePage::HomePage(QWidget *parent) :
 
     mEventHandlerId = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { handleEvent(event); }, mEventHandlerId, RsEventType::NETWORK );
+
+    updateOwnCert();
 }
 
 void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
@@ -139,13 +144,15 @@ void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
     case RsNetworkEventCode::DNS_UPDATED:  // [fallthrough]
                 RsQThreadUtils::postToObject( [=]()
                 {
-                    updateCertificate();
+                    updateOwnCert();
                 },this);
         break;
     default:
         break;
     }
 }
+
+#ifdef DEAD_CODE
 void HomePage::certContextMenu(QPoint /*point*/)
 {
     QMenu menu(this) ;
@@ -178,17 +185,7 @@ void HomePage::certContextMenu(QPoint /*point*/)
 
     menu.exec(QCursor::pos());
 }
-
-void HomePage::toggleUseShortFormat()
-{
-    mUseShortFormat = !mUseShortFormat;
-    updateCertificate();
-}
-void HomePage::toggleIncludeAllIPs()
-{
-    mIncludeAllIPs = !mIncludeAllIPs;
-    updateCertificate();
-}
+#endif
 
 HomePage::~HomePage()
 {
@@ -196,14 +193,9 @@ HomePage::~HomePage()
     delete ui;
 }
 
-void HomePage::updateCertificate()
-{
-    updateOwnCert();
-}
-
 void HomePage::updateOwnCert()
 {
-    bool include_extra_locators = mIncludeAllIPs;
+    bool include_extra_locators = mIncludeIPsAct->isChecked();
 
     RsPeerDetails detail;
 
@@ -214,12 +206,12 @@ void HomePage::updateOwnCert()
     }
 
     QString invite ;
-    RetroshareInviteFlags invite_flags = RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::DNS;
+    RetroshareInviteFlags invite_flags = RsPeers::defaultCertificateFlags;
 
-    if(mIncludeAllIPs)
+    if(mIncludeIPsAct->isChecked())
         invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
 
-    if(mUseShortFormat)
+    if(!mUseOldFormatAct->isChecked())
     {
         std::string short_invite;
         rsPeers->getShortInvite(short_invite,rsPeers->getOwnId(),invite_flags | RetroshareInviteFlags::RADIX_FORMAT);
@@ -245,7 +237,7 @@ void HomePage::updateOwnCert()
 
     ui->retroshareid->setText("\n"+invite+"\n");
 
-    QString description = ConfCertDialog::getCertificateDescription(detail,false,mUseShortFormat,include_extra_locators);
+    QString description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatAct->isChecked(),include_extra_locators);
 
     ui->retroshareid->setToolTip(description);
 }
@@ -348,9 +340,3 @@ void HomePage::openWebHelp()
 {
     QDesktopServices::openUrl(QUrl(QString("https://retrosharedocs.readthedocs.io/en/latest/")));
 }
-
-void HomePage::toggleUseOldFormat()
-{
-    mUseShortFormat = !mUseShortFormat;
-    updateCertificate();
-}
diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index 2b9e28c18..c5f06f33b 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -47,27 +47,25 @@ public:
 	virtual QString helpText() const { return ""; } //MainPage
 
 private slots:
-	void certContextMenu(QPoint);
+#ifdef DEAD_CODE
+    void certContextMenu(QPoint);
+#endif
 	void updateOwnCert();
-    void updateCertificate();
 	void runEmailClient();
 	void copyCert();
 	void copyId();
 	void saveCert();
 	void addFriend();
 	void webMail();
-	//void loadCert();
 	void openWebHelp() ;
-    void toggleUseOldFormat() ;
     void recommendFriends();
-	void toggleIncludeAllIPs();
-	void toggleUseShortFormat();
 
 private:
 	Ui::HomePage *ui;
 
-	bool mIncludeAllIPs;
-	bool mUseShortFormat;
+    QAction *mIncludeDNSact;
+    QAction *mIncludeIPsAct;
+    QAction *mUseOldFormatAct;
 
     RsEventsHandlerId_t mEventHandlerId;
 
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 37b1511f8..641397a30 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -1361,7 +1361,7 @@ bool NewFriendList::exportFriendlist(QString &fileName)
             if (!rsPeers->getPeerDetails(*list_iter2, detailSSL))
                 continue;
 
-            std::string certificate = rsPeers->GetRetroshareInvite(detailSSL.id, RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::DNS | RetroshareInviteFlags::RADIX_FORMAT);
+            std::string certificate = rsPeers->GetRetroshareInvite(detailSSL.id, RsPeers::defaultCertificateFlags | RetroshareInviteFlags::RADIX_FORMAT);
 
             // remove \n from certificate
             certificate.erase(std::remove(certificate.begin(), certificate.end(), '\n'), certificate.end());
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
index 03f7b4205..cd539933f 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@@ -264,7 +264,7 @@ void ConfCertDialog::loadInvitePage()
 	ui._shouldAddSignatures_CB->setEnabled(detail.gpgSigners.size() > 1) ;
 
 	std::string invite ;
-	RetroshareInviteFlags flags = RetroshareInviteFlags::DNS | RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::RADIX_FORMAT;
+    RetroshareInviteFlags flags = RsPeers::defaultCertificateFlags | RetroshareInviteFlags::RADIX_FORMAT;
 
 	if(!detail.isHiddenNode && ui._includeIPHistory_CB->isChecked())
 		flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
@@ -346,13 +346,20 @@ QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bo
 		infotext += "</li>" ;
 	}
 
+    if(!detail.dyndns.empty())
+    {
+        infotext += "<li>" ;
+        infotext += tr("<b>DNS:</b> : ") + QString::fromStdString(detail.dyndns);
+        infotext += "</li>" ;
+    }
+
     infotext += QString("</p>") ;
 
     if(rsPeers->getOwnId() == detail.id)
 		if(use_short_format)
-        infotext += tr("<p>You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.</p>") ;
-		else
-        infotext += tr("<p>You can use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
+            infotext += tr("<p>You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.</p>") ;
+        else
+            infotext += tr("<p>You can use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
 
     return infotext;
 }
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 99317c14d..450ae4330 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -103,7 +103,7 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ )
         ui.pgpfingerprint->setText(misc::fingerPrintStyleSplit(QString::fromStdString(detail.fpr.toStdString())));
 
         std::string invite ;
-        rsPeers->getShortInvite(invite,rsPeers->getOwnId(),RetroshareInviteFlags::RADIX_FORMAT | RetroshareInviteFlags::DNS | RetroshareInviteFlags::CURRENT_IP);
+        rsPeers->getShortInvite(invite,rsPeers->getOwnId(),RetroshareInviteFlags::RADIX_FORMAT | RsPeers::defaultCertificateFlags);
         ui.retroshareid->setText(QString::fromUtf8(invite.c_str()));
 		
         /* set retroshare version */
@@ -139,7 +139,7 @@ void
 CryptoPage::load()
 {
     std::string cert ;
-    RetroshareInviteFlags flags = RetroshareInviteFlags::DNS | RetroshareInviteFlags::CURRENT_IP;
+    RetroshareInviteFlags flags = RetroshareInviteFlags::DNS | RetroshareInviteFlags::CURRENT_LOCAL_IP | RetroshareInviteFlags::CURRENT_EXTERNAL_IP;
 
     if(ui._shortFormat_CB->isChecked())
     {

From 33800e9cb9561160d7e909e1a0d13bdd042f15a9 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 11 Feb 2022 15:23:14 +0100
Subject: [PATCH 026/503] removed/hid the certificate and ID from settings
 since it duplicates functionality of HomePage with different options

---
 retroshare-gui/src/gui/HomePage.cpp           | 12 +++++-----
 .../src/gui/settings/CryptoPage.cpp           |  6 ++++-
 retroshare-gui/src/gui/settings/CryptoPage.ui | 23 ++++++-------------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 7eabe9dd4..f5d7a5719 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -93,12 +93,12 @@ HomePage::HomePage(QWidget *parent) :
         menu->addAction(mIncludeIPsAct);
     }
 
-    QAction *useOldFormatAct = new QAction(QIcon(), tr("Use old certificate format"),this);
-    useOldFormatAct->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
-    connect(useOldFormatAct, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
-    useOldFormatAct->setCheckable(true);
-    useOldFormatAct->setChecked(false);
-    menu->addAction(useOldFormatAct);
+    mUseOldFormatAct = new QAction(QIcon(), tr("Use old certificate format"),this);
+    mUseOldFormatAct->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
+    connect(mUseOldFormatAct, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+    mUseOldFormatAct->setCheckable(true);
+    mUseOldFormatAct->setChecked(false);
+    menu->addAction(mUseOldFormatAct);
 
     ui->shareButton->setMenu(menu);
 
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 450ae4330..9f813209a 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -61,6 +61,10 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags)
     //connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager()));
     connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(exportProfile()));
 
+    // Remove this because it duplicates functionality of the HomePage.
+    ui.retroshareId_LB->hide();
+    ui.retroshareId_content_LB->hide();
+    ui.stackPageCertificate->hide();
 
 	ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime()));
 }
@@ -104,7 +108,7 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ )
 
         std::string invite ;
         rsPeers->getShortInvite(invite,rsPeers->getOwnId(),RetroshareInviteFlags::RADIX_FORMAT | RsPeers::defaultCertificateFlags);
-        ui.retroshareid->setText(QString::fromUtf8(invite.c_str()));
+        ui.retroshareId_content_LB->setText(QString::fromUtf8(invite.c_str()));
 		
         /* set retroshare version */
         ui.version->setText(Rshare::retroshareVersion(true));
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui
index 86b8e38b9..29a336721 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.ui
+++ b/retroshare-gui/src/gui/settings/CryptoPage.ui
@@ -7,25 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>869</width>
-    <height>487</height>
+    <height>493</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Node information</string>
-      </attribute>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <widget class="QWidget" name="stackPageNodeInfo" native="true">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QGroupBox" name="groupBox_1">
          <layout class="QGridLayout" name="gridLayout_4">
           <item row="6" column="0">
-           <widget class="QLabel" name="label">
+           <widget class="QLabel" name="retroshareId_LB">
             <property name="text">
              <string>Retroshare ID:</string>
             </property>
@@ -248,7 +242,7 @@
           <item row="14" column="1">
            <widget class="QPushButton" name="exportprofile">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
              <string>Export</string>
@@ -474,7 +468,7 @@
            </widget>
           </item>
           <item row="6" column="1" colspan="3">
-           <widget class="QLabel" name="retroshareid">
+           <widget class="QLabel" name="retroshareId_content_LB">
             <property name="font">
              <font>
               <weight>75</weight>
@@ -539,10 +533,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2">
-      <attribute name="title">
-       <string>Certificate</string>
-      </attribute>
+     <widget class="QWidget" name="stackPageCertificate" native="true">
       <layout class="QGridLayout" name="gridLayout_7">
        <item row="0" column="0">
         <widget class="QPlainTextEdit" name="certplainTextEdit">

From 6fcb3e8972dc6b0885d779e9f1e1d8dc6f343108 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 11 Feb 2022 16:20:52 +0100
Subject: [PATCH 027/503] added entries to control what we add in the
 certificate

---
 retroshare-gui/src/gui/HomePage.cpp       | 83 +++++++++++++++--------
 retroshare-gui/src/gui/HomePage.h         | 10 ++-
 retroshare-gui/src/gui/MainWindow.cpp     |  4 +-
 retroshare-gui/src/gui/MainWindow.h       |  7 +-
 retroshare-gui/src/gui/RetroShareLink.cpp | 44 +++++++-----
 5 files changed, 98 insertions(+), 50 deletions(-)

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index f5d7a5719..3268b4e79 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -80,25 +80,37 @@ HomePage::HomePage(QWidget *parent) :
 
     if(!RsAccounts::isHiddenNode())
     {
+        mIncludeLocIPact = new QAction(QIcon(), tr("Include current local IP"),this);
+        connect(mIncludeLocIPact, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+        mIncludeLocIPact->setCheckable(true);
+        mIncludeLocIPact->setChecked(true);
+        menu->addAction(mIncludeLocIPact);
+
+        mIncludeExtIPact = new QAction(QIcon(), tr("Include current external IP"),this);
+        connect(mIncludeExtIPact, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+        mIncludeExtIPact->setCheckable(true);
+        mIncludeExtIPact->setChecked(true);
+        menu->addAction(mIncludeExtIPact);
+
         mIncludeDNSact = new QAction(QIcon(), tr("Include my DNS"),this);
         connect(mIncludeDNSact, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
         mIncludeDNSact->setCheckable(true);
         mIncludeDNSact->setChecked(true);
         menu->addAction(mIncludeDNSact);
 
-        mIncludeIPsAct = new QAction(QIcon(), tr("Include all your known IPs"),this);
-        connect(mIncludeIPsAct, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
-        mIncludeIPsAct->setCheckable(true);
-        mIncludeIPsAct->setChecked(false);
-        menu->addAction(mIncludeIPsAct);
+        mIncludeIPHistoryact = new QAction(QIcon(), tr("Include all IPs history"),this);
+        connect(mIncludeIPHistoryact, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+        mIncludeIPHistoryact->setCheckable(true);
+        mIncludeIPHistoryact->setChecked(false);
+        menu->addAction(mIncludeIPHistoryact);
     }
 
-    mUseOldFormatAct = new QAction(QIcon(), tr("Use old certificate format"),this);
-    mUseOldFormatAct->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
-    connect(mUseOldFormatAct, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
-    mUseOldFormatAct->setCheckable(true);
-    mUseOldFormatAct->setChecked(false);
-    menu->addAction(mUseOldFormatAct);
+    mUseOldFormatact = new QAction(QIcon(), tr("Use old certificate format"),this);
+    mUseOldFormatact->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
+    connect(mUseOldFormatact, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
+    mUseOldFormatact->setCheckable(true);
+    mUseOldFormatact->setChecked(false);
+    menu->addAction(mUseOldFormatact);
 
     ui->shareButton->setMenu(menu);
 
@@ -193,9 +205,8 @@ HomePage::~HomePage()
     delete ui;
 }
 
-void HomePage::updateOwnCert()
+void HomePage::getOwnCert(QString& invite,QString& description) const
 {
-    bool include_extra_locators = mIncludeIPsAct->isChecked();
 
     RsPeerDetails detail;
 
@@ -205,23 +216,47 @@ void HomePage::updateOwnCert()
         return ;
     }
 
-    QString invite ;
-    RetroshareInviteFlags invite_flags = RsPeers::defaultCertificateFlags;
+    RetroshareInviteFlags invite_flags = RetroshareInviteFlags::NOTHING;
 
-    if(mIncludeIPsAct->isChecked())
+    if(mIncludeLocIPact->isChecked())
+        invite_flags |= RetroshareInviteFlags::CURRENT_LOCAL_IP;
+
+    if(mIncludeExtIPact->isChecked())
+        invite_flags |= RetroshareInviteFlags::CURRENT_EXTERNAL_IP;
+
+    if(mIncludeDNSact->isChecked())
+        invite_flags |= RetroshareInviteFlags::DNS;
+
+    if(mIncludeIPHistoryact->isChecked())
         invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
 
-    if(!mUseOldFormatAct->isChecked())
+    if(!mUseOldFormatact->isChecked())
     {
         std::string short_invite;
         rsPeers->getShortInvite(short_invite,rsPeers->getOwnId(),invite_flags | RetroshareInviteFlags::RADIX_FORMAT);
+        invite = QString::fromStdString(short_invite);
+    }
+    else
+        invite = QString::fromStdString(rsPeers->GetRetroshareInvite(detail.id,invite_flags));
 
+    bool include_extra_locators = mIncludeIPHistoryact->isChecked();
+    description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatact->isChecked(),include_extra_locators);
+}
+
+void HomePage::updateOwnCert()
+{
+    QString certificate, description;
+
+    getOwnCert(certificate,description);
+
+    if(!mUseOldFormatact->isChecked())	// in this case we have to split the cert for a bettr display
+    {
         QString S;
         QString txt;
 
-        for(uint32_t i=0;i<short_invite.size();)
+        for(int i=0;i<certificate.size();)
             if(S.length() < 100)
-                S += short_invite[i++];
+                S += certificate[i++];
             else
             {
                 txt += S + "\n";
@@ -229,16 +264,10 @@ void HomePage::updateOwnCert()
             }
 
         txt += S;
-
-        invite = txt;	// the "\n" is here to make some space
+        certificate = txt;	// the "\n" is here to make some space
     }
-    else
-        invite = QString::fromStdString(rsPeers->GetRetroshareInvite(detail.id,invite_flags));
-
-    ui->retroshareid->setText("\n"+invite+"\n");
-
-    QString description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatAct->isChecked(),include_extra_locators);
 
+    ui->retroshareid->setText("\n"+certificate+"\n");
     ui->retroshareid->setToolTip(description);
 }
 
diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index c5f06f33b..a20f07863 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -46,6 +46,10 @@ public:
 	virtual QString pageName() const { return tr("Home") ; } //MainPage
 	virtual QString helpText() const { return ""; } //MainPage
 
+    // Returns the certificate along with its description using current options.
+
+    void getOwnCert(QString& invite,QString& description) const;
+
 private slots:
 #ifdef DEAD_CODE
     void certContextMenu(QPoint);
@@ -64,8 +68,10 @@ private:
 	Ui::HomePage *ui;
 
     QAction *mIncludeDNSact;
-    QAction *mIncludeIPsAct;
-    QAction *mUseOldFormatAct;
+    QAction *mIncludeIPHistoryact;
+    QAction *mIncludeExtIPact;
+    QAction *mIncludeLocIPact;
+    QAction *mUseOldFormatact;
 
     RsEventsHandlerId_t mEventHandlerId;
 
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 207fc5130..16af6710a 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -1083,7 +1083,9 @@ void SetForegroundWindowInternal(HWND hWnd)
 			return _instance->gxsforumDialog;
 		case Posted:
 			return _instance->postedDialog;
-	}
+        case Home:
+            return _instance->homePage;
+    }
 
    return NULL;
 }
diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h
index b4f3cccd5..23b70e66f 100644
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@@ -100,9 +100,10 @@ public:
         Channels           = 6,  /** Channels page. */
         Forums             = 7,  /** Forums page. */
         Search             = 8,  /** Search page. */
-        Posted             = 11,  /** Posted links */
-        People             = 12,   /** People page. */
-        Options            = 13   /** People page. */
+        Posted             = 11, /** Posted links */
+        People             = 12, /** People page. */
+        Options            = 13, /** People page. */
+        Home               = 14  /** Home page. */
     };
 
 
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index d34871104..524f3c757 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -22,6 +22,7 @@
 
 #include "ChatLobbyWidget.h"
 #include "MainWindow.h"
+#include "HomePage.h"
 #include "chat/ChatDialog.h"
 #include "common/PeerDefs.h"
 #include "common/RsCollection.h"
@@ -551,32 +552,41 @@ RetroShareLink RetroShareLink::createMessage(const RsGxsId& peerId, const QStrin
 
 RetroShareLink RetroShareLink::createCertificate(const RsPeerId& ssl_id)
 {
-	RetroShareLink link;
-	link.clear();
+    RetroShareLink link;
+    link.clear();
 
 #ifndef RS_NO_WARN_CPP
 #pragma message("csoler 2012-08-14: This is baaaaaad code")
 #endif
 
-	// 	- we should not need to parse and re-read a cert in old format.
-	//
-	RsPeerDetails detail;
-	if (rsPeers->getPeerDetails(ssl_id, detail) == false) {
-		std::cerr << "RetroShareLink::createPerson() Couldn't find peer id " << ssl_id << std::endl;
-	} else {
+    // 	- we should not need to parse and re-read a cert in old format.
+    //
+    RsPeerDetails detail;
+    if (rsPeers->getPeerDetails(ssl_id, detail) == false)
+        std::cerr << "RetroShareLink::createPerson() Couldn't find peer id " << ssl_id << std::endl;
+    else
+    {
+        link._type = TYPE_CERTIFICATE;
 
-		link._type = TYPE_CERTIFICATE;
-        link._radix = QString::fromUtf8(rsPeers->GetRetroshareInvite(ssl_id).c_str());
-		link._name = QString::fromUtf8(detail.name.c_str());
-		link._location = QString::fromUtf8(detail.location.c_str());
-		link._radix.replace("\n","");
+        if(rsPeers->getOwnId() == ssl_id)	// in this case, use application-wide parameters set in HomePage
+        {
+            QString invite,description;
+            static_cast<HomePage*>(MainWindow::getPage(MainWindow::Home))->getOwnCert(invite,description);
+            link._radix = invite;
+        }
+        else
+            link._radix = QString::fromUtf8(rsPeers->GetRetroshareInvite(ssl_id).c_str());
 
-		std::cerr << "Found radix                = " << link._radix.toStdString() << std::endl;
-	}
+        link._name = QString::fromUtf8(detail.name.c_str());
+        link._location = QString::fromUtf8(detail.location.c_str());
+        link._radix.replace("\n","");
 
-	link.check();
+        std::cerr << "Found radix                = " << link._radix.toStdString() << std::endl;
+    }
 
-	return link;
+    link.check();
+
+    return link;
 }
 RetroShareLink RetroShareLink::createUnknownSslCertificate(const RsPeerId& sslId, const RsPgpId& gpgId)
 {

From 24d5fc9eca2dfb63753958f319a9cbbc79c3957c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 11 Feb 2022 22:17:13 +0100
Subject: [PATCH 028/503] show info that is parsed from the cert that was
 generated

---
 retroshare-gui/src/gui/HomePage.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 3268b4e79..8dd936b38 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -208,7 +208,7 @@ HomePage::~HomePage()
 void HomePage::getOwnCert(QString& invite,QString& description) const
 {
 
-    RsPeerDetails detail;
+    RsPeerDetails detail,parsed_details;
 
     if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail))
     {
@@ -235,9 +235,19 @@ void HomePage::getOwnCert(QString& invite,QString& description) const
         std::string short_invite;
         rsPeers->getShortInvite(short_invite,rsPeers->getOwnId(),invite_flags | RetroshareInviteFlags::RADIX_FORMAT);
         invite = QString::fromStdString(short_invite);
+        uint32_t err;
+
+        if(!rsPeers->parseShortInvite(short_invite,parsed_details,err))
+            std::cerr << "Something unexpected happenned while re-parsing a cert just created: error " << err << std::endl;
     }
     else
+    {
         invite = QString::fromStdString(rsPeers->GetRetroshareInvite(detail.id,invite_flags));
+        uint32_t err;
+
+        if(!rsPeers->loadDetailsFromStringCert(invite.toStdString(),parsed_details,err))
+            std::cerr << "Something unexpected happenned while re-parsing a cert just created: error " << err << std::endl;
+    }
 
     bool include_extra_locators = mIncludeIPHistoryact->isChecked();
     description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatact->isChecked(),include_extra_locators);

From dc0cddae7e54195f0a412c9938d08eb0f981903f Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 12 Feb 2022 00:07:23 +0100
Subject: [PATCH 029/503] removed clean up old icons, replaced some by svg

---
 .../gui/FileTransfer/SharedFilesDialog.cpp    |   2 +-
 retroshare-gui/src/gui/Identity/IdDialog.cpp  |   6 +-
 retroshare-gui/src/gui/Identity/IdDialog.ui   |  14 +---
 retroshare-gui/src/gui/MainWindow.cpp         |   3 +-
 .../src/gui/common/FriendListModel.cpp        |  31 +++++++-
 .../src/gui/common/FriendSelectionWidget.cpp  |  27 ++++++-
 .../src/gui/common/FriendSelectionWidget.ui   |   5 ++
 .../src/gui/common/NewFriendList.cpp          |  16 ++--
 .../src/gui/common/RSTreeWidget.cpp           |   4 +-
 retroshare-gui/src/gui/groups/CreateGroup.cpp |   4 +-
 .../src/gui/gxs/GxsGroupFrameDialog.cpp       |   8 +-
 retroshare-gui/src/gui/icons.qrc              |  11 +++
 .../src/gui/icons/account-convert.svg         |   1 +
 retroshare-gui/src/gui/icons/account-plus.svg |   1 +
 retroshare-gui/src/gui/icons/cancel.svg       |  38 +++++++++
 retroshare-gui/src/gui/icons/groups/blue.svg  |  53 +++++++++++++
 .../src/gui/icons/groups/colored.svg          |  73 ++++++++++++++++++
 retroshare-gui/src/gui/icons/groups/green.svg |  53 +++++++++++++
 .../src/gui/icons/groups/indigo.svg           |  53 +++++++++++++
 retroshare-gui/src/gui/icons/groups/pink.svg  |  53 +++++++++++++
 .../src/gui/icons/groups/purple.svg           |  53 +++++++++++++
 retroshare-gui/src/gui/icons/groups/red.svg   |  53 +++++++++++++
 .../src/gui/icons/groups/yellow.svg           |  53 +++++++++++++
 retroshare-gui/src/gui/icons/newtab.svg       |  38 +++++++++
 retroshare-gui/src/gui/icons/newwindow.svg    |  38 +++++++++
 retroshare-gui/src/gui/images.qrc             |  15 ----
 .../src/gui/images/button_cancel.png          | Bin 1518 -> 0 bytes
 .../src/gui/images/rsmessenger48.png          | Bin 4171 -> 0 bytes
 .../src/gui/images/share-icon-16.png          | Bin 691 -> 0 bytes
 .../src/gui/images/share-icon-24.png          | Bin 1379 -> 0 bytes
 .../src/gui/images/share-icon-32.png          | Bin 1270 -> 0 bytes
 .../src/gui/images/stock_signature_bad.png    | Bin 2094 -> 0 bytes
 .../gui/images/stock_signature_missing.png    | Bin 2021 -> 0 bytes
 .../src/gui/images/stock_signature_ok.png     | Bin 1877 -> 0 bytes
 .../gui/images/stock_signature_unverified.png | Bin 2001 -> 0 bytes
 retroshare-gui/src/gui/images/tab-dock.png    | Bin 265 -> 0 bytes
 retroshare-gui/src/gui/images/tab-new.png     | Bin 435 -> 0 bytes
 retroshare-gui/src/gui/images/tab-undock.png  | Bin 319 -> 0 bytes
 .../src/gui/images/view_calendar_day.png      | Bin 696 -> 0 bytes
 .../src/gui/images/view_calendar_list.png     | Bin 662 -> 0 bytes
 .../src/gui/images/view_calendar_month.png    | Bin 652 -> 0 bytes
 .../src/gui/images/view_calendar_week.png     | Bin 677 -> 0 bytes
 .../src/gui/images/view_split_top_bottom.png  | Bin 422 -> 0 bytes
 retroshare-gui/src/gui/msgs/MessageModel.cpp  |   4 +-
 .../src/gui/msgs/MessagesDialog.cpp           |   4 +-
 45 files changed, 652 insertions(+), 62 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/account-convert.svg
 create mode 100644 retroshare-gui/src/gui/icons/account-plus.svg
 create mode 100644 retroshare-gui/src/gui/icons/cancel.svg
 create mode 100644 retroshare-gui/src/gui/icons/groups/blue.svg
 create mode 100644 retroshare-gui/src/gui/icons/groups/colored.svg
 create mode 100644 retroshare-gui/src/gui/icons/groups/green.svg
 create mode 100644 retroshare-gui/src/gui/icons/groups/indigo.svg
 create mode 100644 retroshare-gui/src/gui/icons/groups/pink.svg
 create mode 100644 retroshare-gui/src/gui/icons/groups/purple.svg
 create mode 100644 retroshare-gui/src/gui/icons/groups/red.svg
 create mode 100644 retroshare-gui/src/gui/icons/groups/yellow.svg
 create mode 100644 retroshare-gui/src/gui/icons/newtab.svg
 create mode 100644 retroshare-gui/src/gui/icons/newwindow.svg
 delete mode 100644 retroshare-gui/src/gui/images/button_cancel.png
 delete mode 100644 retroshare-gui/src/gui/images/rsmessenger48.png
 delete mode 100644 retroshare-gui/src/gui/images/share-icon-16.png
 delete mode 100644 retroshare-gui/src/gui/images/share-icon-24.png
 delete mode 100644 retroshare-gui/src/gui/images/share-icon-32.png
 delete mode 100644 retroshare-gui/src/gui/images/stock_signature_bad.png
 delete mode 100644 retroshare-gui/src/gui/images/stock_signature_missing.png
 delete mode 100644 retroshare-gui/src/gui/images/stock_signature_ok.png
 delete mode 100644 retroshare-gui/src/gui/images/stock_signature_unverified.png
 delete mode 100644 retroshare-gui/src/gui/images/tab-dock.png
 delete mode 100644 retroshare-gui/src/gui/images/tab-new.png
 delete mode 100644 retroshare-gui/src/gui/images/tab-undock.png
 delete mode 100644 retroshare-gui/src/gui/images/view_calendar_day.png
 delete mode 100644 retroshare-gui/src/gui/images/view_calendar_list.png
 delete mode 100644 retroshare-gui/src/gui/images/view_calendar_month.png
 delete mode 100644 retroshare-gui/src/gui/images/view_calendar_week.png
 delete mode 100644 retroshare-gui/src/gui/images/view_split_top_bottom.png

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 9ca80dea4..933e30168 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -75,7 +75,7 @@
 #define IMAGE_COLLOPEN       ":/icons/collections.png"
 #define IMAGE_EDITSHARE      ":/icons/png/pencil-edit-button.png"
 #define IMAGE_MYFILES        ":/icons/svg/folders1.svg"
-#define IMAGE_UNSHAREEXTRA   ":/images/button_cancel.png"
+#define IMAGE_UNSHAREEXTRA   ":/icons/cancel.svg"
 
 /*define viewType_CB value */
 #define VIEW_TYPE_TREE       0
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index c40bb0931..0f657a577 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -2260,7 +2260,7 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
 				contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
 
 			if(n_is_not_a_contact == 0)
-                contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"), tr("Remove from Contacts"), this, SLOT(removefromContacts()));
+                contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"), tr("Remove from Contacts"), this, SLOT(removefromContacts()));
 
 			contextMenu->addSeparator();
 
@@ -2279,8 +2279,8 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
 			contextMenu->addSeparator();
 
 			contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
-			contextMenu->addAction(ui->editIdentity);
-			contextMenu->addAction(ui->removeIdentity);
+			contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EDIT),tr("Edit identity"),this,SLOT(editIdentity())) ;
+			contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"),tr("Delete identity"),this,SLOT(removeIdentity())) ;
 		}
 
 	}
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index 8e40da52b..f18ddbc87 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -302,7 +302,7 @@
              <x>0</x>
              <y>0</y>
              <width>634</width>
-             <height>523</height>
+             <height>538</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">
@@ -1091,10 +1091,6 @@ border-image: url(:/images/closepressed.png)
    </item>
   </layout>
   <action name="editIdentity">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/images/edit_16.png</normaloff>:/images/edit_16.png</iconset>
-   </property>
    <property name="text">
     <string>Edit identity</string>
    </property>
@@ -1103,19 +1099,11 @@ border-image: url(:/images/closepressed.png)
    </property>
   </action>
   <action name="removeIdentity">
-   <property name="icon">
-    <iconset resource="../images.qrc">
-     <normaloff>:/images/delete.png</normaloff>:/images/delete.png</iconset>
-   </property>
    <property name="text">
     <string>Delete identity</string>
    </property>
   </action>
   <action name="chatIdentity">
-   <property name="icon">
-    <iconset>
-     <normaloff>:/images/toaster/chat.png</normaloff>:/images/toaster/chat.png</iconset>
-   </property>
    <property name="text">
     <string>Chat with this peer</string>
    </property>
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 207fc5130..8d323524e 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -141,7 +141,6 @@
 #define IMAGE_OVERLAY           ":/icons/star_overlay_128.png"
 
 #define IMAGE_BWGRAPH           ":/icons/png/bandwidth.png"
-#define IMAGE_MESSENGER         ":/images/rsmessenger48.png"
 #define IMAGE_COLOR         	":/images/highlight.png"
 #define IMAGE_NEWRSCOLLECTION   ":/images/library.png"
 #define IMAGE_ADDSHARE          ":/images/directoryadd_24x24_shadow.png"
@@ -625,7 +624,7 @@ void MainWindow::createTrayIcon()
 
     trayMenu->addSeparator();
 #ifdef MESSENGER_WINDOW
-    trayMenu->addAction(QIcon(IMAGE_MESSENGER), tr("Open Messenger"), this, SLOT(showMessengerWindow()));
+    trayMenu->addAction(QIcon(), tr("Open Messenger"), this, SLOT(showMessengerWindow()));
 #endif
     trayMenu->addAction(QIcon(IMAGE_MESSAGES), tr("Open Messages"), this, SLOT(showMess()));
 #ifdef RS_JSONAPI
diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index 1b83485bc..f8740466d 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -42,7 +42,12 @@
 
 #define IS_MESSAGE_UNREAD(flags) (flags &  (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER))
 
-#define IMAGE_GROUP24          ":/images/user/group24.png"
+#define IMAGE_COWORKERS        ":/icons/groups/green.svg"
+#define IMAGE_FRIENDS          ":/icons/groups/blue.svg"
+#define IMAGE_FAMILY           ":/icons/groups/purple.svg"
+#define IMAGE_FAVORITES        ":/icons/groups/yellow.svg"
+#define IMAGE_OTHERCONTACTS    ":/icons/groups/pink.svg"
+#define IMAGE_OTHERGROUPS      ":/icons/groups/red.svg"
 #define IMAGE_STAR_ON          ":/images/star-on-16.png"
 #define IMAGE_STAR_OFF         ":/images/star-off-16.png"
 
@@ -497,7 +502,7 @@ QVariant RsFriendListModel::sizeHintRole(const EntryIndex& e,int col) const
 		y_factor *= 3.0;
 
 	if(e.type == ENTRY_TYPE_GROUP)
-		y_factor = std::max(y_factor, 24.0f / 14.0f ); // allows to fit the 24 pixels icon for groups in the line
+		y_factor *= 1.5;
 
 	switch(col)
 	{
@@ -871,8 +876,28 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
 
     switch(entry.type)
     {
-    case ENTRY_TYPE_GROUP: return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_GROUP24));
+    case ENTRY_TYPE_GROUP: 
+	{
+		const HierarchicalGroupInformation *groupInfo = getGroupInfo(entry);
 
+		if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_FRIENDS.toStdString()) {
+			return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_FRIENDS));
+		}
+		if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_FAMILY.toStdString()) {
+			return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_FAMILY));
+		}
+		if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_COWORKERS.toStdString()) {
+			return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_COWORKERS));
+		}
+		if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_OTHERS.toStdString()) {
+			return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_OTHERCONTACTS));
+		}
+		if (groupInfo->group_info.id.toStdString() == RS_GROUP_ID_FAVORITES.toStdString()) {
+			return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_FAVORITES));
+		}
+
+		return QVariant(FilesDefs::getIconFromQtResourcePath(IMAGE_OTHERGROUPS));
+	}
     case ENTRY_TYPE_PROFILE:
     {
         if(!isProfileExpanded(entry))
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
index a2b355e06..b5b3d8264 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
@@ -53,7 +53,6 @@
 #define ROLE_SORT_STATE             Qt::UserRole + 4
 #define ROLE_FILTER_REASON          Qt::UserRole + 5
 
-#define IMAGE_GROUP16    ":/images/user/group16.png"
 #define IMAGE_FRIENDINFO ":/images/peerdetails_16x16.png"
 
 static bool isSelected(FriendSelectionWidget::Modus modus, QTreeWidgetItem *item)
@@ -382,12 +381,34 @@ void FriendSelectionWidget::secured_fillList()
 			// Add item to the list
 			ui->friendList->addTopLevelItem(groupItem);
 
+			QFontMetricsF fontMetrics(ui->friendList->font());
+			int avatarHeight = fontMetrics.height() * 1.5;
+			ui->friendList->setIconSize(QSize(avatarHeight, avatarHeight));
+
 			groupItem->setFlags(Qt::ItemIsUserCheckable | groupItem->flags());
 			groupItem->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
 			groupItem->setTextAlignment(COLUMN_NAME, Qt::AlignLeft | Qt::AlignVCenter);
-            groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(IMAGE_GROUP16));
 
-            groupItem->setData(COLUMN_DATA, ROLE_ID, QString::fromStdString(groupInfo->id.toStdString()));
+			if (groupInfo->id.toStdString() == RS_GROUP_ID_FRIENDS.toStdString()) {
+				groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/blue.svg"));
+			}
+			else if (groupInfo->id.toStdString() == RS_GROUP_ID_FAMILY.toStdString()) {
+				groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/purple.svg"));
+			}
+			else if (groupInfo->id.toStdString() == RS_GROUP_ID_COWORKERS.toStdString()) {
+				groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/green.svg"));
+			}
+			else if (groupInfo->id.toStdString() == RS_GROUP_ID_OTHERS.toStdString()) {
+				groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/pink.svg"));
+			}
+			else if (groupInfo->id.toStdString() == RS_GROUP_ID_FAVORITES.toStdString()) {
+				groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/yellow.svg"));
+			}
+			else {
+				groupItem->setIcon(COLUMN_NAME, FilesDefs::getIconFromQtResourcePath(":/icons/groups/red.svg"));
+			}
+
+			groupItem->setData(COLUMN_DATA, ROLE_ID, QString::fromStdString(groupInfo->id.toStdString()));
 
 			groupItem->setExpanded(true);
 
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
index d3682f014..065c9013b 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
@@ -38,6 +38,11 @@
        <height>0</height>
       </size>
      </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
      <property name="contextMenuPolicy">
       <enum>Qt::CustomContextMenu</enum>
      </property>
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 37b1511f8..1b2d513f4 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -68,15 +68,13 @@
 #define IMAGE_MSG                ":/icons/mail/write-mail.png"
 #define IMAGE_CONNECT            ":/images/connect_friend.png"
 #define IMAGE_COPYLINK           ":/images/copyrslink.png"
-#define IMAGE_GROUP16            ":/images/user/group16.png"
+#define IMAGE_GROUPS             ":/icons/groups/colored.svg"
 #define IMAGE_EDIT               ":/icons/png/pencil-edit-button.png"
-#define IMAGE_REMOVE             ":/images/delete.png"
-#define IMAGE_EXPAND             ":/images/edit_add24.png"
-#define IMAGE_COLLAPSE           ":/images/edit_remove24.png"
+#define IMAGE_REMOVE             ":/icons/cancel.svg"
+#define IMAGE_ADD                ":/icons/png/add.png"
 /* Images for Status icons */
 #define IMAGE_AVAILABLE          ":/images/user/identityavaiblecyan24.png"
 #define IMAGE_PASTELINK          ":/images/pasterslink.png"
-#define IMAGE_GROUP24            ":/images/user/group24.png"
 
 #define COLUMN_DATA     0 // column for storing the userdata id
 
@@ -687,8 +685,8 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
 						}
 					}
 
-					QMenu *groupsMenu = contextMenu.addMenu(FilesDefs::getIconFromQtResourcePath(IMAGE_GROUP16), tr("Groups"));
-					groupsMenu->addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EXPAND), tr("Create new group"), this, SLOT(createNewGroup()));
+					QMenu *groupsMenu = contextMenu.addMenu(FilesDefs::getIconFromQtResourcePath(IMAGE_GROUPS), tr("Groups"));
+					groupsMenu->addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_ADD), tr("Create new group"), this, SLOT(createNewGroup()));
 
 					if (addToGroupMenu || moveToGroupMenu || foundGroup) {
 						if (addToGroupMenu) {
@@ -763,8 +761,8 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
     if (RSLinkClipboard::empty(RetroShareLink::TYPE_CERTIFICATE))
         action->setDisabled(true);
 
-    contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EXPAND), tr("Expand all"), ui->peerTreeWidget, SLOT(expandAll()));
-    contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COLLAPSE), tr("Collapse all"), ui->peerTreeWidget, SLOT(collapseAll()));
+    contextMenu.addAction(QIcon(""), tr("Expand all"), ui->peerTreeWidget, SLOT(expandAll()));
+    contextMenu.addAction(QIcon(""), tr("Collapse all"), ui->peerTreeWidget, SLOT(collapseAll()));
 
     contextMenu.addSeparator();
 
diff --git a/retroshare-gui/src/gui/common/RSTreeWidget.cpp b/retroshare-gui/src/gui/common/RSTreeWidget.cpp
index 9c91c5f2e..7e3a8b216 100644
--- a/retroshare-gui/src/gui/common/RSTreeWidget.cpp
+++ b/retroshare-gui/src/gui/common/RSTreeWidget.cpp
@@ -264,7 +264,7 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
 
 		QLabel *iconLabel = new QLabel(widget);
 		iconLabel->setObjectName("trans_Icon");
-		QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/settings.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
+		QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/options2.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
 		iconLabel->setPixmap(pix);
 		iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
 		hbox->addWidget(iconLabel);
@@ -273,7 +273,7 @@ QMenu *RSTreeWidget::createStandardContextMenu(QMenu *contextMenu)
 		textLabel->setObjectName("trans_Text");
 		hbox->addWidget(textLabel);
 
-		QSpacerItem *spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+		QSpacerItem *spacerItem = new QSpacerItem(40, 24, QSizePolicy::Expanding, QSizePolicy::Minimum);
 		hbox->addItem(spacerItem);
 
 		widget->setLayout(hbox);
diff --git a/retroshare-gui/src/gui/groups/CreateGroup.cpp b/retroshare-gui/src/gui/groups/CreateGroup.cpp
index 91380f98b..2a3defc9c 100644
--- a/retroshare-gui/src/gui/groups/CreateGroup.cpp
+++ b/retroshare-gui/src/gui/groups/CreateGroup.cpp
@@ -41,7 +41,7 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent)
 
 	mIsStandard = false;
 
-    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/add_group256.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/groups/colored.svg"));
 
 	mGroupId = groupId;
 
@@ -69,7 +69,7 @@ CreateGroup::CreateGroup(const RsNodeGroupId &groupId, QWidget *parent)
 			}
 
 			setWindowTitle(tr("Edit Group"));
-            ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/user/edit_group64.png"));
+            ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/groups/colored.svg"));
 			ui.headerFrame->setHeaderText(tr("Edit Group"));
 
 			ui.groupName->setDisabled(mIsStandard);
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 963b3a8ad..425b87faf 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -42,13 +42,11 @@
 
 /* Images for TreeWidget */
 #define IMAGE_SUBSCRIBE      ":/images/edit_add24.png"
-#define IMAGE_UNSUBSCRIBE    ":/images/cancel.png"
+#define IMAGE_UNSUBSCRIBE    ":/icons/cancel.svg"
 #define IMAGE_INFO           ":/images/info16.png"
-//#define IMAGE_GROUPAUTHD     ":/images/konv_message2.png"
 #define IMAGE_COPYLINK       ":/images/copyrslink.png"
 #define IMAGE_EDIT           ":/icons/png/pencil-edit-button.png"
-#define IMAGE_SHARE          ":/images/share-icon-16.png"
-#define IMAGE_TABNEW         ":/images/tab-new.png"
+#define IMAGE_TABNEW         ":/icons/newtab.svg"
 #define IMAGE_DELETE         ":/images/delete.png"
 #define IMAGE_RETRIEVE       ":/images/edit_add24.png"
 #define IMAGE_COMMENT        ""
@@ -490,7 +488,7 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point)
 			ctxMenu2->setEnabled(isSubscribed);
 
 			if (shareKeyType()) {
-				action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_SHARE), tr("Share publish permissions..."), this, SLOT(sharePublishKey()));
+				action = contextMnu.addAction(QIcon(""), tr("Share publish permissions..."), this, SLOT(sharePublishKey()));
 				action->setEnabled(!mGroupId.isNull() && isPublisher);
 			}
 
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 89c0f83d9..33560031a 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -342,5 +342,16 @@
         <file>icons/wire-circle.png</file>
         <file>icons/folder-account.svg</file>
         <file>icons/notification.svg</file>
+        <file>icons/groups/blue.svg</file>
+        <file>icons/groups/colored.svg</file>
+        <file>icons/groups/green.svg</file>
+        <file>icons/groups/indigo.svg</file>
+        <file>icons/groups/pink.svg</file>
+        <file>icons/groups/purple.svg</file>
+        <file>icons/groups/red.svg</file>
+        <file>icons/groups/yellow.svg</file>
+        <file>icons/newtab.svg</file>
+        <file>icons/newwindow.svg</file>
+        <file>icons/cancel.svg</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/account-convert.svg b/retroshare-gui/src/gui/icons/account-convert.svg
new file mode 100644
index 000000000..1e5609fad
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/account-convert.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M12 0L11.34 .03L15.15 3.84L16.5 2.5C19.75 4.07 22.09 7.24 22.45 11H23.95C23.44 4.84 18.29 0 12 0M12 4C10.07 4 8.5 5.57 8.5 7.5C8.5 9.43 10.07 11 12 11C13.93 11 15.5 9.43 15.5 7.5C15.5 5.57 13.93 4 12 4M.05 13C.56 19.16 5.71 24 12 24L12.66 23.97L8.85 20.16L7.5 21.5C4.25 19.94 1.91 16.76 1.55 13H.05M12 13C8.13 13 5 14.57 5 16.5V18H19V16.5C19 14.57 15.87 13 12 13Z" /></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/account-plus.svg b/retroshare-gui/src/gui/icons/account-plus.svg
new file mode 100644
index 000000000..cf743afad
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/account-plus.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M15,14C12.33,14 7,15.33 7,18V20H23V18C23,15.33 17.67,14 15,14M6,10V7H4V10H1V12H4V15H6V12H9V10M15,12A4,4 0 0,0 19,8A4,4 0 0,0 15,4A4,4 0 0,0 11,8A4,4 0 0,0 15,12Z" /></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/cancel.svg b/retroshare-gui/src/gui/icons/cancel.svg
new file mode 100644
index 000000000..bb921b5fa
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/cancel.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="cancel.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="15.320647"
+     inkscape:cx="12.075208"
+     inkscape:cy="15.69777"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 23.32884,4.886954 19.243587,0.80170168 12.097906,7.9473834 4.9522254,0.80170168 0.8669731,4.886954 l 7.1456817,7.145682 -7.1456817,7.145681 4.0852523,4.085253 7.1456806,-7.145681 7.145681,7.145681 4.085253,-4.085253 -7.145681,-7.145681 z"
+     id="path2"
+     style="fill:#d40000;fill-opacity:1;stroke-width:1.40386" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/groups/blue.svg b/retroshare-gui/src/gui/icons/groups/blue.svg
new file mode 100644
index 000000000..ee0b3786f
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/blue.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="blue.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.48535156"
+     inkscape:cx="181.31187"
+     inkscape:cy="174.1006"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#049bd5;stroke:none"
+       d="m 79.686042,62.328363 c -9.9424,1.4243 -19.5278,4.530101 -28,10.011501 -37.2555,24.104101 -37.3411,79.982206 -2,105.633206 14.2831,10.367 31.8671,13.384 49,10.793 8.134998,-1.231 16.089998,-4.524 22.999998,-8.956 54.83,-35.164 24.028,-126.940707 -41.999998,-117.481707 m 169.999998,-0.0031 c -14.465,1.969 -27.797,6.0094 -40,14.2461 -9.275,6.260399 -17.007,14.037999 -23.251,23.328702 -40.889,60.846995 12.639,140.498995 83.251,131.713995 11.703,-1.456 22.971,-5.589 33,-11.779 62.522,-38.59 47.838,-139.211098 -25,-155.509797 -9.079,-2.0317 -18.726,-3.262401 -28,-2 m 172,0 c -12.007,1.6343 -23.351,5.5022 -33,13.092599 -48.405,38.078198 -16.646,121.889198 46,114.196198 10.227,-1.256 20.411,-4.448 29,-10.234 53.089,-35.765 23.859,-126.019698 -42,-117.054797 M 86.686042,360.90007 c 0.1343,-48.672 26.609998,-101.819 69.999998,-126 -9.584,-20.55 -39.309,-24 -58.999998,-24 -30.318,0 -60.3191,-1.636 -81.6744,24 -14.4232099,17.315 -14.3255999,37.764 -14.3255999,59 0,26.227 -0.64791,53.856 28.9999999,64.301 16.8503,5.936 38.3818,2.699 56,2.699 m 271.999998,-126 c 43.407,24.19 69.866,77.31 70,126 17.618,0 39.15,3.237 56,-2.699 29.648,-10.445 29,-38.074 29,-64.301 0,-21.236 0.098,-41.685 -14.326,-59 -21.355,-25.636 -51.356,-24 -81.674,-24 -19.727,0 -49.4,3.416 -59,24 m -131,19.424 c -60.745,8 -98,54.247 -98,114.576 0,22.177 2.541,43.788 20.039,59.711 19.17,17.443 41.651,17.289 65.961,17.289 h 61 c 16.926,0 35.243,1.972 52,-0.428 66.485,-9.525 70.212,-96.046 40.302,-142.572 -30.398,-47.284 -89.396,-55.411 -141.302,-48.576 z"
+       id="path281" />
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/groups/colored.svg b/retroshare-gui/src/gui/icons/groups/colored.svg
new file mode 100644
index 000000000..8483f270f
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/colored.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="colored.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.48535156"
+     inkscape:cx="181.31187"
+     inkscape:cy="174.1006"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#049bd5;stroke:none;fill-opacity:1"
+       d="m 227.68604,254.32407 c -60.745,8 -98,54.247 -98,114.576 0,22.177 2.541,43.788 20.039,59.711 19.17,17.443 41.651,17.289 65.961,17.289 h 61 c 16.926,0 35.243,1.972 52,-0.428 66.485,-9.525 70.212,-96.046 40.302,-142.572 -30.398,-47.284 -89.396,-55.411 -141.302,-48.576 z"
+       id="path955" />
+    <path
+       style="fill:#d50421;stroke:none;fill-opacity:1"
+       d="m 358.68604,234.90007 c 43.407,24.19 69.866,77.31 70,126 17.618,0 39.15,3.237 56,-2.699 29.648,-10.445 29,-38.074 29,-64.301 0,-21.236 0.098,-41.685 -14.326,-59 -21.355,-25.636 -51.356,-24 -81.674,-24 -19.727,0 -49.4,3.416 -59,24"
+       id="path953" />
+    <path
+       style="fill:#00b400;stroke:none;fill-opacity:1"
+       d="m 86.686042,360.90007 c 0.1343,-48.672 26.609998,-101.819 69.999998,-126 -9.584,-20.55 -39.309,-24 -58.999998,-24 -30.318,0 -60.3191,-1.636 -81.6744,24 -14.4232099,17.315 -14.3255999,37.764 -14.3255999,59 0,26.227 -0.64791,53.856 28.9999999,64.301 16.8503,5.936 38.3818,2.699 56,2.699"
+       id="path951" />
+    <path
+       style="fill:#d50421;stroke:none;fill-opacity:1"
+       d="m 421.68604,62.325263 c -12.007,1.6343 -23.351,5.5022 -33,13.092599 -48.405,38.078198 -16.646,121.889198 46,114.196198 10.227,-1.256 20.411,-4.448 29,-10.234 53.089,-35.765 23.859,-126.019698 -42,-117.054797"
+       id="path949" />
+    <path
+       style="fill:#049bd5;stroke:none;fill-opacity:1"
+       d="m 249.68604,62.325263 c -14.465,1.969 -27.797,6.0094 -40,14.2461 -9.275,6.260399 -17.007,14.037999 -23.251,23.328702 -40.889,60.846995 12.639,140.498995 83.251,131.713995 11.703,-1.456 22.971,-5.589 33,-11.779 62.522,-38.59 47.838,-139.211098 -25,-155.509797 -9.079,-2.0317 -18.726,-3.262401 -28,-2"
+       id="path947" />
+    <path
+       style="fill:#00b400;stroke:none;fill-opacity:1"
+       d="m 79.686042,62.328363 c -9.9424,1.4243 -19.5278,4.530101 -28,10.011501 -37.2555,24.104101 -37.3411,79.982206 -2,105.633206 14.2831,10.367 31.8671,13.384 49,10.793 8.134998,-1.231 16.089998,-4.524 22.999998,-8.956 54.83,-35.164 24.028,-126.940707 -41.999998,-117.481707"
+       id="path281" />
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/groups/green.svg b/retroshare-gui/src/gui/icons/groups/green.svg
new file mode 100644
index 000000000..3ca8e3074
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/green.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="green.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.48535156"
+     inkscape:cx="181.31187"
+     inkscape:cy="174.1006"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#00b400;stroke:none;fill-opacity:1"
+       d="m 79.686042,62.328363 c -9.9424,1.4243 -19.5278,4.530101 -28,10.011501 -37.2555,24.104101 -37.3411,79.982206 -2,105.633206 14.2831,10.367 31.8671,13.384 49,10.793 8.134998,-1.231 16.089998,-4.524 22.999998,-8.956 54.83,-35.164 24.028,-126.940707 -41.999998,-117.481707 m 169.999998,-0.0031 c -14.465,1.969 -27.797,6.0094 -40,14.2461 -9.275,6.260399 -17.007,14.037999 -23.251,23.328702 -40.889,60.846995 12.639,140.498995 83.251,131.713995 11.703,-1.456 22.971,-5.589 33,-11.779 62.522,-38.59 47.838,-139.211098 -25,-155.509797 -9.079,-2.0317 -18.726,-3.262401 -28,-2 m 172,0 c -12.007,1.6343 -23.351,5.5022 -33,13.092599 -48.405,38.078198 -16.646,121.889198 46,114.196198 10.227,-1.256 20.411,-4.448 29,-10.234 53.089,-35.765 23.859,-126.019698 -42,-117.054797 M 86.686042,360.90007 c 0.1343,-48.672 26.609998,-101.819 69.999998,-126 -9.584,-20.55 -39.309,-24 -58.999998,-24 -30.318,0 -60.3191,-1.636 -81.6744,24 -14.4232099,17.315 -14.3255999,37.764 -14.3255999,59 0,26.227 -0.64791,53.856 28.9999999,64.301 16.8503,5.936 38.3818,2.699 56,2.699 m 271.999998,-126 c 43.407,24.19 69.866,77.31 70,126 17.618,0 39.15,3.237 56,-2.699 29.648,-10.445 29,-38.074 29,-64.301 0,-21.236 0.098,-41.685 -14.326,-59 -21.355,-25.636 -51.356,-24 -81.674,-24 -19.727,0 -49.4,3.416 -59,24 m -131,19.424 c -60.745,8 -98,54.247 -98,114.576 0,22.177 2.541,43.788 20.039,59.711 19.17,17.443 41.651,17.289 65.961,17.289 h 61 c 16.926,0 35.243,1.972 52,-0.428 66.485,-9.525 70.212,-96.046 40.302,-142.572 -30.398,-47.284 -89.396,-55.411 -141.302,-48.576 z"
+       id="path281" />
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/groups/indigo.svg b/retroshare-gui/src/gui/icons/groups/indigo.svg
new file mode 100644
index 000000000..56efae8d7
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/indigo.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="indigo.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.48535156"
+     inkscape:cx="181.31187"
+     inkscape:cy="174.1006"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#5c6bc0;stroke:none;fill-opacity:1"
+       d="m 79.686042,62.328363 c -9.9424,1.4243 -19.5278,4.530101 -28,10.011501 -37.2555,24.104101 -37.3411,79.982206 -2,105.633206 14.2831,10.367 31.8671,13.384 49,10.793 8.134998,-1.231 16.089998,-4.524 22.999998,-8.956 54.83,-35.164 24.028,-126.940707 -41.999998,-117.481707 m 169.999998,-0.0031 c -14.465,1.969 -27.797,6.0094 -40,14.2461 -9.275,6.260399 -17.007,14.037999 -23.251,23.328702 -40.889,60.846995 12.639,140.498995 83.251,131.713995 11.703,-1.456 22.971,-5.589 33,-11.779 62.522,-38.59 47.838,-139.211098 -25,-155.509797 -9.079,-2.0317 -18.726,-3.262401 -28,-2 m 172,0 c -12.007,1.6343 -23.351,5.5022 -33,13.092599 -48.405,38.078198 -16.646,121.889198 46,114.196198 10.227,-1.256 20.411,-4.448 29,-10.234 53.089,-35.765 23.859,-126.019698 -42,-117.054797 M 86.686042,360.90007 c 0.1343,-48.672 26.609998,-101.819 69.999998,-126 -9.584,-20.55 -39.309,-24 -58.999998,-24 -30.318,0 -60.3191,-1.636 -81.6744,24 -14.4232099,17.315 -14.3255999,37.764 -14.3255999,59 0,26.227 -0.64791,53.856 28.9999999,64.301 16.8503,5.936 38.3818,2.699 56,2.699 m 271.999998,-126 c 43.407,24.19 69.866,77.31 70,126 17.618,0 39.15,3.237 56,-2.699 29.648,-10.445 29,-38.074 29,-64.301 0,-21.236 0.098,-41.685 -14.326,-59 -21.355,-25.636 -51.356,-24 -81.674,-24 -19.727,0 -49.4,3.416 -59,24 m -131,19.424 c -60.745,8 -98,54.247 -98,114.576 0,22.177 2.541,43.788 20.039,59.711 19.17,17.443 41.651,17.289 65.961,17.289 h 61 c 16.926,0 35.243,1.972 52,-0.428 66.485,-9.525 70.212,-96.046 40.302,-142.572 -30.398,-47.284 -89.396,-55.411 -141.302,-48.576 z"
+       id="path281" />
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/groups/pink.svg b/retroshare-gui/src/gui/icons/groups/pink.svg
new file mode 100644
index 000000000..e8b72e1df
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/pink.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="pink.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.48535156"
+     inkscape:cx="181.31187"
+     inkscape:cy="174.1006"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#e91e63;stroke:none;fill-opacity:1"
+       d="m 79.686042,62.328363 c -9.9424,1.4243 -19.5278,4.530101 -28,10.011501 -37.2555,24.104101 -37.3411,79.982206 -2,105.633206 14.2831,10.367 31.8671,13.384 49,10.793 8.134998,-1.231 16.089998,-4.524 22.999998,-8.956 54.83,-35.164 24.028,-126.940707 -41.999998,-117.481707 m 169.999998,-0.0031 c -14.465,1.969 -27.797,6.0094 -40,14.2461 -9.275,6.260399 -17.007,14.037999 -23.251,23.328702 -40.889,60.846995 12.639,140.498995 83.251,131.713995 11.703,-1.456 22.971,-5.589 33,-11.779 62.522,-38.59 47.838,-139.211098 -25,-155.509797 -9.079,-2.0317 -18.726,-3.262401 -28,-2 m 172,0 c -12.007,1.6343 -23.351,5.5022 -33,13.092599 -48.405,38.078198 -16.646,121.889198 46,114.196198 10.227,-1.256 20.411,-4.448 29,-10.234 53.089,-35.765 23.859,-126.019698 -42,-117.054797 M 86.686042,360.90007 c 0.1343,-48.672 26.609998,-101.819 69.999998,-126 -9.584,-20.55 -39.309,-24 -58.999998,-24 -30.318,0 -60.3191,-1.636 -81.6744,24 -14.4232099,17.315 -14.3255999,37.764 -14.3255999,59 0,26.227 -0.64791,53.856 28.9999999,64.301 16.8503,5.936 38.3818,2.699 56,2.699 m 271.999998,-126 c 43.407,24.19 69.866,77.31 70,126 17.618,0 39.15,3.237 56,-2.699 29.648,-10.445 29,-38.074 29,-64.301 0,-21.236 0.098,-41.685 -14.326,-59 -21.355,-25.636 -51.356,-24 -81.674,-24 -19.727,0 -49.4,3.416 -59,24 m -131,19.424 c -60.745,8 -98,54.247 -98,114.576 0,22.177 2.541,43.788 20.039,59.711 19.17,17.443 41.651,17.289 65.961,17.289 h 61 c 16.926,0 35.243,1.972 52,-0.428 66.485,-9.525 70.212,-96.046 40.302,-142.572 -30.398,-47.284 -89.396,-55.411 -141.302,-48.576 z"
+       id="path281" />
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/groups/purple.svg b/retroshare-gui/src/gui/icons/groups/purple.svg
new file mode 100644
index 000000000..f4d78db5b
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/purple.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="purple.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.48535156"
+     inkscape:cx="181.31187"
+     inkscape:cy="174.1006"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#9933cc;stroke:none;fill-opacity:1"
+       d="m 79.686042,62.328363 c -9.9424,1.4243 -19.5278,4.530101 -28,10.011501 -37.2555,24.104101 -37.3411,79.982206 -2,105.633206 14.2831,10.367 31.8671,13.384 49,10.793 8.134998,-1.231 16.089998,-4.524 22.999998,-8.956 54.83,-35.164 24.028,-126.940707 -41.999998,-117.481707 m 169.999998,-0.0031 c -14.465,1.969 -27.797,6.0094 -40,14.2461 -9.275,6.260399 -17.007,14.037999 -23.251,23.328702 -40.889,60.846995 12.639,140.498995 83.251,131.713995 11.703,-1.456 22.971,-5.589 33,-11.779 62.522,-38.59 47.838,-139.211098 -25,-155.509797 -9.079,-2.0317 -18.726,-3.262401 -28,-2 m 172,0 c -12.007,1.6343 -23.351,5.5022 -33,13.092599 -48.405,38.078198 -16.646,121.889198 46,114.196198 10.227,-1.256 20.411,-4.448 29,-10.234 53.089,-35.765 23.859,-126.019698 -42,-117.054797 M 86.686042,360.90007 c 0.1343,-48.672 26.609998,-101.819 69.999998,-126 -9.584,-20.55 -39.309,-24 -58.999998,-24 -30.318,0 -60.3191,-1.636 -81.6744,24 -14.4232099,17.315 -14.3255999,37.764 -14.3255999,59 0,26.227 -0.64791,53.856 28.9999999,64.301 16.8503,5.936 38.3818,2.699 56,2.699 m 271.999998,-126 c 43.407,24.19 69.866,77.31 70,126 17.618,0 39.15,3.237 56,-2.699 29.648,-10.445 29,-38.074 29,-64.301 0,-21.236 0.098,-41.685 -14.326,-59 -21.355,-25.636 -51.356,-24 -81.674,-24 -19.727,0 -49.4,3.416 -59,24 m -131,19.424 c -60.745,8 -98,54.247 -98,114.576 0,22.177 2.541,43.788 20.039,59.711 19.17,17.443 41.651,17.289 65.961,17.289 h 61 c 16.926,0 35.243,1.972 52,-0.428 66.485,-9.525 70.212,-96.046 40.302,-142.572 -30.398,-47.284 -89.396,-55.411 -141.302,-48.576 z"
+       id="path281" />
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/groups/red.svg b/retroshare-gui/src/gui/icons/groups/red.svg
new file mode 100644
index 000000000..07b706a28
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/red.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="red.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.48535156"
+     inkscape:cx="181.31187"
+     inkscape:cy="174.1006"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#d00808;stroke:none;fill-opacity:1"
+       d="m 79.686042,62.328363 c -9.9424,1.4243 -19.5278,4.530101 -28,10.011501 -37.2555,24.104101 -37.3411,79.982206 -2,105.633206 14.2831,10.367 31.8671,13.384 49,10.793 8.134998,-1.231 16.089998,-4.524 22.999998,-8.956 54.83,-35.164 24.028,-126.940707 -41.999998,-117.481707 m 169.999998,-0.0031 c -14.465,1.969 -27.797,6.0094 -40,14.2461 -9.275,6.260399 -17.007,14.037999 -23.251,23.328702 -40.889,60.846995 12.639,140.498995 83.251,131.713995 11.703,-1.456 22.971,-5.589 33,-11.779 62.522,-38.59 47.838,-139.211098 -25,-155.509797 -9.079,-2.0317 -18.726,-3.262401 -28,-2 m 172,0 c -12.007,1.6343 -23.351,5.5022 -33,13.092599 -48.405,38.078198 -16.646,121.889198 46,114.196198 10.227,-1.256 20.411,-4.448 29,-10.234 53.089,-35.765 23.859,-126.019698 -42,-117.054797 M 86.686042,360.90007 c 0.1343,-48.672 26.609998,-101.819 69.999998,-126 -9.584,-20.55 -39.309,-24 -58.999998,-24 -30.318,0 -60.3191,-1.636 -81.6744,24 -14.4232099,17.315 -14.3255999,37.764 -14.3255999,59 0,26.227 -0.64791,53.856 28.9999999,64.301 16.8503,5.936 38.3818,2.699 56,2.699 m 271.999998,-126 c 43.407,24.19 69.866,77.31 70,126 17.618,0 39.15,3.237 56,-2.699 29.648,-10.445 29,-38.074 29,-64.301 0,-21.236 0.098,-41.685 -14.326,-59 -21.355,-25.636 -51.356,-24 -81.674,-24 -19.727,0 -49.4,3.416 -59,24 m -131,19.424 c -60.745,8 -98,54.247 -98,114.576 0,22.177 2.541,43.788 20.039,59.711 19.17,17.443 41.651,17.289 65.961,17.289 h 61 c 16.926,0 35.243,1.972 52,-0.428 66.485,-9.525 70.212,-96.046 40.302,-142.572 -30.398,-47.284 -89.396,-55.411 -141.302,-48.576 z"
+       id="path281" />
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/groups/yellow.svg b/retroshare-gui/src/gui/icons/groups/yellow.svg
new file mode 100644
index 000000000..06982a820
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/groups/yellow.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="yellow.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.48535156"
+     inkscape:cx="181.31187"
+     inkscape:cy="174.1006"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#f3dd1d;stroke:none;fill-opacity:1"
+       d="m 79.686042,62.328363 c -9.9424,1.4243 -19.5278,4.530101 -28,10.011501 -37.2555,24.104101 -37.3411,79.982206 -2,105.633206 14.2831,10.367 31.8671,13.384 49,10.793 8.134998,-1.231 16.089998,-4.524 22.999998,-8.956 54.83,-35.164 24.028,-126.940707 -41.999998,-117.481707 m 169.999998,-0.0031 c -14.465,1.969 -27.797,6.0094 -40,14.2461 -9.275,6.260399 -17.007,14.037999 -23.251,23.328702 -40.889,60.846995 12.639,140.498995 83.251,131.713995 11.703,-1.456 22.971,-5.589 33,-11.779 62.522,-38.59 47.838,-139.211098 -25,-155.509797 -9.079,-2.0317 -18.726,-3.262401 -28,-2 m 172,0 c -12.007,1.6343 -23.351,5.5022 -33,13.092599 -48.405,38.078198 -16.646,121.889198 46,114.196198 10.227,-1.256 20.411,-4.448 29,-10.234 53.089,-35.765 23.859,-126.019698 -42,-117.054797 M 86.686042,360.90007 c 0.1343,-48.672 26.609998,-101.819 69.999998,-126 -9.584,-20.55 -39.309,-24 -58.999998,-24 -30.318,0 -60.3191,-1.636 -81.6744,24 -14.4232099,17.315 -14.3255999,37.764 -14.3255999,59 0,26.227 -0.64791,53.856 28.9999999,64.301 16.8503,5.936 38.3818,2.699 56,2.699 m 271.999998,-126 c 43.407,24.19 69.866,77.31 70,126 17.618,0 39.15,3.237 56,-2.699 29.648,-10.445 29,-38.074 29,-64.301 0,-21.236 0.098,-41.685 -14.326,-59 -21.355,-25.636 -51.356,-24 -81.674,-24 -19.727,0 -49.4,3.416 -59,24 m -131,19.424 c -60.745,8 -98,54.247 -98,114.576 0,22.177 2.541,43.788 20.039,59.711 19.17,17.443 41.651,17.289 65.961,17.289 h 61 c 16.926,0 35.243,1.972 52,-0.428 66.485,-9.525 70.212,-96.046 40.302,-142.572 -30.398,-47.284 -89.396,-55.411 -141.302,-48.576 z"
+       id="path281" />
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/newtab.svg b/retroshare-gui/src/gui/icons/newtab.svg
new file mode 100644
index 000000000..5e7c4316b
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/newtab.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="tab-plus.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M3,3A2,2 0 0,0 1,5V19A2,2 0 0,0 3,21H21A2,2 0 0,0 23,19V5A2,2 0 0,0 21,3H3M3,5H13V9H21V19H3V5M10,10V13H7V15H10V18H12V15H15V13H12V10H10Z"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/newwindow.svg b/retroshare-gui/src/gui/icons/newwindow.svg
new file mode 100644
index 000000000..dd9e408cb
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/newwindow.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="dock-window.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M18 18V20H4A2 2 0 0 1 2 18V8H4V18M22 6V14A2 2 0 0 1 20 16H8A2 2 0 0 1 6 14V6A2 2 0 0 1 8 4H20A2 2 0 0 1 22 6M20 6H8V14H20Z"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 4dc8177bd..468a0177d 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -22,10 +22,6 @@
     <file>images/streaming.png</file>
     <file>images/white-bubble-64.png</file>
     <file>images/orange-bubble-64.png</file>
-    <file>images/stock_signature_bad.png</file>
-    <file>images/stock_signature_ok.png</file>
-    <file>images/stock_signature_missing.png</file>
-    <file>images/stock_signature_unverified.png</file>
     <file>images/anonymous_128_blue.png</file>
     <file>images/browsable_128_green.png</file>
     <file>images/browsable_128_blue.png</file>
@@ -107,7 +103,6 @@
     <file>images/graph-checking.png</file>
     <file>images/graph-blue.png</file>
     <file>images/avatar_background.png</file>
-    <file>images/button_cancel.png</file>
     <file>images/chat.png</file>
     <file>images/cancel.png</file>
     <file>images/close-down.png</file>
@@ -295,9 +290,6 @@
     <file>images/sort_incr.png</file>
     <file>images/sort_decrease.png</file>
     <file>images/sound.png</file>
-    <file>images/tab-dock.png</file>
-    <file>images/tab-undock.png</file>
-    <file>images/tab-new.png</file>
     <file>images/transferupdown.png</file>
     <file>images/tools_wizard.png</file>
     <file>images/uploads.png</file>
@@ -356,11 +348,6 @@
     <file>images/up1down0.png</file>
     <file>images/underconstruction.png</file>
     <file>images/user.png</file>
-    <file>images/view_calendar_day.png</file>
-    <file>images/view_calendar_week.png</file>
-    <file>images/view_calendar_month.png</file>
-    <file>images/view_calendar_list.png</file>
-    <file>images/view_split_top_bottom.png</file>
     <file>qss/chat/standard/private/info.xml</file>
     <file>qss/chat/standard/private/incoming.htm</file>
     <file>qss/chat/standard/private/outgoing.htm</file>
@@ -427,11 +414,9 @@
     <file>images/tags/dev-translator.png</file>
     <file>images/tags/dev-patcher.png</file>
     <file>images/tags/developer.png</file>
-    <file>images/share-icon-16.png</file>
     <file>images/toasterEnable.png</file>
     <file>images/toasterDisable.png</file>
     <file>images/emblem-web.png</file>
-    <file>images/rsmessenger48.png</file>
     <file>images/SmileyText.png</file>
     <file>images/SimpleText.png</file>
     <file>images/ColoredText.png</file>
diff --git a/retroshare-gui/src/gui/images/button_cancel.png b/retroshare-gui/src/gui/images/button_cancel.png
deleted file mode 100644
index 3f0c98b7d98da3ca38d36f581de0fed5d55b5f95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1518
zcmV<K1rhp*P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000HGNkl<ZNQr%w
zZERat8OML;Ui;cf?6{8YxN)6sBx#ch5!QumnbJya(KZ-r(bla3RRV-2q@p22hgOBD
z+cYW|L7K#ep}_~<R&6lWZ51FfX%iYnAi>bIp*2afbxD&rO`P~GvG4mme7Gl*L9i=b
z-E)tg=lTE7|9Lq=00t3kJSKpfflnlo?9>E$qd_O&0}Y@CqyY&e0S&N#Vm`||(%>I!
zCEfxq0S2H6fkxXSRWP^J8gW~#g0J>I>XCqNTOGb_9SHu1{eJ)iA*0^UKJkO;@l#)4
zb|4;nL|_ScKz!_$)`4$7a><4<|Gxo3!w}bmtOu(fd*A^I4}KFJOb=rJ?-V}Jg38`g
zry0EK4m5bvgwbuX5)f_nnITyJ%jDzahlW9q(p<U9>yr-?gIE)s8qlMhJ3~U1Bafa-
zrv^sAw(%-u#?L;)KRy2@;BBJ~V4&EQe*d-mPB7e)r?tL@FCn@623mHV*PeP3OClNy
zzzad@cYp00-QDRNo7Y#-fzF-`b=zd{=g+WVZcYgJs{ok1>!keN)c4`1Pt*AO->{7s
zQV4_)q_Vv@*t~l21y%z@5731Ay~pnFPG|<TY6a>02q3O$Bohh96?v@I;E9Vr69Qm7
z*7N0+Wc(KwMn@T&dymDyL+TL_AQ9~7Ob~SHyd(W}vuW0DGCGDj1E_5^KTNj<6s4q+
zPP2b@mVtQpxj)yI&jN6yy8v(;kRR;7Ra()AoEFHLh%RTMy1c9*mqE&>o|ba*ak&I?
zS`%_6s>_*(E@vZ}YzXA~&OVum8WK1I5Em*3pGo)g$Lb<cI6iE|UVJIvhp{-%)wVhg
zfUNpf0KKhTb3j+DgOf7gO~;<J;YollO$+^f5r#3~Lg3i<ow{D4(O1L=mVvSgIt^S=
z>oTxH*vV#R7pIZb9sA6H3JxH)JGrhlnqh@p@LcEfKQ5Ok6#B^lj$$s<8>k*g0O?4S
zXI+oFZ9SBMsrJUSw@><pa5?C@90hIxx?#2&_-}pkz@aa8X@a$lbxal1RgM-=%;fO)
zjPP#h+9M+{H4Ur*Tidc~8shT4{j7g*nRhK4SFv3L`lFGVJNs`OUR;=G&i9A{5#{JB
zkSv1H!6E*%IA2|M+@AiB95EoSB#Ny29$QjkwXxe1>u4P4$s}j4zDHFhG1`{YZJC-#
z=H8#<P@$N<R4L1vWeZ;si7PwJl@d=%JjFgA?`Ry(<dRD(O91R5?A`>B2X+&ViIn>H
zfl_ISPxs`=$K$dEhNWUTfELIA-}iBVKEtRUOr?^g(lr7gLpb*nYCZ9(amMdH#x9^k
zfn>tMV7au!!5wJ|v6$^Z%mV@`5wG5`m)gP=^h8%}uMta?D-~Q7G^VN`4h&_pylfcw
zn&3p>Ghez+O-W{}#2P?vF3)spi}_|V6@!N6yEY>aek(Zsqi0gpN(G<r)=DZVvcSIL
zE`DvA>?@T{?k|@n&Tmv192{VmvPmkR04SGNIXre7ciexn?g9F#TMyyQ{3})Z-EVJC
zMxsP4i%#XZ11R(td9L1Icx&rnsq>S#5m`){?%S_h))yuQ2QW4^LakMD6X^`=<z=k$
z>hIU<_2)GJb7AiE)s?kJTdu?I-d>W5dA_f}bJZH7o1151@Iy@qgwW97m77iT-d`;&
zk{TIir;>DcE{_+uELG~y&R)BA^utaTx{d+g-E6kb);4Pt_I;exp(FgJQDtmv>r7N*
zN(exWa1k<o`8LZuetv#|<lq3s-d<{Mi+a8BOC7$Xu{|n;Kxm<p0q2^g^O$|?b6o7|
zV!UZiMqsM_+H1c)1-x{-Wu17zaq#ZBhgNO#d=$R2JyL`a=wBTeAy{3&Y?<2$d*ct&
zGe_^leZ^TVe+L192EGKT38E1l%khaQ-F3LUC!1<qoW3$t+-w}S0aJvd#M3nX4c0Ji
U*ntJqA^-pY07*qoM6N<$g2$cMb^rhX

diff --git a/retroshare-gui/src/gui/images/rsmessenger48.png b/retroshare-gui/src/gui/images/rsmessenger48.png
deleted file mode 100644
index f01ab76b4cd67bb77da4e38767c77a289008f862..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4171
zcmV-R5VY@!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H156DSGK~!jg)tY;(Wp#DOKflL*oyUF8odJe%W}F$EVdN>IsDpqJ
zFhXqAn%YJaHPWc5P1@QtYTCraSRd82zA&b0V`EJfwP?i$kSZxcd6br6#9?3t=6Rpz
z+;h%;{vQ2f@5>Ab<IqY7znh(%n{)Ts>-$@4eb;xb-xc0_p3h4@*9QE5*Yh5Lex?ry
zAp{_rU%h{hV^EyR`x~PbHQ<2bzzt9}cl%s``HcXC5E6)hF<=^)=$x^Ay$-rbZ~r|H
zgINZafF4kI@9nc~^b_nm8Gy$4Hn6U}cI!oFz3MH0cEzrj?s)Om_0j1wT^@M&n7w!R
z-orP3>mNU}@W8D<1P%kklYuxP1XXhvfCn7ly!Y<60-$+O3pjK3{A=H}^JQ1P_pjc4
zReaiX7wbIEd#v>sYq|4*gZ}!je)GnAzxTHv0`@l`e(j5e5DEyJ?`;7IHIWz~ZLSQc
zP8G<>l2`*%V=p-G@)w+Q`TO7h)=RaqjzjYUq!f6-d#H@%jM;JV_P4(2+R<R~v0vTt
zwNC*hP&{cf0-y`5ec?+dE?Tpxb@8@so6iYC(cQc6k-aN(<^6l_So-;B(L4ey2q8wN
z5{^#^pm|{ooVMo0ulw`OXRgsp{fuE+5eAwt&`6~a)Bw`FB8~#ix%i5A%s+J3kCq?Z
zy)1;Ny!Y+|<7dWaqaD}2`+~oI%eC)%#g^00WoGPjq)-gA-Z=;69(dz7ZvM>5Z9lmG
z@BjP9i{Ans6+*0d@6G?k0}^O;H=K7~(4N}ZNkR_I59qWa+O3FoB8Vf2l9I{^^2#wt
zD`uu9k~7bK<<-lN?!E^YQpdFdCO2O=_UboZcg5$fedRkQ#@o|?XL)!GB^5$Q&RnyN
z_x;Yt$0o)<_Q5rq?z-^i>mU0duuljvI9WKI3_z01Y&r*E|B)VX6fs^}rkp^kkT_BV
zVMyglO6wWq6~=nTrq=GDiS332S_Ev^^``9~x%7f-CyXl?<jaIQYK*Tv>AlB!#~UvB
zBj#5=eAU9$#qRrlICnjDDCW-;0DuZRlcxjph8d3@>$BE)l+v_X2}sH0Sewc^gpf!f
zP)ZWFC)aYEVH7ZN#oIQ%ck2t!+B_=yARP{i$Dmb!K;XQ?T8pt2l_}YL+S&9k>0Ni|
z{^8FS9!r;m5arW(;pwD=2dZkYxF5i}nr*Cg80#o1Lz<NwUFb7P3(Cq+8HcrwY`A!k
zy14mfgC@_|I{n%xj2V?Z@@hooavTOPEKV3ISCE?_!=lGZw#ayUhPV}WHeED!C3WJf
zXX*h5q{E}Xx@U6Rt0*f&UK+BZVwe@g!wdnej5L+8tPC?oSx%Oh^cIf(4>cWnKzGLV
z^w>me?I>R%iP}VAL_z}6qXUg|7HcXBlQJq+7-cK;MssK#Fg6qHpsqtttJ$6sK*Ju{
z=*XVkMgQpi(fGQZqpV;s$_RpbGxDNBYlX3vG%M*3Qx=z&dI#?L$&C#F2dFJCpWLpb
zmf*48V10%27NsRg(jqTLn7kybh79v%`sot=bO9+8ovCmGb=?q8W#`E}05zA-&)xl<
zPn~h;JHId(5o=X%L{(XaQI1j)>l}GeF-UXv{Ne|nA1)l&Pn~og@WY<zfv<nO!~6Pf
zt)VD0jIFS?!q|eM%E*cV&N;wSm2L!_v=;m(Ic-Ms`wq_C^WAT1s$!}e6KX+aDn?mO
zQI-hr5Z<_b_uc+q2k!jWyPM}$W7a%$_wqw|QRc=}7*kPHIa!f1%=#=3=IIZY$nqgY
znNyjf2IMNNHH;Rkea&W^I*p!CcqX(?HlO*L_k1)OTlW%!6o=+ln3-rXJK15f+hTc;
zajZYY8YfTRcENd_*}wVh-v7AaL%oOZxCNN6w~>|J!r+my&e-;>91-L-eOgzukn@(J
z%oye?WW|WQ%qXgy(iHTL=J#^Eo;>CHH7z8B2!Uzc9^biP*L9yxCf1&v#34{uUFSSe
zpa=pD&VzuN$qus<ZG;po_J`F2|M~MTJb3e$KL^YK?d`j!-hBD*@A%YMdrEd&<Fw)~
zQJA2m#(76+3bJCvFzqu)d#sF>m^--q;EkVn<n6#7VDNNO{Rtju#8x*NpFMm1E8h9}
z*5vG#sj-AWD*~<1N)iPcr6pQQ0<G%moP<ar@!m7hZ3VMaum9tAqUAl`|Ki^Py*)o$
zx^?|ohi}?`k$#<T3=VaSQVQ=ql_|-~lr$eQ$_I=_qvFo*9Q!121jtX;XXq1*7u34{
zw6!n!y${FZYqpGcVziQIC5b~#w;j_-YJ=k_APNHlB~eXsJMS^p(M=+Dz2=(tq`kTQ
zzr5{+?*ZnPuO9ej+zwuJ{)OjmmS~KrD63VyCkSLjJCqzbawNa=yGOr%?4fiYbrn8o
z!*Zer6fi#ZqAOn8nc4WNv37)3wcbghfbmXDx1BUQ9?^;d;wT_c>I49e$~cPB5Qc%g
z<nn9Y|I6EM*uUel>9a0*{nig8ooKu?Iay_y?94FHo<#sl!#NiFhv}sY=)}brzj@u;
zUvPeR>eeqG{3zgr5PfQi{p%9ldw-(#-?rtN4}E)ldUjJQ3J3y4q!rzE%<NQ`v35eY
zT?1$*A#oTG1_~`}(lOpqR+hY|$nuhvH0Kw0esIr@3n$O&Boop)!$SWMWtGzkyI35?
zlo(f1nUcyB2q}?5Vr)hKXnyZcuRr*w`OxeEmb~}n(*aPxY<u0-D>q(t-B-Hpgz<Jv
z7-*ENeYo+oY1T}380#c-SG^Dign>q@27t8`r6J8LhFQ-3g|Cye7D>W3T4|(^q(w?r
z3|UE+s7z7U1w2Y>0u>^Jz&b-wW%NgjEFVkv-1?=*{$$iQ_W_Gfme=}(`($_hxmN~3
zKsyPU=(Y$0g|UvTC|MchoVj+AIMl>ZKr0StClN^$5NM6}o}#h{QDU9v;POwHo-Bxh
zH3T|(96+}{4Nc;froelLbB4kc<Yh`;q~ujf7$l6hr}1n3_RFu^@aY>r{_s12qUjOb
zlK}+4M0<A2%d`?qbX$yf6O@#sSx#O+niqHhTB(MW>c%FH0+J}iI)|sEtR%f`H#&Tb
zPBK9l!~`lts{kc6g1Vb?-eRr6*pk8&1Z9Sn8YL7`2u8(#Ku2_wNm#SA<Kj22ea9W&
zKK4oK!uGhl){SP5!(?J@G(K}?Cy5wqC5&|voO2Xq)s%lo^OBkI&Iv;yaL!X!7V8|Q
zQKZB2Zn~{W;;=;&#DqE~&;e3vgs5ZEdyBD#%9aFGP9Xzi)7&5g##Q8HN~mMn@i-eV
zuz&E-T`NCaJdiy>UTd1}Yx1mJyQGk+6~}bjF=Oq7L7HK`Yx-YLSsILWl%|%{O4Zyi
zWrcP1=W{C$5J!$U?2v>lq6S2uLX@hF#Cx1`7*|uNmUVd5JL4Io%Q)wVbc}N&!XTp6
zN?PY%J$v0xzj$CbFrewVbwi&m-I?CvJw%bF71s>2yfUIFDxC9J=gEtTqO8zLA_O?=
z$%6`sz&cN54E^jb+O3d4M}$F46ePr9(s&_6iaOz~vlv^VrAA2Ec+@k@R>;eYBy3Zd
zoH%OZoW*<3^!n_TI@V{H+{~@^+?pD9q{DbdNr9FUAq81ck`)zMUezNM=NRQBqr7Yi
zmL(4is|wXQ&oJMIiU%k;hE^J-0s<Wn=!hst2!j}{f*OD|6eh28!h4)E7+297E+T{=
zj@y{j5C<*1cSt1}<^A?~S59AZ*Y}P+42*!s0R-r{D}=y#UmIRj^j1=q7U!)LLUkvm
zD9ehKQBGCWbg8vMO97(p+Di5?kq8h1LEUCbp-@txlqLuwA{`@ypsLC`nVm)13N3@0
znW{QJmDGefBnn#y0ZK~7JJYP$+`k<78nw=<Rsjg5!j_{>$dyrsv5tk_kRuP@@8k9u
zt+5G=_4EfRMHmo<jbV-Zt#foHYAx@b!}%v(9*=i*KOjU6x*p33gb)ZR7^FQ`m4g%t
zsWhRE2!ar$6y0iqsWq*wzyuHoA#zPERWqprZ>?vP73jXiSVLLncKPT5nM|I>)-Yg@
z78vJ<LQSX@TB+I?z&S^IatUi&RHnk%5@YLoWdf8e>IU9fgp@dEsceaH2Ino#IVw{&
zjOQQk!K9SLL4sDAEFY3|TCMdvyIT+5KiC6|R>yh^kKO#a_u0k0H>FuxEiU&N3^Hr_
zhwn}2_Wg^o)=0b?ra5_Dg7bu05r>Laq-kki%HqJhu|rBzaOlvXvNQ!{Rd-o=nUR+x
z(qhP{7?7@N|0<=da>}Z}*gAabuFYX=iFF3NN2`E#+$9VWqA+3Ime#p6qZ>`#vMm?s
z@;wj!_zNFE$1|8*Q@4~U5STsXO~+oi>8<P6j7R+=z4Y+Xd~g2fk%cVnFO<XHv4ukq
zE?;oj8JE9)(@Wnia_tTuJ7U(IzBZIJobT!+4Rl!-Ga&(wb*34m6clAfVe-dAE-z9l
zn^W2f;|xjCA=DvpkPs$vT?0U9@4Xj7l)xe|z~qlM)an}VsA_QZz-{07*zHZlUY#bJ
zhKoxeS~xlgych2}{K(uuXeqON1in_N))^{OqIGZrfI94~GgP*yJyGUZXYk&U6{$D2
z5OFY~h*|_X00CNu1hJZ?9(_vP@UI7q5W@1rDVT2z9svtHaXPR%68Av#=>5xg-g(on
zK9QB#W#_$Q=V@s^=(^QvYf3^Lp_@XsS__=FSZA@eqBI588=SKYdO7olm(BWZ6Tzq$
z5)}yuFs7bpgs~iJYM6LJN7ev&vgTej^l68zLI?*O`O(+!`x5YP+s@kj7g4x=eO`=2
zE!tv26`~psNO8P>a1DUUmWT$_q5a3$|KL$QySas9K$L}b;WGu5DbSJZP%8*=va!l3
zuV#)kq7JA2mp^jTU!MK)`+o9<w_SDJ`VHgTMrB`S#fU&1*E@9_`UZfZYQ~D8PMANs
zL^dkKXt7Fz@w}y^rm_{*S&A|zOjJTM{rjx|SOq~XcMVYPzWvAzyKn!>?HhN_od2e`
zz4i~+ZCLxFBnhXADitf~A|SwfthYE<&qYg9kc3@~E6E4;k-7cZqnj=qyEM%Q<mCwG
z4Cyc%?!9CAAAmk!Pw9~FnXX3RDr%<a0+Ybh?1r(8ule1Juim+H`%W4736$%o$hN)k
z%6luUw=69#48H%*xBdIx+gJW+d^R*YcddK1wSG)#6|O9-9NqKtrCW;BJ_H;BhR+Is
z6M(Evr~{54Ep<44yc9QAKpoSLnz|RMNuz51E}|xoih52opgB-{RslQ-jBJct_0H-&
z;P^QH$@J__c!uV4OMMvV;S|q_pN%C}HOTRk%GK4hAE##6a|YnIwVwC?EAhMs@V~ai
V%98pTkYfM<002ovPDHLkV1mR&2i^bx

diff --git a/retroshare-gui/src/gui/images/share-icon-16.png b/retroshare-gui/src/gui/images/share-icon-16.png
deleted file mode 100644
index a5de1924f2acc70928830e2d77ab475a622c6a93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 691
zcmV;k0!;mhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!RY^oaRCwBqQ%!3VQ4~FI=1pcMnPl3;
ze1H-~TnN#2p%q;yf*Zk|2)eM{h$sl6|Dn1O#jeGT2v!taxl)9>O&1oVxGLCMY)ci#
zNi#Fa%zNH9X``uvJ@d(X_uO;89s{8^acE5nS%$>_!RXf5+RBrURVgKSZM^ZKHe!~C
z>IOgy%AgOaZn|XprY*Xd25%{@V7#$P7FAB`7hEFGy@|>5pqP{bog_xk2_ZxbP2;e+
zjiYBRtb9O4*>EMQlrt8{fC6BtaH`rRvZEPTntG4noC~krLiOema+XPhRp@K#oI>P+
zeiBG6M#3TlVgsie$5OI_n{|j0r|E2gr=bc7LBuc#NVN+=q3<u%F?DegXAYi3(2Zal
zCcMChWgBTN1{^3tgf>3kokhXQ6Cosmg}0w(FmmS<7QQW_?CgRcw&3LKe>spiP_3tA
z1x3C(eG5;U&*9nylnMnZP7K$vDQ6vjwo2=@mf?%P2ru;0#gMB0=+Z;HzCMjTr5f6a
zpFWWcdNq>UYM^?X&t-A={uuJ6gY}Jd>?`iYy>pY8y*+~{iD2p`S|reTFh&s@e@BqD
z3=BJYaN4U3mEgxeF!AyVuD!aEk`)}4qAq~#5vZ<kgAL>+r4GZ;(EQqj7kO|^7k-Dj
zVDbUGo&%a5Zp!}n_CActWgw=uo_Ks5iAcaT9eFAw(|(UEXH0(ox!f%lcJs~IA3Ql3
znSo7?RN)v2(LsX0Ok+>H&9jBk+U3SO+Am_K5OQJl+5CBOI=7X~Xg{5uf%=Jg71b{R
Z1^}|Y?mox^I4b}E002ovPDHLkV1nNgH*Wv{

diff --git a/retroshare-gui/src/gui/images/share-icon-24.png b/retroshare-gui/src/gui/images/share-icon-24.png
deleted file mode 100644
index 09eee141f0e8b56e0a11ecfdddbab06a23c79297..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1379
zcmV-p1)TbcP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000FlNkl<Zc-pO2
zZA?>V6h7zP-ckhQvtP8dR7#5z=LXp@E}5G@3`E@|VjQ@*xDO)9+?EV7ld3UssFVHJ
zM$DE>&3-P+Ha47baWm0OojBvi1Qi9ff*_W*R4AYAeRtk_OECk7F?(-s`+nT_ea>^9
zbIvV7tXXRox*4DefYAumkAQ$8f`A&3M1D)4rC&s0avSw&M^pxZUo;TawR<hQj<$n(
z5`d+;utd`0=X3O$5@3wQcH*@D!*h>%hT3=#&!*`z-aq%ru@*G0%@ap^Mz=Z2javgg
zL7XJ;L@l;ALoY|Wn*BRXPUFX@f5jn<+#afTzhkTIx<+OQlNKuE|J9$G<KHrql`%J7
z;Qpk6ECbjI5U+jhZLkztJZM}!PYT~0tara{tG#>UA%OpI5hGKR66U~$B^9U<MAjYb
zg`X}QMZUxcz?x40`@Id>3$i_EE_X_Uogo6S*Y)1w!p`movKe--*#heqmxCw>5E^~}
zyASV!Z~puaM9_fQ0l)#w3rrrguF01MZVV_4`tEQBFexI&y!vn-$t~<Db3S~zeh=gs
zauuuj1E)LBVZ~R~Or(f2*+5}nQUP295L5tscPY?tW)~^!$>*uM6jt?oIc!?`24p0q
z#R2~4Xu;PHyvub0gJlxH=)oKU2r2;fI{!UXWuz-AN9dN7*hUl;3NN{qzz55!VV>R&
z<I!=@CuhYSS9Nd`oa+3GvO$DQ6H{GONDOi+2;jQPAn4<fAhWc@RH$3N8K1L1!#eNZ
zg5TOt;Ks$3%#mfsOWkek`-_L5>EdB<o19o+aI*7Ve}gyBO*ttjeA4wQ1KT2sBHLP*
z6lf=aw`{ecpnwrJ!M2yy!N$c^arzNCf*0?$vR|(p!=Eo7VS#Xf#MN*QB9~lcDX0-f
zJ5tjL;DEQmQDpO=eVt44UsVAHLx{<`B(}e@5uUX!j05xy`f&S^UF`UclgQ<m%ERfo
z!oxHrRRzc^wtF!5HJ8+Xg#*~@!eN97c^p1ly$4n<D2*R8I5q^|p8o+3wH<*D|4oo%
z+Qc)CGl-=>A0{P{2An~0jt3o;F3H!XG8h>ZkjIM4;Djy9K14@GF1tT;A6oBS!58Pf
zKr0NJE;q9?-m`G2rxi?djc86WGH<X8{NVsONe#h7oyx#oM2Y68B7jzv!Po@%CF3Ok
zjL8O=tD6hM6C=<c_Cs#E4OYxAg$>13(EETu``T#E4k-!AFfbB=njhbT;K%^+5FkNP
z8RQgE6y>gSO8r+u^{zK<wGl2C&YWmmObT5zCL38zNi~6$L86ox*XgA9G}bh2RuWA^
zGPNJ{Hdq%KD2mD*QlN840bqhSCE6ouQB;mHca{tGmhI*Y;sED+E?{+24R<35vI>wr
zU++Q7t9B`LYnTA+byT??qf|4pd=Bhe)d)|U7RG0PX+I3xe&0@MMioE8fCE_ESyb#+
zTBX4|V+sRNC(cl!r<ZGPWx6g6b}ZY0T2W%{{_F6?nMQ>Tw=X&xbCH`Em{wS%p|0_I
z7e$ejB;w<~(PX8ZM3tzccL7g4waQSN7$yKNvYRw8l@UPq*hkjY)~y*%Z33{_Tr^7~
zlt9P$SXWc`&YS|nUNo<=ioWB0=EVGrS}8MeDLnZLGcMAEf8@ki$H1qK(!5^fFynHw
zuK$!TGa8Ph{T~3@6zzcR<y?P9^YzjAVWzTdkws)7{+ETXQ2kOOSLq7M-xZvO&y=W9
lU8|}fYBloh=FTXe`3IH~rB;QQ8vXzP002ovPDHLkV1mqafT#cf

diff --git a/retroshare-gui/src/gui/images/share-icon-32.png b/retroshare-gui/src/gui/images/share-icon-32.png
deleted file mode 100644
index 80fd962506139efe66d96dbf93e1bbc5b71c77c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1270
zcmV<S1PS|zP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000ENNkl<Zc-qC6
zZA@EL7{~wjwzn;BV|2oBI2{xaCQcAXU|SYP=1WYRQ&c8#AqxzAV~ZwcW=0t^`oS4B
zn#h+Wi*80f_`xNUz|_S}25inuQGrofm=k1$brvenw|jlgDea1szK}IO%}IODIqCB|
z&v~BzIak2{Y=ZBH_O>LgzWnxXML}Uq9SZo_dg_l-$DdP<KmaLy=Uo?8WNX&xvo$eY
zv31aiYlF_7v7^7=M~^NaKr#XRo%3)a`Z_#-92lFMWC}GA$ls)bvCR$wSWZ1QpPN(y
zurPrBvmS`5*sNZrwdHN}1Ef*cxDOzW0Io8Cfv%+kxIJz-+)l`{%p)kNBxuwUL_zce
z<d*pXR#KN`KEOkXFrHr;fQy{xre~t{<)c`pOW=K9U2Mmm&l}-%yPy(94v<qq0PP_F
zOg}{rAXDk6MKvzJ+r41y%%yX9qPZ4vl8yryio*byFGdf*Lce4EV|c&vK+y4&z4=Je
zC31kQqA&o%Ju*Zwn$^pgcFv%F^G>|I{k5QT46m2LP2OoL)~pjl16=+sG63e-<#9o$
z)}dib4PGkW1xb_^%$u6E!|+Ba5;XB(xp_xH2!Lz?80nQUm$Xo5Z{4z+)3ZWW2`Yk9
z!9#soa=d3tE%uhz!Y3NWaWisKv*rPme^>$2_z=$#7J-blA_hYNjP`p0nDZIeEUMO5
zpt`h@Kc6;s;&A6N)Ra|`^WA>Ozl`*vsr3-f7`srox&V*g^9XFyHXQ%84P!P7)Krda
zCIeWN7Yg9PM2ro30i0CNuWoI?i<@f}-G-jgUL0(F4_!m&pp~>dLTqb16l>CaDm|57
z126}Wo=pHJLjYVg%Um+;4m(EQ>J936aKemz#}A@=_($lNV{#-!pxq2$WmXt~@nIQ?
zpwM0#aH6gy=pTLX{U^M|OL4T)$PWz$kh&%ez{C}=jIsz^X$&5L?*>j||JO~h*eAHu
zvd~8aKnKz-tHS_TN4)#Ta^RKw8}QtQ#dF|9UmM=}_7KJ<EzqbWe-5z5Y(WkXfIcG(
z!1cep0K5v^v#2brKvj{q3eFC7;>d+#s4lL;3mfbFf80U+&7Ftw1AX7UssP*8QWebF
zIG|-Rpb7{e<<>9&Hj5X46Vr#utX~KCio80&1gO5W7SEU6&;gUx41<2Y4m^6K0%q%+
z4iG?cS}1@A5;1x020$naRKmKF8tg9F#aH@Yvpem$_oGru*mw@GYy|;)vj~8J0RFkI
zL<A5B!UU_j=vnM9-xqXF@yBHpKbZq0qzEvD0+_KWQD4WHTyM|chNi8JLB~s)H}E-v
zA|Ng~41i-QdH|N7qDqbP^_>gG`o{b5RLj$dQ^)app*ATDfOA@j&U-)<GM8uKvx-mY
z<n!K$+D#|%=BWelP_FpOQ4=2q!0lKXfDeKtrbqGcXLdZZdtsm!sI?&gSQ)yVO9zO=
z)EXgZ8K$N`li#7w)8*>3G(1~lVXV5WW+$xuvjbya^ld`GwLDo+i#cge-q|8Zq9K+M
zP+YRf^5vx+id!}!;KhU~h@M&og8@H~V`A)(uu&VKW<|iOnGYhK8hbgs*)L}P08n#M
gn`X`tLq`$YzW_3pKZNYoo&W#<07*qoM6N<$f)?>l9smFU

diff --git a/retroshare-gui/src/gui/images/stock_signature_bad.png b/retroshare-gui/src/gui/images/stock_signature_bad.png
deleted file mode 100644
index c8de64f7ac1b48486601431f0ba9766bbe439d46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2094
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
YA9`&FUHFxB3IG5A07*qoM6N<$g0aBe+W-In

diff --git a/retroshare-gui/src/gui/images/stock_signature_missing.png b/retroshare-gui/src/gui/images/stock_signature_missing.png
deleted file mode 100644
index 66c03a4e6aabcd050d7a8e24a91b570b26a6d536..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2021
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
DuZ5}B

diff --git a/retroshare-gui/src/gui/images/stock_signature_ok.png b/retroshare-gui/src/gui/images/stock_signature_ok.png
deleted file mode 100644
index 454421ad15d80765f71173c3f2ceecb59075817f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1877
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
P00000NkvXXu0mjfWIK7W

diff --git a/retroshare-gui/src/gui/images/stock_signature_unverified.png b/retroshare-gui/src/gui/images/stock_signature_unverified.png
deleted file mode 100644
index aae661fa686e42630f258886cf9ac83851bd765a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2001
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

diff --git a/retroshare-gui/src/gui/images/tab-dock.png b/retroshare-gui/src/gui/images/tab-dock.png
deleted file mode 100644
index ba059de403d4058de57681bcc4f1ef2d92e34e41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 265
zcmV+k0rvihP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002cNkl<Zc-pPg
z-3o#*6bJAPCivCVTQ7Zu=stUk-ZfY+P>;~1(3M+$Axi7yB1%$mcHqwjXZ$wChS9>p
z{{RSN4O#Vi9CC)-r+`h8BnQi~=x3v<s#_R_JD8rPfNh$l>{l}gf*6M55?~L5gj`1f
z&N-7(el_a4My6?wUZC&$aR&$?*wCUr{N5R3<awR~vMggm3&)C5s(?JtX9Ld@xUQ>!
zqA0Wg$8i);mZcV8+qMGW(P#ni_!Q7I4QtzW7C;C=hGBF-^omYh7XQWvC!|$#gu6U}
P00000NkvXXu0mjf((rFj

diff --git a/retroshare-gui/src/gui/images/tab-new.png b/retroshare-gui/src/gui/images/tab-new.png
deleted file mode 100644
index 3bbbb51c18367c5c098254c0a7d0ab4b97e1e35e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpikV@N{tu
zskn7_;zqB-0U~YttM_`ZjFLIx$0upbsk+<F{rMti^+1hU#`L#O793sK%yCxuierHQ
z3v0M8U#7Jx<4UpHN9HUHTH3Z?w)~%%cMt9VTTb_uIX?4<rs(fO@20IkmH%z$-K8h{
zt{9tk-+XB?`IfV;*sGH-W2}VzZkTy#GEZqx-6zDbz0>~D+`a#@<KyjjCdglSyVGS)
zhSE1ine(5W?tgzA>FL{)%G@V$ta!n}0Op@DdfU&KFZs6fs+4W<vH~Ga(eS`5?TDk7
zmjs7+<$mzV-sJH_x1oUlj_W6`K3<0;C$m|pCQ^bdj@ecDe6vj0ct5?hIV#$H_-kzJ
z)>Y<QH+T+jILz<y!6qeRVZaR|hN#ye$x>>~nyNqkvq&UM^dC=2y``*i!0C&%+|-);
b@jn=3mz;W3(chg43}6ONS3j3^P6<r_P$;ff

diff --git a/retroshare-gui/src/gui/images/tab-undock.png b/retroshare-gui/src/gui/images/tab-undock.png
deleted file mode 100644
index f2827606cf18f838aa49727a04d87cc549ad41bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 319
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n2Mb|LpV4>-?)JUISV`@iy0Ug
zcY`pa)tkqUfP#`Gt`Q}{`DrEPiAAXl<>lpinR(g8$%zH2dih1^v)|cB0Tu1@ba4!+
zxRrZuC+{HxhSrDI)A~JfCMxReG7$-Ik?CHN$k8X7z&DM<q_5aZ;^jk?X~`{Ly{F~Y
z9%WWi5!l8e_)&U-h*#070FQr-6LfMXoluC`$hwr7^?9{F2e*i}{?nob%kFoZ&pS4O
ze=%>yi}L4_|79>o*;SOuYX02j=_GOC<Dq%?LfB7nX2h+$v;13-a>v<;;a3`8F$&1E
zu{jzyPn+-XmS>m3i?jtd*)Q?wOh{_w-FD+~gRIe-v(`t2K8oAz%RBP$%FKyCpD=j3
L`njxgN@xNATUvMy

diff --git a/retroshare-gui/src/gui/images/view_calendar_day.png b/retroshare-gui/src/gui/images/view_calendar_day.png
deleted file mode 100644
index a32fbb72388f5cf59be2e8f2d826b571146053ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 696
zcmV;p0!RIcP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yRlQK~y-6jgZYtRACgxfA`K+OUFi>a>g%^Qro(TkfdA)LTw^i
zge$RsAZXE|O@BaZmoC}}ZHgkXAR@vt7#DpI3|3&%e5Es^Io>;W?)$!{MciQ&r5-q(
z!}~t`c+Rl^dvS3w;dx#Tz_#t$?Cfj@2eh!Tpu>4?ZY}~KBF18ZTk)>=_4Nnq7XbEZ
zdus5;;L1Tj`EmJDICo#|evRRwypef}i@dsa`^w~aFbRO;MDT{Q#G_rr+B(33-!+$=
zR9gd<immYE{__{^vODbn)|ag`k1EfI9Y01q+Rn*z2Z<9=dOD*3{MxNjw5n`X_b63e
z&IBVkjuQcJ0E`htKp8`z4YfeATl4=WvRk-0a+j}_Z}hbfvGjeJ&y`P&G!B4L3R~M~
z4Yfey)-^Uhp05D7w|a+aJz&T4*!6ry<HH~!qJ=4?lu=5_|CZKT28ISMiwHIWN<;`N
zlgVI=+1Ir){9K99?6b6`8Y_r2^3dPke`xO;4`{MAWQTyTve_)g7&hW@esp%S5sjji
zA@{CjpKl+a8PeO^3&2vn&Z%^or}a9P4axKV(SYWUd_IpchA9!UqoYg%S{VxO+YSXd
z%>aNzA_2fqu}HYIWkb(7k8-&}KA$HRi;3&H`p^W0LIGn8#YzQfZKb%qjWGrhA(zWB
zHa12omHJRBmEHnaz@+QCFPrailrou&tgWqmoSB)K5RqyKIGs!;&pM7{{R`mxzTVv2
eTosX>@a+$KB9MM>NLw}l0000<MNUMnLSTXdh&X`&

diff --git a/retroshare-gui/src/gui/images/view_calendar_list.png b/retroshare-gui/src/gui/images/view_calendar_list.png
deleted file mode 100644
index f41b620b3066f5207bf758cb56beda3518695546..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10uxC@K~y-6m6J_t6HydE&wH6t+eQ-_u|?WawAFu*Cd8O71VJ|<
zE~Kkc|A64ag&Ti>YnNTP31p)PN_8V*0@F|sRD@D>r=YD3b&{D(=gqq=+6go?pcgLh
zz7G!Pa(N2S)oOJj2!bB~TI=re^70scvAVh%C-ut8N(w+ktl|=PbJ^UjttVS0fKIn#
zrf*L-`T@Job}LCeeq;PCmYTei$BN6mxq0vUVli3-z;RLpbKl9Ovt)+HK*67`&)&vx
z54MqM@chxM*Z!J+)dAG!olTy$UXU3%K`uSY>CG`FPNg|>G7Z2lugy=@W~bfZciZQD
zG>_vrDF6q+T0sPiwM4O{8yUQAcwnT5xHJENFRibf9i8Rnw>3VsKK5)J0Ama~*2FP%
zqZofbMiUZ*27rg|ecJmGdqIE~gj~qYfh33_t{7viF-HD1<2aV7*{N$Hf<uH6Ilx(K
z(OP4z?H@ufwAKKqSeaf637}rDQ!15cG#UdTl}hEv{s^E@D4>+0P$&#ENZuX+Bp0sh
zQY;p6U3Z{Cxm-TpKt#yr^C+dr=kxz(kN}#^CJPG-G@H$14Lr|dW@d&=CL_M@_x{GB
z@B6mX>4@iflB~z&`ue&UW29QGz6VAQ#&~F^lv1fw3V>wok8Cz8wOZ}N($Z2{L;?T>
woSU4Syy!TN8rb+@gkczOZ*RLIvX`9w1@Ajb0p^Y-od5s;07*qoM6N<$f-3JJWB>pF

diff --git a/retroshare-gui/src/gui/images/view_calendar_month.png b/retroshare-gui/src/gui/images/view_calendar_month.png
deleted file mode 100644
index e90194dcc2cb68f78a2f097e98daf8c4c35a3e1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10trb(K~y-6m61(LRACgyf6w)qnRKQ`9a9knDJ|$5L{ct_z%~&s
z!j;$;2wJpg(+6nX(nXtrHc4rikRc%mz6AM#gS|*pP-7!D*SYt(_qq49(2)>f^uXbF
z&RP8VbN&i&^7(w5=XpN?9LMp8hlkS~s?pKWs5*~~jMM>$NUZ4Ney%Y$xbbY`3c#+v
zYrF1t%^nsgjg_ud=jPkZGsHZX_wrP6m3Ma@-0Hs^_5+}G9bV55a+yZ5sWd3~>sQ!W
zNF9hRWM_H#<jquNvT{=cYHh2)i|q-r^{2>X8fYn`X*-jl^>hY+-({Cy%4N&l<&Rt8
zeAtWDx(+}C#IYa(HjW9S7(cX>eY5AtNpP?C5udg{)6vk)>o1e6Y%d?U(E!$3oX8=H
zzz-uTL4<?BGZuiya}RNYkR8vX>=`cPdO)fY39egfV{5G(x1%VM&hE|u5kV7TMTBoH
zEr{<U#-LKEnw&Of3`jcrc{1+%oGlc11;^qzBmmSpxH^?ei!q0zuUS1J%9(&<Rk?L@
z^F#zts~{?wM1p{m@{)*hrXcKCUgj-u6sP~&v+L{lGczQXmSnK0X#ju~2-cEGSp})Z
z`T2RV)=EB~{{YmB2&xrsd@YqGB?z1&t?tJL@V!`+#l^*sLqkJ-BH{ul;9Prq`$es_
ms`YhaOjIlu=R{<udiw`4?sOV$IKnUh0000<MNUMnLSTZ*{3C<_

diff --git a/retroshare-gui/src/gui/images/view_calendar_week.png b/retroshare-gui/src/gui/images/view_calendar_week.png
deleted file mode 100644
index eb12f42d8c4f7be88e3ca00afb42cf9b5c53d127..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10wPI7K~y-6m5|L#R8bhlf9KAfd&?O|@m7i-Af*LuT8ml|L68s;
zEy9)9KM=HN(WXDZbxRj*gf>NGXb=@4xX?u@)?h_&OY(D=9Pgbw_uTWgh?&%c^nsV(
z%i-bSd5;3D@$vEIFbtOgEXyhn4-aS9qp`8Eq`HrcjHCcW#3=f>?KOHgmL4wk0&JJJ
zb;r$)>AeA)Pc|=9_oi!2Z!tWQck)1Sp4Zp!3=Z_f0|3}|im>YkUbc}2Hv<ZOl>>^i
zZY^xKVVb9-Q!j(b;Ia*<#q~Uo3llUPJ%X35<5)gJb1ut?`YZseTP0RhiS^Pp8>N6#
zaW}SYrvPjKV+0Y<#t<ila;(`ZM}HbwX>N7j<8$E)t#zHe_&Ui#VZPSJ2GCk#B^F5n
z<v1azBv?d*kp|%Y%w0;Am|_^R6-J!)x<INCX)bB4jn-NYI!Tg9duRI<5y2uxiwM>6
zeIH}YE+*RWeLBTXpGuUjogh-{Lt9(hzHIG@*<q_meS(thx*3Tgl<RU(nkb69MI37a
zoa6aC&w#`5Iivy90#q!=NlT@IavToBvm(mA2!r2NR;El8seO$*su#nMpT1Ad^W<uO
z|KK8EtwN0JqU!6xby*Dp#Bu&I3=zjc<#H@<Y;dl(m)ZIG_a6&|HvkG42!h}hVEy~Y
zyXE`7%+1Yx7#bSt6OmFi;ABfn%Ng6Y)&BybC`#7W)@DScSbh5qmEd;yMx4DP00000
LNkvXXu0mjf7>p|s

diff --git a/retroshare-gui/src/gui/images/view_split_top_bottom.png b/retroshare-gui/src/gui/images/view_split_top_bottom.png
deleted file mode 100644
index 8c0e4db5685e6275d704316c0ac6f81d0bcdd920..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 422
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpik#_H=O!
zvFKep+0pM%fI!>+N?9qT+fibyO45fkcQkYJFAV=IrZVRs^MyPw0Wpc}-@lHry75lr
zc(nb0+P^<D1&y6uSOm@;K656-<=Enj8Q0#HSwFuK8fvO!B>rHV&S`grqI0s*tsMeR
z4DUH_>*{&lGVy&cGU4t!)m5v)t>#LEs&*~%zj%gYq3ZeKUw`esUKT!mwCUwvXO@n4
zkM}V4E&FKF``^%Y(vmG}1$~#@@mVI%r{S=^{Ahti!u_Z3XGoq-<!fLLxH>tNLC`UD
zKU+)_^M`xMY3kl-ZQp;d6Iq}WKIQ2ve@+nv-}RC_Mtye=Dk`#k+QYDKYQ-v^2XlV!
z7ZTm@_18{bMH$<t&Q2UTX1B!*7>`9xJNwAO?)A)9yYjjg%{aaE{U5&B%bP9Nmp%Z+
O0)wZkpUXO@geCxsbgHBP

diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 5196764a3..4ecdf67ad 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -544,8 +544,8 @@ QVariant RsMessageModel::decorationRole(const Rs::Msgs::MsgInfoSummary& fmpe,int
 		case COLUMN_THREAD_SUBJECT:
 		{
 			if(fmpe.msgflags & RS_MSG_NEW         )  return FilesDefs::getIconFromQtResourcePath(":/images/message-state-new.png");
-			if(fmpe.msgflags & RS_MSG_USER_REQUEST)  return FilesDefs::getIconFromQtResourcePath(":/images/user/user_request16.png");
-			if(fmpe.msgflags & RS_MSG_FRIEND_RECOMMENDATION) return FilesDefs::getIconFromQtResourcePath(":/images/user/friend_suggestion16.png");
+			if(fmpe.msgflags & RS_MSG_USER_REQUEST)  return FilesDefs::getIconFromQtResourcePath(":/images/user/user_request48.png");
+			if(fmpe.msgflags & RS_MSG_FRIEND_RECOMMENDATION) return FilesDefs::getIconFromQtResourcePath(":/images/user/invite24.png");
 			if(fmpe.msgflags & RS_MSG_PUBLISH_KEY) return FilesDefs::getIconFromQtResourcePath(":/images/share-icon-16.png");
 
 			if(fmpe.msgflags & RS_MSG_UNREAD_BY_USER)
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index b2beba606..480959bb8 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -663,13 +663,13 @@ void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/)
 
     QMenu contextMnu( this );
 
-    QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/view_split_top_bottom.png"), tr("Open in a new window"), this, SLOT(openAsWindow()));
+    QAction *action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/newwindow.svg"), tr("Open in a new window"), this, SLOT(openAsWindow()));
 
     if (nCount != 1) {
         action->setDisabled(true);
     }
 
-    action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/tab-dock.png"), tr("Open in a new tab"), this, SLOT(openAsTab()));
+    action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/newtab.svg"), tr("Open in a new tab"), this, SLOT(openAsTab()));
     if (nCount != 1) {
         action->setDisabled(true);
     }

From 235ef6f509351922f244f283dbea223b38f4ecf8 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 12 Feb 2022 11:49:50 +0100
Subject: [PATCH 030/503] removed old icons & cleanup

---
 .../gui/FileTransfer/SharedFilesDialog.cpp    |   2 +-
 retroshare-gui/src/gui/MainWindow.cpp         |   5 +--
 retroshare-gui/src/gui/QuickStartWizard.cpp   |   2 +-
 retroshare-gui/src/gui/common/FriendList.cpp  |   2 +-
 .../src/gui/common/NewFriendList.cpp          |   2 +-
 retroshare-gui/src/gui/icons.qrc              |   1 +
 retroshare-gui/src/gui/icons/connection.svg   |  38 ++++++++++++++++++
 retroshare-gui/src/gui/images.qrc             |   7 ----
 .../src/gui/images/connect_friend.png         | Bin 3472 -> 0 bytes
 retroshare-gui/src/gui/images/kbackgammon.png | Bin 2491 -> 0 bytes
 retroshare-gui/src/gui/images/kcmsystem24.png | Bin 1535 -> 0 bytes
 retroshare-gui/src/gui/images/rs_wizard.png   | Bin 4495 -> 0 bytes
 .../src/gui/images/security-high-16.png       | Bin 682 -> 0 bytes
 .../src/gui/images/security-high-32.png       | Bin 1628 -> 0 bytes
 retroshare-gui/src/gui/images/settings.png    | Bin 2637 -> 0 bytes
 .../src/gui/images/underconstruction.png      | Bin 1755 -> 0 bytes
 .../src/gui/settings/rsettingswin.cpp         |   2 -
 17 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/connection.svg
 delete mode 100755 retroshare-gui/src/gui/images/connect_friend.png
 delete mode 100644 retroshare-gui/src/gui/images/kbackgammon.png
 delete mode 100644 retroshare-gui/src/gui/images/kcmsystem24.png
 delete mode 100644 retroshare-gui/src/gui/images/rs_wizard.png
 delete mode 100644 retroshare-gui/src/gui/images/security-high-16.png
 delete mode 100755 retroshare-gui/src/gui/images/security-high-32.png
 delete mode 100644 retroshare-gui/src/gui/images/settings.png
 delete mode 100644 retroshare-gui/src/gui/images/underconstruction.png

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 933e30168..a7d61489a 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -91,7 +91,7 @@
 
 //#define DEBUG_SHARED_FILES_DIALOG 1
 
-const QString Image_AddNewAssotiationForFile = ":/images/kcmsystem24.png";
+const QString Image_AddNewAssotiationForFile = ":/icons/svg/options.svg";
 
 class SFDSortFilterProxyModel : public QSortFilterProxyModel
 {
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 8d323524e..10ce2695b 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -145,7 +145,6 @@
 #define IMAGE_NEWRSCOLLECTION   ":/images/library.png"
 #define IMAGE_ADDSHARE          ":/images/directoryadd_24x24_shadow.png"
 #define IMAGE_OPTIONS           ":/images/settings.png"
-#define IMAGE_UNFINISHED        ":/images/underconstruction.png"
 #define IMAGE_MINIMIZE          ":/icons/fullscreen.png"
 #define IMAGE_MAXIMIZE          ":/icons/fullscreen-exit.png"
 
@@ -506,7 +505,7 @@ void MainWindow::initStackedPage()
 
 
 #ifdef UNFINISHED
-  addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui->toolBar), &MainWindow::showApplWindow, SLOT(showApplWindow()));
+  addAction(new QAction(QIcon(), tr("Unfinished"), ui->toolBar), &MainWindow::showApplWindow, SLOT(showApplWindow()));
   ui->toolBarAction->addSeparator();
   notify += applicationWindow->getNotify();
 #endif
@@ -637,7 +636,7 @@ void MainWindow::createTrayIcon()
 
 
 #ifdef UNFINISHED
-    trayMenu->addAction(QIcon(IMAGE_UNFINISHED), tr("Applications"), this, SLOT(showApplWindow()));
+    trayMenu->addAction(QIcon(), tr("Applications"), this, SLOT(showApplWindow()));
 #endif
     trayMenu->addAction(QIcon(IMAGE_PREFERENCES), tr("Options"), this, SLOT(showSettings()));
     trayMenu->addAction(QIcon(IMG_HELP), tr("Help"), this, SLOT(showHelpDialog()));
diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp
index 200e75948..ce953a32e 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.cpp
+++ b/retroshare-gui/src/gui/QuickStartWizard.cpp
@@ -43,7 +43,7 @@ QuickStartWizard::QuickStartWizard(QWidget *parent) :
 {
     ui.setupUi(this);
 
-    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/rs_wizard.png"));
+    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/tools_wizard.png"));
     ui.headerFrame->setHeaderText("RetroShare");
 
 	  ui.pagesWizard->setCurrentIndex(0);
diff --git a/retroshare-gui/src/gui/common/FriendList.cpp b/retroshare-gui/src/gui/common/FriendList.cpp
index 303b34356..dd2d17875 100644
--- a/retroshare-gui/src/gui/common/FriendList.cpp
+++ b/retroshare-gui/src/gui/common/FriendList.cpp
@@ -68,7 +68,7 @@
 #define IMAGE_FRIENDINFO         ":/images/info16.png"
 #define IMAGE_CHAT               ":/icons/png/chats.png"
 #define IMAGE_MSG                ":/icons/mail/write-mail.png"
-#define IMAGE_CONNECT            ":/images/connect_friend.png"
+#define IMAGE_CONNECT            ":/icons/connection.svg"
 #define IMAGE_COPYLINK           ":/images/copyrslink.png"
 #define IMAGE_GROUP16            ":/images/user/group16.png"
 #define IMAGE_EDIT               ":/icons/png/pencil-edit-button.png"
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 1b2d513f4..991f5d647 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -66,7 +66,7 @@
 #define IMAGE_FRIENDINFO         ":/images/info16.png"
 #define IMAGE_CHAT               ":/icons/png/chats.png"
 #define IMAGE_MSG                ":/icons/mail/write-mail.png"
-#define IMAGE_CONNECT            ":/images/connect_friend.png"
+#define IMAGE_CONNECT            ":/icons/connection.svg"
 #define IMAGE_COPYLINK           ":/images/copyrslink.png"
 #define IMAGE_GROUPS             ":/icons/groups/colored.svg"
 #define IMAGE_EDIT               ":/icons/png/pencil-edit-button.png"
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 33560031a..57527d447 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -353,5 +353,6 @@
         <file>icons/newtab.svg</file>
         <file>icons/newwindow.svg</file>
         <file>icons/cancel.svg</file>
+        <file>icons/connection.svg</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/connection.svg b/retroshare-gui/src/gui/icons/connection.svg
new file mode 100644
index 000000000..b22e7275d
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/connection.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="connection.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M21.4 7.5C22.2 8.3 22.2 9.6 21.4 10.3L18.6 13.1L10.8 5.3L13.6 2.5C14.4 1.7 15.7 1.7 16.4 2.5L18.2 4.3L21.2 1.3L22.6 2.7L19.6 5.7L21.4 7.5M15.6 13.3L14.2 11.9L11.4 14.7L9.3 12.6L12.1 9.8L10.7 8.4L7.9 11.2L6.4 9.8L3.6 12.6C2.8 13.4 2.8 14.7 3.6 15.4L5.4 17.2L1.4 21.2L2.8 22.6L6.8 18.6L8.6 20.4C9.4 21.2 10.7 21.2 11.4 20.4L14.2 17.6L12.8 16.2L15.6 13.3Z"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 468a0177d..a835757bd 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -35,7 +35,6 @@
     <file>images/help/natgreen.png</file>
     <file>images/help/natred.png</file>
     <file>images/pgp.png</file>
-    <file>images/rs_wizard.png</file>
     <file>images/avatar_request.png</file>
     <file>images/avatar_refused.png</file>
     <file>images/avatar_request_unknown.png</file>
@@ -200,10 +199,7 @@
     <file>images/junk.png</file>
     <file>images/junk_on.png</file>
     <file>images/junk_off.png</file>
-    <file>images/connect_friend.png</file>
     <file>images/kalarm.png</file>
-    <file>images/kbackgammon.png</file>
-    <file>images/kcmsystem24.png</file>
     <file>images/ledoff1.png</file>
     <file>images/ledon1.png</file>
     <file>images/locale.png</file>
@@ -268,7 +264,6 @@
     <file>images/replymailall24-hover.png</file>
     <file>images/reset.png</file>
     <file>images/resume.png</file>
-    <file>images/security-high-16.png</file>
     <file>images/security-high-48.png</file>
     <file>images/security-low-48.png</file>
     <file>images/security-medium-48.png</file>
@@ -277,7 +272,6 @@
     <file>images/security-medium-off-48.png</file>
     <file>images/save24.png</file>
     <file>images/send24.png</file>
-    <file>images/settings.png</file>
     <file>images/show_toolbox_frame.png</file>
     <file>images/start.png</file>
     <file>images/stop.png</file>
@@ -346,7 +340,6 @@
     <file>images/up0down1.png</file>
     <file>images/up1down1.png</file>
     <file>images/up1down0.png</file>
-    <file>images/underconstruction.png</file>
     <file>images/user.png</file>
     <file>qss/chat/standard/private/info.xml</file>
     <file>qss/chat/standard/private/incoming.htm</file>
diff --git a/retroshare-gui/src/gui/images/connect_friend.png b/retroshare-gui/src/gui/images/connect_friend.png
deleted file mode 100755
index 3549e6d83daa8cc78302a34b9888c5ac50d1b441..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3472
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

diff --git a/retroshare-gui/src/gui/images/kbackgammon.png b/retroshare-gui/src/gui/images/kbackgammon.png
deleted file mode 100644
index 9bdda10830044daa2da96d1d8dda6ceceba7c514..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2491
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
FV1mLti+cb7

diff --git a/retroshare-gui/src/gui/images/kcmsystem24.png b/retroshare-gui/src/gui/images/kcmsystem24.png
deleted file mode 100644
index cedcf7f0f27b29b2ef3bde13660632cee29ee8e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1535
zcmV<b1pxYqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv000HXNkl<ZNQsSA
zTWnNS6kX>rckVpyZA(Xo=|ft11lrO<sg&3z^%oO91S$d*jTkI6ihl6}ijhQW(@^~2
zM-o9yd3`_|sIg#-kno7L)C86CXerVTGac*<bRKu^z32GR(oA`XJ2@ZwW37GmK6|Z0
zq?CAGG&D3gH*DDO^T5DBKBW}7xw*Gjty)$0Tp$2QDW7{3#Zmn2frHjqG$s?tl>BD@
zegnV@{|C!<?%X-8U~_ZxjLy!^?x8z(eyyym47auIsj8@0)Vloj<#QE9Awo#_{eG%>
zy>qW#z52(pWy`{?t*uKtIyw&b_4OU8sj0Ct`AFu7cJKa@5khaSYk0dT6by#XpFfu>
zE`GV-)tVZbP8(p1!{Oj?I2`bJJm~K3wjt%O{+To9l$DkF+V<?Zv2EM7dCx4++S+<&
zRsEZV@pv4HqJVRbR4N4k@VH&z+yU<3aBvPn2pD7FoI?l!(=?%~Dq31v26k-UKKl_T
zovK8LE0Ij9LI@B-V45b9$s~jj5Vnn>p*skUj9~chyBHW4gkc!4EDMHVz%)%r3D}km
z%QRht5cbp#R8?Jn>h$RYvx<tjX_^p1VC?>Vl$Msl<x-(23Mi$pg@6<S*ZQxcu&`iq
z5fuFPTaWo#-D@j^5I;WR<eBrTs;VlPRaDF^%YqOBv1k+(73H`W3WE^9G%e`523^-6
zB`|N^T-?5W8$MqyQmGW?%$e&bFE6hEFjatN7Fb<hzg|(4sTC_LE5%qe2F559#R<zY
z?Q}XV6vYWCCF1co3JVI5N*PF}O?W&WtXZ?>{b`T9Wy_YltgNiVmSyFvd24Nn$Kzp^
zHL+<Pk7wc*l;ZQ9pZ(F^-rnwTI6RGwn;Uj~y5l9oFkl!49zGn0+wFps647YPK6>Qv
zU#4k}o;-PSBMAfo^`}mE9SH>TXzW1@wr#_*Ec|o-KKy<^yk0MU=;{hJHhxedrTk}d
zA*$Ni_MUrV<w{pP9!D@Zf<Pc|LRgF;CnpDkgM-%kb!$JQ0F*=`foLoW+qOXnfe-=!
zF#d2HhGAf6Xz1o6asZH0_PE@x(O4{ov|)f!23rVFN+xjeI8v!3ky0`Wz}CDPa<a3*
zD1{UPln^M2f`Y<)Xqtx7veMajEGVHb=vg|lva><R1hJ3+=N!J=T<DrE0f0s#k-m<O
z6aC*G`fhk^Y|Q4IW75!|swyZY(DkgD)z#Hg3azfLo|j)x;36R4oFmugn-X3q9I`+8
zc<aq`=YF|0JUrY>q?90pZ~*vX*RFx4rl!JZG>T+01;77A5JF&C7J7PmV5AIi&cGPQ
z!t!!B6$OTwMl>1&V+^{k<LkX`x4vp_o<j(6N+}IGIa5nYX?=I_;PF^222InTYZ`{{
z4uf+J#uyeZEJt2`K3<wtgasufAOI}O!r;Il7-OJ}Aso7gV@Hp+PjVVh=wM`I<iuz=
zY&o4O6sLlm88gs-tsjX*61Hta*LAp56}D|7kxZih#tr29d;kDODMm*})AxeG&S^Tx
zw2Cul&xY#i>Ryb;;}BB7Oj{TqA4f8o#P5B5u%!ec03`&A7B2>+Q<eiMB{WUL<%<_b
z>g!kMKcQqo2=D6ZN&o=k3~rYjnx?_)^?)&k#g&z)dgT=?SyF|{$|YcwK~+`gx(1ia
z1;!X4CC;4bPCT;%Ldb&6n>Tmu+qbW%rKKeji9{aM)zuZwpTEG7Hci-*`rwl`-P_x1
zT)KE+C@(M1_wIWeXMD2tqg#g#9a<r!{A*fknTJxkw6?bPywmAi4ImppV^dSpmEJ2?
z#Glvt<+c9n^3tWt_NGmnE(3T6fY<GIZ>+7YJrAJralWViqX1ZD?sPiKE?m51218*P
z8jZ-aXMai&LJA+l@TYN2v+Inm?9ALSjL`98N3REiK@NZf0)d2-GV&N^+F$(CH~6n0
lgv<osnoN^Y%6tC@_b;b~AP`ty0&)NV002ovPDHLkV1l%Q)&T$j

diff --git a/retroshare-gui/src/gui/images/rs_wizard.png b/retroshare-gui/src/gui/images/rs_wizard.png
deleted file mode 100644
index 387d21177accf5602f1712f6f4c671b319a22606..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4495
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

diff --git a/retroshare-gui/src/gui/images/security-high-16.png b/retroshare-gui/src/gui/images/security-high-16.png
deleted file mode 100644
index d93b4bdd9bc0981c149a3403f04f75504c78b1fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10w+mCK~#9!rISr)6Hyd}PijI;(`i%MLXijxt<VIFO0#e&;wsM0
zt<b@4TqPU9r9lwwqO@euZiHZqGLuF_n^lD_{K<gTM21M2Rfh)Kpr(mpw6U1$yO@?C
z&8`;?JkI^jWrla3gNSgPa&|Hu4o5eDYeK^<t1R@Ah<+V`g=rUC0ZEeX77B$=jYeaS
z#b@@o*UsC6mxOLdqtS(GwfbGns}xRzDLfx0)li8&?lHrxeE^5g#bU81<#PFpv1O2)
zkO>b!SP*(HGzXF&%Vc~uh#6)%!`UwUFUjxsOWHeaD0DxBmC6d>1JErrD4N3(^rnu`
zObFUXZHQR_tiu77VzIc}FZF{?65wow`vldLuy%e8%U72{UIH`Ba>hPjSJ(AQ@Jx`<
z1k~#))C($loxND~uVTPE0OhFy`~`xigTyRn4zH1jeu%5v^zM7DvB9yk>DOr_ZYHo^
zUx(|23z26Ln5RqxY60}@^;o89ZgR%{1zh>1)KY%p@&vRU4Y9=-K!BW<v2kSs_z6so
zPa>5{<(WOQ2ckSapYLAjYpFgmHA0vIVMgeK&?0DbZj`paZP%G$_8`|~8}z$YtG$_h
zG@D7@NRp@F0sa7ZCFmUwl941$Kb+1m!)(V*Z2i)$Y&QEgXXQwFp^%bMD7Td(_PEE4
zEz@z8``m8#op?O1S(a5|@tHmDwe$QMJ3S^BfQv%oE$h8dL9qMn?6IHoKb4bZ_|TL|
Q{Qv*}07*qoM6N<$f?fSJSpWb4

diff --git a/retroshare-gui/src/gui/images/security-high-32.png b/retroshare-gui/src/gui/images/security-high-32.png
deleted file mode 100755
index 95e73d93e0d768731d8d2f496adc16781f0d2b6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1628
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
a<39j1!+dC#4z5=K0000<MNUMnLSTZjhw#$?

diff --git a/retroshare-gui/src/gui/images/settings.png b/retroshare-gui/src/gui/images/settings.png
deleted file mode 100644
index 9e6d52b8b76136479759b4dc65911124f43a7ed2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2637
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

diff --git a/retroshare-gui/src/gui/images/underconstruction.png b/retroshare-gui/src/gui/images/underconstruction.png
deleted file mode 100644
index af754a98cc40c82a77cd43f49d44bb4f1f4ce252..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1755
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

diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp
index 4cdd929e5..46c85ea8e 100644
--- a/retroshare-gui/src/gui/settings/rsettingswin.cpp
+++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp
@@ -52,8 +52,6 @@
 #	include "JsonApiPage.h"
 #endif
 
-#define IMAGE_GENERAL       ":/images/kcmsystem24.png"
-
 #define ITEM_SPACING 2
 
 #include "rsettingswin.h"

From aa5e40828eac4133ed555f9706187b5888e40975 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 12 Feb 2022 12:22:52 +0100
Subject: [PATCH 031/503] removed old icon

---
 retroshare-gui/src/gui/GenCertDialog.cpp          |   2 +-
 retroshare-gui/src/gui/Identity/IdDialog.cpp      |   2 +-
 .../src/gui/common/SubscribeToolButton.cpp        |   2 +-
 retroshare-gui/src/gui/images.qrc                 |   1 -
 retroshare-gui/src/gui/images/cancel.png          | Bin 640 -> 0 bytes
 retroshare-gui/src/gui/unfinished/PhotoDialog.cpp |   2 +-
 6 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 retroshare-gui/src/gui/images/cancel.png

diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index 1abdb698b..b71e324c7 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -48,7 +48,7 @@
 #include <iostream>
 
 #define IMAGE_GOOD ":/images/accepted16.png"
-#define IMAGE_BAD  ":/images/cancel.png"
+#define IMAGE_BAD  ":/icons/cancel.svg"
 
 class EntropyCollectorWidget: public QTextBrowser
 {
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 0f657a577..5397f6300 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -1111,7 +1111,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
     static const int CANCEL = 3 ; // Admin list: no          Subscription request:  yes
 
     const QString menu_titles[4] = { tr("Request subscription"), tr("Accept circle invitation"), tr("Quit this circle"),tr("Cancel subscribe request")} ;
-    const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/icons/png/enter.png",":/images/cancel.png" } ;
+    const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/icons/png/enter.png",":/icons/cancel.svg" } ;
 
     std::vector< std::vector<RsGxsId> > ids(4) ;
 
diff --git a/retroshare-gui/src/gui/common/SubscribeToolButton.cpp b/retroshare-gui/src/gui/common/SubscribeToolButton.cpp
index 4015e641c..165b6caa1 100644
--- a/retroshare-gui/src/gui/common/SubscribeToolButton.cpp
+++ b/retroshare-gui/src/gui/common/SubscribeToolButton.cpp
@@ -72,7 +72,7 @@ void SubscribeToolButton::updateUi()
 		    delete mMenu ;
             
 		mMenu = new QMenu;
-        mMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/cancel.png"), tr("Unsubscribe"), this, SLOT(unsubscribePrivate()));
+        mMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"), tr("Unsubscribe"), this, SLOT(unsubscribePrivate()));
 
 		if (!mSubscribedActions.empty()) {
 			mMenu->addSeparator();
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index a835757bd..6e893722d 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -103,7 +103,6 @@
     <file>images/graph-blue.png</file>
     <file>images/avatar_background.png</file>
     <file>images/chat.png</file>
-    <file>images/cancel.png</file>
     <file>images/close-down.png</file>
     <file>images/copy.png</file>
     <file>images/delete.png</file>
diff --git a/retroshare-gui/src/gui/images/cancel.png b/retroshare-gui/src/gui/images/cancel.png
deleted file mode 100644
index 87cd0b0125d6193c16c59f25b88396493e885f6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M
z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~*<;sHJ(
zuK)l4Z(v|p!N9PVfuWs&p^JfGA_Kz=28KBd467IzAX4jDSb*GiKE6H%hCBv_Tn2_L
z28Klp4AZo=>*d6nRHQFelpgl-Jed$XS6*hniPlkf`z7+iOXNkDC`v6+mRl+(v`kK5
zwTk$9b?ME9YMZs?_j%bL_HsDk<9sU2r$Je<QCV@JoyjI=t1M;tEM<ji8>2`?nP^4n
zy$lTd7#Q|j8XpwoI%I5o$k*ermDN#8qhmrm$Ax%K+S#3Uu|MtSb;ix@0t3SZA)d=&
zVVA>0E~h43Ns7Cc5PLm2@wTwQZ4try!u<C|gzje~K4xHes;~9bK<BBE?o%VZr^SWO
za&w=RmA>rld@myOUR3yfXZwfVuCELX$$gHBz;HAv3GxeOFfuao00U1?PcLu(fWV*&
z*YDnY^6b^8FJFJbz;6)v0|bBn{{8pwYTmshp#IsOE{-7*lD!9A#hMrxSP$@P+)yej
zFHd4mDu4d>{K5|<=XpdH-eIeeoFkI5<onEvOuxRIc6Um;8@En#@y>#Mch*eE5E3q&
zsDJ)QWe~HZu=JPqwHHm!J!tPMoAuVM<=A|yGuL0$MD)r}t=B23K4h_=$wxfq{j{s6
zvbJ;1RM`0b{&%I*Q{~<_^9mg*KC_8ox^*ST366Hw_&MDTLh{a=g|okJNlO7blfl!~
K&t;ucLK6VLNBNWh

diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
index 42fd5acee..83009c267 100644
--- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
@@ -42,7 +42,7 @@
 
 /* Images for context menu icons */
 #define IMAGE_REMOVEFRIEND       ":/images/removefriend16.png"
-#define IMAGE_REMOVE             ":/images/cancel.png"
+#define IMAGE_REMOVE             ":/icons/cancel.svg"
 #define IMAGE_CHAT               ":/images/chat.png"
 /* Images for Status icons */
 #define IMAGE_PEER               ":/images/user/identity16.png"

From 2428ebf6c36a44ef52db2fd6201b8110eb39340b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 12 Feb 2022 18:32:36 +0100
Subject: [PATCH 032/503] removed re-parsing of certificate

---
 retroshare-gui/src/gui/HomePage.cpp               | 13 +------------
 retroshare-gui/src/gui/connect/ConfCertDialog.cpp |  4 ----
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 8dd936b38..0908b5c37 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -207,8 +207,7 @@ HomePage::~HomePage()
 
 void HomePage::getOwnCert(QString& invite,QString& description) const
 {
-
-    RsPeerDetails detail,parsed_details;
+    RsPeerDetails detail;
 
     if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail))
     {
@@ -235,19 +234,9 @@ void HomePage::getOwnCert(QString& invite,QString& description) const
         std::string short_invite;
         rsPeers->getShortInvite(short_invite,rsPeers->getOwnId(),invite_flags | RetroshareInviteFlags::RADIX_FORMAT);
         invite = QString::fromStdString(short_invite);
-        uint32_t err;
-
-        if(!rsPeers->parseShortInvite(short_invite,parsed_details,err))
-            std::cerr << "Something unexpected happenned while re-parsing a cert just created: error " << err << std::endl;
     }
     else
-    {
         invite = QString::fromStdString(rsPeers->GetRetroshareInvite(detail.id,invite_flags));
-        uint32_t err;
-
-        if(!rsPeers->loadDetailsFromStringCert(invite.toStdString(),parsed_details,err))
-            std::cerr << "Something unexpected happenned while re-parsing a cert just created: error " << err << std::endl;
-    }
 
     bool include_extra_locators = mIncludeIPHistoryact->isChecked();
     description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatact->isChecked(),include_extra_locators);
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
index cd539933f..dc8c871e0 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@@ -303,13 +303,9 @@ QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bo
     QString infotext;
 
 	if(use_short_format)
-	{
 		infotext += tr("<p>This Retroshare ID contains:") ;
-	}
 	else
-	{
 		infotext += tr("<p>This certificate contains:") ;
-	}
 	
 	infotext += "<UL>" ;
 

From b9a4cdcd50facfa15bc581fd5425fc1c0cb881fc Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 13 Feb 2022 22:38:32 +0100
Subject: [PATCH 033/503] fixed up using invite flags to populate certificate
 comments

---
 libretroshare                                 |  2 +-
 retroshare-gui/src/gui/HomePage.cpp           |  3 +-
 .../src/gui/connect/ConfCertDialog.cpp        | 30 +++++++++++--------
 .../src/gui/connect/ConfCertDialog.h          |  2 +-
 .../src/gui/connect/ConnectFriendWizard.cpp   |  4 ++-
 .../src/gui/settings/CryptoPage.cpp           |  2 +-
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/libretroshare b/libretroshare
index d26821b89..61dbe774d 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit d26821b891d7b3e72da475896814a82716574e56
+Subproject commit 61dbe774d60070a7ce371f925f230a878996cdd5
diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 0908b5c37..b55829fbd 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -238,8 +238,7 @@ void HomePage::getOwnCert(QString& invite,QString& description) const
     else
         invite = QString::fromStdString(rsPeers->GetRetroshareInvite(detail.id,invite_flags));
 
-    bool include_extra_locators = mIncludeIPHistoryact->isChecked();
-    description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatact->isChecked(),include_extra_locators);
+    description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatact->isChecked(),invite_flags);
 }
 
 void HomePage::updateOwnCert()
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
index dc8c871e0..6a407cb49 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@@ -283,7 +283,7 @@ void ConfCertDialog::loadInvitePage()
 		ui.stabWidget->setTabText(PageCertificate, tr("Retroshare Certificate"));
 	}
 	
-	QString infotext = getCertificateDescription(detail,ui._shouldAddSignatures_CB->isChecked(),ui._shortFormat_CB->isChecked(), ui._includeIPHistory_CB->isChecked() );
+    QString infotext = getCertificateDescription(detail,ui._shouldAddSignatures_CB->isChecked(),ui._shortFormat_CB->isChecked(), flags );
 
 	ui.userCertificateText->setToolTip(infotext) ;
 
@@ -297,7 +297,7 @@ void ConfCertDialog::loadInvitePage()
 	ui.userCertificateText->setText(QString::fromUtf8(invite.c_str()));
 }
 
-QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bool signatures_included,bool use_short_format,bool include_additional_locators)
+QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail, bool signatures_included, bool use_short_format,RetroshareInviteFlags invite_flags)
 {
     //infotext += tr("<p>Use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
     QString infotext;
@@ -330,19 +330,23 @@ QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bo
 
     if(detail.isHiddenNode)
         infotext += tr("<li> <b>onion address</b> and <b>port</b>") +" (" + detail.hiddenNodeAddress.c_str() + ":" + QString::number(detail.hiddenNodePort)+ ")</li>";
-    else if(!include_additional_locators)
+    else if(!!(invite_flags & RetroshareInviteFlags::FULL_IP_HISTORY))
+        for(auto it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it)
+        {
+            infotext += "<li>" ;
+            infotext += tr("<b>IP address</b> and <b>port</b>: ") + QString::fromStdString(*it) ;
+            infotext += "</li>" ;
+        }
+    else
     {
-        if(!detail.localAddr.empty()) infotext += tr("<li><b>IP address</b> and <b>port</b>: ") + detail.localAddr.c_str() + ":" + QString::number(detail.localPort)+ "</li>";
-        if(!detail.extAddr.empty()) infotext += tr("<li><b>IP address</b> and <b>port</b>: ") + detail.extAddr.c_str() + ":" + QString::number(detail.extPort)+ "</li>";
-    }
-    else for(auto it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it)
-	{
-		infotext += "<li>" ;
-		infotext += tr("<b>IP address</b> and <b>port</b>: ") + QString::fromStdString(*it) ;
-		infotext += "</li>" ;
-	}
+        if(!!(invite_flags & RetroshareInviteFlags::CURRENT_LOCAL_IP) && !detail.localAddr.empty())
+            infotext += tr("<li><b>IP address</b> and <b>port</b>: ") + detail.localAddr.c_str() + ":" + QString::number(detail.localPort)+ "</li>";
 
-    if(!detail.dyndns.empty())
+        if(!!(invite_flags & RetroshareInviteFlags::CURRENT_EXTERNAL_IP) && !detail.extAddr.empty())
+            infotext += tr("<li><b>IP address</b> and <b>port</b>: ") + detail.extAddr.c_str() + ":" + QString::number(detail.extPort)+ "</li>";
+    }
+
+    if(!!(invite_flags & RetroshareInviteFlags::DNS) && !detail.dyndns.empty())
     {
         infotext += "<li>" ;
         infotext += tr("<b>DNS:</b> : ") + QString::fromStdString(detail.dyndns);
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.h b/retroshare-gui/src/gui/connect/ConfCertDialog.h
index a883dfd17..4760835da 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.h
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.h
@@ -59,7 +59,7 @@ public:
         /* window will destroy itself! */
     }
     static void loadAll();
-	static QString getCertificateDescription(const RsPeerDetails& det, bool signatures_included, bool use_short_format, bool extra_locators_included);
+    static QString getCertificateDescription(const RsPeerDetails& det, bool signatures_included, bool use_short_format,RetroshareInviteFlags invite_flags);
 
 signals:
     void configChanged();
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index ca56e06aa..81287c6c4 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -891,7 +891,9 @@ void ConnectFriendWizard::cleanFriendCert()
 				whileBlocking(ui->friendCertEdit)->setPlainText(QString::fromUtf8(cleanCert.c_str()));
 				whileBlocking(ui->friendCertEdit)->setTextCursor(textCursor);
 
-				certDetail = ConfCertDialog::getCertificateDescription(details,false,mIsShortInvite,!details.ipAddressList.empty());
+                // use dummy flags so that the content of the description is driven by what's in the "details" variable.
+                RetroshareInviteFlags dummy_flags = RetroshareInviteFlags::ALL;
+                certDetail = ConfCertDialog::getCertificateDescription(details,false,mIsShortInvite,dummy_flags);
 			}
 			
 			if (mIsShortInvite)
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 9f813209a..6c171bb1a 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -165,7 +165,7 @@ CryptoPage::load()
     RsPeerDetails detail;
     rsPeers->getPeerDetails(rsPeers->getOwnId(),detail);
 
-    ui.certplainTextEdit->setToolTip(ConfCertDialog::getCertificateDescription(detail, ui._includeSignatures_CB->isChecked(), ui._shortFormat_CB->isChecked(), ui._includeAllIPs_CB->isChecked() ));
+    ui.certplainTextEdit->setToolTip(ConfCertDialog::getCertificateDescription(detail, ui._includeSignatures_CB->isChecked(), ui._shortFormat_CB->isChecked(), flags));
 }
 
 void

From 53d43324db3d87bdda7b54b099674498e9187df4 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 14 Feb 2022 21:51:30 +0100
Subject: [PATCH 034/503] fixed hide some options with old certificate format

---
 retroshare-gui/src/gui/HomePage.cpp | 25 +++++++++++++++++--------
 retroshare-gui/src/gui/HomePage.h   |  1 +
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index b55829fbd..dcd98f11e 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -78,6 +78,13 @@ HomePage::HomePage(QWidget *parent) :
     menu->addAction(RecAction);
     menu->addSeparator();
 
+    mUseOldFormatact = new QAction(QIcon(), tr("Use old certificate format"),this);
+    mUseOldFormatact->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
+    connect(mUseOldFormatact, SIGNAL(triggered()), this, SLOT(switchCertificateFormat()));
+    mUseOldFormatact->setCheckable(true);
+    mUseOldFormatact->setChecked(false);
+    menu->addAction(mUseOldFormatact);
+
     if(!RsAccounts::isHiddenNode())
     {
         mIncludeLocIPact = new QAction(QIcon(), tr("Include current local IP"),this);
@@ -105,13 +112,6 @@ HomePage::HomePage(QWidget *parent) :
         menu->addAction(mIncludeIPHistoryact);
     }
 
-    mUseOldFormatact = new QAction(QIcon(), tr("Use old certificate format"),this);
-    mUseOldFormatact->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
-    connect(mUseOldFormatact, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
-    mUseOldFormatact->setCheckable(true);
-    mUseOldFormatact->setChecked(false);
-    menu->addAction(mUseOldFormatact);
-
     ui->shareButton->setMenu(menu);
 
     connect(ui->openwebhelp,SIGNAL(clicked()), this,SLOT(openWebHelp())) ;
@@ -164,6 +164,15 @@ void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
     }
 }
 
+void HomePage::switchCertificateFormat()
+{
+    whileBlocking(mIncludeDNSact)->setVisible(!mUseOldFormatact->isChecked());
+    whileBlocking(mIncludeLocIPact)->setVisible(!mUseOldFormatact->isChecked());
+    whileBlocking(mIncludeExtIPact)->setVisible(!mUseOldFormatact->isChecked());
+
+    updateOwnCert();
+}
+
 #ifdef DEAD_CODE
 void HomePage::certContextMenu(QPoint /*point*/)
 {
@@ -247,7 +256,7 @@ void HomePage::updateOwnCert()
 
     getOwnCert(certificate,description);
 
-    if(!mUseOldFormatact->isChecked())	// in this case we have to split the cert for a bettr display
+    if(!mUseOldFormatact->isChecked())	// in this case we have to split the cert for a better display
     {
         QString S;
         QString txt;
diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index a20f07863..d881c6327 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -63,6 +63,7 @@ private slots:
 	void webMail();
 	void openWebHelp() ;
     void recommendFriends();
+    void switchCertificateFormat();
 
 private:
 	Ui::HomePage *ui;

From 6177b4dcdcd733645284deb4f506d3734b6e8faf Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 15 Feb 2022 20:40:11 +0100
Subject: [PATCH 035/503] removed unused old icons

---
 retroshare-gui/src/gui/images.qrc                |   6 ------
 .../src/gui/images/security-high-48.png          | Bin 2976 -> 0 bytes
 .../src/gui/images/security-high-off-48.png      | Bin 2939 -> 0 bytes
 .../src/gui/images/security-low-48.png           | Bin 3051 -> 0 bytes
 .../src/gui/images/security-low-off-48.png       | Bin 2974 -> 0 bytes
 .../src/gui/images/security-medium-48.png        | Bin 2892 -> 0 bytes
 .../src/gui/images/security-medium-off-48.png    | Bin 2574 -> 0 bytes
 7 files changed, 6 deletions(-)
 delete mode 100644 retroshare-gui/src/gui/images/security-high-48.png
 delete mode 100644 retroshare-gui/src/gui/images/security-high-off-48.png
 delete mode 100644 retroshare-gui/src/gui/images/security-low-48.png
 delete mode 100644 retroshare-gui/src/gui/images/security-low-off-48.png
 delete mode 100644 retroshare-gui/src/gui/images/security-medium-48.png
 delete mode 100644 retroshare-gui/src/gui/images/security-medium-off-48.png

diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 6e893722d..a0c74bb77 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -263,12 +263,6 @@
     <file>images/replymailall24-hover.png</file>
     <file>images/reset.png</file>
     <file>images/resume.png</file>
-    <file>images/security-high-48.png</file>
-    <file>images/security-low-48.png</file>
-    <file>images/security-medium-48.png</file>
-    <file>images/security-high-off-48.png</file>
-    <file>images/security-low-off-48.png</file>
-    <file>images/security-medium-off-48.png</file>
     <file>images/save24.png</file>
     <file>images/send24.png</file>
     <file>images/show_toolbox_frame.png</file>
diff --git a/retroshare-gui/src/gui/images/security-high-48.png b/retroshare-gui/src/gui/images/security-high-48.png
deleted file mode 100644
index fb54fd735289bb627564a30955dbc3b2e3d9e806..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2976
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
W(FI6B%?JDd0000<MNUMnLSTY<nW|a<

diff --git a/retroshare-gui/src/gui/images/security-high-off-48.png b/retroshare-gui/src/gui/images/security-high-off-48.png
deleted file mode 100644
index d4149def23cedbf284d4535b089044713ab82327..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2939
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

diff --git a/retroshare-gui/src/gui/images/security-low-48.png b/retroshare-gui/src/gui/images/security-low-48.png
deleted file mode 100644
index 9d5659f465a9454148f14e840627ae348312d136..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3051
zcmV<H3l#K;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000Fs000Fs0k`caQUCw|8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H13usA1K~#9!?U{K{R7W1iGt6))F=ky54DKdqnHVi~H|E$J#3PAD
zP1LPT#oHX^YJx_Is2n1w2rBA`N1}qja13Aqa-V}BmvSgDT#5n;5xg;o3JQGp`zBp0
zk=j3in6OoL)u$fsP50~Xx4VD8_vrT&fd6Zr7<gi!uNh#G5j|o+`UwogHCdlEAcX6a
zLF5H8mb@hxE3OR^b!2_YfDqr03}3fy&HB2!+M7*HKi_X_YwKV^b8~ZBef_0dj*gDb
zQXNrO)+Y?G$jLKgTtGlTL{n2!duwYeC?4(Y?O@RzAGAHdojZ5hgMxyhq`IPw{0}oA
zM%{=EA=W9WDJ2~Bj(hj+;r@LZpy191r1RF+7Tmtw)RC5UtU_ud+8Xs{HhL=DfS8hT
zwzjrgi?zkKZZ_WFQn`(L_wJ%0D+_t{_DGyI4T;mIBj3RRS8{UD($d0NXhvh>O_Y>q
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

diff --git a/retroshare-gui/src/gui/images/security-low-off-48.png b/retroshare-gui/src/gui/images/security-low-off-48.png
deleted file mode 100644
index 80901511d2f25a3706920298512613602a6a8242..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2974
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
UNljqi8~^|S07*qoM6N<$f<fl(`~Uy|

diff --git a/retroshare-gui/src/gui/images/security-medium-48.png b/retroshare-gui/src/gui/images/security-medium-48.png
deleted file mode 100644
index 9265eb46ca80d5ed777e9d4289add9faa127ff6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2892
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

diff --git a/retroshare-gui/src/gui/images/security-medium-off-48.png b/retroshare-gui/src/gui/images/security-medium-off-48.png
deleted file mode 100644
index 89c83df462ef4b02783a56d6fa1bb51ad0fadd8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2574
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


From 93c1cafdc430c82fb267246f73696930f654eeba Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 15 Feb 2022 15:32:49 +0100
Subject: [PATCH 036/503] Updated external libraries for Windows MinGW build -
 zlib 1.2.11 - bzip2 1.0.8 - miniupnpc 2.2.3 - openssl 1.1.1m - speexdsp 1.2.0
 - libxml2 2.9.12 - libxslt 1.1.34 - curl 7.81.0 - sqlcipher 4.5.0 -
 libmicrohttpd 0.9.75 - ffmpeg 4.4 - xapian 1.4.19

---
 build_scripts/Windows/build-libs/Makefile | 35 +++++++++++------------
 plugins/FeedReader/FeedReader.pro         |  5 ++++
 plugins/VOIP/VOIP.pro                     |  5 ++++
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/build_scripts/Windows/build-libs/Makefile b/build_scripts/Windows/build-libs/Makefile
index 8bab46b92..cadd5ef18 100644
--- a/build_scripts/Windows/build-libs/Makefile
+++ b/build_scripts/Windows/build-libs/Makefile
@@ -1,18 +1,18 @@
-ZLIB_VERSION=1.2.3
-BZIP2_VERSION=1.0.6
-MINIUPNPC_VERSION=2.0
-OPENSSL_VERSION=1.1.1h
+ZLIB_VERSION=1.2.11
+BZIP2_VERSION=1.0.8
+MINIUPNPC_VERSION=2.2.3
+OPENSSL_VERSION=1.1.1m
 SPEEX_VERSION=1.2.0
-SPEEXDSP_VERSION=1.2rc3
-LIBXML2_VERSION=2.9.7
-LIBXSLT_VERSION=1.1.32
-CURL_VERSION=7.58.0
+SPEEXDSP_VERSION=1.2.0
+LIBXML2_VERSION=2.9.12
+LIBXSLT_VERSION=1.1.34
+CURL_VERSION=7.81.0
 TCL_VERSION=8.6.10
-SQLCIPHER_VERSION=4.4.0
-LIBMICROHTTPD_VERSION=0.9.59
-FFMPEG_VERSION=3.4
+SQLCIPHER_VERSION=4.5.0
+LIBMICROHTTPD_VERSION=0.9.75
+FFMPEG_VERSION=4.4
 RAPIDJSON_VERSION=1.1.0
-XAPIAN_VERSION=1.4.7
+XAPIAN_VERSION=1.4.19
 
 DOWNLOAD_PATH?=download
 BUILD_PATH=build
@@ -56,8 +56,7 @@ $(BUILD_PATH)/zlib-$(ZLIB_VERSION): $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz
 	rm -r -f $(BUILD_PATH)/zlib-*
 	tar xvf $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz
 	# build
-	cd zlib-$(ZLIB_VERSION) && ./configure
-	#cd zlib-$(ZLIB_VERSION) && make install prefix="`pwd`/../$(BUILD_PATH)"
+	cd zlib-$(ZLIB_VERSION) && make -f win32/Makefile.gcc libz.a
 	cd zlib-$(ZLIB_VERSION) && make
 	# copy files
 	mkdir -p $(BUILD_PATH)/zlib-$(ZLIB_VERSION).tmp/include
@@ -72,7 +71,7 @@ $(BUILD_PATH)/zlib-$(ZLIB_VERSION): $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz
 bzip2: $(BUILD_PATH)/bzip2-$(BZIP2_VERSION)
 
 $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz:
-	wget https://sourceforge.net/projects/bzip2/files/bzip2-$(BZIP2_VERSION).tar.gz/download -O $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz
+	wget https://www.sourceware.org/pub/bzip2/bzip2-$(BZIP2_VERSION).tar.gz -O $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz
 
 $(BUILD_PATH)/bzip2-$(BZIP2_VERSION): $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz
 	# prepare
@@ -100,10 +99,10 @@ $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION): $(DOWNLOAD_PATH)/miniupnpc-$(MINIU
 	rm -r -f $(BUILD_PATH)/miniupnpc-*
 	tar xvf $(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tar.gz
 	# build
-	cd miniupnpc-$(MINIUPNPC_VERSION) && export CC=gcc && export PATH=.:$$PATH && make -f Makefile.mingw init libminiupnpc.a miniupnpc.dll
+	cd miniupnpc-$(MINIUPNPC_VERSION) && export CC=gcc && export PATH=.:$$PATH && make -f Makefile.mingw libminiupnpc.a miniupnpc.dll
 	# copy files
 	mkdir -p $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc
-	cp miniupnpc-$(MINIUPNPC_VERSION)/*.h $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc/
+	cp miniupnpc-$(MINIUPNPC_VERSION)/include/*.h $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc/
 	mkdir -p $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/lib
 	cp miniupnpc-$(MINIUPNPC_VERSION)/miniupnpc.lib $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/lib/
 	mkdir -p $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/bin
@@ -314,7 +313,7 @@ $(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION): $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION
 	rm -r -f $(BUILD_PATH)/ffmpeg-*
 	tar xvf $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
 	# build
-	cd ffmpeg-$(FFMPEG_VERSION) && ./configure --disable-shared --enable-static --disable-programs --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-yasm --disable-everything --enable-encoder=mpeg4 --enable-decoder=mpeg4 --prefix="`pwd`/../$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION).tmp"
+	cd ffmpeg-$(FFMPEG_VERSION) && ./configure --disable-shared --enable-static --disable-programs --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-yasm --disable-everything --enable-encoder=mpeg4 --enable-decoder=mpeg4 --prefix="`pwd`/../$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION).tmp"
 	cd ffmpeg-$(FFMPEG_VERSION) && make install
 	# cleanup
 	rm -r -f ffmpeg-$(FFMPEG_VERSION)
diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro
index b78dda911..b5dbbf43a 100644
--- a/plugins/FeedReader/FeedReader.pro
+++ b/plugins/FeedReader/FeedReader.pro
@@ -121,6 +121,11 @@ win32 {
 	#Have to reorder libs, else got /libs/lib/libcrypto.a(bio_lib.o):bio_lib.c:(.text+0x0): multiple definition of `BIO_new'
 	LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 $${LIBS}
 
+	isEmpty(QMAKE_SH) {
+		# MinGW
+		LIBS += -lcrypt32
+	}
+
 	# Check for msys2
 	!isEmpty(PREFIX_MSYS2) {
 		message(Use msys2 xml2.)
diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro
index fbc5302d0..72ea621bd 100644
--- a/plugins/VOIP/VOIP.pro
+++ b/plugins/VOIP/VOIP.pro
@@ -55,6 +55,11 @@ linux-* {
 	PKGCONFIG += speex speexdsp
 } else {
 	LIBS += -lspeex -lspeexdsp -lavcodec -lavutil
+
+	win32:isEmpty(QMAKE_SH) {
+		# MinGW
+		LIBS += -lbcrypt
+	}
 }
 
 #################################### Windows #####################################

From 42fa8d4b3c3a9e98b0b1685356f488892905eb63 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 15 Feb 2022 22:04:54 +0100
Subject: [PATCH 037/503] fixed adding external IPs and DNS in old cert format

---
 libretroshare                       |  2 +-
 retroshare-gui/src/gui/HomePage.cpp | 11 +----------
 retroshare-gui/src/gui/HomePage.h   |  1 -
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/libretroshare b/libretroshare
index 61dbe774d..87fdae942 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 61dbe774d60070a7ce371f925f230a878996cdd5
+Subproject commit 87fdae942186ab3412ce40438e30f76670dd55d0
diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index dcd98f11e..b14b68eb9 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -80,7 +80,7 @@ HomePage::HomePage(QWidget *parent) :
 
     mUseOldFormatact = new QAction(QIcon(), tr("Use old certificate format"),this);
     mUseOldFormatact->setToolTip(tr("Displays the certificate format used up to version 0.6.5\nOld Retroshare nodes will not understand the\nnew short format"));
-    connect(mUseOldFormatact, SIGNAL(triggered()), this, SLOT(switchCertificateFormat()));
+    connect(mUseOldFormatact, SIGNAL(triggered()), this, SLOT(updateOwnCert()));
     mUseOldFormatact->setCheckable(true);
     mUseOldFormatact->setChecked(false);
     menu->addAction(mUseOldFormatact);
@@ -164,15 +164,6 @@ void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
     }
 }
 
-void HomePage::switchCertificateFormat()
-{
-    whileBlocking(mIncludeDNSact)->setVisible(!mUseOldFormatact->isChecked());
-    whileBlocking(mIncludeLocIPact)->setVisible(!mUseOldFormatact->isChecked());
-    whileBlocking(mIncludeExtIPact)->setVisible(!mUseOldFormatact->isChecked());
-
-    updateOwnCert();
-}
-
 #ifdef DEAD_CODE
 void HomePage::certContextMenu(QPoint /*point*/)
 {
diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index d881c6327..a20f07863 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -63,7 +63,6 @@ private slots:
 	void webMail();
 	void openWebHelp() ;
     void recommendFriends();
-    void switchCertificateFormat();
 
 private:
 	Ui::HomePage *ui;

From c0cac9ec2d030a0efab579f34109f66908a9a812 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 22 Feb 2022 21:46:05 +0100
Subject: [PATCH 038/503] fixed Boards item in feeds to display a
 constant-aspect-ratio picture using ZoomableLabel

---
 libretroshare                                |  2 +-
 retroshare-gui/src/gui/Posted/PostedItem.cpp | 26 +++++++++++---------
 retroshare-gui/src/gui/Posted/PostedItem.h   | 10 ++++----
 retroshare-gui/src/gui/Posted/PostedItem.ui  | 14 ++++++++---
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/libretroshare b/libretroshare
index 87fdae942..1965f2000 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 87fdae942186ab3412ce40438e30f76670dd55d0
+Subproject commit 1965f200033cc6a5bbf46fcda21e87248b181076
diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
index 90f393dab..d9242c571 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
@@ -495,7 +495,7 @@ void PostedItem::fill()
 		ui->voteUpButton->setDisabled(true);
 		ui->voteDownButton->setDisabled(true);
 
-        ui->thumbnailLabel->setPixmap( FilesDefs::getPixmapFromQtResourcePath(":/images/thumb-default.png"));
+        ui->thumbnailLabel->setPicture( FilesDefs::getPixmapFromQtResourcePath(":/images/thumb-default.png"));
 		ui->fromLabel->setId(mPost.mMeta.mAuthorId);
 		ui->titleLabel->setText(tr( "<p><font color=\"#ff0000\"><b>The author of this message (with ID %1) is banned.</b>").arg(QString::fromStdString(mPost.mMeta.mAuthorId.toStdString()))) ;
 		QDateTime qtime;
@@ -509,8 +509,10 @@ void PostedItem::fill()
 		QPixmap sqpixmap2 = FilesDefs::getPixmapFromQtResourcePath(":/images/thumb-default.png");
 
 		mInFill = true;
-		int desired_height = 1.5*(ui->voteDownButton->height() + ui->voteUpButton->height() + ui->scoreLabel->height());
-		int desired_width =  sqpixmap2.width()*desired_height/(float)sqpixmap2.height();
+        int desired_height = ui->voteDownButton->height() + ui->voteUpButton->height() + ui->scoreLabel->height();
+        int desired_width =  16/9.0 * desired_height; //sqpixmap2.width()*desired_height/(float)sqpixmap2.height();
+
+        ui->thumbnailLabel->setFixedSize(desired_width,desired_height);
 
 		QDateTime qtime;
 		qtime.setTime_t(mPost.mMeta.mPublishTs);
@@ -573,17 +575,17 @@ void PostedItem::fill()
 			GxsIdDetails::loadPixmapFromData(mPost.mImage.mData, mPost.mImage.mSize, pixmap,GxsIdDetails::ORIGINAL);
 			// Wiping data - as its been passed to thumbnail.
 
-			QPixmap sqpixmap = pixmap.scaled(desired_width,desired_height, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-			ui->thumbnailLabel->setPixmap(sqpixmap);
+//			QPixmap sqpixmap = pixmap.scaled(desired_width,desired_height, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+            ui->thumbnailLabel->setPicture(pixmap);
 			ui->thumbnailLabel->setToolTip(tr("Click to view Picture"));
+            ui->thumbnailLabel->setEnableZoom(false);
 
-			QPixmap scaledpixmap;
-			if(pixmap.width() > 800){
-				QPixmap scaledpixmap = pixmap.scaledToWidth(800, Qt::SmoothTransformation);
-				ui->pictureLabel->setPixmap(scaledpixmap);
-			}else{
-				ui->pictureLabel->setPixmap(pixmap);
-			}
+            QPixmap scaledpixmap;
+            if(pixmap.width() > 800){
+                QPixmap scaledpixmap = pixmap.scaledToWidth(800, Qt::SmoothTransformation);
+                ui->pictureLabel->setPixmap(scaledpixmap);
+            }else
+                ui->pictureLabel->setPixmap(pixmap);
 		}
 		else if (urlOkay && (mPost.mImage.mData == NULL))
 		{
diff --git a/retroshare-gui/src/gui/Posted/PostedItem.h b/retroshare-gui/src/gui/Posted/PostedItem.h
index d726cf830..a2f432dc0 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.h
+++ b/retroshare-gui/src/gui/Posted/PostedItem.h
@@ -112,11 +112,11 @@ protected:
 	void setCommentsSize(int comNb) override;
 
 private slots:
-	void doExpand(bool open);
-	void toggle();
-	void makeUpVote();
-	void makeDownVote();
-	void toggleNotes() ;
+    void doExpand(bool open) override;
+    void toggle() override;
+    void makeUpVote() override;
+    void makeDownVote() override;
+    void toggleNotes()  override;
 
 private:
 	/** Qt Designer generated object */
diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui
index 6c6b290f8..aafc8528c 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.ui
+++ b/retroshare-gui/src/gui/Posted/PostedItem.ui
@@ -176,6 +176,12 @@
            <property name="sizeType">
             <enum>QSizePolicy::Expanding</enum>
            </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
           </spacer>
          </item>
         </layout>
@@ -190,7 +196,7 @@
          <number>6</number>
         </property>
         <item>
-         <widget class="ClickableLabel" name="thumbnailLabel">
+         <widget class="ZoomableLabel" name="thumbnailLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -732,15 +738,15 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ClickableLabel</class>
+   <class>ZoomableLabel</class>
    <extends>QLabel</extends>
-   <header>util/ClickableLabel.h</header>
+   <header>gui/gxschannels/GxsChannelPostThumbnail.h</header>
   </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
-  <include location="../icons.qrc"/>
   <include location="Posted_images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>

From a073c0964480b61cc0054dec9bfa808a9c084ec6 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Wed, 23 Feb 2022 13:50:51 +0100
Subject: [PATCH 039/503] Fixed to remove icons

---
 .../src/gui/connect/PGPKeyDialog.cpp          |  1 +
 .../src/gui/connect/PGPKeyDialog.ui           | 24 -------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
index cc86593c4..36b6057b4 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
@@ -180,6 +180,7 @@ void PGPKeyDialog::load()
     {
         ui.make_friend_button->hide();
         ui.signKeyButton->hide();
+        ui.label_signKey->hide();
         ui.denyFriendButton->hide();
 
         ui.label_trustlevel->hide();
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
index a1e0f208e..12781b2c9 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
@@ -111,55 +111,31 @@
                  <property name="text">
                   <string>Unset</string>
                  </property>
-                 <property name="icon">
-                  <iconset resource="../images.qrc">
-                   <normaloff>:/images/security-low-off-48.png</normaloff>:/images/security-low-off-48.png</iconset>
-                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>Unknown</string>
                  </property>
-                 <property name="icon">
-                  <iconset resource="../images.qrc">
-                   <normaloff>:/images/security-low-off-48.png</normaloff>:/images/security-low-off-48.png</iconset>
-                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>No trust</string>
                  </property>
-                 <property name="icon">
-                  <iconset resource="../images.qrc">
-                   <normaloff>:/images/security-low-48.png</normaloff>:/images/security-low-48.png</iconset>
-                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>Marginal</string>
                  </property>
-                 <property name="icon">
-                  <iconset resource="../images.qrc">
-                   <normaloff>:/images/security-medium-48.png</normaloff>:/images/security-medium-48.png</iconset>
-                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>Full</string>
                  </property>
-                 <property name="icon">
-                  <iconset resource="../images.qrc">
-                   <normaloff>:/images/security-high-48.png</normaloff>:/images/security-high-48.png</iconset>
-                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>Ultimate</string>
                  </property>
-                 <property name="icon">
-                  <iconset resource="../images.qrc">
-                   <normaloff>:/images/security-high-48.png</normaloff>:/images/security-high-48.png</iconset>
-                 </property>
                 </item>
                </widget>
               </item>

From f3d2b4f2d04efcba4174350e46e7ddc703886794 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Wed, 23 Feb 2022 14:01:28 +0100
Subject: [PATCH 040/503] Fixed missed icon

---
 .../src/gui/gxschannels/GxsChannelFilesStatusWidget.ui        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui
index 463b05423..2c51ded6c 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui
@@ -120,8 +120,8 @@
          <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
+         <iconset resource="../icons.qrc">
+          <normaloff>:/icons/cancel.svg</normaloff>:/icons/cancel.svg</iconset>
         </property>
        </widget>
       </item>

From d0c4d1ade2625298baf49eec5863f3328740fa4f Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Fri, 25 Feb 2022 13:35:55 +0100
Subject: [PATCH 041/503] retroshare-service CMake and WebUI support

Fix retroshare-service webui terminal password checking
Install WebUI along with retroshare-service
---
 .gitignore                                   |   5 +-
 retroshare-service/CMakeLists.txt            | 162 +++++++++++++++++++
 retroshare-service/src/retroshare-service.cc |  23 +--
 3 files changed, 178 insertions(+), 12 deletions(-)
 create mode 100644 retroshare-service/CMakeLists.txt

diff --git a/.gitignore b/.gitignore
index 6f9356d05..777ba9433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: (C) 2004-2019 Retroshare Team <contact@retroshare.cc>
+# SPDX-FileCopyrightText: (C) 2004-2022 Retroshare Team <contact@retroshare.cc>
 # SPDX-License-Identifier: CC0-1.0
 
 *.o
@@ -17,3 +17,6 @@ Thumbs.db
 *.kdev4
 
 !supportlibs/libsam3/Makefile
+
+# QtCreator cruft
+*CMakeLists.txt.user
diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
new file mode 100644
index 000000000..2a09602d8
--- /dev/null
+++ b/retroshare-service/CMakeLists.txt
@@ -0,0 +1,162 @@
+# RetroShare decentralized communication platform
+#
+# Copyright (C) 2021-2022  Gioacchino Mazzurco <gio@retroshare.cc>
+# Copyright (C) 2021-2022  Asociación Civil Altermundi <info@altermundi.net>
+#
+# SPDX-License-Identifier: CC0-1.0
+
+cmake_minimum_required (VERSION 3.18.0)
+project(retroshare-service)
+
+include(CMakeDependentOption)
+
+option(
+	RS_DEVELOPMENT_BUILD
+	"Disable optimization to speed up build, enable verbose build log. \
+	 just for development purposes, not suitable for library usage"
+	OFF )
+
+option(
+	RS_JSON_API
+	"Use restbed to expose libretroshare as JSON API via HTTP"
+	ON )
+
+option(
+	RS_SERVICE_DESKTOP
+	"Install icons and shortcuts for desktop environements"
+	OFF )
+
+option(
+	RS_SERVICE_TERMINAL_LOGIN
+	"Enable RetroShare login via terminal"
+	ON )
+
+cmake_dependent_option(
+	RS_SERVICE_TERMINAL_WEBUI_PASSWORD
+	"Enable settin Web UI password via terminal in retroshare-service"
+	OFF
+	"RS_WEBUI"
+	ON )
+
+cmake_dependent_option(
+	RS_WEBUI
+	"Install RetroShare Web UI"
+	OFF
+	"RS_JSON_API"
+	ON )
+
+################################################################################
+
+set(FETCHCONTENT_QUIET OFF)
+include(FetchContent)
+
+find_package(Git REQUIRED)
+
+################################################################################
+
+if(RS_DEVELOPMENT_BUILD)
+	set(CMAKE_VERBOSE_MAKEFILE ON)
+	set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+endif(RS_DEVELOPMENT_BUILD)
+
+################################################################################
+
+list(
+	APPEND RS_SERVICE_SOURCES
+	src/retroshare-service.cc )
+
+add_executable(${PROJECT_NAME} ${RS_SERVICE_SOURCES})
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+################################################################################
+
+if(RS_DEVELOPMENT_BUILD)
+	target_compile_options(${PROJECT_NAME} PRIVATE "-O0")
+endif(RS_DEVELOPMENT_BUILD)
+
+################################################################################
+
+set(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/")
+if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
+	message(
+		STATUS
+		"libretroshare submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
+	add_subdirectory(
+		"${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
+else()
+	FetchContent_Declare(
+		libretroshare
+		GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
+		GIT_TAG "origin/master"
+		GIT_SHALLOW TRUE
+		GIT_PROGRESS TRUE
+		TIMEOUT 10
+	)
+	FetchContent_MakeAvailable(libretroshare)
+endif()
+
+target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
+
+################################################################################
+
+if(RS_SERVICE_DESKTOP)
+	if(UNIX AND NOT APPLE)
+		install(
+			FILES data/retroshare-service.svg
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/ )
+
+		install(
+			FILES data/retroshare-service_48x48.png
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/retroshare-service.png )
+
+		install(
+			FILES data/retroshare-service_128x128.png
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/retroshare-service.png )
+
+		install(
+			FILES data/retroshare-service.desktop
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/data/retroshare-service.desktop )
+	endif(UNIX AND NOT APPLE)
+endif(RS_SERVICE_DESKTOP)
+
+################################################################################
+
+if(RS_JSON_API)
+	target_compile_definitions(${PROJECT_NAME} PUBLIC RS_JSONAPI)
+endif(RS_JSON_API)
+
+if(RS_SERVICE_TERMINAL_LOGIN)
+	target_compile_definitions(${PROJECT_NAME} PUBLIC RS_SERVICE_TERMINAL_LOGIN)
+endif(RS_SERVICE_TERMINAL_LOGIN)
+
+if(RS_WEBUI)
+	set(RS_WEBUI_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../webui/")
+	if(EXISTS "${RS_WEBUI_DEVEL_DIR}/.git" )
+		message(
+			STATUS
+			"RetroShare WebUI repository found at ${RS_WEBUI_DEVEL_DIR} using it" )
+		add_subdirectory(
+			"${RS_WEBUI_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/webui" )
+	else()
+		FetchContent_Declare(
+			webui
+			GIT_REPOSITORY "https://gitlab.com/RetroShare/RetroShareWebUI.git"
+			GIT_TAG "origin/master"
+			GIT_SHALLOW TRUE
+			GIT_PROGRESS TRUE
+			TIMEOUT 10
+		)
+		FetchContent_MakeAvailable(webui)
+	endif()
+
+	add_dependencies(${PROJECT_NAME} retroshare-webui)
+	target_compile_definitions(${PROJECT_NAME} PUBLIC RS_WEBUI)
+endif(RS_WEBUI)
+
+if(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC RS_SERVICE_TERMINAL_WEBUI_PASSWORD )
+endif(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
+
+################################################################################
diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index 51888d25a..2390739fd 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -1,7 +1,7 @@
 /*
  * RetroShare Service
- * Copyright (C) 2016-2021  Gioacchino Mazzurco <gio@eigenlab.org>
- * Copyright (C) 2021  Asociación Civil Altermundi <info@altermundi.net>
+ * Copyright (C) 2016-2022  Gioacchino Mazzurco <gio@eigenlab.org>
+ * Copyright (C) 2021-2022  Asociación Civil Altermundi <info@altermundi.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -26,15 +26,16 @@
 #include <iomanip>
 #include <atomic>
 
-#include "util/stacktrace.h"
-#include "util/argstream.h"
-#include "util/rskbdinput.h"
-#include "util/rsdir.h"
 #include "retroshare/rsinit.h"
 #include "retroshare/rstor.h"
 #include "retroshare/rspeers.h"
 #include "retroshare/rsinit.h"
 #include "retroshare/rsiface.h"
+
+#include "util/stacktrace.h"
+#include "util/argstream.h"
+#include "util/rskbdinput.h"
+#include "util/rsdir.h"
 #include "util/rsdebug.h"
 
 #ifdef RS_JSONAPI
@@ -176,7 +177,7 @@ int main(int argc, char* argv[])
 	as.defaultErrorHandling(true, true);
 
 #if (defined(RS_JSONAPI) && defined(RS_WEBUI)) && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
-	std::string webui_pass1 = "Y";
+	std::string webui_pass1;
 	if(askWebUiPassword)
 	{
 		std::string webui_pass2 = "N";
@@ -210,8 +211,8 @@ int main(int argc, char* argv[])
 	int initResult = RsInit::InitRetroShare(conf);
 	if(initResult != RS_INIT_OK)
 	{
-		RsErr() << "Retroshare core initalization failed with: " << initResult
-		        << std::endl;
+		RsFatal() << "Retroshare core initalization failed with: " << initResult
+		          << std::endl;
 		return -initResult;
 	}
 
@@ -331,11 +332,11 @@ int main(int argc, char* argv[])
 
 #if (defined(RS_JSONAPI) && defined(RS_WEBUI)) && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
 	if(rsJsonApi && !webui_pass1.empty())
-    {
+	{
 		rsWebUi->setHtmlFilesDirectory(webui_base_directory);
 		rsWebUi->setUserPassword(webui_pass1);
 		rsWebUi->restart();
-    }
+	}
 #endif
 
 	rsControl->setShutdownCallback([&](int){keepRunning = false;});

From b87d554c2a5e202f6f3716096c2e83860add0588 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Fri, 25 Feb 2022 15:08:48 +0100
Subject: [PATCH 042/503] Update submodules libretroshare libbithdht

---
 libbitdht     | 2 +-
 libretroshare | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libbitdht b/libbitdht
index 659423769..6abbec950 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 659423769541169457c41f71c8a038e2d64ba079
+Subproject commit 6abbec95073f3c1eb5059cbf8441111ef4a317a7
diff --git a/libretroshare b/libretroshare
index 1965f2000..449fcbc3f 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 1965f200033cc6a5bbf46fcda21e87248b181076
+Subproject commit 449fcbc3f293361b3227277e28e2879a46cdd20c

From 52aba1be188298e372287bbfb1c5340e5b78b71c Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Fri, 25 Feb 2022 16:57:07 +0100
Subject: [PATCH 043/503] Update continuous integration

---
 .gitlab-ci.yml                             | 40 ---------------------
 README.asciidoc                            |  3 +-
 build_scripts/GitlabCI/base.Dockerfile     | 41 ++++++++++++++--------
 build_scripts/GitlabCI/gitlabCI.Dockerfile |  9 ++---
 libretroshare                              |  2 +-
 5 files changed, 35 insertions(+), 60 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e96b8124..c91f867a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,43 +67,3 @@ test-ubuntu:
           docker exec retroshare
           curl --verbose http://127.0.0.1:9092/rsMsgs/getChatLobbyList | jq
         - docker container stop retroshare
-          
-build-android-arm-apk:
-    stage: build
-    script:
-        - mkdir Dockercontext
-        - >
-          docker build -t retroshare:android_arm_latest
-          $($CI_PROJECT_DIR/build_scripts/GitlabCI/getRepoArgs.sh)
-          --build-arg RS_SERVICE_QMAKE_EXTRA_OPTS="$RS_SERVICE_QMAKE_EXTRA_OPTS"
-          --file $CI_PROJECT_DIR/build_scripts/GitlabCI/Android.Dockerfile
-          Dockercontext
-# see https://stackoverflow.com/a/59055906
-        - >
-          docker cp
-          $(docker create --rm retroshare:android_arm_latest):/retroshare-service-android-build/android-build/build/outputs/apk/debug/android-build-debug.apk
-          $CI_PROJECT_DIR/RetroShare_Android_Service-arm.apk
-    artifacts:
-      paths:
-        - RetroShare_Android_Service-arm.apk
-
-# Use separate runner to avoid no space left on device
-build-android-arm64-apk:
-    stage: build
-    script:
-        - mkdir Dockercontext
-        - >
-          docker build -t retroshare:android_arm64_latest
-          $($CI_PROJECT_DIR/build_scripts/GitlabCI/getRepoArgs.sh)
-          --build-arg ANDROID_PLATFORM_VER=21
-          --build-arg ANDROID_NDK_ARCH=arm64
-          --build-arg RS_SERVICE_QMAKE_EXTRA_OPTS="$RS_SERVICE_QMAKE_EXTRA_OPTS"
-          --file $CI_PROJECT_DIR/build_scripts/GitlabCI/Android.Dockerfile
-          Dockercontext
-        - >
-          docker cp
-          $(docker create --rm retroshare:android_arm64_latest):/retroshare-service-android-build/android-build/build/outputs/apk/debug/android-build-debug.apk
-          $CI_PROJECT_DIR/RetroShare_Android_Service-arm64.apk
-    artifacts:
-      paths:
-        - RetroShare_Android_Service-arm64.apk
diff --git a/README.asciidoc b/README.asciidoc
index 63890af9e..e1f41e74d 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -9,9 +9,10 @@ RetroShare provides file sharing, chat, messages, forums, channels and more.
 
 .Build Status
 |===============================================================================
-|GNU/Linux, Android (via Gitlab CI) | image:https://gitlab.com/RetroShare/RetroShare/badges/master/pipeline.svg[link="https://gitlab.com/RetroShare/RetroShare/-/commits/master",title="pipeline status"]
+|GNU/Linux (via Gitlab CI) | image:https://gitlab.com/RetroShare/RetroShare/badges/master/pipeline.svg[link="https://gitlab.com/RetroShare/RetroShare/-/commits/master",title="pipeline status"]
 |Windows (via AppVeyor) | image:https://ci.appveyor.com/api/projects/status/github/RetroShare/RetroShare?svg=true[link="https://ci.appveyor.com/project/RetroShare58622/retroshare"]
 |macOS, (via Travis CI) | image:https://app.travis-ci.com/RetroShare/RetroShare.svg?branch=master[link="https://app.travis-ci.com/github/RetroShare/RetroShare"]
+|libretroshare GNU/Linux, Android (via Gitlab CI) | image:https://gitlab.com/RetroShare/libretroshare/badges/master/pipeline.svg[link="https://gitlab.com/RetroShare/libretroshare/-/commits/master",title="pipeline status"]
 |===============================================================================
 
 == Get the source
diff --git a/build_scripts/GitlabCI/base.Dockerfile b/build_scripts/GitlabCI/base.Dockerfile
index b65ed1776..60d122a88 100644
--- a/build_scripts/GitlabCI/base.Dockerfile
+++ b/build_scripts/GitlabCI/base.Dockerfile
@@ -12,16 +12,26 @@
 ## To run the container
 # docker run -it -p 127.0.0.1:9092:9092 "${CI_REGISTRY_IMAGE}" retroshare-service --jsonApiPort 9092 --jsonApiBindAddress 0.0.0.0
 
-FROM ubuntu
+FROM ubuntu:21.10
 
 ENV DEBIAN_FRONTEND=noninteractive
+ENV APT_UNAT="--assume-yes --quiet"
 
-RUN apt-get update -y && apt-get upgrade -y -qq && \
-	apt-get install -y -qq build-essential cimg-dev libssl-dev libbz2-dev \
-		libsqlite3-dev \
-		libsqlcipher-dev libupnp-dev pkg-config libz-dev \
-		qt5-default libxapian-dev qttools5-dev doxygen rapidjson-dev \
-		git cmake curl
+RUN apt-get update $APT_UNAT && \
+	apt-get upgrade --show-upgraded $APT_UNAT && \
+	apt-get clean $APT_UNAT && \
+	apt-get install --no-install-recommends $APT_UNAT \
+		bash build-essential cimg-dev libssl-dev libbz2-dev \
+		libminiupnpc-dev \
+		libsqlite3-dev libsqlcipher-dev \
+		pkg-config libz-dev \
+		libxapian-dev doxygen rapidjson-dev \
+		git cmake curl python3
+
+## Avoid git cloning spuriously failing with
+#  server certificate verification failed. CAfile: none CRLfile: none
+RUN apt-get install --no-install-recommends $APT_UNAT --reinstall \
+	ca-certificates
 
 RUN git clone --depth 1 https://github.com/aetilius/pHash.git && \
 	rm -rf pHash-build && mkdir pHash-build && cd pHash-build && \
@@ -34,11 +44,14 @@ ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 ARG REPO_DEPTH="--depth 2000"
 RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && cd RetroShare && \
-	git fetch --tags && cd ..
-RUN mkdir RetroShare-build && cd RetroShare-build && \
-	qmake ../RetroShare \
-		CONFIG+=no_retroshare_plugins \
-		CONFIG+=retroshare_service CONFIG+=no_retroshare_gui \
-		CONFIG+=rs_jsonapi CONFIG+=rs_deep_search && \
-	(make -j$(nproc) || make -j$(nproc) || make) && make install && \
+	git fetch --tags && \
+	git submodule update --init --remote --force \
+		libbitdht/ libretroshare/ openpgpsdk/ && \
+	cd ..
+
+RUN \
+	mkdir RetroShare-build && cd RetroShare-build && \
+	cmake -B. -S../RetroShare/retroshare-service \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON && \
+	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build
diff --git a/build_scripts/GitlabCI/gitlabCI.Dockerfile b/build_scripts/GitlabCI/gitlabCI.Dockerfile
index aa9c6cc87..65361ff79 100644
--- a/build_scripts/GitlabCI/gitlabCI.Dockerfile
+++ b/build_scripts/GitlabCI/gitlabCI.Dockerfile
@@ -8,11 +8,12 @@ RUN \
 	cd RetroShare && git remote add testing $REPO_URL && \
 	git fetch --tags testing $REPO_BRANCH && \
 	git reset --hard testing/$REPO_BRANCH && \
+	git submodule update --init --remote --force \
+		libbitdht/ libretroshare/ openpgpsdk/ && \
 	git --no-pager log --max-count 1
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
-	qmake ../RetroShare CONFIG+=no_retroshare_gui \
-		CONFIG+=retroshare_service \
-		CONFIG+=rs_jsonapi CONFIG+=rs_deep_search && \
-	(make -j$(nproc) || make -j$(nproc) || make) && make install && \
+	cmake -B. -S../RetroShare/retroshare-service \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON && \
+	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build
diff --git a/libretroshare b/libretroshare
index 449fcbc3f..167589952 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 449fcbc3f293361b3227277e28e2879a46cdd20c
+Subproject commit 16758995237494a1f39fa86f0f04cf37de121a91

From fcaba0e65f7db58a44f1bc78b1d26e25a5ce5c1d Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Fri, 25 Feb 2022 18:26:42 +0100
Subject: [PATCH 044/503] Quieter CMake option for GitlabCI

Avoid GtilabCI suppressing log with:
Job's log exceeded limit of 4194304 bytes.
Job execution will continue but no more output will be collected.
---
 build_scripts/GitlabCI/gitlabCI.Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build_scripts/GitlabCI/gitlabCI.Dockerfile b/build_scripts/GitlabCI/gitlabCI.Dockerfile
index 65361ff79..c62c4d198 100644
--- a/build_scripts/GitlabCI/gitlabCI.Dockerfile
+++ b/build_scripts/GitlabCI/gitlabCI.Dockerfile
@@ -14,6 +14,7 @@ RUN \
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON && \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON \
+		-DRS_WARN_DEPRECATED=OFF -DRS_WARN_LESS=ON && \
 	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build

From d757af5c56fafb83f21a1e0a87825580bbf49901 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Fri, 25 Feb 2022 19:30:34 +0100
Subject: [PATCH 045/503] CMake refinements

---
 libretroshare                     | 2 +-
 retroshare-service/CMakeLists.txt | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libretroshare b/libretroshare
index 167589952..59ebd8136 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 16758995237494a1f39fa86f0f04cf37de121a91
+Subproject commit 59ebd813697eda75b188ea5a8cc5d650c5602700
diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index 2a09602d8..2fcdabe28 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -10,6 +10,12 @@ project(retroshare-service)
 
 include(CMakeDependentOption)
 
+set(
+	RS_BIN_INSTALL_DIR
+	"${CMAKE_INSTALL_PREFIX}/bin"
+	CACHE PATH
+	"Path where to install retroshare-service compiled binary" )
+
 option(
 	RS_DEVELOPMENT_BUILD
 	"Disable optimization to speed up build, enable verbose build log. \
@@ -67,7 +73,7 @@ list(
 
 add_executable(${PROJECT_NAME} ${RS_SERVICE_SOURCES})
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
 
 ################################################################################
 

From a6deaa2a273dab95658198ed9d3cef764695fe9a Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 27 Feb 2022 14:30:59 +0100
Subject: [PATCH 046/503] Added back icons

---
 .../src/gui/common/NewFriendList.cpp          |   6 ++-
 .../src/gui/connect/PGPKeyDialog.ui           |  25 +++++++++++
 retroshare-gui/src/gui/icons.qrc              |   3 ++
 retroshare-gui/src/gui/icons/minus.svg        |  42 ++++++++++++++++++
 retroshare-gui/src/gui/icons/plus.svg         |  42 ++++++++++++++++++
 .../src/gui/icons/security_low_off_128.png    | Bin 0 -> 17008 bytes
 6 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/minus.svg
 create mode 100644 retroshare-gui/src/gui/icons/plus.svg
 create mode 100644 retroshare-gui/src/gui/icons/security_low_off_128.png

diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 7930b3057..893433469 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -70,6 +70,8 @@
 #define IMAGE_COPYLINK           ":/images/copyrslink.png"
 #define IMAGE_GROUPS             ":/icons/groups/colored.svg"
 #define IMAGE_EDIT               ":/icons/png/pencil-edit-button.png"
+#define IMAGE_EXPAND             ":/icons/plus.svg"
+#define IMAGE_COLLAPSE           ":/icons/minus.svg"
 #define IMAGE_REMOVE             ":/icons/cancel.svg"
 #define IMAGE_ADD                ":/icons/png/add.png"
 /* Images for Status icons */
@@ -761,8 +763,8 @@ void NewFriendList::peerTreeWidgetCustomPopupMenu()
     if (RSLinkClipboard::empty(RetroShareLink::TYPE_CERTIFICATE))
         action->setDisabled(true);
 
-    contextMenu.addAction(QIcon(""), tr("Expand all"), ui->peerTreeWidget, SLOT(expandAll()));
-    contextMenu.addAction(QIcon(""), tr("Collapse all"), ui->peerTreeWidget, SLOT(collapseAll()));
+    contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EXPAND), tr("Expand all"), ui->peerTreeWidget, SLOT(expandAll()));
+    contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COLLAPSE), tr("Collapse all"), ui->peerTreeWidget, SLOT(collapseAll()));
 
     contextMenu.addSeparator();
 
diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
index 12781b2c9..eca49e965 100644
--- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
+++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui
@@ -111,31 +111,55 @@
                  <property name="text">
                   <string>Unset</string>
                  </property>
+                 <property name="icon">
+                  <iconset resource="../icons.qrc">
+                   <normaloff>:/icons/security_low_off_128.png</normaloff>:/icons/security_low_off_128.png</iconset>
+                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>Unknown</string>
                  </property>
+                 <property name="icon">
+                  <iconset resource="../icons.qrc">
+                   <normaloff>:/icons/security_low_off_128.png</normaloff>:/icons/security_low_off_128.png</iconset>
+                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>No trust</string>
                  </property>
+                 <property name="icon">
+                  <iconset resource="../icons.qrc">
+                   <normaloff>:/icons/security_low_128.png</normaloff>:/icons/security_low_128.png</iconset>
+                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>Marginal</string>
                  </property>
+                 <property name="icon">
+                  <iconset resource="../icons.qrc">
+                   <normaloff>:/icons/security_medium_128.png</normaloff>:/icons/security_medium_128.png</iconset>
+                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>Full</string>
                  </property>
+                 <property name="icon">
+                  <iconset resource="../icons.qrc">
+                   <normaloff>:/icons/security_high_128.png</normaloff>:/icons/security_high_128.png</iconset>
+                 </property>
                 </item>
                 <item>
                  <property name="text">
                   <string>Ultimate</string>
                  </property>
+                 <property name="icon">
+                  <iconset resource="../icons.qrc">
+                   <normaloff>:/icons/security_high_128.png</normaloff>:/icons/security_high_128.png</iconset>
+                 </property>
                 </item>
                </widget>
               </item>
@@ -513,6 +537,7 @@ p, li { white-space: pre-wrap; }
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 57527d447..b1548493b 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -141,6 +141,7 @@
         <file>icons/search_red_128.png</file>
         <file>icons/security_high_128.png</file>
         <file>icons/security_low_128.png</file>
+        <file>icons/security_low_off_128.png</file>
         <file>icons/security_medium_128.png</file>
         <file>icons/settings/appearance.svg</file>
         <file>icons/settings/channels.svg</file>
@@ -354,5 +355,7 @@
         <file>icons/newwindow.svg</file>
         <file>icons/cancel.svg</file>
         <file>icons/connection.svg</file>
+        <file>icons/plus.svg</file>
+        <file>icons/minus.svg</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/minus.svg b/retroshare-gui/src/gui/icons/minus.svg
new file mode 100644
index 000000000..fc2ccfaa8
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/minus.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="minus.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12.046154"
+     inkscape:cy="11.053846"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+  </sodipodi:namedview>
+  <path
+     d="M 21,13.523077 H 3 V 11 h 18 z"
+     id="path2"
+     style="fill:#d40000;fill-opacity:1;stroke-width:1.27357" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/plus.svg b/retroshare-gui/src/gui/icons/plus.svg
new file mode 100644
index 000000000..83b1dfbbb
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/plus.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="plus.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="15.320647"
+     inkscape:cx="12.075208"
+     inkscape:cy="12.042572"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+  </sodipodi:namedview>
+  <path
+     d="M 23,14.75 H 14.75 V 23 H 9.2500008 V 14.75 H 1 V 9.2500008 H 9.2500008 V 1 H 14.75 V 9.2500008 H 23 Z"
+     id="path2"
+     style="fill:#00b400;fill-opacity:1;stroke-width:1.375" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/security_low_off_128.png b/retroshare-gui/src/gui/icons/security_low_off_128.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0f02b0a127e317b47460aeb7845f68e7e8c3204
GIT binary patch
literal 17008
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
G`2PU;Zic%6

literal 0
HcmV?d00001


From daa8eaea9ecba74aa3165f353b1f462de7b47067 Mon Sep 17 00:00:00 2001
From: sehraf <sehraf42@gmail.com>
Date: Tue, 1 Mar 2022 17:33:38 +0100
Subject: [PATCH 047/503] RetroShare-gui: Rename DATA_DIR to RS_DATA_DIR to be
 consistent

fixes 94bd09940722d1e4ca5dc8ab09488fd149f96aa5
---
 retroshare-gui/src/retroshare-gui.pro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 3340e0f0c..b8e8365e0 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -146,11 +146,11 @@ unix {
 	target.path = "$${BIN_DIR}"
 	INSTALLS += target
 
-	data_files.path="$${DATA_DIR}/"
+        data_files.path="$${RS_DATA_DIR}/"
 	data_files.files=sounds qss
 	INSTALLS += data_files
 
-	style_files.path="$${DATA_DIR}/stylesheets"
+        style_files.path="$${RS_DATA_DIR}/stylesheets"
 	style_files.files=gui/qss/chat/Bubble gui/qss/chat/Bubble_Compact
 	INSTALLS += style_files
 

From 6ca3d645119db22bea49e7111970cc5ab8e7d33c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 8 Mar 2022 21:28:42 +0100
Subject: [PATCH 048/503] added list of already received peers from FS so that
 we do not request them again

---
 libbitdht                                   |  2 +-
 libretroshare                               |  2 +-
 retroshare-friendserver/src/friendserver.cc | 26 +++++++++++++--------
 retroshare-friendserver/src/friendserver.h  |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/libbitdht b/libbitdht
index 6abbec950..659423769 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 6abbec95073f3c1eb5059cbf8441111ef4a317a7
+Subproject commit 659423769541169457c41f71c8a038e2d64ba079
diff --git a/libretroshare b/libretroshare
index 59ebd8136..ac742c869 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 59ebd813697eda75b188ea5a8cc5d650c5602700
+Subproject commit ac742c869a7187de467c38e73c0ea7b87e09ffdb
diff --git a/retroshare-friendserver/src/friendserver.cc b/retroshare-friendserver/src/friendserver.cc
index 523a76640..e63156ae6 100644
--- a/retroshare-friendserver/src/friendserver.cc
+++ b/retroshare-friendserver/src/friendserver.cc
@@ -88,7 +88,7 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
 
         std::map<RsPeerId,RsPgpFingerprint> friends;
         sr_item.nonce = pi->second.last_nonce;
-        sr_item.friend_invites = computeListOfFriendInvites(item->n_requested_friends,pi->first,friends);
+        sr_item.friend_invites = computeListOfFriendInvites(item->n_requested_friends,item->already_received_peers,pi->first,friends);
         sr_item.PeerId(item->PeerId());
 
         // Update the have_added_as_friend for the list of each peer. We do that before sending because sending destroys
@@ -142,7 +142,10 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
     }
 }
 
-std::map<std::string, bool> FriendServer::computeListOfFriendInvites(uint32_t nb_reqs_invites, const RsPeerId &pid, std::map<RsPeerId,RsPgpFingerprint>& friends)
+std::map<std::string, bool> FriendServer::computeListOfFriendInvites(uint32_t nb_reqs_invites,
+                                                                     const std::set<RsPeerId>& already_known_peers,
+                                                                     const RsPeerId &pid,
+                                                                     std::map<RsPeerId,RsPgpFingerprint>& friends)
 {
     // Strategy: we want to return the same set of friends for a given PGP profile key.
     // Still, using some closest distance strategy, the n-closest peers for profile A is not the
@@ -168,17 +171,20 @@ std::map<std::string, bool> FriendServer::computeListOfFriendInvites(uint32_t nb
 
     std::map<std::string,bool> res;
 
-    auto add_from = [&res,&friends,nb_reqs_invites,this](bool added,const std::map<PeerInfo::PeerDistance,RsPeerId>& lst) -> bool
+    auto add_from = [&res,&friends,nb_reqs_invites,already_known_peers,this](bool added,
+                                                         const std::map<PeerInfo::PeerDistance, RsPeerId>& lst) -> bool
     {
         for(const auto& pid:lst)
-        {
-            const auto p = mCurrentClientPeers.find(pid.second);
-            res.insert(std::make_pair(p->second.short_certificate,added));
-            friends.insert(std::make_pair(p->first,p->second.pgp_fingerprint));
+            if(already_known_peers.find(pid.second) == already_known_peers.end())
+            {
+                const auto p = mCurrentClientPeers.find(pid.second);
+                res.insert(std::make_pair(p->second.short_certificate,added));
+                friends.insert(std::make_pair(p->first,p->second.pgp_fingerprint));
+
+                if(res.size() + already_known_peers.size() >= nb_reqs_invites)
+                    return true;
+            }
 
-            if(res.size() >= nb_reqs_invites)
-                return true;
-        }
         return false;
     };
 
diff --git a/retroshare-friendserver/src/friendserver.h b/retroshare-friendserver/src/friendserver.h
index 4f46bebdc..7b688147a 100644
--- a/retroshare-friendserver/src/friendserver.h
+++ b/retroshare-friendserver/src/friendserver.h
@@ -69,7 +69,7 @@ private:
     std::map<RsPeerId,PeerInfo>::iterator handleIncomingClientData(const std::string& pgp_public_key_b64,const std::string& short_invite_b64);
 
     // Computes the appropriate list of short invites to send to a given peer.
-    std::map<std::string, bool> computeListOfFriendInvites(uint32_t nb_reqs_invites, const RsPeerId &pid, std::map<RsPeerId,RsPgpFingerprint>& friends);
+    std::map<std::string, bool> computeListOfFriendInvites(uint32_t nb_reqs_invites, const std::set<RsPeerId> &already_received_peers, const RsPeerId &pid, std::map<RsPeerId,RsPgpFingerprint>& friends);
 
     // Compute the distance between peers using the random bias (It's not really a distance though. I'm not sure about the triangular inequality).
     PeerInfo::PeerDistance computePeerDistance(const RsPgpFingerprint &p1, const RsPgpFingerprint &p2);

From 97829de0ba023c663a6f81ae148f6d4866365278 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 9 Mar 2022 21:32:26 +0100
Subject: [PATCH 049/503] fixed certificate pasting bug

---
 retroshare-gui/src/gui/HomePage.cpp       | 27 ++++++++++++++---------
 retroshare-gui/src/gui/HomePage.h         |  1 +
 retroshare-gui/src/gui/RetroShareLink.cpp | 10 ++++++---
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index b14b68eb9..dec4e9fec 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -205,17 +205,9 @@ HomePage::~HomePage()
     delete ui;
 }
 
-void HomePage::getOwnCert(QString& invite,QString& description) const
+RetroshareInviteFlags HomePage::currentInviteFlags() const
 {
-    RsPeerDetails detail;
-
-    if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail))
-    {
-        std::cerr << "(EE) Cannot retrieve information about own certificate. That is a real problem!!" << std::endl;
-        return ;
-    }
-
-    RetroshareInviteFlags invite_flags = RetroshareInviteFlags::NOTHING;
+     RetroshareInviteFlags invite_flags = RetroshareInviteFlags::NOTHING;
 
     if(mIncludeLocIPact->isChecked())
         invite_flags |= RetroshareInviteFlags::CURRENT_LOCAL_IP;
@@ -229,6 +221,21 @@ void HomePage::getOwnCert(QString& invite,QString& description) const
     if(mIncludeIPHistoryact->isChecked())
         invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
 
+    return invite_flags;
+}
+void HomePage::getOwnCert(QString& invite,QString& description) const
+{
+    RsPeerDetails detail;
+
+    if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail))
+    {
+        std::cerr << "(EE) Cannot retrieve information about own certificate. That is a real problem!!" << std::endl;
+        return ;
+    }
+    auto invite_flags = currentInviteFlags();
+
+    invite_flags |= RetroshareInviteFlags::SLICE_TO_80_CHARS;
+
     if(!mUseOldFormatact->isChecked())
     {
         std::string short_invite;
diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index a20f07863..aa77ed1a3 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -49,6 +49,7 @@ public:
     // Returns the certificate along with its description using current options.
 
     void getOwnCert(QString& invite,QString& description) const;
+    RetroshareInviteFlags currentInviteFlags() const ;
 
 private slots:
 #ifdef DEAD_CODE
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 524f3c757..6e377f70e 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -570,9 +570,13 @@ RetroShareLink RetroShareLink::createCertificate(const RsPeerId& ssl_id)
 
         if(rsPeers->getOwnId() == ssl_id)	// in this case, use application-wide parameters set in HomePage
         {
-            QString invite,description;
-            static_cast<HomePage*>(MainWindow::getPage(MainWindow::Home))->getOwnCert(invite,description);
-            link._radix = invite;
+            QString description;
+            auto invite_flags = static_cast<HomePage*>(MainWindow::getPage(MainWindow::Home))->currentInviteFlags();
+
+            invite_flags &= ~RetroshareInviteFlags::SLICE_TO_80_CHARS;
+            invite_flags |=  RetroshareInviteFlags::RADIX_FORMAT;
+
+            link._radix = QString::fromUtf8(rsPeers->GetRetroshareInvite(ssl_id,invite_flags).c_str());
         }
         else
             link._radix = QString::fromUtf8(rsPeers->GetRetroshareInvite(ssl_id).c_str());

From ae0f294c4b985e75d37365bfff479eef888353b9 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 10 Mar 2022 21:35:59 +0100
Subject: [PATCH 050/503] Fixed missed icons

---
 .../src/gui/FileTransfer/SharedFilesDialog.ui | 24 +++++++-----
 retroshare-gui/src/gui/icons.qrc              |  5 +++
 .../src/gui/icons/svg/calendar-blank.svg      | 38 +++++++++++++++++++
 .../src/gui/icons/svg/calendar-month.svg      | 38 +++++++++++++++++++
 .../src/gui/icons/svg/calendar-today.svg      | 38 +++++++++++++++++++
 .../src/gui/icons/svg/calendar-week.svg       | 38 +++++++++++++++++++
 retroshare-gui/src/gui/icons/svg/download.svg | 29 +++++++-------
 retroshare-gui/src/gui/icons/svg/refresh.svg  | 38 +++++++++++++++++++
 8 files changed, 224 insertions(+), 24 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/svg/calendar-blank.svg
 create mode 100644 retroshare-gui/src/gui/icons/svg/calendar-month.svg
 create mode 100644 retroshare-gui/src/gui/icons/svg/calendar-today.svg
 create mode 100644 retroshare-gui/src/gui/icons/svg/calendar-week.svg
 create mode 100644 retroshare-gui/src/gui/icons/svg/refresh.svg

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
index 4207aa042..b732d0464 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
@@ -243,8 +243,8 @@ border-image: url(:/images/closepressed.png)
           <string>All</string>
          </property>
          <property name="icon">
-          <iconset resource="../images.qrc">
-           <normaloff>:/images/view_calendar_list.png</normaloff>:/images/view_calendar_list.png</iconset>
+          <iconset resource="../icons.qrc">
+           <normaloff>:/icons/svg/calendar-blank.svg</normaloff>:/icons/svg/calendar-blank.svg</iconset>
          </property>
         </item>
         <item>
@@ -252,8 +252,8 @@ border-image: url(:/images/closepressed.png)
           <string>One day old</string>
          </property>
          <property name="icon">
-          <iconset resource="../images.qrc">
-           <normaloff>:/images/view_calendar_day.png</normaloff>:/images/view_calendar_day.png</iconset>
+          <iconset resource="../icons.qrc">
+           <normaloff>:/icons/svg/calendar-today.svg</normaloff>:/icons/svg/calendar-today.svg</iconset>
          </property>
         </item>
         <item>
@@ -261,8 +261,8 @@ border-image: url(:/images/closepressed.png)
           <string>One Week old</string>
          </property>
          <property name="icon">
-          <iconset resource="../images.qrc">
-           <normaloff>:/images/view_calendar_week.png</normaloff>:/images/view_calendar_week.png</iconset>
+          <iconset resource="../icons.qrc">
+           <normaloff>:/icons/svg/calendar-week.svg</normaloff>:/icons/svg/calendar-week.svg</iconset>
          </property>
         </item>
         <item>
@@ -270,8 +270,8 @@ border-image: url(:/images/closepressed.png)
           <string>One month old</string>
          </property>
          <property name="icon">
-          <iconset resource="../images.qrc">
-           <normaloff>:/images/view_calendar_month.png</normaloff>:/images/view_calendar_month.png</iconset>
+          <iconset resource="../icons.qrc">
+           <normaloff>:/icons/svg/calendar-month.svg</normaloff>:/icons/svg/calendar-month.svg</iconset>
          </property>
         </item>
        </widget>
@@ -288,6 +288,10 @@ border-image: url(:/images/closepressed.png)
         <property name="text">
          <string>check files</string>
         </property>
+        <property name="icon">
+         <iconset resource="../icons.qrc">
+          <normaloff>:/icons/svg/refresh.svg</normaloff>:/icons/svg/refresh.svg</iconset>
+        </property>
        </widget>
       </item>
       <item>
@@ -311,8 +315,8 @@ border-image: url(:/images/closepressed.png)
          <string>Download</string>
         </property>
         <property name="icon">
-         <iconset>
-          <normaloff>:/images/download16.png</normaloff>:/images/download16.png</iconset>
+         <iconset resource="../icons.qrc">
+          <normaloff>:/icons/png/download.png</normaloff>:/icons/png/download.png</iconset>
         </property>
        </widget>
       </item>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index b1548493b..d180b5fb1 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -357,5 +357,10 @@
         <file>icons/connection.svg</file>
         <file>icons/plus.svg</file>
         <file>icons/minus.svg</file>
+        <file>icons/svg/calendar-blank.svg</file>
+        <file>icons/svg/calendar-month.svg</file>
+        <file>icons/svg/calendar-today.svg</file>
+        <file>icons/svg/calendar-week.svg</file>
+        <file>icons/svg/refresh.svg</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/svg/calendar-blank.svg b/retroshare-gui/src/gui/icons/svg/calendar-blank.svg
new file mode 100644
index 000000000..240eea35c
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/calendar-blank.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="calendar-blank.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M19,19H5V8H19M16,1V3H8V1H6V3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3H18V1"
+     id="path2"
+     style="fill:#00b400;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/svg/calendar-month.svg b/retroshare-gui/src/gui/icons/svg/calendar-month.svg
new file mode 100644
index 000000000..ad16153d4
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/calendar-month.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="calendar-month.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M9,10V12H7V10H9M13,10V12H11V10H13M17,10V12H15V10H17M19,3A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5C3.89,21 3,20.1 3,19V5A2,2 0 0,1 5,3H6V1H8V3H16V1H18V3H19M19,19V8H5V19H19M9,14V16H7V14H9M13,14V16H11V14H13M17,14V16H15V14H17Z"
+     id="path2"
+     style="fill:#00b400;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/svg/calendar-today.svg b/retroshare-gui/src/gui/icons/svg/calendar-today.svg
new file mode 100644
index 000000000..1673a26ca
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/calendar-today.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="calendar-today.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M7,10H12V15H7M19,19H5V8H19M19,3H18V1H16V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3Z"
+     id="path2"
+     style="fill:#00b400;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/svg/calendar-week.svg b/retroshare-gui/src/gui/icons/svg/calendar-week.svg
new file mode 100644
index 000000000..b958f1bd9
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/calendar-week.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="calendar-range.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M9,10H7V12H9V10M13,10H11V12H13V10M17,10H15V12H17V10M19,3H18V1H16V3H8V1H6V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M19,19H5V8H19V19Z"
+     id="path2"
+     style="fill:#00b400;fill-opacity:1" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/svg/download.svg b/retroshare-gui/src/gui/icons/svg/download.svg
index 4cd19ee40..9c260c8e8 100644
--- a/retroshare-gui/src/gui/icons/svg/download.svg
+++ b/retroshare-gui/src/gui/icons/svg/download.svg
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    viewBox="0 0 44 44"
    enable-background="new 0 0 44 44"
    id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="download.svg">
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="download.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -36,18 +36,19 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="706"
+     inkscape:window-height="705"
      id="namedview6"
      showgrid="false"
      inkscape:zoom="5.3636364"
-     inkscape:cx="22"
-     inkscape:cy="21.813559"
+     inkscape:cx="22.186441"
+     inkscape:cy="21.720339"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2"
+     inkscape:pagecheckerboard="0" />
   <path
      d="M22,0C9.8,0,0,9.8,0,22s9.8,22,22,22s22-9.8,22-22S34.2,0,22,0z M31.7,25.7l-9,9C22.5,34.9,22.2,35,22,35  c-0.3,0-0.5-0.1-0.7-0.3l-9-9C12.1,25.5,12,25.3,12,25s0.1-0.5,0.3-0.7l1.4-1.4c0.4-0.4,1-0.4,1.4,0l4,4c0.3,0.3,0.9,0.1,0.9-0.4V10  c0-0.6,0.4-1,1-1h2c0.6,0,1,0.4,1,1v16.6c0,0.4,0.5,0.7,0.9,0.4l4-4c0.4-0.4,1-0.4,1.4,0l1.4,1.4c0.2,0.2,0.3,0.4,0.3,0.7  C32,25.3,31.9,25.5,31.7,25.7z"
      id="path4"
-     style="fill:#008000" />
+     style="fill:#00b400;fill-opacity:1" />
 </svg>
diff --git a/retroshare-gui/src/gui/icons/svg/refresh.svg b/retroshare-gui/src/gui/icons/svg/refresh.svg
new file mode 100644
index 000000000..eddf8330e
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/refresh.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="refresh.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="15.320647"
+     inkscape:cx="12.009937"
+     inkscape:cy="12.042572"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 11.869457,0.82511489 A 11.044343,11.044343 0 1 0 22.9138,11.869457 11.044343,11.044343 0 0 0 11.869457,0.82511489 m 6.626606,9.93990811 h -5.522171 l 1.999026,-1.999026 a 4.3514709,4.3514709 0 0 0 -3.103461,-1.3142768 4.4177369,4.4177369 0 1 0 4.263116,5.5221718 h 2.264091 a 6.6266053,6.6266053 0 1 1 -6.527207,-7.7310402 6.5272064,6.5272064 0 0 1 4.660712,1.965893 l 1.965894,-1.965893 z"
+     id="path2"
+     style="fill:#00b400;fill-opacity:1;stroke-width:1.10443" />
+</svg>

From 327a254e7c6814c6b1e4d02fe12daa14164a8076 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Wed, 16 Mar 2022 18:56:09 +0100
Subject: [PATCH 051/503] Improved classic stylesheet

* Use light blue for selection colors
---
 retroshare-gui/src/qss/retroclassic.qss | 139 ++++++++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/retroshare-gui/src/qss/retroclassic.qss b/retroshare-gui/src/qss/retroclassic.qss
index eb45b3379..3c4aee8fd 100644
--- a/retroshare-gui/src/qss/retroclassic.qss
+++ b/retroshare-gui/src/qss/retroclassic.qss
@@ -1,3 +1,123 @@
+/* QTreeView QListView QTableView -----------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtreeview
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
+
+--------------------------------------------------------------------------- */
+QTreeView:branch:selected, QTreeView:branch:hover {
+  background: url(":/standard_light/rc/transparent.png");
+}
+
+QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
+  border-image: none;
+  image: url(":/standard_light/rc/branch_closed.png");
+}
+
+QTreeView:branch:open:has-children:!has-siblings, QTreeView:branch:open:has-children:has-siblings {
+  border-image: none;
+  image: url(":/standard_light/rc/branch_open.png");
+}
+
+QTreeView:branch:has-children:!has-siblings:closed:hover, QTreeView:branch:closed:has-children:has-siblings:hover {
+  image: url(":/standard_light/rc/branch_closed_focus.png");
+}
+
+QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:has-children:has-siblings:hover {
+  image: url(":/standard_light/rc/branch_open_focus.png");
+}
+
+QTreeView,
+QListView,
+QTableView,
+QColumnView {
+  background-color: #FAFAFA;
+  border: 1px solid #C9CDD0;
+  color: #19232D;
+  gridline-color: #C9CDD0;
+  border-radius: 4px;
+}
+
+QTreeView:disabled,
+QListView:disabled,
+QTableView:disabled,
+QColumnView:disabled {
+  background-color: #FAFAFA;
+  color: #788D9C;
+}
+
+QTreeView:selected,
+QListView:selected,
+QTableView:selected,
+QColumnView:selected {
+  background-color: #9FCBFF;
+  color: #C9CDD0;
+}
+
+QTreeView:focus,
+QListView:focus,
+QTableView:focus,
+QColumnView:focus {
+  border: 1px solid #73C7FF;
+}
+
+QTreeView::item:pressed,
+QListView::item:pressed,
+QTableView::item:pressed,
+QColumnView::item:pressed {
+  background-color: #9FCBFF;
+}
+
+QTreeView::item:selected:active,
+QListView::item:selected:active,
+QTableView::item:selected:active,
+QColumnView::item:selected:active {
+  background-color: #9FCBFF;
+}
+
+QTreeView::item:selected:!active,
+QListView::item:selected:!active,
+QTableView::item:selected:!active,
+QColumnView::item:selected:!active {
+  color: #19232D;
+  background-color: #CED1D4;
+}
+
+QTreeView::item:!selected:hover,
+QListView::item:!selected:hover,
+QTableView::item:!selected:hover,
+QColumnView::item:!selected:hover {
+  outline: 0;
+  color: #19232D;
+  background-color: #CED1D4;
+}
+
+QTableCornerButton::section {
+  background-color: #FAFAFA;
+  border: 1px transparent #C9CDD0;
+  border-radius: 0px;
+}
+
+/**** Fix QTreeView Items ****/
+
+QTreeView::item,
+QListView::item,
+QTableView::item,
+QColumnView::item {
+  color: #101010;
+  background: transparent;
+}
+
+QTreeView:branch:selected{
+  background-color: #9FCBFF;
+}
+
+QTreeView:branch:!selected:hover,
+QTreeView:branch:selected:!active {
+  color: #19232D;
+  background-color: #CED1D4;
+}
+
 /* HeaderFrame & TitleBarFrame */
 
 QFrame[objectName^="headerFrame"] {
@@ -19,3 +139,22 @@ QFrame[objectName^="toolBarFrameTop"] {
 	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8);
 	border: 1px solid #CCCCCC;
 }
+
+/* Forums */
+
+GxsForumThreadWidget QWidget#threadTreeWidget {
+	selection-background-color: #9FCBFF;
+	show-decoration-selected: 1;
+}
+
+GxsForumThreadWidget QWidget#threadTreeWidget::item:selected:active ,
+GxsForumThreadWidget QWidget#threadTreeWidget::item:selected:!active {
+	background-color: #9FCBFF;
+}
+
+/* People */
+
+IdDialog QWidget#idTreeWidget {
+	selection-background-color: #9FCBFF;
+	show-decoration-selected: 1;
+}

From f8470068cff14319175fad0c8ac263ac3d5b9982 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 18 Mar 2022 19:04:26 +0100
Subject: [PATCH 052/503] changed file type icons

---
 .../src/gui/FileTransfer/SearchDialog.cpp     |   4 +
 .../src/gui/FileTransfer/SearchDialog.ui      |  43 ++--
 retroshare-gui/src/gui/common/FilesDefs.cpp   |  36 ++--
 retroshare-gui/src/gui/icons.qrc              |  16 ++
 retroshare-gui/src/gui/icons/filetype/any.svg |  56 ++++++
 retroshare-gui/src/gui/icons/filetype/apk.svg |  54 +++++
 .../src/gui/icons/filetype/archive.svg        |  54 +++++
 .../src/gui/icons/filetype/audio.svg          |  54 +++++
 retroshare-gui/src/gui/icons/filetype/c.svg   |  54 +++++
 .../src/gui/icons/filetype/collection.svg     | 190 ++++++++++++++++++
 retroshare-gui/src/gui/icons/filetype/cpp.svg |  59 ++++++
 retroshare-gui/src/gui/icons/filetype/dll.svg |  59 ++++++
 .../src/gui/icons/filetype/document.svg       |  56 ++++++
 retroshare-gui/src/gui/icons/filetype/h.svg   |  56 ++++++
 retroshare-gui/src/gui/icons/filetype/img.svg |  54 +++++
 .../src/gui/icons/filetype/patch.svg          | 110 ++++++++++
 retroshare-gui/src/gui/icons/filetype/pdf.svg |  56 ++++++
 .../src/gui/icons/filetype/picture.svg        |  61 ++++++
 .../src/gui/icons/filetype/program.svg        |  48 +++++
 .../src/gui/icons/filetype/video.svg          |  54 +++++
 retroshare-gui/src/gui/images.qrc             |  14 --
 retroshare-gui/src/gui/images/FileTypeAny.png | Bin 603 -> 0 bytes
 .../src/gui/images/FileTypeArchive.png        | Bin 706 -> 0 bytes
 .../src/gui/images/FileTypeAudio.png          | Bin 568 -> 0 bytes
 .../src/gui/images/FileTypeCDImage.png        | Bin 648 -> 0 bytes
 .../src/gui/images/FileTypeDocument.png       | Bin 635 -> 0 bytes
 .../src/gui/images/FileTypePicture.png        | Bin 703 -> 0 bytes
 .../src/gui/images/FileTypeProgram.png        | Bin 450 -> 0 bytes
 .../src/gui/images/FileTypeVideo.png          | Bin 539 -> 0 bytes
 .../src/gui/images/mimetypes/patch.png        | Bin 717 -> 0 bytes
 .../src/gui/images/mimetypes/pdf.png          | Bin 700 -> 0 bytes
 .../gui/images/mimetypes/rscollection-16.png  | Bin 1068 -> 0 bytes
 .../src/gui/images/mimetypes/source_c.png     | Bin 626 -> 0 bytes
 .../src/gui/images/mimetypes/source_cpp.png   | Bin 673 -> 0 bytes
 .../src/gui/images/mimetypes/source_h.png     | Bin 547 -> 0 bytes
 35 files changed, 1135 insertions(+), 53 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/filetype/any.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/apk.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/archive.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/audio.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/c.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/collection.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/cpp.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/dll.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/document.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/h.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/img.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/patch.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/pdf.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/picture.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/program.svg
 create mode 100644 retroshare-gui/src/gui/icons/filetype/video.svg
 delete mode 100644 retroshare-gui/src/gui/images/FileTypeAny.png
 delete mode 100644 retroshare-gui/src/gui/images/FileTypeArchive.png
 delete mode 100644 retroshare-gui/src/gui/images/FileTypeAudio.png
 delete mode 100644 retroshare-gui/src/gui/images/FileTypeCDImage.png
 delete mode 100644 retroshare-gui/src/gui/images/FileTypeDocument.png
 delete mode 100644 retroshare-gui/src/gui/images/FileTypePicture.png
 delete mode 100644 retroshare-gui/src/gui/images/FileTypeProgram.png
 delete mode 100644 retroshare-gui/src/gui/images/FileTypeVideo.png
 delete mode 100644 retroshare-gui/src/gui/images/mimetypes/patch.png
 delete mode 100644 retroshare-gui/src/gui/images/mimetypes/pdf.png
 delete mode 100644 retroshare-gui/src/gui/images/mimetypes/rscollection-16.png
 delete mode 100644 retroshare-gui/src/gui/images/mimetypes/source_c.png
 delete mode 100644 retroshare-gui/src/gui/images/mimetypes/source_cpp.png
 delete mode 100644 retroshare-gui/src/gui/images/mimetypes/source_h.png

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index b6da4de7b..482ae39cd 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -188,6 +188,10 @@ SearchDialog::SearchDialog(QWidget *parent)
 
     ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder);
 
+    QFontMetricsF fontMetrics(ui.searchResultWidget->font());
+    int iconHeight = fontMetrics.height() * 1.4;
+    ui.searchResultWidget->setIconSize(QSize(iconHeight, iconHeight));
+
     /* Set initial size the splitter */
     QList<int> sizes;
     sizes << 250 << width(); // Qt calculates the right sizes
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui b/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui
index 47fd2179e..f121c16c1 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>783</width>
+    <width>793</width>
     <height>511</height>
    </rect>
   </property>
@@ -64,10 +64,7 @@
            <property name="bottomMargin">
             <number>2</number>
            </property>
-           <property name="horizontalSpacing">
-            <number>0</number>
-           </property>
-           <property name="verticalSpacing">
+           <property name="spacing">
             <number>0</number>
            </property>
            <item row="0" column="0">
@@ -343,8 +340,8 @@
              <string>Any</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/FileTypeAny.png</normaloff>:/images/FileTypeAny.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/filetype/any.svg</normaloff>:/icons/filetype/any.svg</iconset>
             </property>
            </item>
            <item>
@@ -352,8 +349,8 @@
              <string>Archive</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/FileTypeArchive.png</normaloff>:/images/FileTypeArchive.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/filetype/archive.svg</normaloff>:/icons/filetype/archive.svg</iconset>
             </property>
            </item>
            <item>
@@ -361,8 +358,8 @@
              <string>Audio</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/FileTypeAudio.png</normaloff>:/images/FileTypeAudio.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/filetype/audio.svg</normaloff>:/icons/filetype/audio.svg</iconset>
             </property>
            </item>
            <item>
@@ -370,8 +367,8 @@
              <string>CD-Image</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/FileTypeCDImage.png</normaloff>:/images/FileTypeCDImage.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/filetype/img.svg</normaloff>:/icons/filetype/img.svg</iconset>
             </property>
            </item>
            <item>
@@ -379,8 +376,8 @@
              <string>Document</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/FileTypeDocument.png</normaloff>:/images/FileTypeDocument.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/filetype/document.svg</normaloff>:/icons/filetype/document.svg</iconset>
             </property>
            </item>
            <item>
@@ -388,8 +385,8 @@
              <string>Picture</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/FileTypePicture.png</normaloff>:/images/FileTypePicture.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/filetype/picture.svg</normaloff>:/icons/filetype/picture.svg</iconset>
             </property>
            </item>
            <item>
@@ -397,8 +394,8 @@
              <string>Program</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/FileTypeProgram.png</normaloff>:/images/FileTypeProgram.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/filetype/program.svg</normaloff>:/icons/filetype/program.svg</iconset>
             </property>
            </item>
            <item>
@@ -406,8 +403,8 @@
              <string>Video</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/FileTypeVideo.png</normaloff>:/images/FileTypeVideo.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/filetype/video.svg</normaloff>:/icons/filetype/video.svg</iconset>
             </property>
            </item>
            <item>
@@ -415,8 +412,8 @@
              <string>Directory</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/foldermail.png</normaloff>:/images/foldermail.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/folder.png</normaloff>:/icons/folder.png</iconset>
             </property>
            </item>
           </widget>
diff --git a/retroshare-gui/src/gui/common/FilesDefs.cpp b/retroshare-gui/src/gui/common/FilesDefs.cpp
index 4d9f9c903..0baaea837 100644
--- a/retroshare-gui/src/gui/common/FilesDefs.cpp
+++ b/retroshare-gui/src/gui/common/FilesDefs.cpp
@@ -34,49 +34,53 @@ static QString getInfoFromFilename(const QString& filename, bool anyForUnknown,
 	QString ext = QFileInfo(filename).suffix().toLower();
 
 	if (ext == "jpg" || ext == "jpeg" || ext == "tif" || ext == "tiff" || ext == "png" || ext == "gif" || ext == "bmp" || ext == "ico" || ext == "svg") {
-		return image ? ":/images/FileTypePicture.png" : QApplication::translate("FilesDefs", "Picture");
+		return image ? ":/icons/filetype/picture.svg" : QApplication::translate("FilesDefs", "Picture");
 	} else if (ext == "avi" || ext == "mpg" || ext == "mpeg" || ext == "wmv" || ext == "divx" || ext == "ts" ||
 			   ext == "mkv" || ext == "mp4" || ext == "flv" || ext == "mov" || ext == "asf" || ext == "xvid" ||
 			   ext == "vob" || ext == "qt" || ext == "rm" || ext == "3gp" || ext == "ogm") {
-		return image ? ":/images/FileTypeVideo.png" : QApplication::translate("FilesDefs", "Video");
+		return image ? ":/icons/filetype/video.svg" : QApplication::translate("FilesDefs", "Video");
 	} else if (ext == "ogg" || ext == "mp3" || ext == "mp1" || ext == "mp2" || ext == "wav" || ext == "wma" || ext == "m4a" || ext == "flac" ||ext == "xpm") {
-		return image ? ":/images/FileTypeAudio.png" : QApplication::translate("FilesDefs", "Audio");
+		return image ? ":/icons/filetype/audio.svg" : QApplication::translate("FilesDefs", "Audio");
 	} else if (ext == "tar" || ext == "bz2" || ext == "zip" || ext == "gz" || ext == "7z" || ext == "msi" ||
 			   ext == "rar" || ext == "rpm" || ext == "ace" || ext == "jar" || ext == "tgz" || ext == "lha" ||
 			   ext == "cab" || ext == "cbz"|| ext == "cbr" || ext == "alz" || ext == "sit" || ext == "arj" || ext == "deb") {
-		return image ? ":/images/FileTypeArchive.png" : QApplication::translate("FilesDefs", "Archive");
+		return image ? ":/icons/filetype/archive.svg" : QApplication::translate("FilesDefs", "Archive");
 	} else if (ext == "app" || ext == "bat" || ext == "cgi" || ext == "com" ||
 			   ext == "exe" || ext == "js" || ext == "pif" ||
 			   ext == "py" || ext == "pl" || ext == "sh" || ext == "vb" || ext == "ws") {
-		return image ? ":/images/FileTypeProgram.png" : QApplication::translate("FilesDefs", "Program");
+		return image ? ":/icons/filetype/program.svg" : QApplication::translate("FilesDefs", "Program");
 	} else if (ext == "iso" || ext == "nrg" || ext == "mdf" || ext == "img" || ext == "dmg" || ext == "bin" || ext == "uif") {
-		return image ? ":/images/FileTypeCDImage.png" : QApplication::translate("FilesDefs", "CD/DVD-Image");
+		return image ? ":/icons/filetype/img.svg" : QApplication::translate("FilesDefs", "CD/DVD-Image");
 	} else if (ext == "txt" || ext == "ui" ||
 			   ext == "doc" || ext == "rtf" || ext == "sxw" || ext == "xls" || ext == "pps" || ext == "xml" || ext == "nfo" ||
 			   ext == "reg" || ext == "sxc" || ext == "odt" || ext == "ods" || ext == "dot" || ext == "ppt" || ext == "css" || ext == "crt" ||
 			   ext == "html" || ext == "htm" || ext == "php") {
-		return image ? ":/images/FileTypeDocument.png" : QApplication::translate("FilesDefs", "Document");
+		return image ? ":/icons/filetype/document.svg" : QApplication::translate("FilesDefs", "Document");
 	} else if (ext == "pdf") {
-		return image ? ":/images/mimetypes/pdf.png" : QApplication::translate("FilesDefs", "Document");
+		return image ? ":/icons/filetype/pdf.svg" : QApplication::translate("FilesDefs", "Document");
 	} else if (ext == RsCollection::ExtensionString) {
-		return image ? ":/images/mimetypes/rscollection-16.png" : QApplication::translate("FilesDefs", "RetroShare collection file");
+		return image ? ":/icons/filetype/collection.svg" : QApplication::translate("FilesDefs", "RetroShare collection file");
 	} else if (ext == "sub" || ext == "srt") {
-		return image ? ":/images/FileTypeAny.png" : QApplication::translate("FilesDefs", "Subtitles");
+		return image ? ":/icons/filetype/any.svg" : QApplication::translate("FilesDefs", "Subtitles");
 	} else if (ext == "nds") {
-		return image ? ":/images/FileTypeAny.png" : QApplication::translate("FilesDefs", "Nintendo DS Rom");
+		return image ? ":/icons/filetype/any.svg" : QApplication::translate("FilesDefs", "Nintendo DS Rom");
 	} else if (ext == "patch" || ext == "diff") {
-		return image ? ":/images/mimetypes/patch.png" : QApplication::translate("FilesDefs", "Patch");
+		return image ? ":/icons/filetype/patch.svg" : QApplication::translate("FilesDefs", "Patch");
 	} else if (ext == "cpp") {
-		return image ? ":/images/mimetypes/source_cpp.png" : QApplication::translate("FilesDefs", "C++");
+		return image ? ":/icons/filetype/cpp.svg" : QApplication::translate("FilesDefs", "C++");
 	} else if (ext == "h") {
-		return image ? ":/images/mimetypes/source_h.png" : QApplication::translate("FilesDefs", "Header");
+		return image ? ":/icons/filetype/h.svg" : QApplication::translate("FilesDefs", "Header");
 	} else if (ext == "c") {
-		return image ? ":/images/mimetypes/source_c.png" : QApplication::translate("FilesDefs", "C ");
+		return image ? ":/icons/filetype/c.svg" : QApplication::translate("FilesDefs", "C ");
+	} else if (ext == "apk") {
+		return image ? ":/icons/filetype/apk.svg" : QApplication::translate("FilesDefs", "APK ");
+	} else if (ext == "dll") {
+		return image ? ":/icons/filetype/dll.svg" : QApplication::translate("FilesDefs", "DLL ");
 	}
 
 
 	if (anyForUnknown) {
-		return image ? ":/images/FileTypeAny.png" : "";
+		return image ? ":/icons/filetype/any.svg" : "";
 	}
 
 	return "";
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index d180b5fb1..c5db35fa0 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -362,5 +362,21 @@
         <file>icons/svg/calendar-today.svg</file>
         <file>icons/svg/calendar-week.svg</file>
         <file>icons/svg/refresh.svg</file>
+        <file>icons/filetype/any.svg</file>
+        <file>icons/filetype/archive.svg</file>
+        <file>icons/filetype/audio.svg</file>
+        <file>icons/filetype/document.svg</file>
+        <file>icons/filetype/img.svg</file>
+        <file>icons/filetype/picture.svg</file>
+        <file>icons/filetype/program.svg</file>
+        <file>icons/filetype/video.svg</file>
+        <file>icons/filetype/c.svg</file>
+        <file>icons/filetype/cpp.svg</file>
+        <file>icons/filetype/h.svg</file>
+        <file>icons/filetype/pdf.svg</file>
+        <file>icons/filetype/apk.svg</file>
+        <file>icons/filetype/dll.svg</file>
+        <file>icons/filetype/collection.svg</file>
+        <file>icons/filetype/patch.svg</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/filetype/any.svg b/retroshare-gui/src/gui/icons/filetype/any.svg
new file mode 100644
index 000000000..7e0cbf726
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/any.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="any.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       d="M 431.78024,146.53386 321.38568,42.70364 c -3.34529,-3.146404 -7.52691,-4.719577 -11.70853,-4.719577 H 92.233227 c -9.199567,0 -16.726422,7.079317 -16.726422,15.731861 V 455.66482 c 0,8.65249 7.526855,15.73186 16.726422,15.73186 H 420.90809 c 9.19956,0 16.72642,-7.07937 16.72642,-15.73186 V 157.54613 c -0.83633,-3.9329 -2.50897,-7.86586 -5.85427,-11.01227 z M 399.16367,164.6255 H 302.15024 V 73.380755 Z M 400,436 H 112.30499 V 72.594133 H 267.0247 V 177.21096 c 0,11.01235 10.03589,20.45145 21.74436,20.45145 H 400 Z"
+       fill="#bababa"
+       stroke="#bababa"
+       stroke-miterlimit="10"
+       id="path6"
+       style="stroke-width:8.11074" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/apk.svg b/retroshare-gui/src/gui/icons/filetype/apk.svg
new file mode 100644
index 000000000..81b468fc7
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/apk.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="apk.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       d="m 152,360 c 0,10.92225 7.23211,17.6436 16.87496,17.6436 h 16.87501 v 62.17272 c 0,14.28298 12.05354,26.88552 25.71426,26.88552 13.66067,0 25.71426,-12.60254 25.71426,-26.88552 V 377.6436 h 34.55352 v 62.17272 c 0,14.28298 12.05359,26.88552 25.71427,26.88552 13.66071,0 25.71426,-12.60254 25.71426,-26.88552 V 377.6436 h 16.87501 c 10.44638,0 16.87494,-7.56153 16.87494,-17.6436 V 181.88356 H 152 Z M 109.41073,181.88356 c -13.66067,0 -25.71426,12.60254 -25.71426,26.88547 v 125.18565 c 0,14.28293 12.05359,26.88552 25.71426,26.88552 13.66072,0 25.71426,-12.60259 25.71426,-26.88552 V 208.76903 c 0,-14.28293 -12.05354,-26.88547 -25.71426,-26.88547 z m 290.89258,0 c -13.66067,0 -25.71425,12.60254 -25.71425,26.88547 v 125.18565 c 0,14.28293 12.05358,26.88552 25.71425,26.88552 13.66068,0 25.71426,-12.60259 25.71426,-26.88552 V 208.76903 c 0,-14.28293 -12.05358,-26.88547 -25.71426,-26.88547 z M 314.32122,77.702197 336.82125,54.177382 c 3.2143,-3.360657 3.2143,-9.241913 0,-12.602586 -3.21429,-3.360659 -8.83929,-3.360659 -12.05358,0 l -25.71425,26.88554 c -12.05355,-8.401738 -27.32141,-11.762408 -44.19637,-11.762408 -16.87501,0 -32.14284,3.36067 -45.80355,10.922202 L 184.94637,40.73466 c -3.21427,-1.680386 -10.44639,-1.680386 -13.66067,0 -1.60714,3.360673 -1.60714,10.922211 0,14.282928 l 22.49998,23.524803 C 169.67856,97.86632 152.80355,128.95271 152.80355,164.23991 h 204.91054 c 0,-36.12739 -17.67854,-68.053919 -43.39287,-86.537713 z m -94.01774,50.410323 h -16.87494 v -17.6436 h 16.87494 z m 85.98209,0 h -16.87501 v -17.6436 h 16.87501 z"
+       fill="#a4ca39"
+       id="path6"
+       style="stroke-width:8.21667" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/archive.svg b/retroshare-gui/src/gui/icons/filetype/archive.svg
new file mode 100644
index 000000000..dc7f6ed1a
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/archive.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="archive.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       class="st1"
+       d="M 437.01264,162.69226 H 371.38029 V 99.13943 Z M 260.05457,99.13943 v 231.6863 H 437.84343 V 177.97712 H 355.59528 V 98.33497 H 260.05457 Z M 287.47059,38 H 91.404298 V 83.050099 H 168.66772 L 119.65113,119.2511 v 38.61435 L 191.09902,104.7707 V 83.050099 H 441.16658 V 64.547355 Z m -95.54077,97.34043 -71.44789,53.09477 v 38.61436 l 71.44789,-53.09477 z m -72.27869,160.89328 71.44789,-53.09483 v -38.61434 l -71.44789,53.09476 z m 72.27869,16.08927 v -38.61434 l -71.44789,53.09476 v 20.91613 H 92.235099 v 45.0501 h 44.031851 v 30.56973 h -26.58528 c -4.98475,-8.04466 -13.292629,-12.87147 -23.262111,-12.87147 -14.954162,0 -26.585228,11.26254 -26.585228,25.74295 0,14.48035 11.631066,25.74288 26.585228,25.74288 9.969482,0 18.277361,-4.82679 23.262111,-12.87147 h 25.75448 v 23.32954 h 39.87786 v -23.32954 h 25.75448 c 4.98475,8.04468 13.29263,12.87147 23.26209,12.87147 14.95423,0 26.58525,-11.26253 26.58525,-25.74288 0,-14.48041 -11.63102,-25.74295 -26.58525,-25.74295 -9.96946,0 -18.27734,4.82681 -23.26209,12.87147 H 175.31401 V 392.76963 H 287.47059 L 441.16658,366.22221 V 347.71953 H 143.74403 Z"
+       id="path8"
+       style="fill:#ff6600;fill-opacity:1;stroke-width:8.17523" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/audio.svg b/retroshare-gui/src/gui/icons/filetype/audio.svg
new file mode 100644
index 000000000..d56eee2cc
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/audio.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="audio.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       class="st0"
+       d="m 394.83072,259.83098 c -37.27142,-14.83963 -80.55432,3.70989 -96.18429,42.04559 -14.4276,38.33569 3.60695,82.85451 40.87831,98.9308 7.21381,3.70988 15.62993,4.94655 24.04606,4.94655 42.08067,1.23664 76.94741,-32.15252 76.94741,-74.19815 V 36 c -2.40461,0 -3.60688,1.236649 -6.01151,1.236649 -81.75658,23.496066 -162.31095,48.228781 -244.06753,71.724841 -7.21381,2.47325 -7.21381,6.18314 -7.21381,12.36634 v 207.75468 c -6.01156,-2.47323 -8.41613,-3.70988 -13.22536,-4.94654 -30.05757,-11.12972 -56.50825,-4.94654 -78.149688,17.31289 -21.641489,21.02281 -27.653018,53.1753 -15.629995,81.61792 15.629995,38.33571 58.912873,56.88521 96.184293,42.04559 27.65295,-12.36633 45.68752,-39.57233 45.68752,-70.48821 V 201.70911 c 0,-8.65644 2.40461,-11.12974 10.82075,-13.60298 39.67597,-11.12973 79.352,-23.49607 120.23033,-34.62581 l 57.71054,-17.31286 v 128.61006 c -6.01153,-2.4733 -8.41613,-3.7099 -12.02303,-4.94654 z"
+       id="path10-7"
+       style="fill:#d40000;fill-opacity:1;stroke-width:12.1935" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/c.svg b/retroshare-gui/src/gui/icons/filetype/c.svg
new file mode 100644
index 000000000..702863c5e
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/c.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="c.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       d="M 273.8718,470 C 160.51477,470 68.183607,373.19491 68.183607,254.34505 c 0,-118.84985 92.331163,-215.654945 205.688193,-215.654945 64.90602,0 124.32708,31.629383 163.63635,85.303475 L 362.54623,170 c -22.85422,-25.8786 -54.85015,-41.21406 -88.67443,-41.21406 -65.82023,0 -119.75624,56.54952 -119.75624,125.55911 0,69.00961 53.93601,125.55911 119.75624,125.55911 33.82428,0 65.82021,-15.33545 88.67443,-41.21405 l 74.96192,46.00636 C 398.19888,438.37062 338.77782,470 273.8718,470 Z"
+       fill="#215997"
+       id="path6"
+       style="stroke-width:9.36054" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/collection.svg b/retroshare-gui/src/gui/icons/filetype/collection.svg
new file mode 100644
index 000000000..4a6b79ddf
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/collection.svg
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="collection.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="235.39638"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <image
+       width="427.48892"
+       height="427.48892"
+       preserveAspectRatio="none"
+       xlink:href="data:image/png;base64,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
+AgAAAABJRU5ErkJggg==
+"
+       id="image1310"
+       x="40"
+       y="42.511078" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/cpp.svg b/retroshare-gui/src/gui/icons/filetype/cpp.svg
new file mode 100644
index 000000000..fbacc8635
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/cpp.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="cpp.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="172.55533"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       class="st2"
+       d="m 221.19222,436.58489 c -100.744,0 -182.801605,-83.76926 -182.801605,-186.61466 0,-102.84543 82.057605,-186.614635 182.801605,-186.614635 57.68406,0 110.49339,27.370153 145.42881,73.816435 L 300,176.98318 c -20.31128,-22.39374 -48.74709,-35.66417 -78.80778,-35.66417 -58.49654,0 -106.43115,48.93454 -106.43115,108.65122 0,59.7167 47.93461,108.6512 106.43115,108.6512 30.06069,0 58.4965,-13.27036 78.80778,-35.66413 l 66.62103,39.81116 c -34.12295,46.4463 -87.74475,73.81643 -145.42881,73.81643 z"
+       id="path8"
+       style="fill:#215997;stroke-width:8.20882" />
+    <path
+       class="st2"
+       d="m 374.84254,265.72883 h -26.54922 v 30.68775 h -27.2668 v -30.68775 h -26.54926 v -31.51717 h 26.54926 v -30.68774 h 27.2668 v 30.68774 h 26.54922 z m 94.71621,0 h -27.26676 v 30.68775 h -26.54928 v -30.68775 h -27.26679 v -31.51717 h 27.26679 v -30.68774 h 26.54928 v 30.68774 h 27.26676 z"
+       id="path10"
+       style="fill:#215997;stroke-width:7.71446" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/dll.svg b/retroshare-gui/src/gui/icons/filetype/dll.svg
new file mode 100644
index 000000000..7dbca1de8
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/dll.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="dll.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <g
+       id="g825"
+       transform="matrix(5.8449375,0,0,5.8449375,-36.819688,-38.509501)"
+       style="fill:#999999;fill-opacity:1">
+      <path
+         class="st1"
+         d="m 85,17.80577 -32.342122,4.348521 v 25.68345 H 85 Z M 46.67866,22.833745 14.336539,27.182267 V 47.837741 H 46.67866 Z M 14.472429,53.681065 V 74.336538 L 46.814554,78.68506 V 53.816956 Z m 38.185449,0 v 25.68345 L 85,83.713036 V 53.681065 Z"
+         id="path8"
+         style="stroke-width:1.3589;fill:#999999;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/document.svg b/retroshare-gui/src/gui/icons/filetype/document.svg
new file mode 100644
index 000000000..e2976b503
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/document.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="document.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       d="M 194,210.75499 H 312.51924 V 240 H 194 Z m 0,59.25965 h 118.51924 v 29.24495 H 194 Z m 0,59.25958 h 118.51924 v 29.24501 H 194 Z M 401.02383,62.990733 H 164.75498 c -32.32339,0 -59.25958,26.166571 -59.25958,59.259587 V 388.53387 H 46.235747 c 0,32.32339 26.16657,59.25959 59.259653,59.25959 h 237.03847 c 32.32339,0 59.25959,-26.16657 59.25959,-59.25959 V 151.49533 h 59.25965 V 122.25032 C 460.28349,89.157304 434.11692,62.990733 401.02383,62.990733 Z M 371.77888,383.14663 c 0,19.24006 -15.39213,34.63219 -34.63225,34.63219 H 120.1179 c 14.62245,-10.00487 14.62245,-29.24495 14.62245,-29.24495 V 122.25032 c 0,-16.1617 13.08331,-29.245015 29.24501,-29.245015 16.16175,0 29.24501,13.083315 29.24501,29.245015 v 29.24501 h 177.77889 v 231.6513 z M 224.01464,122.25032 V 93.005305 h 177.77882 c 26.93619,0 29.24501,16.931315 29.24501,29.245015 z"
+       fill="#999999"
+       stroke="#999999"
+       stroke-width="5.76151"
+       stroke-miterlimit="10"
+       id="path6" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/h.svg b/retroshare-gui/src/gui/icons/filetype/h.svg
new file mode 100644
index 000000000..bf4963ba8
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/h.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="h.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="254.96982"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       d="m 94.05987,75.174125 h 70.89821 V 228.01688 h 177.2455 V 75.174125 h 70.89821 V 435.06556 H 342.20358 V 284 H 164 V 435.06556 H 93.10179 V 75.174125 Z"
+       fill="#215997"
+       stroke="#215997"
+       stroke-width="16.1472"
+       stroke-miterlimit="10"
+       id="path6" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/img.svg b/retroshare-gui/src/gui/icons/filetype/img.svg
new file mode 100644
index 000000000..66f8c4018
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/img.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="img.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="291.02616"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       class="st1"
+       d="m 115.25649,121.16791 c -75.979156,75.09075 -75.979156,196.15562 0,271.24645 75.97911,75.09082 198.47606,75.09082 274.4552,0 75.9791,-75.09083 75.9791,-196.1557 0,-271.24645 -75.97914,-74.324594 -198.47609,-74.324594 -274.4552,0 z m 286.85994,216.07767 c -6.97764,13.02595 -16.28119,24.51942 -27.13541,35.24672 -10.85414,10.72724 -23.2589,19.92206 -35.66365,26.81811 l -44.96722,-85.05179 c 0,0 3.87645,-1.53252 12.40474,-9.19483 8.52829,-8.42855 10.07882,-12.25977 10.07882,-12.25977 z M 286.59716,223.07687 c 9.30356,9.19478 13.95535,21.45454 13.95535,33.71425 0,12.25967 -4.65179,24.51945 -13.95535,33.71423 -18.60712,18.38958 -49.61905,18.38958 -68.22613,0 -9.30359,-9.19478 -13.95536,-21.45456 -13.95536,-33.71423 0,-12.25971 4.65177,-24.51947 13.95536,-33.71425 a 47.293134,46.740206 0 0 1 68.22613,0 z m -65.90028,-33.71428 c 0,0 -9.30355,5.36361 -17.05651,13.79221 -6.97771,7.66233 -7.753,9.19479 -10.07889,13.02594 l -85.28267,-45.20772 c 6.97768,-13.02596 16.28121,-24.51945 27.13539,-35.24672 10.85418,-10.72725 23.25889,-19.92209 35.6637,-26.81817 z"
+       id="path10"
+       style="fill:#cc9966;stroke-width:7.70751" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/patch.svg b/retroshare-gui/src/gui/icons/filetype/patch.svg
new file mode 100644
index 000000000..2df822b37
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/patch.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="patch.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="251.87928"
+     inkscape:cy="225.09457"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <g
+       id="g30"
+       transform="matrix(0.89249979,0,0,0.89249979,30.096296,27.413883)"
+       style="fill:#c83737;fill-opacity:1">
+      <path
+         d="m 338.294,304.354 -67.881,67.881 c -2.929,2.929 -2.929,7.678 0,10.606 1.464,1.464 3.384,2.197 5.303,2.197 1.919,0 3.839,-0.732 5.303,-2.197 L 348.9,314.96 c 2.929,-2.929 2.929,-7.678 0,-10.606 -2.928,-2.929 -7.677,-2.929 -10.606,0 z"
+         id="path2"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 372.235,270.412 -11.313,11.313 c -2.929,2.929 -2.929,7.678 0,10.606 1.464,1.464 3.384,2.197 5.303,2.197 1.919,0 3.839,-0.732 5.303,-2.197 l 11.313,-11.313 c 2.929,-2.929 2.929,-7.678 0,-10.606 -2.928,-2.929 -7.677,-2.929 -10.606,0 z"
+         id="path4"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 219.144,147.454 c 1.919,0 3.839,-0.732 5.303,-2.197 l 11.317,-11.317 c 2.929,-2.929 2.929,-7.678 0,-10.606 -2.929,-2.929 -7.678,-2.929 -10.606,0 l -11.317,11.317 c -2.929,2.929 -2.929,7.678 0,10.606 1.464,1.464 3.384,2.197 5.303,2.197 z"
+         id="path6"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 201.82,157.277 c -2.929,-2.929 -7.678,-2.929 -10.606,0 l -67.88,67.881 c -2.929,2.929 -2.929,7.678 0,10.606 1.464,1.464 3.384,2.197 5.303,2.197 1.919,0 3.839,-0.732 5.303,-2.197 l 67.88,-67.881 c 2.929,-2.928 2.929,-7.677 0,-10.606 z"
+         id="path8"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 410.772,253.088 90.863,-90.863 c 2.928,-2.928 4.541,-6.82 4.541,-10.96 0,-4.14 -1.612,-8.033 -4.54,-10.96 L 365.872,4.54 C 362.944,1.612 359.052,0 354.912,0 c -4.141,0 -8.033,1.612 -10.96,4.54 L 253.089,95.403 162.225,4.541 C 159.297,1.612 155.405,0 151.265,0 c -4.14,0 -8.033,1.612 -10.96,4.54 L 4.54,140.304 c -2.928,2.928 -4.54,6.82 -4.54,10.96 0,4.141 1.612,8.033 4.54,10.96 L 95.403,253.087 4.541,343.951 C 1.612,346.878 0,350.771 0,354.911 c 0,4.14 1.612,8.033 4.54,10.96 l 135.764,135.764 c 2.928,2.928 6.82,4.54 10.96,4.54 4.141,0 8.033,-1.612 10.96,-4.54 l 90.863,-90.863 90.863,90.863 c 0,0 0,0 0,0 2.927,2.928 6.82,4.54 10.96,4.54 4.14,0 8.033,-1.612 10.96,-4.54 L 501.634,365.871 c 2.928,-2.928 4.54,-6.82 4.54,-10.96 0,-4.141 -1.612,-8.033 -4.54,-10.96 z M 354.558,15.146 C 354.594,15.11 354.704,15 354.911,15 c 0.207,0 0.318,0.11 0.354,0.146 L 491.029,150.91 c 0.036,0.036 0.146,0.147 0.146,0.354 0,0.207 -0.11,0.317 -0.146,0.354 L 400.166,242.481 263.694,106.01 Z M 151.618,491.03 c -0.036,0.036 -0.146,0.146 -0.353,0.146 -0.207,0 -0.318,-0.11 -0.354,-0.146 L 15.146,355.265 C 15.11,355.229 15,355.118 15,354.911 c 0,-0.207 0.11,-0.317 0.146,-0.354 l 90.863,-90.863 136.472,136.472 z M 491.029,355.265 355.265,491.029 c -0.036,0.036 -0.147,0.146 -0.354,0.146 -0.207,0 -0.317,-0.11 -0.353,-0.146 0,0 0,0 0,0 L 15.146,151.618 C 15.11,151.582 15,151.471 15,151.265 c 0,-0.207 0.11,-0.318 0.146,-0.354 L 150.911,15.146 C 150.947,15.11 151.058,15 151.265,15 c 0.207,0 0.317,0.11 0.354,0.146 L 491.03,354.558 c 0.036,0.036 0.146,0.146 0.146,0.353 0,0.207 -0.111,0.318 -0.147,0.354 z"
+         id="path10"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 236.471,190.509 c 4.438,4.438 10.34,6.883 16.617,6.883 6.277,0 12.179,-2.445 16.617,-6.883 9.163,-9.163 9.163,-24.071 0,-33.234 -4.438,-4.438 -10.34,-6.883 -16.617,-6.883 -6.277,0 -12.179,2.445 -16.617,6.883 -9.162,9.163 -9.162,24.071 0,33.234 z m 10.607,-22.628 c 1.605,-1.605 3.739,-2.49 6.01,-2.49 2.271,0 4.405,0.884 6.01,2.49 3.314,3.314 3.314,8.707 0,12.021 v 0 c -1.605,1.605 -3.739,2.49 -6.01,2.49 -2.271,0 -4.405,-0.884 -6.01,-2.49 -3.314,-3.314 -3.314,-8.706 0,-12.021 z"
+         id="path12"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 276.069,230.107 c 4.581,4.582 10.599,6.872 16.617,6.872 6.018,0 12.036,-2.291 16.617,-6.872 9.163,-9.163 9.163,-24.071 0,-33.234 -9.162,-9.163 -24.072,-9.162 -33.234,0 -9.163,9.163 -9.163,24.071 0,33.234 z m 10.606,-22.628 c 1.657,-1.657 3.834,-2.485 6.01,-2.485 2.177,0 4.354,0.828 6.011,2.485 3.314,3.314 3.314,8.707 0,12.021 -3.314,3.314 -8.706,3.315 -12.021,0 -3.314,-3.314 -3.314,-8.706 0,-12.021 z"
+         id="path14"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 315.667,236.471 c -4.438,4.438 -6.883,10.34 -6.883,16.617 0,6.277 2.445,12.179 6.883,16.617 4.581,4.582 10.599,6.872 16.617,6.872 6.018,0 12.036,-2.291 16.617,-6.872 4.438,-4.438 6.883,-10.34 6.883,-16.617 0,-6.277 -2.445,-12.179 -6.883,-16.617 -9.164,-9.163 -24.072,-9.163 -33.234,0 z m 22.627,22.627 v 0 c -3.314,3.315 -8.707,3.314 -12.021,0 -1.605,-1.605 -2.49,-3.739 -2.49,-6.01 0,-2.271 0.884,-4.405 2.49,-6.01 1.657,-1.657 3.833,-2.485 6.01,-2.485 2.177,0 4.354,0.829 6.011,2.486 1.605,1.605 2.49,3.739 2.49,6.01 0,2.271 -0.884,4.404 -2.49,6.009 z"
+         id="path16"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 230.107,196.873 c -9.162,-9.162 -24.071,-9.163 -33.234,0 -9.163,9.163 -9.163,24.071 0,33.234 4.581,4.582 10.599,6.872 16.617,6.872 6.018,0 12.036,-2.291 16.617,-6.872 9.163,-9.163 9.163,-24.071 0,-33.234 z M 219.5,219.5 c -3.314,3.315 -8.707,3.314 -12.021,0 -3.314,-3.314 -3.314,-8.707 0,-12.021 1.657,-1.657 3.834,-2.485 6.011,-2.485 2.176,0 4.353,0.828 6.01,2.485 3.314,3.315 3.314,8.707 0,12.021 z"
+         id="path18"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 253.088,276.588 c 6.277,0 12.178,-2.445 16.617,-6.883 v 0 c 4.438,-4.438 6.883,-10.34 6.883,-16.617 0,-6.277 -2.445,-12.179 -6.883,-16.617 -4.438,-4.438 -10.34,-6.883 -16.617,-6.883 -6.277,0 -12.179,2.445 -16.617,6.883 -4.438,4.438 -6.883,10.34 -6.883,16.617 0,6.277 2.445,12.179 6.883,16.617 4.438,4.438 10.34,6.883 16.617,6.883 z m -6.01,-29.51 c 1.605,-1.605 3.739,-2.49 6.01,-2.49 2.271,0 4.405,0.884 6.01,2.49 1.605,1.605 2.49,3.739 2.49,6.01 0,2.271 -0.884,4.405 -2.49,6.01 v 0 c -1.605,1.605 -3.739,2.49 -6.01,2.49 -2.271,0 -4.405,-0.884 -6.01,-2.49 -1.605,-1.605 -2.49,-3.739 -2.49,-6.01 0,-2.271 0.884,-4.405 2.49,-6.01 z"
+         id="path20"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 292.686,316.175 c 6.018,0 12.036,-2.291 16.617,-6.872 9.163,-9.163 9.163,-24.071 0,-33.234 -9.162,-9.163 -24.072,-9.162 -33.234,0 -9.163,9.163 -9.163,24.071 0,33.234 4.581,4.581 10.599,6.872 16.617,6.872 z m -6.011,-29.5 c 1.657,-1.657 3.834,-2.485 6.01,-2.485 2.177,0 4.354,0.828 6.011,2.485 3.314,3.314 3.314,8.707 0,12.021 -3.314,3.314 -8.706,3.315 -12.021,0 -3.314,-3.314 -3.314,-8.706 0,-12.021 z"
+         id="path22"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 197.392,253.088 c 0,-6.277 -2.445,-12.179 -6.883,-16.617 -9.163,-9.164 -24.072,-9.163 -33.234,0 -4.438,4.438 -6.883,10.34 -6.883,16.617 0,6.277 2.445,12.179 6.883,16.617 4.581,4.582 10.599,6.872 16.617,6.872 6.018,0 12.036,-2.291 16.617,-6.872 4.438,-4.438 6.883,-10.34 6.883,-16.617 z m -17.49,6.01 v 0 c -3.314,3.315 -8.707,3.314 -12.021,0 -1.605,-1.605 -2.49,-3.739 -2.49,-6.01 0,-2.271 0.884,-4.405 2.49,-6.01 1.657,-1.657 3.833,-2.485 6.01,-2.485 2.177,0 4.354,0.829 6.011,2.486 1.605,1.605 2.49,3.739 2.49,6.01 0,2.271 -0.884,4.404 -2.49,6.009 z"
+         id="path24"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 230.107,276.069 c -9.162,-9.162 -24.071,-9.163 -33.234,0 -9.163,9.163 -9.163,24.071 0,33.234 4.581,4.582 10.599,6.872 16.617,6.872 6.018,0 12.036,-2.291 16.617,-6.872 9.163,-9.163 9.163,-24.072 0,-33.234 z M 219.5,298.696 c -3.314,3.315 -8.707,3.314 -12.021,0 -3.314,-3.314 -3.314,-8.707 0,-12.021 1.657,-1.657 3.834,-2.485 6.011,-2.485 2.176,0 4.353,0.828 6.01,2.485 3.314,3.315 3.314,8.707 0,12.021 z"
+         id="path26"
+         style="fill:#c83737;fill-opacity:1" />
+      <path
+         d="m 269.705,315.667 c -4.438,-4.438 -10.34,-6.883 -16.617,-6.883 -6.277,0 -12.179,2.445 -16.617,6.883 -9.163,9.163 -9.163,24.071 0,33.234 4.438,4.438 10.34,6.883 16.617,6.883 6.277,0 12.179,-2.445 16.617,-6.883 9.162,-9.163 9.162,-24.071 0,-33.234 z m -10.607,22.627 v 0 c -1.605,1.605 -3.74,2.49 -6.01,2.49 -2.27,0 -4.405,-0.884 -6.01,-2.49 -3.314,-3.314 -3.314,-8.707 0,-12.021 1.605,-1.605 3.739,-2.49 6.01,-2.49 2.271,0 4.405,0.884 6.01,2.49 3.314,3.315 3.314,8.707 0,12.021 z"
+         id="path28"
+         style="fill:#c83737;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/pdf.svg b/retroshare-gui/src/gui/icons/filetype/pdf.svg
new file mode 100644
index 000000000..3be7f47a8
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/pdf.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="pdf.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="234.3662"
+     inkscape:cy="291.02616"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       d="m 227.61799,66.533138 c -23.92774,0 -43.06997,19.825488 -43.06997,43.069922 0,29.39662 16.40766,65.63132 33.49885,100.49658 -13.67352,41.70357 -28.03019,86.82315 -47.85547,124.42422 -39.65254,15.72489 -75.202442,27.34695 -95.710916,45.12129 l -1.368222,1.3679 c -7.519857,8.20316 -12.305417,18.45754 -12.305417,30.07964 0,23.92779 19.82549,43.06992 43.069925,43.06992 11.62232,0 23.2447,-4.10063 30.08125,-12.30542 0,0 1.3664,0 1.3664,-1.36633 15.72479,-18.45894 34.18372,-53.32591 51.27464,-83.40562 37.59978,-14.35661 78.62005,-30.08119 115.53652,-39.65231 28.03021,23.2447 69.04892,37.60133 102.54778,37.60133 23.92768,0 43.06992,-19.82705 43.06992,-43.06992 0,-23.92797 -19.82544,-43.07021 -43.06992,-43.07021 -27.34696,0 -65.63138,9.57112 -95.02798,19.8255 -23.92768,-23.24449 -45.80418,-51.27309 -62.89515,-81.35434 10.93747,-36.91646 24.61083,-71.10018 24.61083,-98.44532 -1.3664,-23.927741 -19.82526,-42.386832 -43.75307,-42.386832 z m 0,24.611048 c 9.57112,0 16.40767,7.519805 16.40767,16.407674 0,12.30557 -7.51986,36.23332 -14.35657,61.52906 -10.25582,-25.29574 -19.82694,-49.22349 -19.82694,-61.52906 0.68471,-8.202954 8.20472,-16.407674 17.77584,-16.407674 z m 7.51993,146.985664 c 12.30535,21.19317 28.02998,39.6507 45.12111,56.05865 -25.29569,7.51986 -49.90668,15.72452 -75.20243,25.29569 12.30702,-25.97894 21.19345,-54.00905 30.08132,-81.35434 z M 404,293.50525 c 9.57117,0 16.40799,7.5198 16.40799,16.40783 0,9.57111 -7.52147,16.40788 -16.40799,16.40788 -19.82684,0 -47.17219,-8.20477 -69.04866,-21.19345 25.29414,-4.78555 53.32414,-11.62226 69.04866,-11.62226 z m -255.6853,76.56873 c -12.30536,21.87652 -23.92774,41.70357 -32.13246,51.95794 -3.41739,3.41739 -6.1519,4.1023 -11.62216,4.1023 -9.571122,0 -16.407834,-7.52146 -16.407834,-16.40793 0,-4.1022 2.051153,-9.57107 4.102198,-11.62205 8.887976,-8.20483 30.764506,-17.77589 56.060256,-28.03026 z"
+       fill="#c11e07"
+       stroke="#c11e07"
+       stroke-width="8.54576"
+       stroke-miterlimit="10"
+       id="path6" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/picture.svg b/retroshare-gui/src/gui/icons/filetype/picture.svg
new file mode 100644
index 000000000..72d6f7c6e
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/picture.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="picture.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="233.33602"
+     inkscape:cy="208.61167"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       class="st0"
+       d="M 42,91.310929 V 421.06544 H 470 V 91.310929 Z M 445.68181,115.62912 V 259.59274 L 343.54545,181.77453 231.68181,293.63823 152.89092,249.86544 67.290915,317.95641 V 115.62912 Z"
+       id="path10-8"
+       style="fill:#9933cc;fill-opacity:1;stroke:none;stroke-width:9.72713;stroke-opacity:1" />
+    <circle
+       class="st0"
+       cx="111.14708"
+       cy="160.64659"
+       r="20.453379"
+       id="circle12"
+       style="fill:#9933cc;fill-opacity:1;stroke:none;stroke-width:6.59777;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/program.svg b/retroshare-gui/src/gui/icons/filetype/program.svg
new file mode 100644
index 000000000..7ae7e7305
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/program.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 100 100"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="program.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="5.2"
+     inkscape:cx="49.903846"
+     inkscape:cy="73.173077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid911" />
+  </sodipodi:namedview>
+  <style
+     id="style2">.st1{fill:#999}</style>
+  <path
+     class="st0"
+     d="m 85.8,14.8 h -71 v 71 h 71 z M 29,28.81316 h -7.1 v -7.1 H 29 Z m 49.7,0 H 35.91316 v -7.1 H 78.7 Z m 0,49.7 H 21.71316 V 36.1 H 78.7 Z"
+     id="path10"
+     style="fill:#999999;stroke-width:1.8684" />
+  <path
+     class="st0"
+     d="m 32.923678,42.078947 -5.044731,5.044731 8.221053,8.221054 -8.221053,8.034215 5.044731,5.044731 13.265804,-13.078946 z m 11.771054,23.915785 h 14.2 v 7.1 h -14.2 z"
+     id="path12"
+     style="fill:#999999;stroke-width:1.8684" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/filetype/video.svg b/retroshare-gui/src/gui/icons/filetype/video.svg
new file mode 100644
index 000000000..0dd6c78c7
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/filetype/video.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg9"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="video.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     id="namedview11"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="0.97070312"
+     inkscape:cx="233.33602"
+     inkscape:cy="208.61167"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g15">
+    <inkscape:grid
+       type="xygrid"
+       id="grid381" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g15">
+    <path
+       style="fill:#000000"
+       id="path117"
+       d="" />
+    <path
+       class="st1"
+       d="M 39.880941,80 V 429.45344 H 460.00005 V 80 Z M 118.83433,402.74363 H 66.681655 v -53.41968 h 52.152675 z m 0,-80.12943 H 66.681655 v -53.41962 h 52.152675 z m 0,-80.87145 H 66.681655 v -53.41963 h 52.152675 z m 0,-80.87141 H 66.681655 v -53.41957 h 52.152675 z m 78.95341,188.45261 V 160.87134 L 328.8939,255.0977 Z m 236.13596,53.41968 h -52.15277 v -53.41968 h 52.15277 z m 0,-80.12943 h -52.15277 v -53.41962 h 52.15277 z m 0,-80.87145 h -52.15277 v -53.41963 h 52.15277 z m 0,-80.87141 h -52.15277 v -53.41957 h 52.15277 z"
+       id="path8"
+       style="fill:#00b400;fill-opacity:1;stroke:none;stroke-width:7.33046" />
+  </g>
+</svg>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index a0c74bb77..de468d270 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -85,14 +85,6 @@
     <file>images/closepressed.png</file>
     <file>images/denied16.png</file>
     <file>images/filetype-association.png</file>
-    <file>images/FileTypeAny.png</file>
-    <file>images/FileTypeArchive.png</file>
-    <file>images/FileTypeAudio.png</file>
-    <file>images/FileTypeCDImage.png</file>
-    <file>images/FileTypeDocument.png</file>
-    <file>images/FileTypePicture.png</file>
-    <file>images/FileTypeProgram.png</file>
-    <file>images/FileTypeVideo.png</file>
     <file>images/foldermail.png</file>
     <file>images/folderopen.png</file>
     <file>images/fileopen.png</file>
@@ -284,12 +276,6 @@
     <file>images/loader/indicator-32.gif</file>
     <file>images/loader/circleball-16.gif</file>
     <file>images/loader/progress.gif</file>
-    <file>images/mimetypes/pdf.png</file>
-    <file>images/mimetypes/rscollection-16.png</file>
-    <file>images/mimetypes/patch.png</file>
-    <file>images/mimetypes/source_c.png</file>
-    <file>images/mimetypes/source_cpp.png</file>
-    <file>images/mimetypes/source_h.png</file>
     <file>images/thumb-default-video.png</file>
     <file>images/user/add_user24.png</file>
     <file>images/user/add_user48.png</file>
diff --git a/retroshare-gui/src/gui/images/FileTypeAny.png b/retroshare-gui/src/gui/images/FileTypeAny.png
deleted file mode 100644
index 34e64b73ceb5ca6a606817379746b2f606b36a29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb00007bV*G`2iFD_
z6BiUJQJMGv000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0005%Nkl<Z
zc-obcziSjh6vw~2Ib)1z?QQ%cgj9i)F@>!lY5ZMSgn%YUNGI4Ng^1V*LPT2|dy%UW
z^osLGz@*4sZqHnDvwOEQv-5m2bNfRMQ6D_szS;La@5c;KmA!UKg%h-nCDp&xyeASx
z?VhAN_g+w7559A(7#e(yrZ6t+FZbxUFX_gur=ECiwN3|7N?#6#?x5D#Z9{Omq*4-_
z?+z(VHQ8!Cp=kNxtKx6ysy4fvWe`hp_U`?wc>mE*5zuUO5Hr%M#S1PsthtWiMrrJ{
zF~7KtnX?k-&L~VzN>+t`7o{{MLq(^tqVB1rrRN`hZ&GE%3P`q66Q*`QV`Xi-Y*K2t
zA4>bc<ww^GdaWds6wS65b<2Qsl&OuScv>t5Rf4D3Qh6C6k}_a!;SFYZ_VdLa6x&IE
z^?5T7UjHC623C#9zz%{SKoCwKWKH%zVQb||fIrFOw+HS*?Y``#p774>yNGyiofAnn
zZ$G1YJ)_G{npDjT^N*iV;)Zo|jJ6^(Ka)LQ-B`kfiy9lVmx>)1Gv)xBWZy_;z?PgP
z>k~%jK2P-e7z1=WiCeD?@c?hL5y%+t4<;DU7vq4VmT>E@Rx3I%r7yz(Njw+_bXqY|
p&Mp&tk};*953aQSkEi?>`2{k}jT!a48`S^+002ovPDHLkV1hRN2e1GD

diff --git a/retroshare-gui/src/gui/images/FileTypeArchive.png b/retroshare-gui/src/gui/images/FileTypeArchive.png
deleted file mode 100644
index b982beb6c0a8bf34d0129ee9f4a6b6da0b27b603..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 706
zcmV;z0zLhSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb00007bV*G`2iFD_
z5-uCHsAJ>+000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0006}Nkl<Z
zc-oayO=uHA6#gbVNr>j6Mx?>Cs3%cR5fpn;K`D3>JbEpH6cNO$hkBBF(L*VSco7d$
z3WX|IL~AOF7HLdNrEQ3tCQuTI`D@zj&-2YrQe#xm2akC>``)+T_suNO8Lvh_+Ycf;
z0h*oVLOoIW6y?&rNIZU`Hzsd^s#RdEfZs#VD#-1-h-bIQk<SxkdJYJ0gdqfBKGSM@
zJ$i^94e4)sprx#zWWYj`ftwqE#aZO;k^6vD4ZdXyG5|QS8_3MuLAeYl7XABL4XG3m
z3IRJCb0`*ptu3I@04A2YC_cPu(A~=&djBQF%TdsYOH8cB1na!k^}6&<V&JANWQ>XI
z*kr$=*H}RVsmTP)#Rb%Awuc};d<1%S1HtS)eE#I1&eMj$%6$40awQ9odBE>rlaVY7
za9y2VLoy8%*!3X$P^st!)!1yd8lEN~4(<h=Ij$QVNBi*LMVFkR0npeW=<KmyeGu*9
zTpV<?4~WKq^ZiVcoi+TLY?V1?R)MJ*c0CWgU-&ua73Lez{`fACJj~?R;8-SH=IAhA
zM{yOsu$xh=FISNJQbK-ZooTul9E0%Avdri`{t|rtw=jY%EW8J`;1w*655uyRV3P+-
zPn#02Y;05T0H*l%Mk4x!O6mIs=fHQbO9=cil4b{hx?1WilwQd@2Cso|&f8b#VcXh%
zm8w=wyVL<N%zq2Hpwn?43}}#$@zpyPB0Zq84d8M;o$NY=c3i&zI(bAfh@f03ZUdB<
o&GbC*Jc+-EQa>=!|J`+tA5+N_yCSCpvj6}907*qoM6N<$g4O*wW&i*H

diff --git a/retroshare-gui/src/gui/images/FileTypeAudio.png b/retroshare-gui/src/gui/images/FileTypeAudio.png
deleted file mode 100644
index 988b27bf7ba4520f602bc0dcf53c6d155dd9d323..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb00007bV*G`2iFD_
z5;+^NE9Y_m000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0005UNkl<Z
zc-muNzz^1m3;u_5jyIGeI2RcNz?}aEe*dxS-NeiQmN_9U|DOrOU}xZ9*qf687G&AZ
z&HZ0ZPLF}@`9B8frw<t!k+mM+;`lH4jf3G1>qmy`V*eRz7^JbA4c8zo4Y6ZqZruO%
z5<>rl|8jsO_A#*j2RT(<#TcUUFwg;SEOEJ+06=jh$k;CoKNv3a1F-@N!_<p^P~;gN
zrRD!Wv~&u2R>1+tgl%rN|JSlIB23!p<p>u5v5zuv{J+j24N<Vo*99y9iy{!XFKPP!
ze|ay$g!}sT|9|8)V|5%O1CapaHrCsZ86H2m#c=J(RR)&_EDSa`t})^?02FWXe+3vo
z;RXUPSbs7w=_)aByE!p%=;|}Dm31>%08;}_8+S5u;0;euLIBY$xD>Gd{fprR=Bqau
z*jU*ae!P9dz`A}v1BL;IO4I%`e*Xn#f19@!Nc;w~w<m}F|1oPR!;d4!8F>D(0#i6M
z1GAPo1H;pY5CgWQNB!q|_m$y8-z>NSL17V~0iVGJ2;O<Z@blm~25|-f27Xpv23}KR
z1{NnP28L@FAvRyCt@;m3!}nOE|G%{g`2RaHhr%>PBme-g1GdY^EU+8^0000<MNUMn
GLSTZuwCzIx

diff --git a/retroshare-gui/src/gui/images/FileTypeCDImage.png b/retroshare-gui/src/gui/images/FileTypeCDImage.png
deleted file mode 100644
index cb3ae8289de47baa7142a045ce1a2d0370d33872..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 648
zcmV;30(bq1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb00007bV*G`2iFD_
z5<3-TrKtA+000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0006PNkl<Z
zc-obd%WD%+6vlrUCo!NDswh&aORb=S-AD;V3W~0TEVO~{<3bneA7TZ~CL8IZG_lZy
zxTs1+ELC(PRxxVTmZmWktWNW=NyyCg+?h<ASn=_}H}`e!J?DJq3<RMB?M3MNGo`{I
zndsGm9PN^Et_X(Ss5PNW#<$rNn{jh&N?CGczUsYbG!Dm^&Q7vdHMu%^Ly=4-)v8#0
z3;Oi0YSe{#t_|II^k?jqQe9DqZTrN%nMdqDk>L3XRA*COSZnuF*bX>*dPoePrF%CV
z=!G}AdG7@uZV-3}>2x~8KSKxP2U%(b*<tXarc^-=Y++vbaP_B=q5b9-p;Cc~@hsuO
z3a|6f?2o&b-7MCtutP!`85!om>|-}0T22fdadfM=DMQ1tIg>cYu|6oz1S+B3EQ#-R
z;dkLzVTY1_CVdBwxbrKQFShr8D~2{6h@I}(donluXYqWkisF7vSkbaLjw;KjtG_6G
z+2|~^h8gtOdos?l1>MqbJ))0e+eE~)9ya;#8LX11ax~6BtBZ9+u8caj`k^@Q3-EM7
zB;9bhow<c+nndLC-H9yy+nW^S@md3Hse!MD*%o7qr+rw4oMmuo=s20oq-=#48jSHp
zO!w{d9&jR1`c(s6iaQ0b4fOx8EIC`P_R!@iwsd$W^t*CX6@sNYf9V2Izf}aI*HTnB
iD&&_w{%0%y1wR1um{S&vnXZNa0000<MNUMnLSTX*?kQgY

diff --git a/retroshare-gui/src/gui/images/FileTypeDocument.png b/retroshare-gui/src/gui/images/FileTypeDocument.png
deleted file mode 100644
index 41d20a5c33e3dd3d374c94f50c38f311ea13785b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 635
zcmV->0)+jEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb00007bV*G`2iFD_
z69_6MYKqMO000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0006CNkl<Z
zc-oax&ubGw6#iygW2?P-)=U3@;zh-i;z6XI^lICSKklWV7LncrFM5#1Lrn=*lmsEt
z9`q=b(jpjY#DJF89&AjaNi*3rGrRMgnN4<6_F(&9_U-%i&3oTGpjS3ZZHla9GD*2L
zMa&r7mGm+_hx~e96wPn7DD#O3F?pEYpuY`4H*Y_)QRn-&3b;l;JrdMAg?!06_Q{i_
zU({}UWNxc*Nt5>$!i;|N`BAJQwVkt$E7!&`e6oQLD~c|iahPMA#X>nmTg;?z?(!J+
z`dNff_*}x~*Fg*&6&O4sk$soMv4q6IMM{s{JxRMwN!49J6VI2!CT$PWC#2`+AhZ@9
zVIcnnQ`4_0Ob}j>oqhE}Cj*lY#t=goy*_Ro?G8$<QjMn29N9{ntkFI$&ZEg&y$Hbj
zw<+r|!I6tMz_}YCTo}z@D3QSN4iCAdS*;T`fpwd?`(}$sDVU>_4{d-k2Ilm^(Z~I{
zj;B*s!~B>$%5K{SHGG*zt!vKAUQ{%1<+`9-cV=mI)u*$Mi~Cl=>HhqwxOP}WnPJ5o
z;hUk!`tQ$7;KV5pGv|jxj>8$d0H#RkkguRMS#7pfyF31%j@KH90aVMb<=><P0D<;9
zKuQI6OD{HW@HoKl9d4ha_qMPD71_dJaGR|-KzXNWw;(DAij<1%?%>k%4zbGrk$>tp
VX=83?c>MqX002ovPDHLkV1jn9Bo+Vw

diff --git a/retroshare-gui/src/gui/images/FileTypePicture.png b/retroshare-gui/src/gui/images/FileTypePicture.png
deleted file mode 100644
index 7e9bb14f6ef13f9244c6d27b387706564f480028..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 703
zcmV;w0zmzVP)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb00007bV*G`2iFD_
z6A~t$@jN{M000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0006`Nkl<Z
zc-qC2TS${(7{~vg+qBIfJ7IJYff(40)XnZHs+-*!qzs}1A#`J26(VIc%!{SC;TDrQ
zaGkJ`5P@ZMQ)EPkS>zPTBR1Lcu+}&C?c3q|_k9~$qIX{OyLjO_z3=~d-{%GX<;P5z
ze=VQSN1Pcgc%om9lIN=!i9{%94v)vfsl6c>gFCSvuh+}5&?|-yl@{u=*(}{|H<LeS
zX}fW~;GCYCVW*=bZwM=;e!rjTOa@tnNJ&XFHZ%yU2~>F>*pE2R;h^OTc9kfo>=JQF
z>Oql~;BYu#K0PB$EbKvJ@GuVa?Za@L070k6=2;b~b+0oNLzZP2bVaDIuV0PjMTYu7
zvBypxD`8x<?RI;i=kD%qe!Q>e(7oeaOr$v)Ss<>>^Tmg$e1bls_Wmx`38T@7Dmj52
znH;LJv$!3YTQ7)dvf_!J-k~nG-D>5Up!Qai6O(*CIKbws&BXtqxA!i;O+>juZu&cU
zwwkGdM^sdMcqBxp)45)r%jM#-lw*7`%();q{uKQ5(#iRl#JJhWSOxf|_5>yQ7b!+L
z_H~#Y?d^qY)E0xmfMP=tmgF)FetrOxX$vezERZD;iT-izp<p&CD7hJfqANpnE)8qx
za{loAG$oTsyd8Rt{(u)3FIWX@U5()Lx=~)f8wu$*9*2F1B?LS>nZupRARgAFv7E}R
zos|^=fdI96sXbK(|A-51k;@QM>epHTTDRJ;ZD~8iq==@bCSk)3G+J6(s7*#nQY#hp
lUnw~Vs#crLwqgFJ_ycF^M|*x46jA^H002ovPDHLkV1hY$KqdeH

diff --git a/retroshare-gui/src/gui/images/FileTypeProgram.png b/retroshare-gui/src/gui/images/FileTypeProgram.png
deleted file mode 100644
index 63b9f6c32a61ffbaccd601bf6adf9e265becb733..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb00007bV*G`2iFD_
z5-B#nHmOzs000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0003|Nkl<Z
zc-o~>yH3ME5S)vM6d<KVLl=p{wAA?u{(*c0pW;3}4K+<#=pxfZktot6Rvty3PO^B;
z-s2J@o+F*tcix+w-7(-}JQi^qBN=+V?1j5Hj%7XvCX?b|I22hff!PdY7^d%bz;p^U
z<1i=NY=9&IE+2uD(FoXXfyJV@!bkM%3GmQ*DH2G-$eWbIMTV=VjFKOeE=_^eDvwMi
zY{GdPe}_RN65W(PwBLZvtueMl^X%0gvi^FV$NSSPK{bS72o<XxsPKxbWeoQFa;eI3
zo7$qbX%k4BSp-@{4V*m<adWtM_^M57#^+vqi&ilP2YUV!)ayX4_92mwJ3a%K!zS4a
zo7U*B>(0>_{c-*VjzCA7reZ5rtL9+j^vGW&0{u^Ukugcc{t`i8oa{!!SbNl>gBkD=
sF&N~2vI-OX{ag`Mbh~1G_6h!tcjOq;Eir%XoB#j-07*qoM6N<$f*b0-H~;_u

diff --git a/retroshare-gui/src/gui/images/FileTypeVideo.png b/retroshare-gui/src/gui/images/FileTypeVideo.png
deleted file mode 100644
index 9bcc41b784830e66907a4017f8df890b16440984..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s7X!Otb00007bV*G`2iFD_
z6AK<J^DVmo000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP00051Nkl<Z
zc-muNKn5OuR{!A~#)z<(|JSZwh4A*>?ff4d755)Sy}5}cssIYubF<}tVPPRy1!H@A
z`+rHxPYlNT5)5l6zK5s)$*w!oiD^c8N%jBU-d+?57MO&D?N<gPU0w!G&i@Sd>)rkv
z7;7?2oH&t@5vCGk?Bxqr8S*FFF}!{KmBHFrg+Y}snGwU9hK2?_?k5DEJ$r^*_s(lA
z|1%0g{$o{C+n?}1DB9&eNYT`lStyE_KtyJE8-uoq48yg%uNjQ36d3ki?8dYXBv3aY
z?*D=VmH%y>4Y0cfq{zrzn*wj51N3;o2AHr3-uXWH|AxcW|L@&>40aYMNf2cKDD8nf
zdEoFPhLv+qGZgkJGaS0w&v0=65wJn|`T75`8US)CNWsQQ&lon(y2zlSD##F=ZNYHi
z%4>!ntSk(IQoq3l?cZ|<!yuH@0!k=pX=x0Jv8fC)CL9b;@4jRxZ1Q0E`SULWBP%ll
z9~TQld)XF-kB^xcj-Nclh|62xqzSSKlyh>M!~Rd%QTE@|R`>trvz??x5y+_^gIpZl
ds2I0s006of+?hH+n0o*K002ovPDHLkV1lHY>TLi3

diff --git a/retroshare-gui/src/gui/images/mimetypes/patch.png b/retroshare-gui/src/gui/images/mimetypes/patch.png
deleted file mode 100644
index 3925b7c2e786f14bc6df8f12b90728400258dd1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 717
zcmV;;0y6!HP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02{9W02{9XUK)`c00007bV*G`2ipMx
z0}vDMeoCPL00K=(L_t(I%axN$Pg8La#eeg^w-2$DmbSD$NHoF31T`@VAtbUfV!(y+
zE&K|uh=~gm7wr86CdQRfh&$s#R}dwaBG3>i4{3YbOG{tewtqKLsdS;UoXk0M&Y6q=
zL?V%ZZQIuYlYgs*&*xjI*XswzjXU~33z+7_Mgt(1$)J?#SS3IUp|LiPM&SG?iAz`7
zn2u?s6e5C%pp-%>0}PYq`T}QqdI<D|@$P<tMx~AE@T^4Ow*pZLjo>EV;WY)VHLYd?
zZ(oAL?;pDpU>GP7L=-4RJvom*5JtCLaI0tp(Jot=a$9|e1w$#6VWLcvdU64e&rc=&
zmD>IqwQ3b<)>yJO8624gXq~oT7>F{dSa0!o{T!ygpxq<<u|e`%E38Y5_|5wSLeW2%
zj>HX<^0zm5dwQwvS!nkNPcTe=H%&%jM6cbYFM6)Sb%%n|(rb)HmE1;}K){bbHb`M_
zo5h_v#j{@e*EjL~*wJI7qXO)mB#?UYJ*J`1Ef2k+Fhx6yu9f(_S>n;-S%Q%`fUcCw
zGCn^3WO#UZ(Xy<z1+!r1P#!;GdJ$#PA0ObSMA?@F!AP7!p`h1RSLOD|$kT%3ys#{*
zBShCR6AV;$Q2rnyO_n!o25wApK_>z9K|U`JXJ($;+3d5dZ8uM4aCK~w53gPl_ogY;
z8eF{ffM7Ji<x)l0YBjkxH8q#ZW@jD8X>|LpiQ^~P-bm`~?v{34S38cQQ>m058XB4l
z27|tCKocMo3N4Aq#NTH<K29hUS}qogZa0EoSHc>}P<6S^00000NkvXXu0mjf_N6y#

diff --git a/retroshare-gui/src/gui/images/mimetypes/pdf.png b/retroshare-gui/src/gui/images/mimetypes/pdf.png
deleted file mode 100644
index 73946b90d544bff95f0e9aca02da33f40c6e08ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10y#-UK~y-6m6Oj)R8bViKj+>zKby%YCKtwJ5G`||B0}rj88k+;
z>dz3|v<-Lu0TQj;*g`=N+_)3Ug&I>4H7Ka*Cd%eD@4lJ)PK%xoLkl`^;Qruze{rv<
zDk5?d80P<KM^!%s>1H^J+^aZth!{FYU&vP~B!vRSQV9X#I3}OZ0}uoOxm>ORWB@ql
z2!Dor+uY>Z$Ou0U4v=ygcl9d8Vv%mQn^B8Mwl>+J5v;XT1_s!lo1;{#;orT(T1y<q
zSYxo(Vy(Rxz=&Xs;nLtB*YDrwXm%D8hLlSsazQ|nB=o$;T8lB+7?}l00jx3fjf_yR
zmaosAQR(l;j*n9)6mZTFMG@t4`2q_mz-d=TN9ntFkM6<(?&(u#HmO#t8PH!9ND4q0
za_P<;f|(io_BJQapTp(L^i5Aws@KmeK;(B0DUj~%5!CB=?<tLrQd?MnYL&w$Pxw4G
zc7cVnDnv+HEx2(5agLMuc@7&5WN3)~^>uD-Y@D}%2$Bwq2;EkT=;KGi)m4g*A9Lm9
zOC)_r<nwwygEK06%_iZ>3c1NiYRk*yDizx8Hplz>7-QJl+Ij=L2S8N;9y;f=)9L8<
z<z+p1^hl3iywGm9tKNGJ!%%m2b~Fq_U0Pb&1?~c(s(*%<Bnk1+5rv5fs*MKLT2z%@
zuZM`Rwzjr6H8u4Bc&jOMrl9A&I_EUp-PQKtp?dE%NfPzmYZOJv;^N}#v&^S0>36=J
iUjD1z10OQxw0;3Tg9NVX!~H%00000<MNUMnLSTZGE;`u&

diff --git a/retroshare-gui/src/gui/images/mimetypes/rscollection-16.png b/retroshare-gui/src/gui/images/mimetypes/rscollection-16.png
deleted file mode 100644
index ab6d1686e79037034bc9e6708df474eef611bcd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1068
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87??vnT^vI!PUlYc%#lu&XuJP^zU29y=~nmN
z-sp@qFElgP6kB;IZ0Qzuhn1&zkEn_Eada}5^LfZvD6aG1D13B-JIG-bgK5($#|D|n
zM?IyJx62(b+~fad=Emcni#0+*URBqM*IruQet5GBV+Vs<_%w%SLM_tQI5?vdcz>-w
z{ja;|{44*7CN_%~>br#P-*!U#y|hQ0<m>AdS@V~ESvz~vn_$kB*I5$VCN7^fGd00P
zDDk<!|C3vPcJJN3zx;CXM$;K#(=xrLTibE9#@mW_PMPv)vH!hdi?sT>BF3khGZqQd
z9sA5yUHNr&omOS)x(x4_cgJ(;Ha6|ZeNx6TvG9J$gme0AvAgzt{BZD|`F>l;1V*_R
zkxF?h<R=}u7<yWK-W_{+@h(46>C5gFKW0f!{~;X1A8_KJTCb1qlIXQ*GucHCxG~4<
z7pOmHpSru`^tThYyPq?DW_&F-@8H~Q{X^1wyN=#8nQ}obFD$vjF6;2~^3{F<`zOaU
z8hCbmpF87u_tMWByNmCfDOekjY*{azxs*?D8{es_57R^DM0z|d-`djJ%<=BMLD*Ws
zW5;K(3Y^=wreyNz?B9FLMIWSvKhkJBHnFf(u%M;jbc)1m^MKv+4{v+YwkPjV!gZJ6
z=LaSq_fJ(yKEutmTe&B=lJDL-i5GL2^G<dryk_CM$a-{*LcFZPPw@-kx<(3O56^oE
zakVLi$Ozr6O%!~)ROHZX(-fu8D}v0+w(aKV?>uq;H*@tYw{2e%>Vxt_+<i7RE;u3{
zuCKFiro{h@L;BS^;_Zk0qZfSAe3BvG^yJu*a<-pYa-yl?)-KMS7PIc}%Bx>sx`6Ru
z^&jukE4ydDeDPXO`bpgKvzN3lzgSWGXYF;zTT*k{_+HpviM*-h^mNU|$i0G-%}+Mf
zbXeOriQjDaw2Y0LMP}gxi?*tjZkJ|B|C=%U<CMeGZYj)b+PQH0>~hQVbz-VdB`z8=
zFx(IQJ#C@%ku>pxYZNbjW&Fk$%^u|cUQIPUD$KNzH|j%l3IFT4{q8>wG8~BTuH>1V
z$=7?&Q~%VLx{8FxRPWw5>wiD>-+x=L=Gw(yQy<^j`2T#^+&3A=rte-F_U*q469Xf|
zc9jYv&iko1_1I74{w-Tq5W$wfxPUWo-UZENRyMy~6OO!?m*M~MJHK&O>5p?+-JgNE
zO|`@|q9i4;B-JXpC>2OC7#SEE>H?90S%{&Tm8qeXfw8s$kTh79mwO9ELvDUbW?Cg~
V4cCpYrU5lDc)I$ztaD0e0s!|+*D3%2

diff --git a/retroshare-gui/src/gui/images/mimetypes/source_c.png b/retroshare-gui/src/gui/images/mimetypes/source_c.png
deleted file mode 100644
index 51e7d39768fabd9b01f95581b5c1a14bb8fe35dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10q;pfK~y-6m6Jbc6hRcmfA7s+{z!ts!o((mq%cK9NTJx+C<rM;
zlTK_bQrX$q+gMv@qgYr8r*J7mxLDc5Sa_bnSQzoJi4sBX*t^}koqZNrCx1=@elRf0
z&ij4ed&7vCAtJ|tS^iITGy5DBAG1l4KI?W<L=+Ja5oCLV?5m8Th*GIE4+H>dni98T
zR2|M~0PI=CS&<!N0Ei0CIaHNzv2gcYPVJ}BOpU2A<<{vE7bl}WfQF3-s!FpbTzToK
zZ5cObO58g?#Q3mq<5kMa4+|#!2@1f|4dYj8Jf9op?1V#9nL9Da<Bwe?M<bkb|7f8A
zY&0_>g)<Wo>J%;dUz`~Vg$Dwh7Kc=EMbvO3f6-1eBB%%_$CNCGl}#TCGZSvVj#=Hz
z`d|Sdh12!vLB<aWi_2{uuB9w}>2d8vlSgX_?W{jRXaNyKmC;C9o<Gc;Hy!T3PuS|@
zOdpAOa%qHfM|0ZkHUk3#)<1(?DUOXO4=#*^xZZnOtrm^OcT|;Ht@ajJ2f)k#uBK^f
zoleKP-LCa|J<GDpy!Yn4w>XZiUawmm$5yFSz5=HJF|)lx+%FNq%*e9s;Z>{E#=^qF
zW#EGq&LKhOeV=ol=jOe)BuVmexxBjD`OlK#IZqWo57IjDDL5DU4eMU&R+8C6O#lD@
M07*qoM6N<$f<t2s_W%F@

diff --git a/retroshare-gui/src/gui/images/mimetypes/source_cpp.png b/retroshare-gui/src/gui/images/mimetypes/source_cpp.png
deleted file mode 100644
index 522dc111f1fc7f0f89b24088bee41f355805ab86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10v<_3K~y-6m6OkF6G0Tmzi&1HTNFg8J*ZU0iwHf~gBLwXQE8#H
z<|2rC(31!0$^W5(;z`dv2$8fjwjyn+mx|bUi-aWjgKCuOB^I)~+1cIMuZJX?q!Gaf
z58g2I{k%8dVT2?^WCXw%{x1q7KP6g=G0)QrzONyoAOeU8q**|ADHDkVlF8&105Jes
zYdEe0r7T#MiUB>@IxEsa#sE<Q%d()9YNiN8sUC4#*bPu|Ap%N-#p*-MzCVv^8z*pg
z^Bms%T7ab#EX%_5`VgQ9rBpvaMDXIr6FjdzM(X%1?w?)9g~M0zsCWlkP7zaU2LS-n
zYlnI!07(Ftab1_!S5I>;f19>#({)`oJdf3#kMw<?zVCB<X@Efx&=^AiGbFn_5JAn~
z#_-^=jt@#<cyJ{4;pJq#?=3r*5y8-&qu6%8#9|Ra@%LL8h7b{4UfG8T=I<s7fQv_N
zVB_Z^R=>~Vn_b4U&ku0#-2}=zd0blF3jml{+21=t+XGK)+K$bqr8(ZrjdF7N0B^lI
z!`Ia`qbOn!1RP%)V7*?a);el?5CgQ<bX}KPYX(8UFbrvoiN&>AjipkFl}d%_bb1rO
zsXjoX(V*}9Jpf}29mipzP@v;D%x1G&07d}_$zBt8hlqeA!mw##E|>e7N~NX%d|<0{
zJV9toU*{-_XpEufc~K^l$#-{dr?kHF$=2q-q6DBEcW%WW3x8VYDhXYn00000NkvXX
Hu0mjf@GKu-

diff --git a/retroshare-gui/src/gui/images/mimetypes/source_h.png b/retroshare-gui/src/gui/images/mimetypes/source_h.png
deleted file mode 100644
index 116790f4e527f82e845ad1b1fa71c706aded2fed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0005I0005I0XppC;s5{u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ia1lK~y-6m6N}U6hRQie_!?Po?amSd4Nj<LFAHq2$O>o-8b+}
z3`7h}d;{Y(*gz0A5{xui_mERCa1-$YxnP;wnc3+ngPEI~*-^oQf|~BG-}g;5Eq6!K
z9&o__#lqdc4eF1BG|gV;d4^<2APH3k+Ugt(1`LP8M?eE0%QBMl1hYU0)&M$LpOr3=
z4L~MB2$)%w5;E&FUo^G>))dlZvl*)!PspFWBbZeg0v19e(sxh;LJervLa5xd)c@!}
zTMhu?=Tpx1U+`=1Df!#4SnHSm3Q!yH=?B-IAEH~koWFeEYwiG$syWmkfSvnyxN>-x
zt4H@Jj(>J;r0<~ZqCOC=?^g9N5KmV<_0ABHSUq@!ByPTWT&?X4I*MtU5@TdE8hQT~
zTGY0ZB+9a+pk%pRVrI<e^N+v@0PYU(Fv~Juuh*XExo<WbFN(rrj2>h3BuRX+Sa^~o
zKAld#1N(s7y*tG1kc7Ka6a|u)&1TE-czgsLd#&6!C}Qj>mu2ZOMo-hUoJ=Mk+R7KH
l`Z?dOH~$qUz?Vk3j^9-Wy_JxApL75K002ovPDHLkV1ln`>rnsz


From 962124f18d014e8d32695e1ae5c2f843d17dd394 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 18 Mar 2022 22:13:23 +0100
Subject: [PATCH 053/503] Update picture.svg

---
 retroshare-gui/src/gui/icons/filetype/picture.svg | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/icons/filetype/picture.svg b/retroshare-gui/src/gui/icons/filetype/picture.svg
index 72d6f7c6e..91d8165b4 100644
--- a/retroshare-gui/src/gui/icons/filetype/picture.svg
+++ b/retroshare-gui/src/gui/icons/filetype/picture.svg
@@ -25,7 +25,7 @@
      inkscape:pagecheckerboard="0"
      showgrid="true"
      inkscape:zoom="0.97070312"
-     inkscape:cx="233.33602"
+     inkscape:cx="234.3662"
      inkscape:cy="208.61167"
      inkscape:window-width="1366"
      inkscape:window-height="705"
@@ -52,10 +52,10 @@
        style="fill:#9933cc;fill-opacity:1;stroke:none;stroke-width:9.72713;stroke-opacity:1" />
     <circle
        class="st0"
-       cx="111.14708"
-       cy="160.64659"
-       r="20.453379"
+       cx="121.96398"
+       cy="171.46349"
+       r="31.270281"
        id="circle12"
-       style="fill:#9933cc;fill-opacity:1;stroke:none;stroke-width:6.59777;stroke-opacity:1" />
+       style="fill:#9933cc;fill-opacity:1;stroke:none;stroke-width:10.087;stroke-opacity:1" />
   </g>
 </svg>

From bc85c5255e9804c89cb0148b38d984340b29e680 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 21 Mar 2022 21:06:49 +0100
Subject: [PATCH 054/503] Fixed missed changes for classic stylesheet

---
 retroshare-gui/src/qss/retroclassic.qss | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/retroshare-gui/src/qss/retroclassic.qss b/retroshare-gui/src/qss/retroclassic.qss
index 3c4aee8fd..02da3c18f 100644
--- a/retroshare-gui/src/qss/retroclassic.qss
+++ b/retroshare-gui/src/qss/retroclassic.qss
@@ -27,6 +27,26 @@ QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:ha
   image: url(":/standard_light/rc/branch_open_focus.png");
 }
 
+QTreeView::indicator:checked {
+  image: url(":/standard_light/rc/checkbox_checked.png");
+}
+
+QTreeView::indicator:checked:hover, 
+QTreeView::indicator:checked:focus, 
+QTreeView::indicator:checked:pressed {
+  image: url(":/standard_light/rc/checkbox_checked_focus.png");
+}
+
+QTreeView::indicator:unchecked {
+  image: url(":/standard_light/rc/checkbox_unchecked.png");
+}
+
+QTreeView::indicator:unchecked:hover, 
+QTreeView::indicator:unchecked:focus, 
+QTreeView::indicator:unchecked:pressed {
+  image: url(":/standard_light/rc/checkbox_unchecked_focus.png");
+}
+
 QTreeView,
 QListView,
 QTableView,

From 574e67e7d5729d60f55cb20851783f8731603bdb Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 25 Mar 2022 10:28:08 +0100
Subject: [PATCH 055/503] updated to latest git submodules commit

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index ac742c869..940c2d888 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit ac742c869a7187de467c38e73c0ea7b87e09ffdb
+Subproject commit 940c2d8882a53da3dfc72a35f6bdb81176d06c9a

From 094e54d1220708cb0f146aca36fa40cf58f29617 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 25 Mar 2022 16:23:09 +0100
Subject: [PATCH 056/503] added cmake list for files in GUI

---
 retroshare-gui/src/CMakeLists.txt | 1291 +++++++++++++++++++++++++++++
 1 file changed, 1291 insertions(+)
 create mode 100644 retroshare-gui/src/CMakeLists.txt

diff --git a/retroshare-gui/src/CMakeLists.txt b/retroshare-gui/src/CMakeLists.txt
new file mode 100644
index 000000000..871175869
--- /dev/null
+++ b/retroshare-gui/src/CMakeLists.txt
@@ -0,0 +1,1291 @@
+################################################################################
+# uselibresapi.pri                                                             #
+# Copyright (C) 2018, Retroshare team <retroshare.team@gmailcom>               #
+#                                                                              #
+# This program is free software: you can redistribute it and/or modify         #
+# it under the terms of the GNU Affero General Public License as               #
+# published by the Free Software Foundation, either version 3 of the           #
+# License, or (at your option) any later version.                              #
+#                                                                              #
+# This program is distributed in the hope that it will be useful,              #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU Affero General Public License for more details.                          #
+#                                                                              #
+# You should have received a copy of the GNU Affero General Public License     #
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.       #
+################################################################################
+
+list(
+	APPEND RS_SOURCES
+	TorControl/TorControlWindow.cpp
+
+	main.cpp 
+	rshare.cpp 
+
+	gui/notifyqt.cpp 
+	gui/AboutDialog.cpp 
+	gui/AboutWidget.cpp 
+	gui/QuickStartWizard.cpp 
+	gui/StartDialog.cpp 
+	gui/HomePage.cpp
+        gui/PluginsPage.cpp 
+	gui/PluginManagerWidget.cpp 
+	gui/PluginManager.cpp
+	gui/ChatLobbyWidget.cpp 
+	gui/GetStartedDialog.cpp 
+	gui/GenCertDialog.cpp 
+	gui/NetworkDialog.cpp 
+	gui/mainpagestack.cpp 
+	gui/MainWindow.cpp 
+	gui/NetworkView.cpp 
+	gui/FriendsDialog.cpp 
+	gui/ServicePermissionDialog.cpp 
+	gui/RemoteDirModel.cpp 
+	gui/RsAutoUpdatePage.cpp 
+	gui/RetroShareLink.cpp 
+	gui/SearchTreeWidget.cpp 
+	gui/ShareManager.cpp 
+	gui/ShareDialog.cpp 
+	gui/NewsFeed.cpp 
+	gui/SFListDelegate.cpp 
+	gui/MainPage.cpp 
+	gui/HelpDialog.cpp 
+	gui/LogoBar.cpp 
+	gui/SoundManager.cpp 
+
+	gui/im_history/ImHistoryBrowser.cpp 
+	gui/im_history/IMHistoryItemDelegate.cpp 
+	gui/im_history/IMHistoryItemPainter.cpp 
+
+	gui/help/browser/helpbrowser.cpp 
+	gui/help/browser/helptextbrowser.cpp 
+
+	gui/FileTransfer/SearchDialog.cpp 
+	gui/FileTransfer/SharedFilesDialog.cpp 
+	gui/FileTransfer/TransfersDialog.cpp 
+	gui/FileTransfer/FileTransferInfoWidget.cpp 
+	gui/FileTransfer/DLListDelegate.cpp 
+	gui/FileTransfer/ULListDelegate.cpp 
+	gui/FileTransfer/xprogressbar.cpp 
+	gui/FileTransfer/DetailsDialog.cpp 
+	gui/FileTransfer/TransferUserNotify.cpp 
+	gui/FileTransfer/BannedFilesDialog.cpp 
+
+	lang/languagesupport.cpp 
+
+	util/RsProtectedTimer.cpp 
+	util/stringutil.cpp 
+	util/RsNetUtil.cpp 
+	util/DateTime.cpp 
+	util/RetroStyleLabel.cpp 
+	util/WidgetBackgroundImage.cpp 
+	util/NonCopyable.cpp 
+	util/PixmapMerging.cpp 
+	util/MouseEventFilter.cpp 
+	util/EventFilter.cpp 
+	util/Widget.cpp 
+	util/RsAction.cpp 
+	util/printpreview.cpp 
+	util/log.cpp 
+	util/misc.cpp 
+	util/HandleRichText.cpp 
+	util/ObjectPainter.cpp 
+	util/RsFile.cpp 
+	util/RichTextEdit.cpp 
+	util/ClickableLabel.cpp 
+	util/AspectRatioPixmapLabel.cpp 
+
+	gui/profile/ProfileWidget.cpp 
+	gui/profile/StatusMessage.cpp 
+	gui/profile/ProfileManager.cpp 
+
+	gui/chat/PopupChatWindow.cpp 
+	gui/chat/PopupChatDialog.cpp 
+	gui/chat/PopupDistantChatDialog.cpp 
+	gui/chat/ChatTabWidget.cpp 
+	gui/chat/ChatWidget.cpp 
+	gui/chat/ChatDialog.cpp 
+	gui/chat/ChatLobbyDialog.cpp 
+	gui/chat/CreateLobbyDialog.cpp 
+	gui/chat/ChatStyle.cpp 
+	gui/chat/ChatUserNotify.cpp 
+	gui/chat/ChatLobbyUserNotify.cpp 
+
+	gui/connect/ConfCertDialog.cpp 
+	gui/connect/PGPKeyDialog.cpp 
+	gui/connect/ConnectFriendWizard.cpp 
+	gui/connect/ConnectProgressDialog.cpp 
+	gui/connect/FriendRecommendDialog.cpp 
+
+	gui/msgs/MessagesDialog.cpp 
+	gui/msgs/MessageComposer.cpp 
+	gui/msgs/MessageWidget.cpp 
+	gui/msgs/MessageWindow.cpp 
+	gui/msgs/MessageModel.cpp 
+	gui/msgs/TagsMenu.cpp 
+	gui/msgs/MessageUserNotify.cpp 
+
+	gui/common/RsButtonOnText.cpp 
+	gui/common/RSGraphWidget.cpp 
+	gui/common/ElidedLabel.cpp 
+	gui/common/vmessagebox.cpp 
+	gui/common/RsCollectionDialog.cpp 
+	gui/common/RsCollection.cpp 
+	gui/common/RsUrlHandler.cpp 
+	gui/common/rwindow.cpp 
+	gui/common/rshtml.cpp 
+	gui/common/AvatarDefs.cpp 
+	gui/common/AvatarDialog.cpp 
+	gui/common/GroupFlagsWidget.cpp 
+	gui/common/GroupSelectionBox.cpp 
+	gui/common/GroupChooser.cpp 
+	gui/common/StatusDefs.cpp 
+	gui/common/TagDefs.cpp 
+	gui/common/GroupDefs.cpp 
+	gui/common/Emoticons.cpp 
+	gui/common/RSComboBox.cpp 
+	gui/common/RSListWidgetItem.cpp 
+	gui/common/RSTextEdit.cpp 
+	gui/common/RSPlainTextEdit.cpp 
+	gui/common/RSTreeWidget.cpp 
+	gui/common/RSTreeWidgetItem.cpp 
+	gui/common/RSFeedWidget.cpp 
+	gui/common/RSTabWidget.cpp 
+	gui/common/RSElidedItemDelegate.cpp 
+	gui/common/RSItemDelegate.cpp 
+	gui/common/PeerDefs.cpp 
+	gui/common/FilesDefs.cpp 
+	gui/common/PopularityDefs.cpp 
+	gui/common/RsBanListDefs.cpp 
+	gui/common/GroupTreeWidget.cpp 
+	gui/common/RSTreeView.cpp 
+	gui/common/AvatarWidget.cpp 
+	gui/common/FriendListModel.cpp 
+	gui/common/NewFriendList.cpp 
+	gui/common/FriendSelectionWidget.cpp 
+	gui/common/FriendSelectionDialog.cpp 
+	gui/common/HashBox.cpp 
+	gui/common/LineEditClear.cpp 
+	gui/common/DropLineEdit.cpp 
+	gui/common/RSTextBrowser.cpp 
+	gui/common/RSImageBlockWidget.cpp 
+	gui/common/FeedNotify.cpp 
+	gui/common/UserNotify.cpp 
+	gui/common/HeaderFrame.cpp 
+	gui/common/MimeTextEdit.cpp 
+	gui/common/UIStateHelper.cpp 
+	gui/common/FloatingHelpBrowser.cpp 
+	gui/common/SubscribeToolButton.cpp 
+	gui/common/RsBanListToolButton.cpp 
+	gui/common/FlowLayout.cpp 
+	gui/common/PictureFlow.cpp 
+	gui/common/ToasterNotify.cpp 
+
+	gui/style/RSStyle.cpp 
+	gui/style/StyleDialog.cpp 
+
+	gui/settings/RSPermissionMatrixWidget.cpp 
+	gui/settings/rsharesettings.cpp 
+	gui/settings/RsharePeerSettings.cpp 
+	gui/settings/rsettings.cpp 
+	gui/settings/rsettingswin.cpp 
+	gui/settings/GeneralPage.cpp 
+	gui/settings/AboutPage.cpp 
+	gui/settings/ServerPage.cpp 
+	gui/settings/NotifyPage.cpp 
+	gui/settings/CryptoPage.cpp 
+	gui/settings/PeoplePage.cpp 
+	gui/settings/MessagePage.cpp 
+	gui/settings/NewTag.cpp 
+	gui/settings/ForumPage.cpp 
+	gui/settings/PluginsPage.cpp 
+	gui/settings/PluginItem.cpp 
+	gui/settings/AppearancePage.cpp 
+	gui/settings/FileAssociationsPage.cpp 
+	gui/settings/SoundPage.cpp 
+	gui/settings/TransferPage.cpp 
+	gui/settings/ChatPage.cpp 
+	gui/settings/ChannelPage.cpp 
+	gui/settings/PostedPage.cpp 
+	gui/settings/ServicePermissionsPage.cpp 
+	gui/settings/AddFileAssociationDialog.cpp 
+	gui/settings/GroupFrameSettingsWidget.cpp 
+
+	gui/statusbar/peerstatus.cpp 
+	gui/statusbar/natstatus.cpp 
+	gui/statusbar/dhtstatus.cpp 
+	gui/statusbar/torstatus.cpp 
+	gui/statusbar/ratesstatus.cpp 
+	gui/statusbar/hashingstatus.cpp 
+	gui/statusbar/discstatus.cpp 
+	gui/statusbar/SoundStatus.cpp 
+	gui/statusbar/OpModeStatus.cpp 
+	gui/statusbar/ToasterDisable.cpp 
+	gui/statusbar/SysTrayStatus.cpp 
+
+	gui/toaster/ToasterItem.cpp 
+	gui/toaster/MessageToaster.cpp 
+	gui/toaster/DownloadToaster.cpp 
+	gui/toaster/OnlineToaster.cpp 
+	gui/toaster/ChatToaster.cpp 
+	gui/toaster/GroupChatToaster.cpp 
+	gui/toaster/ChatLobbyToaster.cpp 
+	gui/toaster/FriendRequestToaster.cpp 
+
+	gui/advsearch/advancedsearchdialog.cpp 
+	gui/advsearch/expressionwidget.cpp 
+	gui/advsearch/guiexprelement.cpp 
+
+	gui/elastic/graphwidget.cpp 
+	gui/elastic/edge.cpp 
+	gui/elastic/arrow.cpp 
+	gui/elastic/elnode.cpp 
+
+	gui/feeds/BoardsCommentsItem.cpp 
+	gui/feeds/FeedItem.cpp 
+	gui/feeds/FeedHolder.cpp 
+	gui/feeds/GxsCircleItem.cpp 
+	gui/feeds/ChannelsCommentsItem.cpp 
+	gui/feeds/PeerItem.cpp 
+	gui/feeds/MsgItem.cpp 
+	gui/feeds/ChatMsgItem.cpp 
+	gui/feeds/SubFileItem.cpp 
+	gui/feeds/AttachFileItem.cpp 
+	gui/feeds/SecurityItem.cpp 
+	gui/feeds/SecurityIpItem.cpp 
+	gui/feeds/NewsFeedUserNotify.cpp 
+
+	gui/groups/CreateGroup.cpp 
+
+	gui/statistics/BandwidthGraphWindow.cpp 
+	gui/statistics/BandwidthStatsWidget.cpp 
+	gui/statistics/DhtWindow.cpp 
+	gui/statistics/Histogram.cpp 
+	gui/statistics/TurtleRouterDialog.cpp 
+	gui/statistics/TurtleRouterStatistics.cpp 
+	gui/statistics/GxsIdStatistics.cpp 
+	gui/statistics/GlobalRouterStatistics.cpp 
+	gui/statistics/GxsTransportStatistics.cpp 
+	gui/statistics/StatisticsWindow.cpp 
+	gui/statistics/BwCtrlWindow.cpp 
+	gui/statistics/RttStatistics.cpp 
+	gui/statistics/BWGraph.cpp 
+
+	util/RsSyntaxHighlighter.cpp 
+	util/imageutil.cpp 
+	util/retroshareWin32.cpp
+
+	gui/NetworkDialog/pgpid_item_model.cpp 
+	gui/NetworkDialog/pgpid_item_proxy.cpp 
+	)
+
+list(
+	APPEND RS_FORMS
+	TorControl/TorControlWindow.ui
+
+	gui/StartDialog.ui 
+	gui/HomePage.ui
+	gui/GetStartedDialog.ui 
+	gui/GenCertDialog.ui 
+	gui/AboutDialog.ui 
+	gui/AboutWidget.ui 
+	gui/QuickStartWizard.ui 
+	gui/NetworkDialog.ui 
+	gui/common/AvatarDialog.ui 
+	gui/MainWindow.ui 
+	gui/NetworkView.ui 
+	gui/FriendsDialog.ui 
+	gui/NewsFeed.ui 
+	gui/ShareManager.ui 
+	gui/ShareDialog.ui 
+	gui/help/browser/helpbrowser.ui 
+	gui/HelpDialog.ui 
+	gui/ServicePermissionDialog.ui 
+	gui/ChatLobbyWidget.ui 
+
+	gui/FileTransfer/TransfersDialog.ui 
+	gui/FileTransfer/DetailsDialog.ui 
+	gui/FileTransfer/SearchDialog.ui 
+	gui/FileTransfer/SharedFilesDialog.ui 
+	gui/FileTransfer/BannedFilesDialog.ui 
+
+	gui/profile/ProfileWidget.ui 
+	gui/profile/StatusMessage.ui 
+	gui/profile/ProfileManager.ui 
+
+	gui/chat/PopupChatWindow.ui 
+	gui/chat/PopupChatDialog.ui 
+	gui/chat/ChatTabWidget.ui 
+	gui/chat/ChatWidget.ui 
+	gui/chat/ChatLobbyDialog.ui 
+	gui/chat/CreateLobbyDialog.ui 
+
+	gui/connect/ConfCertDialog.ui 
+	gui/connect/PGPKeyDialog.ui 
+	gui/connect/ConnectFriendWizard.ui 
+	gui/connect/ConnectProgressDialog.ui 
+	gui/connect/FriendRecommendDialog.ui 
+
+	gui/msgs/MessagesDialog.ui 
+	gui/msgs/MessageComposer.ui 
+	gui/msgs/MessageWindow.ui
+	gui/msgs/MessageWidget.ui
+
+	gui/settings/settingsw.ui 
+	gui/settings/GeneralPage.ui 
+	gui/settings/ServerPage.ui 
+	gui/settings/NotifyPage.ui 
+	gui/settings/PeoplePage.ui 
+	gui/settings/CryptoPage.ui 
+	gui/settings/MessagePage.ui 
+	gui/settings/NewTag.ui 
+	gui/settings/ForumPage.ui 
+	gui/settings/AboutPage.ui 
+	gui/settings/PluginsPage.ui 
+	gui/settings/AppearancePage.ui 
+	gui/settings/TransferPage.ui 
+	gui/settings/SoundPage.ui 
+	gui/settings/ChatPage.ui 
+	gui/settings/ChannelPage.ui 
+	gui/settings/PostedPage.ui 
+	gui/settings/ServicePermissionsPage.ui 
+	gui/settings/PluginItem.ui 
+	gui/settings/GroupFrameSettingsWidget.ui 
+
+	gui/toaster/MessageToaster.ui 
+	gui/toaster/OnlineToaster.ui 
+	gui/toaster/DownloadToaster.ui 
+	gui/toaster/ChatToaster.ui 
+	gui/toaster/GroupChatToaster.ui 
+	gui/toaster/ChatLobbyToaster.ui 
+	gui/toaster/FriendRequestToaster.ui 
+
+	gui/advsearch/AdvancedSearchDialog.ui 
+	gui/advsearch/expressionwidget.ui 
+
+	gui/feeds/BoardsCommentsItem.ui 
+	gui/feeds/GxsCircleItem.ui 
+	gui/feeds/ChannelsCommentsItem.ui 
+	gui/feeds/PeerItem.ui 
+	gui/feeds/MsgItem.ui 
+	gui/feeds/ChatMsgItem.ui 
+	gui/feeds/SubFileItem.ui 
+	gui/feeds/AttachFileItem.ui 
+	gui/feeds/SecurityItem.ui 
+	gui/feeds/SecurityIpItem.ui 
+
+	gui/im_history/ImHistoryBrowser.ui 
+
+	gui/groups/CreateGroup.ui 
+
+	gui/common/GroupTreeWidget.ui 
+	gui/common/AvatarWidget.ui 
+	gui/common/NewFriendList.ui 
+	gui/common/FriendSelectionWidget.ui 
+	gui/common/HashBox.ui 
+	gui/common/RSImageBlockWidget.ui 
+	gui/common/RsCollectionDialog.ui 
+	gui/common/HeaderFrame.ui 
+	gui/common/RSFeedWidget.ui 
+
+	gui/style/StyleDialog.ui 
+
+	gui/statistics/BandwidthGraphWindow.ui 
+	gui/statistics/BandwidthStatsWidget.ui 
+	gui/statistics/DhtWindow.ui 
+	gui/statistics/TurtleRouterDialog.ui 
+	gui/statistics/TurtleRouterStatistics.ui 
+	gui/statistics/GxsIdStatistics.ui 
+	gui/statistics/GlobalRouterStatistics.ui 
+	gui/statistics/GxsTransportStatistics.ui 
+	gui/statistics/StatisticsWindow.ui 
+	gui/statistics/BwCtrlWindow.ui 
+	gui/statistics/RttStatistics.ui 
+
+	util/RichTextEdit.ui
+	)
+
+list(
+	APPEND RS_IMPLEMENTATION_HEADERS
+
+	TorControl/TorControlWindow.h
+
+	chat/distantchat.h
+	chat/distributedchat.h
+	chat/p3chatservice.h
+	chat/rschatitems.h 
+
+	rshare.h 
+	retroshare-gui/configpage.h 
+	retroshare-gui/RsAutoUpdatePage.h 
+	retroshare-gui/mainpage.h 
+
+	control/bandwidthevent.h 
+	control/eventtype.h 
+
+	gui/QuickStartWizard.h 
+	gui/notifyqt.h 
+	gui/GetStartedDialog.h 
+	gui/StartDialog.h 
+	gui/HomePage.h
+	gui/NetworkDialog.h 
+	gui/GenCertDialog.h 
+	gui/linetypes.h 
+	gui/mainpagestack.h 
+	gui/MainWindow.h 
+	gui/RSHumanReadableDelegate.h 
+	gui/AboutDialog.h 
+	gui/AboutWidget.h 
+	gui/NetworkView.h 
+	gui/FriendsDialog.h 
+	gui/ServicePermissionDialog.h 
+	gui/RemoteDirModel.h 
+        gui/PluginsPage.h  
+	gui/PluginManagerWidget.h 
+	gui/PluginManager.h
+	gui/RetroShareLink.h 
+	gui/SearchTreeWidget.h 
+	gui/ShareManager.h 
+	gui/NewsFeed.h 
+	gui/ShareDialog.h 
+	gui/SFListDelegate.h 
+	gui/SoundManager.h 
+	gui/HelpDialog.h 
+	gui/LogoBar.h 
+
+	gui/common/AvatarDialog.h 
+
+	gui/NetworkDialog/pgpid_item_model.h 
+	gui/NetworkDialog/pgpid_item_proxy.h 
+
+	gui/FileTransfer/SearchDialog.h 
+	gui/FileTransfer/SharedFilesDialog.h 
+	gui/FileTransfer/xprogressbar.h 
+	gui/FileTransfer/DetailsDialog.h 
+	gui/FileTransfer/FileTransferInfoWidget.h 
+	gui/FileTransfer/DLListDelegate.h 
+	gui/FileTransfer/ULListDelegate.h 
+	gui/FileTransfer/TransfersDialog.h 
+	gui/FileTransfer/BannedFilesDialog.h 
+	gui/FileTransfer/TransferUserNotify.h 
+
+	gui/statistics/TurtleRouterDialog.h 
+	gui/statistics/TurtleRouterStatistics.h 
+	gui/statistics/GxsIdStatistics.h 
+	gui/statistics/dhtgraph.h 
+	gui/statistics/Histogram.h 
+	gui/statistics/BandwidthGraphWindow.h 
+	gui/statistics/turtlegraph.h 
+	gui/statistics/BandwidthStatsWidget.h 
+	gui/statistics/DhtWindow.h 
+	gui/statistics/GlobalRouterStatistics.h 
+	gui/statistics/GxsTransportStatistics.h 
+	gui/statistics/StatisticsWindow.h 
+	gui/statistics/BwCtrlWindow.h 
+	gui/statistics/BWGraph.h 
+	gui/statistics/RttStatistics.h 
+
+	gui/plugins/PluginInterface.h 
+
+	gui/im_history/ImHistoryBrowser.h 
+	gui/im_history/IMHistoryItemDelegate.h 
+	gui/im_history/IMHistoryItemPainter.h 
+
+	lang/languagesupport.h 
+
+	util/RsSyntaxHighlighter.h 
+	util/imageutil.h 
+	util/RichTextEdit.h 
+	util/retroshareWin32.h
+	util/RsProtectedTimer.h 
+	util/stringutil.h 
+	util/RsNetUtil.h 
+	util/DateTime.h 
+	util/RetroStyleLabel.h 
+	util/dllexport.h 
+	util/NonCopyable.h 
+	util/rsutildll.h 
+	util/dllexport.h 
+	util/global.h 
+	util/rsqtutildll.h 
+	util/Interface.h 
+	util/PixmapMerging.h 
+	util/MouseEventFilter.h 
+	util/EventFilter.h 
+	util/Widget.h 
+	util/RsAction.h 
+	util/RsUserdata.h 
+	util/printpreview.h 
+	util/log.h 
+	util/misc.h 
+	util/HandleRichText.h 
+	util/ObjectPainter.h 
+	util/QtVersion.h 
+	util/RsFile.h 
+	util/qtthreadsutils.h 
+	util/ClickableLabel.h 
+	util/AspectRatioPixmapLabel.h 
+
+	gui/profile/ProfileWidget.h 
+	gui/profile/ProfileManager.h 
+	gui/profile/StatusMessage.h 
+
+	gui/chat/PopupChatWindow.h 
+	gui/chat/PopupChatDialog.h 
+	gui/chat/PopupDistantChatDialog.h 
+	gui/chat/ChatTabWidget.h 
+	gui/chat/ChatWidget.h 
+	gui/chat/ChatDialog.h 
+	gui/ChatLobbyWidget.h 
+	gui/chat/ChatLobbyDialog.h 
+	gui/chat/CreateLobbyDialog.h 
+	gui/chat/ChatStyle.h 
+	gui/chat/ChatUserNotify.h 
+	gui/chat/ChatLobbyUserNotify.h 
+
+	gui/connect/ConfCertDialog.h 
+	gui/connect/PGPKeyDialog.h 
+	gui/connect/FriendRecommendDialog.h 
+
+	gui/msgs/MessagesDialog.h 
+	gui/msgs/MessageInterface.h 
+	gui/msgs/MessageComposer.h 
+	gui/msgs/MessageWindow.h 
+	gui/msgs/MessageWidget.h 
+	gui/msgs/MessageModel.h 
+	gui/msgs/TagsMenu.h 
+	gui/msgs/textformat.h 
+	gui/msgs/MessageUserNotify.h 
+
+	gui/images/retroshare_win.rc.h 
+
+	gui/settings/RSPermissionMatrixWidget.h 
+	gui/settings/rsharesettings.h 
+	gui/settings/RsharePeerSettings.h 
+	gui/settings/rsettings.h 
+	gui/settings/rsettingswin.h 
+	gui/settings/GeneralPage.h 
+	gui/settings/PeoplePage.h 
+	gui/settings/AboutPage.h 
+	gui/settings/ServerPage.h 
+	gui/settings/NotifyPage.h 
+	gui/settings/CryptoPage.h 
+	gui/settings/MessagePage.h 
+	gui/settings/NewTag.h 
+	gui/settings/ForumPage.h 
+	gui/settings/PluginsPage.h 
+	gui/settings/PluginItem.h 
+	gui/settings/AppearancePage.h 
+	gui/settings/FileAssociationsPage.h 
+	gui/settings/SoundPage.h 
+	gui/settings/TransferPage.h 
+	gui/settings/ChatPage.h 
+	gui/settings/ChannelPage.h 
+	gui/settings/PostedPage.h 
+	gui/settings/ServicePermissionsPage.h 
+	gui/settings/AddFileAssociationDialog.h 
+	gui/settings/GroupFrameSettingsWidget.h 
+
+	gui/toaster/ToasterItem.h 
+	gui/toaster/MessageToaster.h 
+	gui/toaster/OnlineToaster.h 
+	gui/toaster/DownloadToaster.h 
+	gui/toaster/ChatToaster.h 
+	gui/toaster/GroupChatToaster.h 
+	gui/toaster/ChatLobbyToaster.h 
+	gui/toaster/FriendRequestToaster.h 
+
+	gui/common/RsButtonOnText.h 
+	gui/common/RsCollection.h 
+	gui/common/RSGraphWidget.h 
+	gui/common/ElidedLabel.h 
+	gui/common/vmessagebox.h 
+	gui/common/RsUrlHandler.h 
+	gui/common/RsCollectionDialog.h 
+	gui/common/rwindow.h 
+	gui/common/rshtml.h 
+	gui/common/AvatarDefs.h 
+	gui/common/GroupFlagsWidget.h 
+	gui/common/GroupSelectionBox.h 
+	gui/common/GroupChooser.h 
+	gui/common/StatusDefs.h 
+	gui/common/TagDefs.h 
+	gui/common/GroupDefs.h 
+	gui/common/Emoticons.h 
+	gui/common/RSComboBox.h 
+	gui/common/RSListWidgetItem.h 
+	gui/common/RSTextEdit.h 
+	gui/common/RSPlainTextEdit.h 
+	gui/common/RSTreeWidget.h 
+	gui/common/RSTreeWidgetItem.h 
+	gui/common/RSFeedWidget.h 
+	gui/common/RSTabWidget.h 
+	gui/common/RSElidedItemDelegate.h 
+	gui/common/RSItemDelegate.h 
+	gui/common/PeerDefs.h 
+	gui/common/FilesDefs.h 
+	gui/common/PopularityDefs.h 
+	gui/common/RsBanListDefs.h 
+	gui/common/GroupTreeWidget.h 
+	gui/common/RSTreeView.h 
+	gui/common/AvatarWidget.h 
+	gui/common/FriendListModel.h 
+	gui/common/NewFriendList.h 
+	gui/common/FriendSelectionWidget.h 
+	gui/common/FriendSelectionDialog.h 
+	gui/common/HashBox.h 
+	gui/common/LineEditClear.h 
+	gui/common/DropLineEdit.h 
+	gui/common/RSTextBrowser.h 
+	gui/common/RSImageBlockWidget.h 
+	gui/common/FeedNotify.h 
+	gui/common/UserNotify.h 
+	gui/common/HeaderFrame.h 
+	gui/common/MimeTextEdit.h 
+	gui/common/UIStateHelper.h 
+	gui/common/FloatingHelpBrowser.h 
+	gui/common/SubscribeToolButton.h 
+	gui/common/RsBanListToolButton.h 
+	gui/common/FlowLayout.h 
+	gui/common/PictureFlow.h 
+	gui/common/ToasterNotify.h 
+
+	gui/style/RSStyle.h 
+	gui/style/StyleDialog.h 
+
+	gui/help/browser/helpbrowser.h 
+	gui/help/browser/helptextbrowser.h 
+
+	gui/statusbar/peerstatus.h 
+	gui/statusbar/natstatus.h 
+	gui/statusbar/dhtstatus.h 
+	gui/statusbar/torstatus.h 
+	gui/statusbar/ratesstatus.h 
+	gui/statusbar/hashingstatus.h 
+	gui/statusbar/discstatus.h 
+	gui/statusbar/SoundStatus.h 
+	gui/statusbar/OpModeStatus.h 
+	gui/statusbar/ToasterDisable.h 
+	gui/statusbar/SysTrayStatus.h 
+
+	gui/advsearch/advancedsearchdialog.h 
+	gui/advsearch/expressionwidget.h 
+	gui/advsearch/guiexprelement.h 
+
+	gui/elastic/graphwidget.h 
+	gui/elastic/edge.h 
+	gui/elastic/arrow.h 
+	gui/elastic/elnode.h 
+
+	gui/feeds/BoardsCommentsItem.h 
+	gui/feeds/FeedItem.h 
+	gui/feeds/FeedHolder.h 
+	gui/feeds/GxsCircleItem.h 
+	gui/feeds/ChannelsCommentsItem.h 
+	gui/feeds/PeerItem.h 
+	gui/feeds/MsgItem.h 
+	gui/feeds/ChatMsgItem.h 
+	gui/feeds/SubFileItem.h 
+	gui/feeds/AttachFileItem.h 
+	gui/feeds/SecurityItem.h 
+	gui/feeds/SecurityIpItem.h 
+	gui/feeds/NewsFeedUserNotify.h 
+
+	gui/connect/ConnectFriendWizard.h 
+	gui/connect/ConnectProgressDialog.h 
+
+	gui/groups/CreateGroup.h 
+	)
+
+if(RS_JSONAPI)
+	list(
+		APPEND RS_SOURCES
+		gui/settings/JsonApiPage.cc
+	)
+
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/settings/JsonApiPage.h
+	)
+
+	list(
+		APPEND RS_FORMS
+		gui/settings/JsonApiPage.ui
+	)
+endif(RS_JSONAPI)
+
+if(RS_WEBUI)
+	list(
+		APPEND RS_SOURCES
+		gui/settings/WebuiPage.cpp
+	)
+
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		jsonapi/p3webui.h 
+		gui/settings/WebuiPage.h 
+	)
+
+	list(
+		APPEND RS_FORMS
+		gui/settings/WebuiPage.ui
+	)
+endif(RS_WEBUI)
+
+list(
+	APPEND RS_QTRESOURCES
+	gui/images.qrc 
+	gui/icons.qrc 
+	lang/lang.qrc 
+	gui/help/content/content.qrc 
+	gui/emojione.qrc 
+	gui/qss/stylesheet/qdarkstyle/dark/Standard_Dark.qrc 
+	gui/qss/stylesheet/qdarkstyle/light/Standard_Light.qrc
+	)
+
+list(
+	APPEND RS_TRANSLATIONS
+	lang/retroshare_ca_ES.ts 
+	lang/retroshare_cs.ts 
+	lang/retroshare_da.ts
+	lang/retroshare_de.ts
+	lang/retroshare_el.ts
+	lang/retroshare_en.ts
+	lang/retroshare_es.ts
+	lang/retroshare_fi.ts
+	lang/retroshare_fr.ts
+	lang/retroshare_hu.ts
+	lang/retroshare_it.ts
+	lang/retroshare_ja_JP.ts 
+	lang/retroshare_nl.ts 
+	lang/retroshare_ko.ts 
+	lang/retroshare_pl.ts 
+	lang/retroshare_ru.ts 
+	lang/retroshare_sv.ts 
+	lang/retroshare_tr.ts 
+	lang/retroshare_zh_CN.ts
+	)
+
+if(RS_UNFINISHED_TRANSLATIONS)
+	list(
+		APPEND RS_TRANSLATIONS
+		lang/retroshare_bg.ts 
+		lang/retroshare_af.ts 
+		lang/retroshare_pt.ts 
+		lang/retroshare_sl.ts 
+		lang/retroshare_sr.ts 
+		lang/retroshare_zh_TW.ts
+		)
+endif(RS_UNFINISHED_TRANSLATIONS)
+
+if(RS_MESSENGER)
+
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC MESSENGER_WINDOW
+		)
+
+	list(
+		APPEND RS_SOURCES
+		gui/MessengerWindow.cpp 
+		gui/common/FriendList.cpp
+		)
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/MessengerWindow.h 
+		gui/common/FriendList.h 
+		)
+	list(
+		APPEND RS_FORMS
+		gui/MessengerWindow.ui 
+		gui/common/FriendList.ui
+		)
+endif(RS_MESSENGER)
+
+if(RS_IDLE)
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		idle/idle.h
+		)
+	list(
+		APPEND RS_SOURCES
+		idle/idle.cpp 
+		idle/idle_platform.cpp
+		)
+endif(RS_IDLE)
+
+if(RS_FRAMECATCHER)
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		util/framecatcher.h
+		)
+	list(
+		APPEND RS_SOURCES
+		util/framecatcher.cpp
+		)
+
+	# TODO: LIBS += -lxine
+
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC CHANNELS_FRAME_CATCHER
+		)
+endif(RS_FRAMECATCHER)
+
+# Embedded Friend Server
+
+if(RS_EFS)
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC RS_EMBEDED_FRIEND_SERVER
+		)
+	list(
+		APPEND RS_SOURCES
+		gui/FriendServerControl.cpp
+		)
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/FriendServerControl.h
+		)
+	list(
+		APPEND RS_FORMS
+		gui/FriendServerControl.ui
+		)
+endif(RS_EFS)
+
+# BELOW IS GXS Unfinished Services.
+	
+if(RS_UNFINISHED)
+
+	list(	
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/unfinished/ApplicationWindow.h 
+
+		#		gui/unfinished/CalDialog.h 
+		#		gui/unfinished/ExampleDialog.h 
+		#		gui/unfinished/GamesDialog.h 
+		#		gui/unfinished/profile/ProfileView.h 
+		#		gui/unfinished/profile/ProfileEdit.h
+		#		gui/unfinished/StatisticDialog.h 
+		#		gui/unfinished/PhotoDialog.h 
+		#		gui/unfinished/PhotoShow.h 
+		)
+
+	list(
+		APPEND RS_FORMS
+		gui/unfinished/ApplicationWindow.ui 
+
+		#		gui/unfinished/CalDialog.ui 
+		#		gui/unfinished/ExampleDialog.ui 
+		#		gui/unfinished/GamesDialog.ui 
+		#		gui/unfinished/profile/ProfileView.ui 
+		#		gui/unfinished/profile/ProfileEdit.ui
+		#		gui/unfinished/StatisticDialog.ui 
+		#		gui/unfinished/PhotoDialog.ui 
+		#		gui/unfinished/PhotoShow.ui 
+		)
+
+	list(
+		APPEND RS_SOURCES 
+		gui/unfinished/ApplicationWindow.cpp 
+
+		#		gui/unfinished/CalDialog.cpp 
+		#		gui/unfinished/ExampleDialog.cpp 
+		#		gui/unfinished/GamesDialog.cpp 
+		#		gui/unfinished/profile/ProfileView.cpp 
+		#		gui/unfinished/profile/ProfileEdit.cpp
+		#		gui/unfinished/StatisticDialog.cpp 
+		#		gui/unfinished/PhotoDialog.cpp 
+		#		gui/unfinished/PhotoShow.cpp 
+		)
+
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC UNFINISHED 
+		)
+endif(RS_UNFINISHED)
+
+if(RS_GXSPHOTOSHARE)
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC RS_USE_PHOTO 
+		)
+
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/PhotoShare/AlbumGroupDialog.h 
+		gui/PhotoShare/AlbumExtra.h 
+		gui/PhotoShare/PhotoDrop.h 
+		gui/PhotoShare/AlbumItem.h 
+		gui/PhotoShare/AlbumDialog.h 
+		gui/PhotoShare/PhotoItem.h 
+		gui/PhotoShare/PhotoShareItemHolder.h 
+		gui/PhotoShare/PhotoShare.h 
+		gui/PhotoShare/PhotoSlideShow.h 
+		gui/PhotoShare/PhotoDialog.h
+		)
+	list(
+		APPEND RS_FORMS
+		gui/PhotoShare/AlbumExtra.ui 
+		gui/PhotoShare/PhotoItem.ui 
+		gui/PhotoShare/PhotoDialog.ui 
+		gui/PhotoShare/AlbumItem.ui 
+		gui/PhotoShare/AlbumDialog.ui 
+		gui/PhotoShare/PhotoShare.ui 
+		gui/PhotoShare/PhotoSlideShow.ui
+		)
+
+	list(
+		APPEND RS_SOURCES
+		gui/PhotoShare/AlbumGroupDialog.cpp 
+		gui/PhotoShare/AlbumExtra.cpp 
+		gui/PhotoShare/PhotoItem.cpp 
+		gui/PhotoShare/PhotoDialog.cpp 
+		gui/PhotoShare/PhotoDrop.cpp 
+		gui/PhotoShare/AlbumItem.cpp 
+		gui/PhotoShare/AlbumDialog.cpp 
+		gui/PhotoShare/PhotoShareItemHolder.cpp 
+		gui/PhotoShare/PhotoShare.cpp 
+		gui/PhotoShare/PhotoSlideShow.cpp
+		)
+
+	list(
+		APPEND RS_QTRESOURCES
+		gui/PhotoShare/Photo_images.qrc
+		)
+endif(RS_GXSPHOTOSHARE)
+
+if(RS_GXSWIKIPOS)
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC RS_USE_WIKI 
+		)
+
+	target_include_directories(${PROJECT_NAME} PUBLIC ../../supportlibs/pegmarkdown)
+
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/WikiPoos/WikiDialog.h 
+		gui/WikiPoos/WikiAddDialog.h 
+		gui/WikiPoos/WikiEditDialog.h 
+		gui/gxs/WikiGroupDialog.h 
+		gui/gxs/RsGxsUpdateBroadcastBase.h 
+		gui/gxs/RsGxsUpdateBroadcastWidget.h 
+		gui/gxs/RsGxsUpdateBroadcastPage.h 
+		)
+
+	list(
+		APPEND RS_FORMS
+		gui/WikiPoos/WikiDialog.ui 
+		gui/WikiPoos/WikiAddDialog.ui 
+		gui/WikiPoos/WikiEditDialog.ui 
+		)
+
+	list(
+		APPEND RS_SOURCES
+		gui/WikiPoos/WikiDialog.cpp 
+		gui/WikiPoos/WikiAddDialog.cpp 
+		gui/WikiPoos/WikiEditDialog.cpp 
+		gui/gxs/WikiGroupDialog.cpp 
+		gui/gxs/RsGxsUpdateBroadcastBase.cpp 
+		gui/gxs/RsGxsUpdateBroadcastWidget.cpp 
+		gui/gxs/RsGxsUpdateBroadcastPage.cpp 
+		)
+
+	list(
+		APPEND RS_QTRESOURCES
+		gui/WikiPoos/Wiki_images.qrc
+		)
+endif(RS_GXSWIKIPOS)
+	
+if(RS_GXSTHEWIRE)
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC RS_USE_WIRE 
+		)
+
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/TheWire/WireDialog.h 
+		gui/TheWire/WireGroupItem.h 
+		gui/TheWire/WireGroupDialog.h 
+		gui/TheWire/WireGroupExtra.h 
+		gui/TheWire/PulseAddDialog.h 
+		gui/TheWire/PulseViewItem.h 
+		gui/TheWire/PulseTopLevel.h 
+		gui/TheWire/PulseViewGroup.h 
+		gui/TheWire/PulseReply.h 
+		gui/TheWire/PulseReplySeperator.h 
+		gui/TheWire/PulseMessage.h 
+		)
+
+	list(
+		APPEND RS_FORMS
+		gui/TheWire/WireDialog.ui 
+		gui/TheWire/WireGroupItem.ui 
+		gui/TheWire/WireGroupExtra.ui 
+		gui/TheWire/PulseAddDialog.ui 
+		gui/TheWire/PulseTopLevel.ui 
+		gui/TheWire/PulseViewGroup.ui 
+		gui/TheWire/PulseReply.ui 
+		gui/TheWire/PulseReplySeperator.ui 
+		gui/TheWire/PulseMessage.ui 
+		)
+
+	list(
+		APPEND RS_SOURCES
+		gui/TheWire/WireDialog.cpp 
+		gui/TheWire/WireGroupItem.cpp 
+		gui/TheWire/WireGroupDialog.cpp 
+		gui/TheWire/WireGroupExtra.cpp 
+		gui/TheWire/PulseAddDialog.cpp 
+		gui/TheWire/PulseViewItem.cpp 
+		gui/TheWire/PulseTopLevel.cpp 
+		gui/TheWire/PulseViewGroup.cpp 
+		gui/TheWire/PulseReply.cpp 
+		gui/TheWire/PulseReplySeperator.cpp 
+		gui/TheWire/PulseMessage.cpp 
+		)
+
+	list(
+		APPEND RS_QTRESOURCES
+		RESOURCES += gui/TheWire/TheWire_images.qrc
+		)
+endif(RS_GXSTHEWIRE)
+
+if(RS_GXSIDENTITIES)
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/Identity/IdDialog.h 
+		gui/Identity/IdEditDialog.h 
+		gui/Identity/IdDetailsDialog.h 
+		)
+
+	list(
+		APPEND RS_FORMS
+		gui/Identity/IdDialog.ui 
+		gui/Identity/IdEditDialog.ui 
+		gui/Identity/IdDetailsDialog.ui 
+		)
+
+	list(
+		APPEND RS_SOURCES
+		gui/Identity/IdDialog.cpp 
+		gui/Identity/IdEditDialog.cpp 
+		gui/Identity/IdDetailsDialog.cpp 
+		)
+endif(RS_GXSIDENTITIES)
+	
+if(RS_GXSCIRCLES)
+	target_compile_definitions(
+		${PROJECT_NAME} PUBLIC RS_USE_CIRCLES 
+		)
+
+	list(
+		gui/Circles/CirclesDialog.h 
+		gui/Circles/CreateCircleDialog.h 
+		gui/People/PeopleDialog.h
+		gui/People/CircleWidget.h
+		gui/People/IdentityWidget.h
+		)
+
+	list(
+		gui/Circles/CirclesDialog.ui 
+		gui/Circles/CreateCircleDialog.ui 
+		gui/People/PeopleDialog.ui 
+		gui/People/CircleWidget.ui
+		gui/People/IdentityWidget.ui
+		)
+
+	list(
+		gui/Circles/CirclesDialog.cpp 
+		gui/Circles/CreateCircleDialog.cpp 
+		gui/People/PeopleDialog.cpp 
+		gui/People/CircleWidget.cpp
+		gui/People/IdentityWidget.cpp
+		)
+endif(RS_GXSCIRCLES)
+
+if(RS_GXSGUI)
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/gxs/GxsGroupDialog.h 
+		gui/gxs/GxsIdDetails.h 
+		gui/gxs/GxsIdChooser.h
+		gui/gxs/GxsIdLabel.h 
+		gui/gxs/GxsCircleChooser.h 
+		gui/gxs/GxsCircleLabel.h 
+		gui/gxs/GxsIdTreeWidgetItem.h 
+		gui/gxs/GxsCommentTreeWidget.h 
+		gui/gxs/GxsCommentContainer.h 
+		gui/gxs/GxsCommentDialog.h 
+		gui/gxs/GxsCreateCommentDialog.h 
+		gui/gxs/GxsGroupFrameDialog.h 
+		gui/gxs/GxsMessageFrameWidget.h 
+		gui/gxs/GxsMessageFramePostWidget.h 
+		gui/gxs/GxsGroupFeedItem.h 
+		gui/gxs/GxsFeedItem.h 
+		gui/gxs/GxsGroupShareKey.h 
+		gui/gxs/GxsUserNotify.h 
+		gui/gxs/GxsFeedWidget.h 
+		util/TokenQueue.h 
+		util/RsGxsUpdateBroadcast.h 
+		)
+
+	list(
+		APPEND RS_FORMS
+		gui/gxs/GxsGroupDialog.ui 
+		gui/gxs/GxsCommentContainer.ui 
+		gui/gxs/GxsCommentDialog.ui 
+		gui/gxs/GxsCreateCommentDialog.ui 
+		gui/gxs/GxsGroupFrameDialog.ui
+		gui/gxs/GxsGroupShareKey.ui 
+		)
+	
+	list(
+		APPEND RS_SOURCES
+		gui/gxs/GxsGroupDialog.cpp 
+		gui/gxs/GxsIdDetails.cpp 
+		gui/gxs/GxsIdChooser.cpp 
+		gui/gxs/GxsIdLabel.cpp 
+		gui/gxs/GxsCircleChooser.cpp 
+		gui/gxs/GxsGroupShareKey.cpp 
+		gui/gxs/GxsCircleLabel.cpp 
+		gui/gxs/GxsIdTreeWidgetItem.cpp 
+		gui/gxs/GxsCommentTreeWidget.cpp 
+		gui/gxs/GxsCommentContainer.cpp 
+		gui/gxs/GxsCommentDialog.cpp 
+		gui/gxs/GxsCreateCommentDialog.cpp 
+		gui/gxs/GxsGroupFrameDialog.cpp 
+		gui/gxs/GxsMessageFrameWidget.cpp 
+		gui/gxs/GxsMessageFramePostWidget.cpp 
+		gui/gxs/GxsGroupFeedItem.cpp 
+		gui/gxs/GxsFeedItem.cpp 
+		gui/gxs/GxsUserNotify.cpp 
+		gui/gxs/GxsFeedWidget.cpp 
+		util/TokenQueue.cpp 
+		util/RsGxsUpdateBroadcast.cpp 
+		)
+endif(RS_GXSGUI)
+	
+if(RS_GXSFORUMS) 
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS 
+		gui/gxsforums/GxsForumsDialog.h 
+		gui/gxsforums/GxsForumGroupDialog.h 
+		gui/gxsforums/CreateGxsForumMsg.h 
+		gui/gxsforums/GxsForumThreadWidget.h 
+		gui/gxsforums/GxsForumModel.h 
+		gui/gxsforums/GxsForumUserNotify.h 
+		gui/feeds/GxsForumGroupItem.h 
+		gui/feeds/GxsForumMsgItem.h
+		)
+
+	list(
+		APPEND RS_FORMS
+		ui/gxsforums/CreateGxsForumMsg.ui 
+		gui/gxsforums/GxsForumThreadWidget.ui 
+		gui/feeds/GxsForumGroupItem.ui 
+		gui/feeds/GxsForumMsgItem.ui
+		)
+
+	list(
+		APPEND RS_SOURCES
+		gui/gxsforums/GxsForumsDialog.cpp 
+		gui/gxsforums/GxsForumGroupDialog.cpp 
+		gui/gxsforums/CreateGxsForumMsg.cpp 
+		gui/gxsforums/GxsForumThreadWidget.cpp 
+		gui/gxsforums/GxsForumModel.cpp 
+		gui/gxsforums/GxsForumUserNotify.cpp 
+		gui/feeds/GxsForumGroupItem.cpp 
+		gui/feeds/GxsForumMsgItem.cpp
+		)
+endif(RS_GXSFORUMS)
+	
+	
+if(RS_GXSCHANNELS)
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/gxschannels/GxsChannelDialog.h 
+		gui/gxschannels/GxsChannelGroupDialog.h 
+		gui/gxschannels/CreateGxsChannelMsg.h 
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.h 
+		gui/gxschannels/GxsChannelPostsModel.h 
+		gui/gxschannels/GxsChannelPostFilesModel.h 
+		gui/gxschannels/GxsChannelPostThumbnail.h 
+		gui/gxschannels/GxsChannelFilesStatusWidget.h 
+		gui/feeds/GxsChannelGroupItem.h 
+		gui/feeds/GxsChannelPostItem.h 
+		gui/gxschannels/GxsChannelUserNotify.h
+		)
+	
+	list(
+		APPEND RS_FORMS
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.ui 
+		gui/gxschannels/GxsChannelFilesStatusWidget.ui 
+		gui/gxschannels/CreateGxsChannelMsg.ui 
+		gui/feeds/GxsChannelGroupItem.ui 
+		gui/feeds/GxsChannelPostItem.ui
+		)
+	
+	list(
+		APPEND RS_SOURCES
+		gui/gxschannels/GxsChannelDialog.cpp 
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp 
+		gui/gxschannels/GxsChannelPostsModel.cpp 
+		gui/gxschannels/GxsChannelPostFilesModel.cpp 
+		gui/gxschannels/GxsChannelFilesStatusWidget.cpp 
+                gui/gxschannels/GxsChannelPostThumbnail.cpp 
+		gui/gxschannels/GxsChannelGroupDialog.cpp 
+		gui/gxschannels/CreateGxsChannelMsg.cpp 
+		gui/feeds/GxsChannelGroupItem.cpp 
+		gui/feeds/GxsChannelPostItem.cpp 
+		gui/gxschannels/GxsChannelUserNotify.cpp
+		)
+endif(RS_GXSCHANNELS)
+	
+if(RS_GXSPOSTED)
+	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
+		gui/Posted/PostedDialog.h 
+		gui/Posted/PostedListWidgetWithModel.h 
+		gui/Posted/PostedPostsModel.h 
+		gui/Posted/BoardPostDisplayWidget.h 
+		gui/Posted/PostedItem.h 
+		gui/Posted/PostedCardView.h 
+		gui/Posted/PostedGroupDialog.h 
+		gui/feeds/PostedGroupItem.h 
+		gui/Posted/PostedCreatePostDialog.h 
+		gui/Posted/PhotoView.h 
+		gui/Posted/PostedUserNotify.h
+		)
+
+	list(
+		APPEND RS_FORMS
+		gui/Posted/PostedListWidgetWithModel.ui 
+		gui/feeds/PostedGroupItem.ui 
+		gui/Posted/BoardPostDisplayWidget_compact.ui 
+		gui/Posted/BoardPostDisplayWidget_card.ui 
+		gui/Posted/PostedItem.ui 
+		gui/Posted/PostedCardView.ui 
+		gui/Posted/PostedCreatePostDialog.ui 
+		gui/Posted/PhotoView.ui 
+		)
+	
+	list(
+		APPEND RS_SOURCES
+		gui/Posted/PostedDialog.cpp 
+		gui/Posted/PostedListWidgetWithModel.cpp 
+		gui/Posted/BoardPostDisplayWidget.cpp 
+		gui/Posted/PostedPostsModel.cpp 
+		gui/feeds/PostedGroupItem.cpp 
+		gui/Posted/PostedItem.cpp 
+		gui/Posted/PostedCardView.cpp 
+		gui/Posted/PostedGroupDialog.cpp 
+		gui/Posted/PostedCreatePostDialog.cpp 
+		gui/Posted/PhotoView.cpp 
+		gui/Posted/PostedUserNotify.cpp
+		)
+
+	list(
+		APPEND RS_QTRESOURCES
+		gui/Posted/Posted_images.qrc
+		)
+endif(RS_GXSPOSTED)
+
+
+

From 40336c23374f26784d09666851bf2125e0ecc0bb Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 25 Mar 2022 18:39:14 +0100
Subject: [PATCH 057/503] added root cmake file in retroshare-gui

---
 retroshare-gui/CMakeLists.txt | 470 ++++++++++++++++++++++++++++++++++
 1 file changed, 470 insertions(+)
 create mode 100644 retroshare-gui/CMakeLists.txt

diff --git a/retroshare-gui/CMakeLists.txt b/retroshare-gui/CMakeLists.txt
new file mode 100644
index 000000000..57721d9f8
--- /dev/null
+++ b/retroshare-gui/CMakeLists.txt
@@ -0,0 +1,470 @@
+################################################################################
+# retroshare-gui/CMakeLists.txt                                                #
+# Copyright (C) 2022, Retroshare team <retroshare.team@gmailcom>               #
+#                                                                              #
+# This program is free software: you can redistribute it and/or modify         #
+# it under the terms of the GNU Affero General Public License as               #
+# published by the Free Software Foundation, either version 3 of the           #
+# License, or (at your option) any later version.                              #
+#                                                                              #
+# This program is distributed in the hope that it will be useful,              #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU Affero General Public License for more details.                          #
+#                                                                              #
+# You should have received a copy of the GNU Affero General Public License     #
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.       #
+################################################################################
+
+cmake_minimum_required (VERSION 3.18.0)
+project(retroshare-gui VERSION 0.6.6 LANGUAGES CXX)
+
+include(CMakeDependentOption)
+
+set(
+	RS_BIN_INSTALL_DIR
+	"${CMAKE_INSTALL_PREFIX}/bin"
+	CACHE PATH
+	"Path where to install retroshare-service compiled binary" )
+
+option(
+	RS_DEVELOPMENT_BUILD
+	"Disable optimization to speed up build, enable verbose build log. \
+	 just for development purposes, not suitable for library usage"
+	OFF )
+
+option(
+	RS_JSON_API
+	"Use restbed to expose libretroshare as JSON API via HTTP"
+	ON )
+
+option(
+	RS_SERVICE_DESKTOP
+	"Install icons and shortcuts for desktop environements"
+	OFF )
+
+option(
+	RS_SERVICE_TERMINAL_LOGIN
+	"Enable RetroShare login via terminal"
+	ON )
+
+cmake_dependent_option(
+	RS_SERVICE_TERMINAL_WEBUI_PASSWORD
+	"Enable settin Web UI password via terminal in retroshare-service"
+	OFF
+	"RS_WEBUI"
+	ON )
+
+cmake_dependent_option(
+	RS_WEBUI
+	"Install RetroShare Web UI"
+	OFF
+	"RS_JSON_API"
+	ON )
+
+################################################################################
+
+set(FETCHCONTENT_QUIET OFF)
+include(FetchContent)
+
+find_package(Git REQUIRED)
+
+################################################################################
+
+if(RS_DEVELOPMENT_BUILD)
+	set(CMAKE_VERBOSE_MAKEFILE ON)
+	set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+endif(RS_DEVELOPMENT_BUILD)
+
+################################################################################
+
+include(src/CMakeLists.txt)
+
+add_executable(${PROJECT_NAME} ${RS_SERVICE_SOURCES})
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
+
+################################################################################
+
+if(RS_DEVELOPMENT_BUILD)
+	target_compile_options(${PROJECT_NAME} PRIVATE "-O0")
+endif(RS_DEVELOPMENT_BUILD)
+
+################################################################################
+
+set(RETROSHAREGUI_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../retroshare-gui/")
+if(EXISTS "${RETROSHAREGUI_DEVEL_DIR}/.git" )
+	message(
+		STATUS
+		"retroshare-gui submodule found at ${RETROSHAREGUI_DEVEL_DIR} using it" )
+	add_subdirectory(
+		"${RETROSHAREGUI_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/retroshare-gui" )
+else()
+	FetchContent_Declare(
+		retroshare-gui
+		GIT_REPOSITORY "https://gitlab.com/RetroShare/retroshare.git"
+		GIT_TAG "origin/master"
+		GIT_SHALLOW TRUE
+		GIT_PROGRESS TRUE
+		TIMEOUT 10
+	)
+	FetchContent_MakeAvailable(retroshare-gui)
+endif()
+
+target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
+
+################################################################################
+
+if(RS_SERVICE_DESKTOP)
+	if(UNIX AND NOT APPLE)
+		install(
+			FILES data/retroshare.svg
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/ )
+
+		install(
+			FILES data/retroshare.xpm
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/ )
+
+		install(
+			FILES data/24x24/apps/retroshare.png
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/24x24/apps/retroshare.png )
+
+		install(
+			FILES data/48x48/apps/retroshare.png
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/retroshare.png )
+
+		install(
+			FILES data/64x64/apps/retroshare.png
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps/retroshare.png )
+
+		install(
+			FILES data/128x128/apps/retroshare.png
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/retroshare.png )
+
+		install(
+			FILES data/retroshare.desktop
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/data/retroshare.desktop )
+
+		install(
+			FILES gui/qss/chat/Bubble gui/qss/chat/Bubble_Compact
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/data/stylesheets/ )
+
+		install(
+			FILES src/sounds/ src/qss/
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/ )
+	endif(UNIX AND NOT APPLE)
+endif(RS_SERVICE_DESKTOP)
+
+################################################################################
+
+if(RS_JSON_API)
+	target_compile_definitions(${PROJECT_NAME} PUBLIC RS_JSONAPI)
+endif(RS_JSON_API)
+
+################################################################################
+
+################################################################################
+#                                    TODO                                      #
+################################################################################
+
+if(RS_GUI_CMARK)
+	set(CMARK_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../supportlibs/cmark/")
+	if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
+		message( STATUS "cmark submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
+		add_subdirectory( "${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
+	else()
+		FetchContent_Declare(
+			cmark
+			GIT_REPOSITORY "https://github.com/commonmark/cmark.git"
+			GIT_TAG "origin/master"
+			GIT_SHALLOW TRUE
+			GIT_PROGRESS TRUE
+			TIMEOUT 10
+			)
+		FetchContent_MakeAvailable(cmark)
+	endif()
+endif(RS_GUI_CMARK)
+
+
+#   # Auto detect installed version of cmark
+#   rs_gui_cmark {
+#   	DEFINES *= USE_CMARK
+#   	no_rs_cross_compiling {
+#   		message("Using compiled cmark")
+#   		CMARK_SRC_PATH=$$clean_path($${RS_SRC_PATH}/supportlibs/cmark)
+#   		CMARK_BUILD_PATH=$$clean_path($${RS_BUILD_PATH}/supportlibs/cmark/build)
+#   		INCLUDEPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
+#   		DEPENDPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
+#   		QMAKE_LIBDIR *= $$clean_path($${CMARK_BUILD_PATH}/)
+#   		# Using sLibs would fail as libcmark.a is generated at compile-time
+#   		LIBS *= -L$$clean_path($${CMARK_BUILD_PATH}/src/) -lcmark
+#   
+#   		DUMMYCMARKINPUT = FORCE
+#   		CMAKE_GENERATOR_OVERRIDE=""
+#   		win32-g++|win32-clang-g++:CMAKE_GENERATOR_OVERRIDE="-G \"MSYS Makefiles\""
+#   		gencmarklib.name = Generating libcmark.
+#   		gencmarklib.input = DUMMYCMARKINPUT
+#   		gencmarklib.output = $$clean_path($${CMARK_BUILD_PATH}/src/libcmark.a)
+#   		gencmarklib.CONFIG += target_predeps combine
+#   		gencmarklib.variable_out = PRE_TARGETDEPS
+#   		gencmarklib.commands = \
+#   		    cd $${RS_SRC_PATH} && ( \
+#   		    git submodule update --init supportlibs/cmark ; \
+#   		    cd $${CMARK_SRC_PATH} ; \
+#   		    true ) && \
+#   		    mkdir -p $${CMARK_BUILD_PATH} && cd $${CMARK_BUILD_PATH} && \
+#   		    cmake \
+#   		        -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
+#                           \"-DCMAKE_CXX_FLAGS=$${QMAKE_CXXFLAGS}\" \
+#   		        $${CMAKE_GENERATOR_OVERRIDE} \
+#   		        -DCMAKE_INSTALL_PREFIX=. \
+#   		        -B. \
+#   		        -H$$shell_path($${CMARK_SRC_PATH}) && \
+#   		    $(MAKE)
+#   		QMAKE_EXTRA_COMPILERS += gencmarklib
+#   	} else {
+#   		message("Using systems cmark")
+#   		sLibs *= libcmark
+#   	}
+#   }
+
+################################# Linux ##########################################
+# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
+
+if(UNIX)
+	find_package(PkgConfig REQUIRED)
+
+	pkg_check_modules(X11 REQUIRED x11)
+	pkg_check_modules(XSCRNSAVER REQUIRED xscrnsaver)
+
+	target_link_libraries(${PROJECT_NAME} PRIVATE ${X11_LIBRARIES})
+	target_include_directories(${PROJECT_NAME} PRIVATE ${X11_INCLUDE_DIRS})
+	target_compile_options(${PROJECT_NAME} PRIVATE ${X11_CFLAGS_OTHER})
+
+	target_link_libraries(${PROJECT_NAME} ${XSCRNSAVER_LIBRARIES})
+	target_include_directories(retroshare-gui PRIVATE ${XSCRNSAVER_INCLUDE_DIRS})
+	target_compile_options(retroshare-gui PRIVATE ${XSCRNSAVER_CFLAGS_OTHER})
+
+	target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_XSS)
+	target_compile_definitions(${PROJECT_NAME} PRIVATE _FILE_OFFSET_BITS=64)
+	target_link_options(${PROJECT_NAME} PRIVATE LINKER:-rdynamic)
+endif(UNIX)
+
+if(RS_SANITIZE)
+	target_link_libraries(${PROJECT_NAME} asan)
+	target_link_libraries(${PROJECT_NAME} ubsan)
+endif(RS_SANITIZE)
+
+#                       #################### Cross compilation for windows under Linux ###################
+#                       
+#                       win32-x-g++ {
+#                       		OBJECTS_DIR = temp/win32-x-g++/obj
+#                       
+#                       		LIBS += ../../../../lib/win32-x-g++-v0.5/libssl.a
+#                       		LIBS += ../../../../lib/win32-x-g++-v0.5/libcrypto.a
+#                       		LIBS += ../../../../lib/win32-x-g++-v0.5/libgpgme.dll.a
+#                       		LIBS += ../../../../lib/win32-x-g++-v0.5/libminiupnpc.a
+#                       		LIBS += ../../../../lib/win32-x-g++-v0.5/libz.a
+#                       		LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
+#                       		LIBS += -lQtUiTools
+#                       		LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
+#                       		LIBS += -lole32 -lwinmm
+#                       
+#                       		DEFINES *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
+#                       
+#                       		INCLUDEPATH += ../../../../gpgme-1.1.8/src/
+#                       		INCLUDEPATH += ../../../../libgpg-error-1.7/src/
+#                       
+#                       		RC_FILE = gui/images/retroshare_win.rc
+#                       }
+#                       
+#                       #################################### Windows #####################################
+#                       
+#                       win32-g++|win32-clang-g++ {
+#                       	CONFIG(debug, debug|release) {
+#                       		# show console output
+#                       		CONFIG += console
+#                       	} else {
+#                       		CONFIG -= console
+#                       	}
+#                       
+#                       	CONFIG(debug, debug|release) {
+#                       	} else {
+#                       		# Tell linker to use ASLR protection
+#                       		QMAKE_LFLAGS += -Wl,-dynamicbase
+#                       		# Tell linker to use DEP protection
+#                       		QMAKE_LFLAGS += -Wl,-nxcompat
+#                       	}
+#                       
+#                           # Fix linking error (ld.exe: Error: export ordinal too large) due to too
+#                           # many exported symbols.
+#                           !libretroshare_shared:QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
+#                       
+#                       	# Switch off optimization for release version
+#                       	QMAKE_CXXFLAGS_RELEASE -= -O2
+#                       	QMAKE_CXXFLAGS_RELEASE += -O0
+#                       	QMAKE_CFLAGS_RELEASE -= -O2
+#                       	QMAKE_CFLAGS_RELEASE += -O0
+#                       
+#                       	# Switch on optimization for debug version
+#                       	#QMAKE_CXXFLAGS_DEBUG += -O2
+#                       	#QMAKE_CFLAGS_DEBUG += -O2
+#                       
+#                       	OBJECTS_DIR = temp/obj
+#                       
+#                           dLib = ws2_32 gdi32 uuid ole32 iphlpapi crypt32 winmm
+#                           LIBS *= $$linkDynamicLibs(dLib)
+#                       
+#                       	RC_FILE = gui/images/retroshare_win.rc
+#                       
+#                       	# export symbols for the plugins
+#                       	LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a
+#                       
+#                       	# create lib directory
+#                       	isEmpty(QMAKE_SH) {
+#                       		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib $(MKDIR) lib
+#                       	} else {
+#                       		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib || $(MKDIR) lib
+#                       	}
+#                       
+#                       	greaterThan(QT_MAJOR_VERSION, 4) {
+#                       		# Qt 5
+#                       		RC_INCLUDEPATH += $$_PRO_FILE_PWD_/../../libretroshare/src
+#                       	} else {
+#                       		# Qt 4
+#                       		QMAKE_RC += --include-dir=$$_PRO_FILE_PWD_/../../libretroshare/src
+#                       	}
+#                       }
+#                       
+#                       ##################################### MacOS ######################################
+#                       
+#                       macx {
+#                       	# ENABLE THIS OPTION FOR Univeral Binary BUILD.
+#                       	#CONFIG += ppc x86
+#                       	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+#                       	QMAKE_INFO_PLIST = Info.plist
+#                       	mac_icon.files = $$files($$PWD/rsMacIcon.icns)
+#                       	mac_icon.path = Contents/Resources
+#                       	QMAKE_BUNDLE_DATA += mac_icon
+#                       	dplQSS.files = $$PWD/qss
+#                       	dplQSS.path = Contents/Resources
+#                       	QMAKE_BUNDLE_DATA += dplQSS
+#                       	dplChatStyles.files = \
+#                       		$$PWD/gui/qss/chat/Bubble \
+#                       		$$PWD/gui/qss/chat/Bubble_Compact
+#                       	dplChatStyles.path = Contents/Resources/stylesheets
+#                       	QMAKE_BUNDLE_DATA += dplChatStyles 
+#                       #	mac_webui.files = $$files($$PWD/../../libresapi/src/webui)
+#                       #	mac_webui.path = Contents/Resources
+#                       #	QMAKE_BUNDLE_DATA += mac_webui
+#                       
+#                       	OBJECTS_DIR = temp/obj
+#                       
+#                       	CONFIG += version_detail_bash_script
+#                       	LIBS += -lssl -lcrypto -lz 
+#                       	for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
+#                       	LIBS += -framework CoreFoundation
+#                       	LIBS += -framework Security
+#                       	LIBS += -framework Carbon
+#                       
+#                       	for(lib, LIB_DIR):LIBS += -L"$$lib"
+#                       	for(bin, BIN_DIR):LIBS += -L"$$bin"
+#                       
+#                       	DEPENDPATH += . $$INC_DIR
+#                       	INCLUDEPATH += . $$INC_DIR
+#                       
+#                       	#DEFINES *= MAC_IDLE # for idle feature
+#                       	CONFIG -= uitools
+#                       }
+#                       
+#                       ##################################### FreeBSD ######################################
+#                       
+#                       freebsd-* {
+#                       	INCLUDEPATH *= /usr/local/include/gpgme
+#                       	LIBS *= -lssl
+#                       	LIBS *= -lgpgme
+#                       	LIBS *= -lupnp
+#                       	LIBS *= -lgnome-keyring
+#                       
+#                       	LIBS += -lsqlite3
+#                       }
+#                       
+#                       ##################################### Haiku ######################################
+#                       
+#                       haiku-* {
+#                       	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+#                       	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
+#                       
+#                       	LIBS *= ../../libretroshare/src/lib/libretroshare.a
+#                       	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2 -lbsd
+#                       	LIBS *= -lssl -lcrypto -lnetwork
+#                       	LIBS *= -lgpgme
+#                       	LIBS *= -lupnp
+#                       	LIBS *= -lz
+#                       	LIBS *= -lixml
+#                       
+#                       	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+#                       	LIBS += -lsqlite3
+#                       }
+#                       
+#                       ##################################### OpenBSD ######################################
+#                       
+#                       openbsd-* {
+#                       	INCLUDEPATH *= /usr/local/include
+#                       
+#                       	LIBS *= -lssl -lcrypto
+#                       	LIBS *= -lgpgme
+#                       	LIBS *= -lupnp
+#                       	LIBS *= -lgnome-keyring
+#                       	LIBS += -lsqlite3
+#                       	LIBS *= -rdynamic
+#                       }
+#                       
+#                       ################################### COMMON stuff ##################################
+#                       
+#                       wikipoos {
+#                       	PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+#                       	LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+#                       	LIBS *= -lglib-2.0
+#                       }
+
+set(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/")
+if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
+	message(
+		STATUS
+		"libretroshare submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
+	add_subdirectory(
+		"${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
+else()
+	FetchContent_Declare(
+		libretroshare
+		GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
+		GIT_TAG "origin/master"
+		GIT_SHALLOW TRUE
+		GIT_PROGRESS TRUE
+		TIMEOUT 10
+	)
+	FetchContent_MakeAvailable(libretroshare)
+endif()
+
+################################ QT FILES #######################################
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package( Qt5 COMPONENTS Widgets REQUIRED)
+
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
+
+################################ GENERAL #######################################
+
+target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
+add_dependencies(${PROJECT_NAME} libretroshare)
+
+add_executable(${PROJECT_NAME} ${RS_SOURCES} ${RS_FORMS} ${RS_QTRESOURCES})
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})

From bf1b3ed69a938049f434aac9fdfd3915f62b44ea Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 25 Mar 2022 22:05:28 +0100
Subject: [PATCH 058/503] fixed some bugs

---
 retroshare-gui/CMakeLists.txt | 53 +++++++++++------------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/retroshare-gui/CMakeLists.txt b/retroshare-gui/CMakeLists.txt
index 57721d9f8..19e7690c9 100644
--- a/retroshare-gui/CMakeLists.txt
+++ b/retroshare-gui/CMakeLists.txt
@@ -80,7 +80,7 @@ endif(RS_DEVELOPMENT_BUILD)
 
 include(src/CMakeLists.txt)
 
-add_executable(${PROJECT_NAME} ${RS_SERVICE_SOURCES})
+add_executable(${PROJECT_NAME} ${RS_SOURCES} ${RS_FORMS} ${RS_QTRESOURCES})
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
 
@@ -92,27 +92,25 @@ endif(RS_DEVELOPMENT_BUILD)
 
 ################################################################################
 
-set(RETROSHAREGUI_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../retroshare-gui/")
-if(EXISTS "${RETROSHAREGUI_DEVEL_DIR}/.git" )
+set(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/")
+if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
 	message(
 		STATUS
-		"retroshare-gui submodule found at ${RETROSHAREGUI_DEVEL_DIR} using it" )
+		"libretroshare submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
 	add_subdirectory(
-		"${RETROSHAREGUI_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/retroshare-gui" )
+		"${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
 else()
 	FetchContent_Declare(
-		retroshare-gui
-		GIT_REPOSITORY "https://gitlab.com/RetroShare/retroshare.git"
+		libretroshare
+		GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
 		GIT_TAG "origin/master"
 		GIT_SHALLOW TRUE
 		GIT_PROGRESS TRUE
 		TIMEOUT 10
 	)
-	FetchContent_MakeAvailable(retroshare-gui)
+	FetchContent_MakeAvailable(libretroshare)
 endif()
 
-target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
-
 ################################################################################
 
 if(RS_SERVICE_DESKTOP)
@@ -237,11 +235,12 @@ if(UNIX)
 	pkg_check_modules(X11 REQUIRED x11)
 	pkg_check_modules(XSCRNSAVER REQUIRED xscrnsaver)
 
-	target_link_libraries(${PROJECT_NAME} PRIVATE ${X11_LIBRARIES})
+	list( APPEND RS_LINK_LIBRARIES ${X11_LIBRARIES} )
+	list( APPEND RS_LINK_LIBRARIES ${XSCRNSAVER_LIBRARIES} )
+
 	target_include_directories(${PROJECT_NAME} PRIVATE ${X11_INCLUDE_DIRS})
 	target_compile_options(${PROJECT_NAME} PRIVATE ${X11_CFLAGS_OTHER})
 
-	target_link_libraries(${PROJECT_NAME} ${XSCRNSAVER_LIBRARIES})
 	target_include_directories(retroshare-gui PRIVATE ${XSCRNSAVER_INCLUDE_DIRS})
 	target_compile_options(retroshare-gui PRIVATE ${XSCRNSAVER_CFLAGS_OTHER})
 
@@ -251,8 +250,8 @@ if(UNIX)
 endif(UNIX)
 
 if(RS_SANITIZE)
-	target_link_libraries(${PROJECT_NAME} asan)
-	target_link_libraries(${PROJECT_NAME} ubsan)
+	list( APPEND RS_LINK_LIBRARIES asan )
+	list( APPEND RS_LINK_LIBRARIES ubsan )
 endif(RS_SANITIZE)
 
 #                       #################### Cross compilation for windows under Linux ###################
@@ -428,25 +427,6 @@ endif(RS_SANITIZE)
 #                       	LIBS *= -lglib-2.0
 #                       }
 
-set(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/")
-if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
-	message(
-		STATUS
-		"libretroshare submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
-	add_subdirectory(
-		"${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
-else()
-	FetchContent_Declare(
-		libretroshare
-		GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
-		GIT_TAG "origin/master"
-		GIT_SHALLOW TRUE
-		GIT_PROGRESS TRUE
-		TIMEOUT 10
-	)
-	FetchContent_MakeAvailable(libretroshare)
-endif()
-
 ################################ QT FILES #######################################
 
 set(CMAKE_CXX_STANDARD 11)
@@ -458,13 +438,12 @@ set(CMAKE_AUTOUIC ON)
 
 find_package( Qt5 COMPONENTS Widgets REQUIRED)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
+list( APPEND RS_LINK_LIBRARIES Qt5::Widget )
 
 ################################ GENERAL #######################################
 
-target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${RS_LINK_LIBRARIES})
+
 add_dependencies(${PROJECT_NAME} libretroshare)
 
-add_executable(${PROJECT_NAME} ${RS_SOURCES} ${RS_FORMS} ${RS_QTRESOURCES})
-
 install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})

From a0ac041582196fe1c2fc2ff2d30649c7ba2783c4 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 25 Mar 2022 23:35:12 +0100
Subject: [PATCH 059/503] fixed compilatin

---
 retroshare-gui/CMakeLists.txt                 |   52 +-
 retroshare-gui/src/CMakeLists.txt             | 1843 ++++++++---------
 .../src/gui/statistics/BandwidthStatsWidget.h |    2 +
 3 files changed, 953 insertions(+), 944 deletions(-)

diff --git a/retroshare-gui/CMakeLists.txt b/retroshare-gui/CMakeLists.txt
index 19e7690c9..0a44cfa82 100644
--- a/retroshare-gui/CMakeLists.txt
+++ b/retroshare-gui/CMakeLists.txt
@@ -62,6 +62,22 @@ cmake_dependent_option(
 	"RS_JSON_API"
 	ON )
 
+################################ QT FILES #######################################
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package( Qt5 COMPONENTS Widgets REQUIRED)
+find_package( Qt5 COMPONENTS Xml     REQUIRED)
+find_package( Qt5 COMPONENTS Network REQUIRED)
+find_package( Qt5 COMPONENTS PrintSupport REQUIRED)
+
+list( APPEND RS_LINK_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
+
 ################################################################################
 
 set(FETCHCONTENT_QUIET OFF)
@@ -80,8 +96,7 @@ endif(RS_DEVELOPMENT_BUILD)
 
 include(src/CMakeLists.txt)
 
-add_executable(${PROJECT_NAME} ${RS_SOURCES} ${RS_FORMS} ${RS_QTRESOURCES})
-
+add_executable(${PROJECT_NAME} ${RS_GUI_SOURCES} ${RS_GUI_FORMS} ${RS_GUI_QTRESOURCES})
 install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
 
 ################################################################################
@@ -111,6 +126,8 @@ else()
 	FetchContent_MakeAvailable(libretroshare)
 endif()
 
+target_include_directories(${PROJECT_NAME} PRIVATE ${LIBRETROSHARE_DEVEL_DIR}/src/)
+
 ################################################################################
 
 if(RS_SERVICE_DESKTOP)
@@ -161,10 +178,6 @@ endif(RS_JSON_API)
 
 ################################################################################
 
-################################################################################
-#                                    TODO                                      #
-################################################################################
-
 if(RS_GUI_CMARK)
 	set(CMARK_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../supportlibs/cmark/")
 	if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
@@ -184,6 +197,10 @@ if(RS_GUI_CMARK)
 endif(RS_GUI_CMARK)
 
 
+################################################################################
+#                                    TODO                                      #
+################################################################################
+
 #   # Auto detect installed version of cmark
 #   rs_gui_cmark {
 #   	DEFINES *= USE_CMARK
@@ -427,23 +444,16 @@ endif(RS_SANITIZE)
 #                       	LIBS *= -lglib-2.0
 #                       }
 
-################################ QT FILES #######################################
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-find_package( Qt5 COMPONENTS Widgets REQUIRED)
-
-list( APPEND RS_LINK_LIBRARIES Qt5::Widget )
-
 ################################ GENERAL #######################################
 
 target_link_libraries(${PROJECT_NAME} PRIVATE ${RS_LINK_LIBRARIES})
 
-add_dependencies(${PROJECT_NAME} libretroshare)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/)
+
+set( CMAKE_CXX_FLAGS "-Wno-deprecated-declarations" )
+target_compile_definitions(${PROJECT_NAME} PUBLIC RS_NO_WARN_DEPRECATED )
+
+
+
+#add_dependencies(${PROJECT_NAME} libretroshare)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
diff --git a/retroshare-gui/src/CMakeLists.txt b/retroshare-gui/src/CMakeLists.txt
index 871175869..540363ea2 100644
--- a/retroshare-gui/src/CMakeLists.txt
+++ b/retroshare-gui/src/CMakeLists.txt
@@ -17,765 +17,762 @@
 ################################################################################
 
 list(
-	APPEND RS_SOURCES
-	TorControl/TorControlWindow.cpp
+	APPEND RS_GUI_SOURCES
+	src/TorControl/TorControlWindow.cpp
 
-	main.cpp 
-	rshare.cpp 
+	src/main.cpp 
+	src/rshare.cpp 
 
-	gui/notifyqt.cpp 
-	gui/AboutDialog.cpp 
-	gui/AboutWidget.cpp 
-	gui/QuickStartWizard.cpp 
-	gui/StartDialog.cpp 
-	gui/HomePage.cpp
-        gui/PluginsPage.cpp 
-	gui/PluginManagerWidget.cpp 
-	gui/PluginManager.cpp
-	gui/ChatLobbyWidget.cpp 
-	gui/GetStartedDialog.cpp 
-	gui/GenCertDialog.cpp 
-	gui/NetworkDialog.cpp 
-	gui/mainpagestack.cpp 
-	gui/MainWindow.cpp 
-	gui/NetworkView.cpp 
-	gui/FriendsDialog.cpp 
-	gui/ServicePermissionDialog.cpp 
-	gui/RemoteDirModel.cpp 
-	gui/RsAutoUpdatePage.cpp 
-	gui/RetroShareLink.cpp 
-	gui/SearchTreeWidget.cpp 
-	gui/ShareManager.cpp 
-	gui/ShareDialog.cpp 
-	gui/NewsFeed.cpp 
-	gui/SFListDelegate.cpp 
-	gui/MainPage.cpp 
-	gui/HelpDialog.cpp 
-	gui/LogoBar.cpp 
-	gui/SoundManager.cpp 
+	src/gui/notifyqt.cpp 
+	src/gui/AboutDialog.cpp 
+	src/gui/AboutWidget.cpp 
+	src/gui/QuickStartWizard.cpp 
+	src/gui/StartDialog.cpp 
+	src/gui/HomePage.cpp
+        src/gui/PluginsPage.cpp 
+	src/gui/PluginManagerWidget.cpp 
+	src/gui/PluginManager.cpp
+	src/gui/ChatLobbyWidget.cpp 
+	src/gui/GetStartedDialog.cpp 
+	src/gui/GenCertDialog.cpp 
+	src/gui/NetworkDialog.cpp 
+	src/gui/mainpagestack.cpp 
+	src/gui/MainWindow.cpp 
+	src/gui/NetworkView.cpp 
+	src/gui/FriendsDialog.cpp 
+	src/gui/ServicePermissionDialog.cpp 
+	src/gui/RemoteDirModel.cpp 
+	src/gui/RsAutoUpdatePage.cpp 
+	src/gui/RetroShareLink.cpp 
+	src/gui/SearchTreeWidget.cpp 
+	src/gui/ShareManager.cpp 
+	#	src/gui/ShareDialog.cpp 
+	src/gui/NewsFeed.cpp 
+	src/gui/MainPage.cpp 
+	src/gui/HelpDialog.cpp 
+	src/gui/LogoBar.cpp 
+	src/gui/SoundManager.cpp 
 
-	gui/im_history/ImHistoryBrowser.cpp 
-	gui/im_history/IMHistoryItemDelegate.cpp 
-	gui/im_history/IMHistoryItemPainter.cpp 
+	src/gui/im_history/ImHistoryBrowser.cpp 
+	src/gui/im_history/IMHistoryItemDelegate.cpp 
+	src/gui/im_history/IMHistoryItemPainter.cpp 
 
-	gui/help/browser/helpbrowser.cpp 
-	gui/help/browser/helptextbrowser.cpp 
+	src/gui/help/browser/helpbrowser.cpp 
+	src/gui/help/browser/helptextbrowser.cpp 
 
-	gui/FileTransfer/SearchDialog.cpp 
-	gui/FileTransfer/SharedFilesDialog.cpp 
-	gui/FileTransfer/TransfersDialog.cpp 
-	gui/FileTransfer/FileTransferInfoWidget.cpp 
-	gui/FileTransfer/DLListDelegate.cpp 
-	gui/FileTransfer/ULListDelegate.cpp 
-	gui/FileTransfer/xprogressbar.cpp 
-	gui/FileTransfer/DetailsDialog.cpp 
-	gui/FileTransfer/TransferUserNotify.cpp 
-	gui/FileTransfer/BannedFilesDialog.cpp 
+	src/gui/FileTransfer/SearchDialog.cpp 
+	src/gui/FileTransfer/SharedFilesDialog.cpp 
+	src/gui/FileTransfer/TransfersDialog.cpp 
+	src/gui/FileTransfer/FileTransferInfoWidget.cpp 
+	src/gui/FileTransfer/DLListDelegate.cpp 
+	src/gui/FileTransfer/ULListDelegate.cpp 
+	src/gui/FileTransfer/xprogressbar.cpp 
+	src/gui/FileTransfer/DetailsDialog.cpp 
+	src/gui/FileTransfer/TransferUserNotify.cpp 
+	src/gui/FileTransfer/BannedFilesDialog.cpp 
 
-	lang/languagesupport.cpp 
+	src/lang/languagesupport.cpp 
 
-	util/RsProtectedTimer.cpp 
-	util/stringutil.cpp 
-	util/RsNetUtil.cpp 
-	util/DateTime.cpp 
-	util/RetroStyleLabel.cpp 
-	util/WidgetBackgroundImage.cpp 
-	util/NonCopyable.cpp 
-	util/PixmapMerging.cpp 
-	util/MouseEventFilter.cpp 
-	util/EventFilter.cpp 
-	util/Widget.cpp 
-	util/RsAction.cpp 
-	util/printpreview.cpp 
-	util/log.cpp 
-	util/misc.cpp 
-	util/HandleRichText.cpp 
-	util/ObjectPainter.cpp 
-	util/RsFile.cpp 
-	util/RichTextEdit.cpp 
-	util/ClickableLabel.cpp 
-	util/AspectRatioPixmapLabel.cpp 
+	src/util/RsProtectedTimer.cpp 
+	src/util/stringutil.cpp 
+	src/util/RsNetUtil.cpp 
+	src/util/DateTime.cpp 
+	src/util/RetroStyleLabel.cpp 
+	src/util/WidgetBackgroundImage.cpp 
+	src/util/PixmapMerging.cpp 
+	src/util/MouseEventFilter.cpp 
+	src/util/EventFilter.cpp 
+	src/util/Widget.cpp 
+	src/util/RsAction.cpp 
+	src/util/printpreview.cpp 
+	src/util/log.cpp 
+	src/util/misc.cpp 
+	src/util/HandleRichText.cpp 
+	src/util/ObjectPainter.cpp 
+	src/util/RsFile.cpp 
+	src/util/RichTextEdit.cpp 
+	src/util/ClickableLabel.cpp 
+	src/util/AspectRatioPixmapLabel.cpp 
 
-	gui/profile/ProfileWidget.cpp 
-	gui/profile/StatusMessage.cpp 
-	gui/profile/ProfileManager.cpp 
+	src/gui/profile/ProfileWidget.cpp 
+	src/gui/profile/StatusMessage.cpp 
+	src/gui/profile/ProfileManager.cpp 
 
-	gui/chat/PopupChatWindow.cpp 
-	gui/chat/PopupChatDialog.cpp 
-	gui/chat/PopupDistantChatDialog.cpp 
-	gui/chat/ChatTabWidget.cpp 
-	gui/chat/ChatWidget.cpp 
-	gui/chat/ChatDialog.cpp 
-	gui/chat/ChatLobbyDialog.cpp 
-	gui/chat/CreateLobbyDialog.cpp 
-	gui/chat/ChatStyle.cpp 
-	gui/chat/ChatUserNotify.cpp 
-	gui/chat/ChatLobbyUserNotify.cpp 
+	src/gui/chat/PopupChatWindow.cpp 
+	src/gui/chat/PopupChatDialog.cpp 
+	src/gui/chat/PopupDistantChatDialog.cpp 
+	src/gui/chat/ChatTabWidget.cpp 
+	src/gui/chat/ChatWidget.cpp 
+	src/gui/chat/ChatDialog.cpp 
+	src/gui/chat/ChatLobbyDialog.cpp 
+	src/gui/chat/CreateLobbyDialog.cpp 
+	src/gui/chat/ChatStyle.cpp 
+	src/gui/chat/ChatUserNotify.cpp 
+	src/gui/chat/ChatLobbyUserNotify.cpp 
 
-	gui/connect/ConfCertDialog.cpp 
-	gui/connect/PGPKeyDialog.cpp 
-	gui/connect/ConnectFriendWizard.cpp 
-	gui/connect/ConnectProgressDialog.cpp 
-	gui/connect/FriendRecommendDialog.cpp 
+	src/gui/connect/ConfCertDialog.cpp 
+	src/gui/connect/PGPKeyDialog.cpp 
+	src/gui/connect/ConnectFriendWizard.cpp 
+	src/gui/connect/ConnectProgressDialog.cpp 
+	src/gui/connect/FriendRecommendDialog.cpp 
 
-	gui/msgs/MessagesDialog.cpp 
-	gui/msgs/MessageComposer.cpp 
-	gui/msgs/MessageWidget.cpp 
-	gui/msgs/MessageWindow.cpp 
-	gui/msgs/MessageModel.cpp 
-	gui/msgs/TagsMenu.cpp 
-	gui/msgs/MessageUserNotify.cpp 
+	src/gui/msgs/MessagesDialog.cpp 
+	src/gui/msgs/MessageComposer.cpp 
+	src/gui/msgs/MessageWidget.cpp 
+	src/gui/msgs/MessageWindow.cpp 
+	src/gui/msgs/MessageModel.cpp 
+	src/gui/msgs/TagsMenu.cpp 
+	src/gui/msgs/MessageUserNotify.cpp 
 
-	gui/common/RsButtonOnText.cpp 
-	gui/common/RSGraphWidget.cpp 
-	gui/common/ElidedLabel.cpp 
-	gui/common/vmessagebox.cpp 
-	gui/common/RsCollectionDialog.cpp 
-	gui/common/RsCollection.cpp 
-	gui/common/RsUrlHandler.cpp 
-	gui/common/rwindow.cpp 
-	gui/common/rshtml.cpp 
-	gui/common/AvatarDefs.cpp 
-	gui/common/AvatarDialog.cpp 
-	gui/common/GroupFlagsWidget.cpp 
-	gui/common/GroupSelectionBox.cpp 
-	gui/common/GroupChooser.cpp 
-	gui/common/StatusDefs.cpp 
-	gui/common/TagDefs.cpp 
-	gui/common/GroupDefs.cpp 
-	gui/common/Emoticons.cpp 
-	gui/common/RSComboBox.cpp 
-	gui/common/RSListWidgetItem.cpp 
-	gui/common/RSTextEdit.cpp 
-	gui/common/RSPlainTextEdit.cpp 
-	gui/common/RSTreeWidget.cpp 
-	gui/common/RSTreeWidgetItem.cpp 
-	gui/common/RSFeedWidget.cpp 
-	gui/common/RSTabWidget.cpp 
-	gui/common/RSElidedItemDelegate.cpp 
-	gui/common/RSItemDelegate.cpp 
-	gui/common/PeerDefs.cpp 
-	gui/common/FilesDefs.cpp 
-	gui/common/PopularityDefs.cpp 
-	gui/common/RsBanListDefs.cpp 
-	gui/common/GroupTreeWidget.cpp 
-	gui/common/RSTreeView.cpp 
-	gui/common/AvatarWidget.cpp 
-	gui/common/FriendListModel.cpp 
-	gui/common/NewFriendList.cpp 
-	gui/common/FriendSelectionWidget.cpp 
-	gui/common/FriendSelectionDialog.cpp 
-	gui/common/HashBox.cpp 
-	gui/common/LineEditClear.cpp 
-	gui/common/DropLineEdit.cpp 
-	gui/common/RSTextBrowser.cpp 
-	gui/common/RSImageBlockWidget.cpp 
-	gui/common/FeedNotify.cpp 
-	gui/common/UserNotify.cpp 
-	gui/common/HeaderFrame.cpp 
-	gui/common/MimeTextEdit.cpp 
-	gui/common/UIStateHelper.cpp 
-	gui/common/FloatingHelpBrowser.cpp 
-	gui/common/SubscribeToolButton.cpp 
-	gui/common/RsBanListToolButton.cpp 
-	gui/common/FlowLayout.cpp 
-	gui/common/PictureFlow.cpp 
-	gui/common/ToasterNotify.cpp 
+	src/gui/common/RsButtonOnText.cpp 
+	src/gui/common/RSGraphWidget.cpp 
+	src/gui/common/ElidedLabel.cpp 
+	src/gui/common/vmessagebox.cpp 
+	src/gui/common/RsCollectionDialog.cpp 
+	src/gui/common/RsCollection.cpp 
+	src/gui/common/RsUrlHandler.cpp 
+	src/gui/common/rwindow.cpp 
+	src/gui/common/rshtml.cpp 
+	src/gui/common/AvatarDefs.cpp 
+	src/gui/common/AvatarDialog.cpp 
+	src/gui/common/GroupFlagsWidget.cpp 
+	src/gui/common/GroupSelectionBox.cpp 
+	src/gui/common/GroupChooser.cpp 
+	src/gui/common/StatusDefs.cpp 
+	src/gui/common/TagDefs.cpp 
+	src/gui/common/GroupDefs.cpp 
+	src/gui/common/Emoticons.cpp 
+	src/gui/common/RSComboBox.cpp 
+	src/gui/common/RSListWidgetItem.cpp 
+	src/gui/common/RSTextEdit.cpp 
+	src/gui/common/RSPlainTextEdit.cpp 
+	src/gui/common/RSTreeWidget.cpp 
+	src/gui/common/RSTreeWidgetItem.cpp 
+	src/gui/common/RSFeedWidget.cpp 
+	src/gui/common/RSTabWidget.cpp 
+	src/gui/common/RSElidedItemDelegate.cpp 
+	src/gui/common/RSItemDelegate.cpp 
+	src/gui/common/PeerDefs.cpp 
+	src/gui/common/FilesDefs.cpp 
+	src/gui/common/PopularityDefs.cpp 
+	src/gui/common/RsBanListDefs.cpp 
+	src/gui/common/GroupTreeWidget.cpp 
+	src/gui/common/RSTreeView.cpp 
+	src/gui/common/AvatarWidget.cpp 
+	src/gui/common/FriendListModel.cpp 
+	src/gui/common/NewFriendList.cpp 
+	src/gui/common/FriendSelectionWidget.cpp 
+	src/gui/common/FriendSelectionDialog.cpp 
+	src/gui/common/HashBox.cpp 
+	src/gui/common/LineEditClear.cpp 
+	src/gui/common/DropLineEdit.cpp 
+	src/gui/common/RSTextBrowser.cpp 
+	src/gui/common/RSImageBlockWidget.cpp 
+	src/gui/common/FeedNotify.cpp 
+	src/gui/common/UserNotify.cpp 
+	src/gui/common/HeaderFrame.cpp 
+	src/gui/common/MimeTextEdit.cpp 
+	src/gui/common/UIStateHelper.cpp 
+	src/gui/common/FloatingHelpBrowser.cpp 
+	src/gui/common/SubscribeToolButton.cpp 
+	src/gui/common/RsBanListToolButton.cpp 
+	src/gui/common/FlowLayout.cpp 
+	src/gui/common/PictureFlow.cpp 
+	src/gui/common/ToasterNotify.cpp 
 
-	gui/style/RSStyle.cpp 
-	gui/style/StyleDialog.cpp 
+	src/gui/style/RSStyle.cpp 
+	src/gui/style/StyleDialog.cpp 
 
-	gui/settings/RSPermissionMatrixWidget.cpp 
-	gui/settings/rsharesettings.cpp 
-	gui/settings/RsharePeerSettings.cpp 
-	gui/settings/rsettings.cpp 
-	gui/settings/rsettingswin.cpp 
-	gui/settings/GeneralPage.cpp 
-	gui/settings/AboutPage.cpp 
-	gui/settings/ServerPage.cpp 
-	gui/settings/NotifyPage.cpp 
-	gui/settings/CryptoPage.cpp 
-	gui/settings/PeoplePage.cpp 
-	gui/settings/MessagePage.cpp 
-	gui/settings/NewTag.cpp 
-	gui/settings/ForumPage.cpp 
-	gui/settings/PluginsPage.cpp 
-	gui/settings/PluginItem.cpp 
-	gui/settings/AppearancePage.cpp 
-	gui/settings/FileAssociationsPage.cpp 
-	gui/settings/SoundPage.cpp 
-	gui/settings/TransferPage.cpp 
-	gui/settings/ChatPage.cpp 
-	gui/settings/ChannelPage.cpp 
-	gui/settings/PostedPage.cpp 
-	gui/settings/ServicePermissionsPage.cpp 
-	gui/settings/AddFileAssociationDialog.cpp 
-	gui/settings/GroupFrameSettingsWidget.cpp 
+	src/gui/settings/RSPermissionMatrixWidget.cpp 
+	src/gui/settings/rsharesettings.cpp 
+	src/gui/settings/RsharePeerSettings.cpp 
+	src/gui/settings/rsettings.cpp 
+	src/gui/settings/rsettingswin.cpp 
+	src/gui/settings/GeneralPage.cpp 
+	src/gui/settings/AboutPage.cpp 
+	src/gui/settings/ServerPage.cpp 
+	src/gui/settings/NotifyPage.cpp 
+	src/gui/settings/CryptoPage.cpp 
+	src/gui/settings/PeoplePage.cpp 
+	src/gui/settings/MessagePage.cpp 
+	src/gui/settings/NewTag.cpp 
+	src/gui/settings/ForumPage.cpp 
+	src/gui/settings/PluginsPage.cpp 
+	src/gui/settings/PluginItem.cpp 
+	src/gui/settings/AppearancePage.cpp 
+	src/gui/settings/FileAssociationsPage.cpp 
+	src/gui/settings/SoundPage.cpp 
+	src/gui/settings/TransferPage.cpp 
+	src/gui/settings/ChatPage.cpp 
+	src/gui/settings/ChannelPage.cpp 
+	src/gui/settings/PostedPage.cpp 
+	src/gui/settings/ServicePermissionsPage.cpp 
+	src/gui/settings/AddFileAssociationDialog.cpp 
+	src/gui/settings/GroupFrameSettingsWidget.cpp 
 
-	gui/statusbar/peerstatus.cpp 
-	gui/statusbar/natstatus.cpp 
-	gui/statusbar/dhtstatus.cpp 
-	gui/statusbar/torstatus.cpp 
-	gui/statusbar/ratesstatus.cpp 
-	gui/statusbar/hashingstatus.cpp 
-	gui/statusbar/discstatus.cpp 
-	gui/statusbar/SoundStatus.cpp 
-	gui/statusbar/OpModeStatus.cpp 
-	gui/statusbar/ToasterDisable.cpp 
-	gui/statusbar/SysTrayStatus.cpp 
+	src/gui/statusbar/peerstatus.cpp 
+	src/gui/statusbar/natstatus.cpp 
+	src/gui/statusbar/dhtstatus.cpp 
+	src/gui/statusbar/torstatus.cpp 
+	src/gui/statusbar/ratesstatus.cpp 
+	src/gui/statusbar/hashingstatus.cpp 
+	src/gui/statusbar/discstatus.cpp 
+	src/gui/statusbar/SoundStatus.cpp 
+	src/gui/statusbar/OpModeStatus.cpp 
+	src/gui/statusbar/ToasterDisable.cpp 
+	src/gui/statusbar/SysTrayStatus.cpp 
 
-	gui/toaster/ToasterItem.cpp 
-	gui/toaster/MessageToaster.cpp 
-	gui/toaster/DownloadToaster.cpp 
-	gui/toaster/OnlineToaster.cpp 
-	gui/toaster/ChatToaster.cpp 
-	gui/toaster/GroupChatToaster.cpp 
-	gui/toaster/ChatLobbyToaster.cpp 
-	gui/toaster/FriendRequestToaster.cpp 
+	src/gui/toaster/ToasterItem.cpp 
+	src/gui/toaster/MessageToaster.cpp 
+	src/gui/toaster/DownloadToaster.cpp 
+	src/gui/toaster/OnlineToaster.cpp 
+	src/gui/toaster/ChatToaster.cpp 
+	src/gui/toaster/GroupChatToaster.cpp 
+	src/gui/toaster/ChatLobbyToaster.cpp 
+	src/gui/toaster/FriendRequestToaster.cpp 
 
-	gui/advsearch/advancedsearchdialog.cpp 
-	gui/advsearch/expressionwidget.cpp 
-	gui/advsearch/guiexprelement.cpp 
+	src/gui/advsearch/advancedsearchdialog.cpp 
+	src/gui/advsearch/expressionwidget.cpp 
+	src/gui/advsearch/guiexprelement.cpp 
 
-	gui/elastic/graphwidget.cpp 
-	gui/elastic/edge.cpp 
-	gui/elastic/arrow.cpp 
-	gui/elastic/elnode.cpp 
+	src/gui/elastic/graphwidget.cpp 
+	src/gui/elastic/edge.cpp 
+	src/gui/elastic/arrow.cpp 
+	src/gui/elastic/elnode.cpp 
 
-	gui/feeds/BoardsCommentsItem.cpp 
-	gui/feeds/FeedItem.cpp 
-	gui/feeds/FeedHolder.cpp 
-	gui/feeds/GxsCircleItem.cpp 
-	gui/feeds/ChannelsCommentsItem.cpp 
-	gui/feeds/PeerItem.cpp 
-	gui/feeds/MsgItem.cpp 
-	gui/feeds/ChatMsgItem.cpp 
-	gui/feeds/SubFileItem.cpp 
-	gui/feeds/AttachFileItem.cpp 
-	gui/feeds/SecurityItem.cpp 
-	gui/feeds/SecurityIpItem.cpp 
-	gui/feeds/NewsFeedUserNotify.cpp 
+	src/gui/feeds/BoardsCommentsItem.cpp 
+	src/gui/feeds/FeedItem.cpp 
+	src/gui/feeds/FeedHolder.cpp 
+	src/gui/feeds/GxsCircleItem.cpp 
+	src/gui/feeds/ChannelsCommentsItem.cpp 
+	src/gui/feeds/PeerItem.cpp 
+	src/gui/feeds/MsgItem.cpp 
+	src/gui/feeds/ChatMsgItem.cpp 
+	src/gui/feeds/SubFileItem.cpp 
+	src/gui/feeds/AttachFileItem.cpp 
+	src/gui/feeds/SecurityItem.cpp 
+	src/gui/feeds/SecurityIpItem.cpp 
+	src/gui/feeds/NewsFeedUserNotify.cpp 
 
-	gui/groups/CreateGroup.cpp 
+	src/gui/groups/CreateGroup.cpp 
 
-	gui/statistics/BandwidthGraphWindow.cpp 
-	gui/statistics/BandwidthStatsWidget.cpp 
-	gui/statistics/DhtWindow.cpp 
-	gui/statistics/Histogram.cpp 
-	gui/statistics/TurtleRouterDialog.cpp 
-	gui/statistics/TurtleRouterStatistics.cpp 
-	gui/statistics/GxsIdStatistics.cpp 
-	gui/statistics/GlobalRouterStatistics.cpp 
-	gui/statistics/GxsTransportStatistics.cpp 
-	gui/statistics/StatisticsWindow.cpp 
-	gui/statistics/BwCtrlWindow.cpp 
-	gui/statistics/RttStatistics.cpp 
-	gui/statistics/BWGraph.cpp 
+	src/gui/statistics/BandwidthGraphWindow.cpp 
+	src/gui/statistics/BandwidthStatsWidget.cpp 
+	src/gui/statistics/DhtWindow.cpp 
+	src/gui/statistics/Histogram.cpp 
+	src/gui/statistics/TurtleRouterDialog.cpp 
+	src/gui/statistics/TurtleRouterStatistics.cpp 
+	src/gui/statistics/GxsIdStatistics.cpp 
+	src/gui/statistics/GlobalRouterStatistics.cpp 
+	src/gui/statistics/GxsTransportStatistics.cpp 
+	src/gui/statistics/StatisticsWindow.cpp 
+	src/gui/statistics/BwCtrlWindow.cpp 
+	src/gui/statistics/RttStatistics.cpp 
+	src/gui/statistics/BWGraph.cpp 
 
-	util/RsSyntaxHighlighter.cpp 
-	util/imageutil.cpp 
-	util/retroshareWin32.cpp
+	src/util/RsSyntaxHighlighter.cpp 
+	src/util/imageutil.cpp 
+	src/util/retroshareWin32.cpp
 
-	gui/NetworkDialog/pgpid_item_model.cpp 
-	gui/NetworkDialog/pgpid_item_proxy.cpp 
+	src/gui/NetworkDialog/pgpid_item_model.cpp 
+	src/gui/NetworkDialog/pgpid_item_proxy.cpp 
 	)
 
 list(
-	APPEND RS_FORMS
-	TorControl/TorControlWindow.ui
+	APPEND RS_GUI_FORMS
+	src/TorControl/TorControlWindow.ui
 
-	gui/StartDialog.ui 
-	gui/HomePage.ui
-	gui/GetStartedDialog.ui 
-	gui/GenCertDialog.ui 
-	gui/AboutDialog.ui 
-	gui/AboutWidget.ui 
-	gui/QuickStartWizard.ui 
-	gui/NetworkDialog.ui 
-	gui/common/AvatarDialog.ui 
-	gui/MainWindow.ui 
-	gui/NetworkView.ui 
-	gui/FriendsDialog.ui 
-	gui/NewsFeed.ui 
-	gui/ShareManager.ui 
-	gui/ShareDialog.ui 
-	gui/help/browser/helpbrowser.ui 
-	gui/HelpDialog.ui 
-	gui/ServicePermissionDialog.ui 
-	gui/ChatLobbyWidget.ui 
+	src/gui/StartDialog.ui 
+	src/gui/HomePage.ui
+	src/gui/GetStartedDialog.ui 
+	src/gui/GenCertDialog.ui 
+	src/gui/AboutDialog.ui 
+	src/gui/AboutWidget.ui 
+	src/gui/QuickStartWizard.ui 
+	src/gui/NetworkDialog.ui 
+	src/gui/common/AvatarDialog.ui 
+	src/gui/MainWindow.ui 
+	src/gui/NetworkView.ui 
+	src/gui/FriendsDialog.ui 
+	src/gui/NewsFeed.ui 
+	src/gui/ShareManager.ui 
+	src/gui/help/browser/helpbrowser.ui 
+	src/gui/HelpDialog.ui 
+	src/gui/ServicePermissionDialog.ui 
+	src/gui/ChatLobbyWidget.ui 
 
-	gui/FileTransfer/TransfersDialog.ui 
-	gui/FileTransfer/DetailsDialog.ui 
-	gui/FileTransfer/SearchDialog.ui 
-	gui/FileTransfer/SharedFilesDialog.ui 
-	gui/FileTransfer/BannedFilesDialog.ui 
+	src/gui/FileTransfer/TransfersDialog.ui 
+	src/gui/FileTransfer/DetailsDialog.ui 
+	src/gui/FileTransfer/SearchDialog.ui 
+	src/gui/FileTransfer/SharedFilesDialog.ui 
+	src/gui/FileTransfer/BannedFilesDialog.ui 
 
-	gui/profile/ProfileWidget.ui 
-	gui/profile/StatusMessage.ui 
-	gui/profile/ProfileManager.ui 
+	src/gui/profile/ProfileWidget.ui 
+	src/gui/profile/StatusMessage.ui 
+	src/gui/profile/ProfileManager.ui 
 
-	gui/chat/PopupChatWindow.ui 
-	gui/chat/PopupChatDialog.ui 
-	gui/chat/ChatTabWidget.ui 
-	gui/chat/ChatWidget.ui 
-	gui/chat/ChatLobbyDialog.ui 
-	gui/chat/CreateLobbyDialog.ui 
+	src/gui/chat/PopupChatWindow.ui 
+	src/gui/chat/PopupChatDialog.ui 
+	src/gui/chat/ChatTabWidget.ui 
+	src/gui/chat/ChatWidget.ui 
+	src/gui/chat/ChatLobbyDialog.ui 
+	src/gui/chat/CreateLobbyDialog.ui 
 
-	gui/connect/ConfCertDialog.ui 
-	gui/connect/PGPKeyDialog.ui 
-	gui/connect/ConnectFriendWizard.ui 
-	gui/connect/ConnectProgressDialog.ui 
-	gui/connect/FriendRecommendDialog.ui 
+	src/gui/connect/ConfCertDialog.ui 
+	src/gui/connect/PGPKeyDialog.ui 
+	src/gui/connect/ConnectFriendWizard.ui 
+	src/gui/connect/ConnectProgressDialog.ui 
+	src/gui/connect/FriendRecommendDialog.ui 
 
-	gui/msgs/MessagesDialog.ui 
-	gui/msgs/MessageComposer.ui 
-	gui/msgs/MessageWindow.ui
-	gui/msgs/MessageWidget.ui
+	src/gui/msgs/MessagesDialog.ui 
+	src/gui/msgs/MessageComposer.ui 
+	src/gui/msgs/MessageWindow.ui
+	src/gui/msgs/MessageWidget.ui
 
-	gui/settings/settingsw.ui 
-	gui/settings/GeneralPage.ui 
-	gui/settings/ServerPage.ui 
-	gui/settings/NotifyPage.ui 
-	gui/settings/PeoplePage.ui 
-	gui/settings/CryptoPage.ui 
-	gui/settings/MessagePage.ui 
-	gui/settings/NewTag.ui 
-	gui/settings/ForumPage.ui 
-	gui/settings/AboutPage.ui 
-	gui/settings/PluginsPage.ui 
-	gui/settings/AppearancePage.ui 
-	gui/settings/TransferPage.ui 
-	gui/settings/SoundPage.ui 
-	gui/settings/ChatPage.ui 
-	gui/settings/ChannelPage.ui 
-	gui/settings/PostedPage.ui 
-	gui/settings/ServicePermissionsPage.ui 
-	gui/settings/PluginItem.ui 
-	gui/settings/GroupFrameSettingsWidget.ui 
+	src/gui/settings/settingsw.ui 
+	src/gui/settings/GeneralPage.ui 
+	src/gui/settings/ServerPage.ui 
+	src/gui/settings/NotifyPage.ui 
+	src/gui/settings/PeoplePage.ui 
+	src/gui/settings/CryptoPage.ui 
+	src/gui/settings/MessagePage.ui 
+	src/gui/settings/NewTag.ui 
+	src/gui/settings/ForumPage.ui 
+	src/gui/settings/AboutPage.ui 
+	src/gui/settings/PluginsPage.ui 
+	src/gui/settings/AppearancePage.ui 
+	src/gui/settings/TransferPage.ui 
+	src/gui/settings/SoundPage.ui 
+	src/gui/settings/ChatPage.ui 
+	src/gui/settings/ChannelPage.ui 
+	src/gui/settings/PostedPage.ui 
+	src/gui/settings/ServicePermissionsPage.ui 
+	src/gui/settings/PluginItem.ui 
+	src/gui/settings/GroupFrameSettingsWidget.ui 
 
-	gui/toaster/MessageToaster.ui 
-	gui/toaster/OnlineToaster.ui 
-	gui/toaster/DownloadToaster.ui 
-	gui/toaster/ChatToaster.ui 
-	gui/toaster/GroupChatToaster.ui 
-	gui/toaster/ChatLobbyToaster.ui 
-	gui/toaster/FriendRequestToaster.ui 
+	src/gui/toaster/MessageToaster.ui 
+	src/gui/toaster/OnlineToaster.ui 
+	src/gui/toaster/DownloadToaster.ui 
+	src/gui/toaster/ChatToaster.ui 
+	src/gui/toaster/GroupChatToaster.ui 
+	src/gui/toaster/ChatLobbyToaster.ui 
+	src/gui/toaster/FriendRequestToaster.ui 
 
-	gui/advsearch/AdvancedSearchDialog.ui 
-	gui/advsearch/expressionwidget.ui 
+	src/gui/advsearch/AdvancedSearchDialog.ui 
+	src/gui/advsearch/expressionwidget.ui 
 
-	gui/feeds/BoardsCommentsItem.ui 
-	gui/feeds/GxsCircleItem.ui 
-	gui/feeds/ChannelsCommentsItem.ui 
-	gui/feeds/PeerItem.ui 
-	gui/feeds/MsgItem.ui 
-	gui/feeds/ChatMsgItem.ui 
-	gui/feeds/SubFileItem.ui 
-	gui/feeds/AttachFileItem.ui 
-	gui/feeds/SecurityItem.ui 
-	gui/feeds/SecurityIpItem.ui 
+	src/gui/feeds/BoardsCommentsItem.ui 
+	src/gui/feeds/GxsCircleItem.ui 
+	src/gui/feeds/ChannelsCommentsItem.ui 
+	src/gui/feeds/PeerItem.ui 
+	src/gui/feeds/MsgItem.ui 
+	src/gui/feeds/ChatMsgItem.ui 
+	src/gui/feeds/SubFileItem.ui 
+	src/gui/feeds/AttachFileItem.ui 
+	src/gui/feeds/SecurityItem.ui 
+	src/gui/feeds/SecurityIpItem.ui 
 
-	gui/im_history/ImHistoryBrowser.ui 
+	src/gui/im_history/ImHistoryBrowser.ui 
 
-	gui/groups/CreateGroup.ui 
+	src/gui/groups/CreateGroup.ui 
 
-	gui/common/GroupTreeWidget.ui 
-	gui/common/AvatarWidget.ui 
-	gui/common/NewFriendList.ui 
-	gui/common/FriendSelectionWidget.ui 
-	gui/common/HashBox.ui 
-	gui/common/RSImageBlockWidget.ui 
-	gui/common/RsCollectionDialog.ui 
-	gui/common/HeaderFrame.ui 
-	gui/common/RSFeedWidget.ui 
+	src/gui/common/GroupTreeWidget.ui 
+	src/gui/common/AvatarWidget.ui 
+	src/gui/common/NewFriendList.ui 
+	src/gui/common/FriendSelectionWidget.ui 
+	src/gui/common/HashBox.ui 
+	src/gui/common/RSImageBlockWidget.ui 
+	src/gui/common/RsCollectionDialog.ui 
+	src/gui/common/HeaderFrame.ui 
+	src/gui/common/RSFeedWidget.ui 
 
-	gui/style/StyleDialog.ui 
+	src/gui/style/StyleDialog.ui 
 
-	gui/statistics/BandwidthGraphWindow.ui 
-	gui/statistics/BandwidthStatsWidget.ui 
-	gui/statistics/DhtWindow.ui 
-	gui/statistics/TurtleRouterDialog.ui 
-	gui/statistics/TurtleRouterStatistics.ui 
-	gui/statistics/GxsIdStatistics.ui 
-	gui/statistics/GlobalRouterStatistics.ui 
-	gui/statistics/GxsTransportStatistics.ui 
-	gui/statistics/StatisticsWindow.ui 
-	gui/statistics/BwCtrlWindow.ui 
-	gui/statistics/RttStatistics.ui 
+	src/gui/statistics/BandwidthGraphWindow.ui 
+	src/gui/statistics/BandwidthStatsWidget.ui 
+	src/gui/statistics/DhtWindow.ui 
+	src/gui/statistics/TurtleRouterDialog.ui 
+	src/gui/statistics/TurtleRouterStatistics.ui 
+	src/gui/statistics/GxsIdStatistics.ui 
+	src/gui/statistics/GlobalRouterStatistics.ui 
+	src/gui/statistics/GxsTransportStatistics.ui 
+	src/gui/statistics/StatisticsWindow.ui 
+	src/gui/statistics/BwCtrlWindow.ui 
+	src/gui/statistics/RttStatistics.ui 
 
-	util/RichTextEdit.ui
+	src/util/RichTextEdit.ui
 	)
 
 list(
 	APPEND RS_IMPLEMENTATION_HEADERS
 
-	TorControl/TorControlWindow.h
+	src/TorControl/TorControlWindow.h
 
-	chat/distantchat.h
-	chat/distributedchat.h
-	chat/p3chatservice.h
-	chat/rschatitems.h 
+	src/chat/distantchat.h
+	src/chat/distributedchat.h
+	src/chat/p3chatservice.h
+	src/chat/rschatitems.h 
 
-	rshare.h 
-	retroshare-gui/configpage.h 
-	retroshare-gui/RsAutoUpdatePage.h 
-	retroshare-gui/mainpage.h 
+	src/rshare.h 
+	src/retroshare-gui/configpage.h 
+	src/retroshare-gui/RsAutoUpdatePage.h 
+	src/retroshare-gui/mainpage.h 
 
-	control/bandwidthevent.h 
-	control/eventtype.h 
+	src/control/bandwidthevent.h 
+	src/control/eventtype.h 
 
-	gui/QuickStartWizard.h 
-	gui/notifyqt.h 
-	gui/GetStartedDialog.h 
-	gui/StartDialog.h 
-	gui/HomePage.h
-	gui/NetworkDialog.h 
-	gui/GenCertDialog.h 
-	gui/linetypes.h 
-	gui/mainpagestack.h 
-	gui/MainWindow.h 
-	gui/RSHumanReadableDelegate.h 
-	gui/AboutDialog.h 
-	gui/AboutWidget.h 
-	gui/NetworkView.h 
-	gui/FriendsDialog.h 
-	gui/ServicePermissionDialog.h 
-	gui/RemoteDirModel.h 
-        gui/PluginsPage.h  
-	gui/PluginManagerWidget.h 
-	gui/PluginManager.h
-	gui/RetroShareLink.h 
-	gui/SearchTreeWidget.h 
-	gui/ShareManager.h 
-	gui/NewsFeed.h 
-	gui/ShareDialog.h 
-	gui/SFListDelegate.h 
-	gui/SoundManager.h 
-	gui/HelpDialog.h 
-	gui/LogoBar.h 
+	src/gui/QuickStartWizard.h 
+	src/gui/notifyqt.h 
+	src/gui/GetStartedDialog.h 
+	src/gui/StartDialog.h 
+	src/gui/HomePage.h
+	src/gui/NetworkDialog.h 
+	src/gui/GenCertDialog.h 
+	src/gui/linetypes.h 
+	src/gui/mainpagestack.h 
+	src/gui/MainWindow.h 
+	src/gui/RSHumanReadableDelegate.h 
+	src/gui/AboutDialog.h 
+	src/gui/AboutWidget.h 
+	src/gui/NetworkView.h 
+	src/gui/FriendsDialog.h 
+	src/gui/ServicePermissionDialog.h 
+	src/gui/RemoteDirModel.h 
+        src/gui/PluginsPage.h  
+	src/gui/PluginManagerWidget.h 
+	src/gui/PluginManager.h
+	src/gui/RetroShareLink.h 
+	src/gui/SearchTreeWidget.h 
+	src/gui/ShareManager.h 
+	src/gui/NewsFeed.h 
+	src/gui/ShareDialog.h 
+	src/gui/SFListDelegate.h 
+	src/gui/SoundManager.h 
+	src/gui/HelpDialog.h 
+	src/gui/LogoBar.h 
 
-	gui/common/AvatarDialog.h 
+	src/gui/common/AvatarDialog.h 
 
-	gui/NetworkDialog/pgpid_item_model.h 
-	gui/NetworkDialog/pgpid_item_proxy.h 
+	src/gui/NetworkDialog/pgpid_item_model.h 
+	src/gui/NetworkDialog/pgpid_item_proxy.h 
 
-	gui/FileTransfer/SearchDialog.h 
-	gui/FileTransfer/SharedFilesDialog.h 
-	gui/FileTransfer/xprogressbar.h 
-	gui/FileTransfer/DetailsDialog.h 
-	gui/FileTransfer/FileTransferInfoWidget.h 
-	gui/FileTransfer/DLListDelegate.h 
-	gui/FileTransfer/ULListDelegate.h 
-	gui/FileTransfer/TransfersDialog.h 
-	gui/FileTransfer/BannedFilesDialog.h 
-	gui/FileTransfer/TransferUserNotify.h 
+	src/gui/FileTransfer/SearchDialog.h 
+	src/gui/FileTransfer/SharedFilesDialog.h 
+	src/gui/FileTransfer/xprogressbar.h 
+	src/gui/FileTransfer/DetailsDialog.h 
+	src/gui/FileTransfer/FileTransferInfoWidget.h 
+	src/gui/FileTransfer/DLListDelegate.h 
+	src/gui/FileTransfer/ULListDelegate.h 
+	src/gui/FileTransfer/TransfersDialog.h 
+	src/gui/FileTransfer/BannedFilesDialog.h 
+	src/gui/FileTransfer/TransferUserNotify.h 
 
-	gui/statistics/TurtleRouterDialog.h 
-	gui/statistics/TurtleRouterStatistics.h 
-	gui/statistics/GxsIdStatistics.h 
-	gui/statistics/dhtgraph.h 
-	gui/statistics/Histogram.h 
-	gui/statistics/BandwidthGraphWindow.h 
-	gui/statistics/turtlegraph.h 
-	gui/statistics/BandwidthStatsWidget.h 
-	gui/statistics/DhtWindow.h 
-	gui/statistics/GlobalRouterStatistics.h 
-	gui/statistics/GxsTransportStatistics.h 
-	gui/statistics/StatisticsWindow.h 
-	gui/statistics/BwCtrlWindow.h 
-	gui/statistics/BWGraph.h 
-	gui/statistics/RttStatistics.h 
+	src/gui/statistics/TurtleRouterDialog.h 
+	src/gui/statistics/TurtleRouterStatistics.h 
+	src/gui/statistics/GxsIdStatistics.h 
+	src/gui/statistics/dhtgraph.h 
+	src/gui/statistics/Histogram.h 
+	src/gui/statistics/BandwidthGraphWindow.h 
+	src/gui/statistics/turtlegraph.h 
+	src/gui/statistics/BandwidthStatsWidget.h 
+	src/gui/statistics/DhtWindow.h 
+	src/gui/statistics/GlobalRouterStatistics.h 
+	src/gui/statistics/GxsTransportStatistics.h 
+	src/gui/statistics/StatisticsWindow.h 
+	src/gui/statistics/BwCtrlWindow.h 
+	src/gui/statistics/BWGraph.h 
+	src/gui/statistics/RttStatistics.h 
 
-	gui/plugins/PluginInterface.h 
+	src/gui/plugins/PluginInterface.h 
 
-	gui/im_history/ImHistoryBrowser.h 
-	gui/im_history/IMHistoryItemDelegate.h 
-	gui/im_history/IMHistoryItemPainter.h 
+	src/gui/im_history/ImHistoryBrowser.h 
+	src/gui/im_history/IMHistoryItemDelegate.h 
+	src/gui/im_history/IMHistoryItemPainter.h 
 
-	lang/languagesupport.h 
+	src/lang/languagesupport.h 
 
-	util/RsSyntaxHighlighter.h 
-	util/imageutil.h 
-	util/RichTextEdit.h 
-	util/retroshareWin32.h
-	util/RsProtectedTimer.h 
-	util/stringutil.h 
-	util/RsNetUtil.h 
-	util/DateTime.h 
-	util/RetroStyleLabel.h 
-	util/dllexport.h 
-	util/NonCopyable.h 
-	util/rsutildll.h 
-	util/dllexport.h 
-	util/global.h 
-	util/rsqtutildll.h 
-	util/Interface.h 
-	util/PixmapMerging.h 
-	util/MouseEventFilter.h 
-	util/EventFilter.h 
-	util/Widget.h 
-	util/RsAction.h 
-	util/RsUserdata.h 
-	util/printpreview.h 
-	util/log.h 
-	util/misc.h 
-	util/HandleRichText.h 
-	util/ObjectPainter.h 
-	util/QtVersion.h 
-	util/RsFile.h 
-	util/qtthreadsutils.h 
-	util/ClickableLabel.h 
-	util/AspectRatioPixmapLabel.h 
+	src/util/RsSyntaxHighlighter.h 
+	src/util/imageutil.h 
+	src/util/RichTextEdit.h 
+	src/util/retroshareWin32.h
+	src/util/RsProtectedTimer.h 
+	src/util/stringutil.h 
+	src/util/RsNetUtil.h 
+	src/util/DateTime.h 
+	src/util/RetroStyleLabel.h 
+	src/util/dllexport.h 
+	src/util/NonCopyable.h 
+	src/util/rsutildll.h 
+	src/util/dllexport.h 
+	src/util/global.h 
+	src/util/rsqtutildll.h 
+	src/util/Interface.h 
+	src/util/PixmapMerging.h 
+	src/util/MouseEventFilter.h 
+	src/util/EventFilter.h 
+	src/util/Widget.h 
+	src/util/RsAction.h 
+	src/util/RsUserdata.h 
+	src/util/printpreview.h 
+	src/util/log.h 
+	src/util/misc.h 
+	src/util/HandleRichText.h 
+	src/util/ObjectPainter.h 
+	src/util/QtVersion.h 
+	src/util/RsFile.h 
+	src/util/qtthreadsutils.h 
+	src/util/ClickableLabel.h 
+	src/util/AspectRatioPixmapLabel.h 
 
-	gui/profile/ProfileWidget.h 
-	gui/profile/ProfileManager.h 
-	gui/profile/StatusMessage.h 
+	src/gui/profile/ProfileWidget.h 
+	src/gui/profile/ProfileManager.h 
+	src/gui/profile/StatusMessage.h 
 
-	gui/chat/PopupChatWindow.h 
-	gui/chat/PopupChatDialog.h 
-	gui/chat/PopupDistantChatDialog.h 
-	gui/chat/ChatTabWidget.h 
-	gui/chat/ChatWidget.h 
-	gui/chat/ChatDialog.h 
-	gui/ChatLobbyWidget.h 
-	gui/chat/ChatLobbyDialog.h 
-	gui/chat/CreateLobbyDialog.h 
-	gui/chat/ChatStyle.h 
-	gui/chat/ChatUserNotify.h 
-	gui/chat/ChatLobbyUserNotify.h 
+	src/gui/chat/PopupChatWindow.h 
+	src/gui/chat/PopupChatDialog.h 
+	src/gui/chat/PopupDistantChatDialog.h 
+	src/gui/chat/ChatTabWidget.h 
+	src/gui/chat/ChatWidget.h 
+	src/gui/chat/ChatDialog.h 
+	src/gui/ChatLobbyWidget.h 
+	src/gui/chat/ChatLobbyDialog.h 
+	src/gui/chat/CreateLobbyDialog.h 
+	src/gui/chat/ChatStyle.h 
+	src/gui/chat/ChatUserNotify.h 
+	src/gui/chat/ChatLobbyUserNotify.h 
 
-	gui/connect/ConfCertDialog.h 
-	gui/connect/PGPKeyDialog.h 
-	gui/connect/FriendRecommendDialog.h 
+	src/gui/connect/ConfCertDialog.h 
+	src/gui/connect/PGPKeyDialog.h 
+	src/gui/connect/FriendRecommendDialog.h 
 
-	gui/msgs/MessagesDialog.h 
-	gui/msgs/MessageInterface.h 
-	gui/msgs/MessageComposer.h 
-	gui/msgs/MessageWindow.h 
-	gui/msgs/MessageWidget.h 
-	gui/msgs/MessageModel.h 
-	gui/msgs/TagsMenu.h 
-	gui/msgs/textformat.h 
-	gui/msgs/MessageUserNotify.h 
+	src/gui/msgs/MessagesDialog.h 
+	src/gui/msgs/MessageInterface.h 
+	src/gui/msgs/MessageComposer.h 
+	src/gui/msgs/MessageWindow.h 
+	src/gui/msgs/MessageWidget.h 
+	src/gui/msgs/MessageModel.h 
+	src/gui/msgs/TagsMenu.h 
+	src/gui/msgs/textformat.h 
+	src/gui/msgs/MessageUserNotify.h 
 
-	gui/images/retroshare_win.rc.h 
+	src/gui/images/retroshare_win.rc.h 
 
-	gui/settings/RSPermissionMatrixWidget.h 
-	gui/settings/rsharesettings.h 
-	gui/settings/RsharePeerSettings.h 
-	gui/settings/rsettings.h 
-	gui/settings/rsettingswin.h 
-	gui/settings/GeneralPage.h 
-	gui/settings/PeoplePage.h 
-	gui/settings/AboutPage.h 
-	gui/settings/ServerPage.h 
-	gui/settings/NotifyPage.h 
-	gui/settings/CryptoPage.h 
-	gui/settings/MessagePage.h 
-	gui/settings/NewTag.h 
-	gui/settings/ForumPage.h 
-	gui/settings/PluginsPage.h 
-	gui/settings/PluginItem.h 
-	gui/settings/AppearancePage.h 
-	gui/settings/FileAssociationsPage.h 
-	gui/settings/SoundPage.h 
-	gui/settings/TransferPage.h 
-	gui/settings/ChatPage.h 
-	gui/settings/ChannelPage.h 
-	gui/settings/PostedPage.h 
-	gui/settings/ServicePermissionsPage.h 
-	gui/settings/AddFileAssociationDialog.h 
-	gui/settings/GroupFrameSettingsWidget.h 
+	src/gui/settings/RSPermissionMatrixWidget.h 
+	src/gui/settings/rsharesettings.h 
+	src/gui/settings/RsharePeerSettings.h 
+	src/gui/settings/rsettings.h 
+	src/gui/settings/rsettingswin.h 
+	src/gui/settings/GeneralPage.h 
+	src/gui/settings/PeoplePage.h 
+	src/gui/settings/AboutPage.h 
+	src/gui/settings/ServerPage.h 
+	src/gui/settings/NotifyPage.h 
+	src/gui/settings/CryptoPage.h 
+	src/gui/settings/MessagePage.h 
+	src/gui/settings/NewTag.h 
+	src/gui/settings/ForumPage.h 
+	src/gui/settings/PluginsPage.h 
+	src/gui/settings/PluginItem.h 
+	src/gui/settings/AppearancePage.h 
+	src/gui/settings/FileAssociationsPage.h 
+	src/gui/settings/SoundPage.h 
+	src/gui/settings/TransferPage.h 
+	src/gui/settings/ChatPage.h 
+	src/gui/settings/ChannelPage.h 
+	src/gui/settings/PostedPage.h 
+	src/gui/settings/ServicePermissionsPage.h 
+	src/gui/settings/AddFileAssociationDialog.h 
+	src/gui/settings/GroupFrameSettingsWidget.h 
 
-	gui/toaster/ToasterItem.h 
-	gui/toaster/MessageToaster.h 
-	gui/toaster/OnlineToaster.h 
-	gui/toaster/DownloadToaster.h 
-	gui/toaster/ChatToaster.h 
-	gui/toaster/GroupChatToaster.h 
-	gui/toaster/ChatLobbyToaster.h 
-	gui/toaster/FriendRequestToaster.h 
+	src/gui/toaster/ToasterItem.h 
+	src/gui/toaster/MessageToaster.h 
+	src/gui/toaster/OnlineToaster.h 
+	src/gui/toaster/DownloadToaster.h 
+	src/gui/toaster/ChatToaster.h 
+	src/gui/toaster/GroupChatToaster.h 
+	src/gui/toaster/ChatLobbyToaster.h 
+	src/gui/toaster/FriendRequestToaster.h 
 
-	gui/common/RsButtonOnText.h 
-	gui/common/RsCollection.h 
-	gui/common/RSGraphWidget.h 
-	gui/common/ElidedLabel.h 
-	gui/common/vmessagebox.h 
-	gui/common/RsUrlHandler.h 
-	gui/common/RsCollectionDialog.h 
-	gui/common/rwindow.h 
-	gui/common/rshtml.h 
-	gui/common/AvatarDefs.h 
-	gui/common/GroupFlagsWidget.h 
-	gui/common/GroupSelectionBox.h 
-	gui/common/GroupChooser.h 
-	gui/common/StatusDefs.h 
-	gui/common/TagDefs.h 
-	gui/common/GroupDefs.h 
-	gui/common/Emoticons.h 
-	gui/common/RSComboBox.h 
-	gui/common/RSListWidgetItem.h 
-	gui/common/RSTextEdit.h 
-	gui/common/RSPlainTextEdit.h 
-	gui/common/RSTreeWidget.h 
-	gui/common/RSTreeWidgetItem.h 
-	gui/common/RSFeedWidget.h 
-	gui/common/RSTabWidget.h 
-	gui/common/RSElidedItemDelegate.h 
-	gui/common/RSItemDelegate.h 
-	gui/common/PeerDefs.h 
-	gui/common/FilesDefs.h 
-	gui/common/PopularityDefs.h 
-	gui/common/RsBanListDefs.h 
-	gui/common/GroupTreeWidget.h 
-	gui/common/RSTreeView.h 
-	gui/common/AvatarWidget.h 
-	gui/common/FriendListModel.h 
-	gui/common/NewFriendList.h 
-	gui/common/FriendSelectionWidget.h 
-	gui/common/FriendSelectionDialog.h 
-	gui/common/HashBox.h 
-	gui/common/LineEditClear.h 
-	gui/common/DropLineEdit.h 
-	gui/common/RSTextBrowser.h 
-	gui/common/RSImageBlockWidget.h 
-	gui/common/FeedNotify.h 
-	gui/common/UserNotify.h 
-	gui/common/HeaderFrame.h 
-	gui/common/MimeTextEdit.h 
-	gui/common/UIStateHelper.h 
-	gui/common/FloatingHelpBrowser.h 
-	gui/common/SubscribeToolButton.h 
-	gui/common/RsBanListToolButton.h 
-	gui/common/FlowLayout.h 
-	gui/common/PictureFlow.h 
-	gui/common/ToasterNotify.h 
+	src/gui/common/RsButtonOnText.h 
+	src/gui/common/RsCollection.h 
+	src/gui/common/RSGraphWidget.h 
+	src/gui/common/ElidedLabel.h 
+	src/gui/common/vmessagebox.h 
+	src/gui/common/RsUrlHandler.h 
+	src/gui/common/RsCollectionDialog.h 
+	src/gui/common/rwindow.h 
+	src/gui/common/rshtml.h 
+	src/gui/common/AvatarDefs.h 
+	src/gui/common/GroupFlagsWidget.h 
+	src/gui/common/GroupSelectionBox.h 
+	src/gui/common/GroupChooser.h 
+	src/gui/common/StatusDefs.h 
+	src/gui/common/TagDefs.h 
+	src/gui/common/GroupDefs.h 
+	src/gui/common/Emoticons.h 
+	src/gui/common/RSComboBox.h 
+	src/gui/common/RSListWidgetItem.h 
+	src/gui/common/RSTextEdit.h 
+	src/gui/common/RSPlainTextEdit.h 
+	src/gui/common/RSTreeWidget.h 
+	src/gui/common/RSTreeWidgetItem.h 
+	src/gui/common/RSFeedWidget.h 
+	src/gui/common/RSTabWidget.h 
+	src/gui/common/RSElidedItemDelegate.h 
+	src/gui/common/RSItemDelegate.h 
+	src/gui/common/PeerDefs.h 
+	src/gui/common/FilesDefs.h 
+	src/gui/common/PopularityDefs.h 
+	src/gui/common/RsBanListDefs.h 
+	src/gui/common/GroupTreeWidget.h 
+	src/gui/common/RSTreeView.h 
+	src/gui/common/AvatarWidget.h 
+	src/gui/common/FriendListModel.h 
+	src/gui/common/NewFriendList.h 
+	src/gui/common/FriendSelectionWidget.h 
+	src/gui/common/FriendSelectionDialog.h 
+	src/gui/common/HashBox.h 
+	src/gui/common/LineEditClear.h 
+	src/gui/common/DropLineEdit.h 
+	src/gui/common/RSTextBrowser.h 
+	src/gui/common/RSImageBlockWidget.h 
+	src/gui/common/FeedNotify.h 
+	src/gui/common/UserNotify.h 
+	src/gui/common/HeaderFrame.h 
+	src/gui/common/MimeTextEdit.h 
+	src/gui/common/UIStateHelper.h 
+	src/gui/common/FloatingHelpBrowser.h 
+	src/gui/common/SubscribeToolButton.h 
+	src/gui/common/RsBanListToolButton.h 
+	src/gui/common/FlowLayout.h 
+	src/gui/common/PictureFlow.h 
+	src/gui/common/ToasterNotify.h 
 
-	gui/style/RSStyle.h 
-	gui/style/StyleDialog.h 
+	src/gui/style/RSStyle.h 
+	src/gui/style/StyleDialog.h 
 
-	gui/help/browser/helpbrowser.h 
-	gui/help/browser/helptextbrowser.h 
+	src/gui/help/browser/helpbrowser.h 
+	src/gui/help/browser/helptextbrowser.h 
 
-	gui/statusbar/peerstatus.h 
-	gui/statusbar/natstatus.h 
-	gui/statusbar/dhtstatus.h 
-	gui/statusbar/torstatus.h 
-	gui/statusbar/ratesstatus.h 
-	gui/statusbar/hashingstatus.h 
-	gui/statusbar/discstatus.h 
-	gui/statusbar/SoundStatus.h 
-	gui/statusbar/OpModeStatus.h 
-	gui/statusbar/ToasterDisable.h 
-	gui/statusbar/SysTrayStatus.h 
+	src/gui/statusbar/peerstatus.h 
+	src/gui/statusbar/natstatus.h 
+	src/gui/statusbar/dhtstatus.h 
+	src/gui/statusbar/torstatus.h 
+	src/gui/statusbar/ratesstatus.h 
+	src/gui/statusbar/hashingstatus.h 
+	src/gui/statusbar/discstatus.h 
+	src/gui/statusbar/SoundStatus.h 
+	src/gui/statusbar/OpModeStatus.h 
+	src/gui/statusbar/ToasterDisable.h 
+	src/gui/statusbar/SysTrayStatus.h 
 
-	gui/advsearch/advancedsearchdialog.h 
-	gui/advsearch/expressionwidget.h 
-	gui/advsearch/guiexprelement.h 
+	src/gui/advsearch/advancedsearchdialog.h 
+	src/gui/advsearch/expressionwidget.h 
+	src/gui/advsearch/guiexprelement.h 
 
-	gui/elastic/graphwidget.h 
-	gui/elastic/edge.h 
-	gui/elastic/arrow.h 
-	gui/elastic/elnode.h 
+	src/gui/elastic/graphwidget.h 
+	src/gui/elastic/edge.h 
+	src/gui/elastic/arrow.h 
+	src/gui/elastic/elnode.h 
 
-	gui/feeds/BoardsCommentsItem.h 
-	gui/feeds/FeedItem.h 
-	gui/feeds/FeedHolder.h 
-	gui/feeds/GxsCircleItem.h 
-	gui/feeds/ChannelsCommentsItem.h 
-	gui/feeds/PeerItem.h 
-	gui/feeds/MsgItem.h 
-	gui/feeds/ChatMsgItem.h 
-	gui/feeds/SubFileItem.h 
-	gui/feeds/AttachFileItem.h 
-	gui/feeds/SecurityItem.h 
-	gui/feeds/SecurityIpItem.h 
-	gui/feeds/NewsFeedUserNotify.h 
+	src/gui/feeds/BoardsCommentsItem.h 
+	src/gui/feeds/FeedItem.h 
+	src/gui/feeds/FeedHolder.h 
+	src/gui/feeds/GxsCircleItem.h 
+	src/gui/feeds/ChannelsCommentsItem.h 
+	src/gui/feeds/PeerItem.h 
+	src/gui/feeds/MsgItem.h 
+	src/gui/feeds/ChatMsgItem.h 
+	src/gui/feeds/SubFileItem.h 
+	src/gui/feeds/AttachFileItem.h 
+	src/gui/feeds/SecurityItem.h 
+	src/gui/feeds/SecurityIpItem.h 
+	src/gui/feeds/NewsFeedUserNotify.h 
 
-	gui/connect/ConnectFriendWizard.h 
-	gui/connect/ConnectProgressDialog.h 
+	src/gui/connect/ConnectFriendWizard.h 
+	src/gui/connect/ConnectProgressDialog.h 
 
-	gui/groups/CreateGroup.h 
+	src/gui/groups/CreateGroup.h 
 	)
 
-if(RS_JSONAPI)
+if(RS_JSON_API)
 	list(
-		APPEND RS_SOURCES
-		gui/settings/JsonApiPage.cc
+		APPEND RS_GUI_SOURCES
+		src/gui/settings/JsonApiPage.cc
 	)
 
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/settings/JsonApiPage.h
+		src/gui/settings/JsonApiPage.h
 	)
 
 	list(
-		APPEND RS_FORMS
-		gui/settings/JsonApiPage.ui
+		APPEND RS_GUI_FORMS
+		src/gui/settings/JsonApiPage.ui
 	)
-endif(RS_JSONAPI)
+endif(RS_JSON_API)
 
 if(RS_WEBUI)
 	list(
-		APPEND RS_SOURCES
-		gui/settings/WebuiPage.cpp
+		APPEND RS_GUI_SOURCES
+		src/gui/settings/WebuiPage.cpp
 	)
 
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		jsonapi/p3webui.h 
-		gui/settings/WebuiPage.h 
+		src/jsonapi/p3webui.h 
+		src/gui/settings/WebuiPage.h 
 	)
 
 	list(
-		APPEND RS_FORMS
-		gui/settings/WebuiPage.ui
+		APPEND RS_GUI_FORMS
+		src/gui/settings/WebuiPage.ui
 	)
 endif(RS_WEBUI)
 
 list(
-	APPEND RS_QTRESOURCES
-	gui/images.qrc 
-	gui/icons.qrc 
-	lang/lang.qrc 
-	gui/help/content/content.qrc 
-	gui/emojione.qrc 
-	gui/qss/stylesheet/qdarkstyle/dark/Standard_Dark.qrc 
-	gui/qss/stylesheet/qdarkstyle/light/Standard_Light.qrc
+	APPEND RS_GUI_QTRESOURCES
+	src/gui/images.qrc 
+	src/gui/icons.qrc 
+	src/lang/lang.qrc 
+	src/gui/help/content/content.qrc 
+	src/gui/emojione.qrc 
+	src/gui/qss/stylesheet/qdarkstyle/dark/Standard_Dark.qrc 
+	src/gui/qss/stylesheet/qdarkstyle/light/Standard_Light.qrc
 	)
 
 list(
 	APPEND RS_TRANSLATIONS
-	lang/retroshare_ca_ES.ts 
-	lang/retroshare_cs.ts 
-	lang/retroshare_da.ts
-	lang/retroshare_de.ts
-	lang/retroshare_el.ts
-	lang/retroshare_en.ts
-	lang/retroshare_es.ts
-	lang/retroshare_fi.ts
-	lang/retroshare_fr.ts
-	lang/retroshare_hu.ts
-	lang/retroshare_it.ts
-	lang/retroshare_ja_JP.ts 
-	lang/retroshare_nl.ts 
-	lang/retroshare_ko.ts 
-	lang/retroshare_pl.ts 
-	lang/retroshare_ru.ts 
-	lang/retroshare_sv.ts 
-	lang/retroshare_tr.ts 
-	lang/retroshare_zh_CN.ts
+	src/lang/retroshare_ca_ES.ts 
+	src/lang/retroshare_cs.ts 
+	src/lang/retroshare_da.ts
+	src/lang/retroshare_de.ts
+	src/lang/retroshare_el.ts
+	src/lang/retroshare_en.ts
+	src/lang/retroshare_es.ts
+	src/lang/retroshare_fi.ts
+	src/lang/retroshare_fr.ts
+	src/lang/retroshare_hu.ts
+	src/lang/retroshare_it.ts
+	src/lang/retroshare_ja_JP.ts 
+	src/lang/retroshare_nl.ts 
+	src/lang/retroshare_ko.ts 
+	src/lang/retroshare_pl.ts 
+	src/lang/retroshare_ru.ts 
+	src/lang/retroshare_sv.ts 
+	src/lang/retroshare_tr.ts 
+	src/lang/retroshare_zh_CN.ts
 	)
 
 if(RS_UNFINISHED_TRANSLATIONS)
 	list(
 		APPEND RS_TRANSLATIONS
-		lang/retroshare_bg.ts 
-		lang/retroshare_af.ts 
-		lang/retroshare_pt.ts 
-		lang/retroshare_sl.ts 
-		lang/retroshare_sr.ts 
-		lang/retroshare_zh_TW.ts
+		src/lang/retroshare_bg.ts 
+		src/lang/retroshare_af.ts 
+		src/lang/retroshare_pt.ts 
+		src/lang/retroshare_sl.ts 
+		src/lang/retroshare_sr.ts 
+		src/lang/retroshare_zh_TW.ts
 		)
 endif(RS_UNFINISHED_TRANSLATIONS)
 
@@ -786,42 +783,42 @@ if(RS_MESSENGER)
 		)
 
 	list(
-		APPEND RS_SOURCES
-		gui/MessengerWindow.cpp 
-		gui/common/FriendList.cpp
+		APPEND RS_GUI_SOURCES
+		src/gui/MessengerWindow.cpp 
+		src/gui/common/FriendList.cpp
 		)
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/MessengerWindow.h 
-		gui/common/FriendList.h 
+		src/gui/MessengerWindow.h 
+		src/gui/common/FriendList.h 
 		)
 	list(
-		APPEND RS_FORMS
-		gui/MessengerWindow.ui 
-		gui/common/FriendList.ui
+		APPEND RS_GUI_FORMS
+		src/gui/MessengerWindow.ui 
+		src/gui/common/FriendList.ui
 		)
 endif(RS_MESSENGER)
 
 if(RS_IDLE)
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		idle/idle.h
+		src/idle/idle.h
 		)
 	list(
-		APPEND RS_SOURCES
-		idle/idle.cpp 
-		idle/idle_platform.cpp
+		APPEND RS_GUI_SOURCES
+		src/idle/idle.cpp 
+		src/idle/idle_platform.cpp
 		)
 endif(RS_IDLE)
 
 if(RS_FRAMECATCHER)
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		util/framecatcher.h
+		src/util/framecatcher.h
 		)
 	list(
-		APPEND RS_SOURCES
-		util/framecatcher.cpp
+		APPEND RS_GUI_SOURCES
+		src/util/framecatcher.cpp
 		)
 
 	# TODO: LIBS += -lxine
@@ -838,16 +835,16 @@ if(RS_EFS)
 		${PROJECT_NAME} PUBLIC RS_EMBEDED_FRIEND_SERVER
 		)
 	list(
-		APPEND RS_SOURCES
-		gui/FriendServerControl.cpp
+		APPEND RS_GUI_SOURCES
+		src/gui/FriendServerControl.cpp
 		)
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/FriendServerControl.h
+		src/gui/FriendServerControl.h
 		)
 	list(
-		APPEND RS_FORMS
-		gui/FriendServerControl.ui
+		APPEND RS_GUI_FORMS
+		src/gui/FriendServerControl.ui
 		)
 endif(RS_EFS)
 
@@ -857,7 +854,7 @@ if(RS_UNFINISHED)
 
 	list(	
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/unfinished/ApplicationWindow.h 
+		src/gui/unfinished/ApplicationWindow.h 
 
 		#		gui/unfinished/CalDialog.h 
 		#		gui/unfinished/ExampleDialog.h 
@@ -870,8 +867,8 @@ if(RS_UNFINISHED)
 		)
 
 	list(
-		APPEND RS_FORMS
-		gui/unfinished/ApplicationWindow.ui 
+		APPEND RS_GUI_FORMS
+		src/gui/unfinished/ApplicationWindow.ui 
 
 		#		gui/unfinished/CalDialog.ui 
 		#		gui/unfinished/ExampleDialog.ui 
@@ -884,8 +881,8 @@ if(RS_UNFINISHED)
 		)
 
 	list(
-		APPEND RS_SOURCES 
-		gui/unfinished/ApplicationWindow.cpp 
+		APPEND RS_GUI_SOURCES 
+		src/gui/unfinished/ApplicationWindow.cpp 
 
 		#		gui/unfinished/CalDialog.cpp 
 		#		gui/unfinished/ExampleDialog.cpp 
@@ -909,45 +906,45 @@ if(RS_GXSPHOTOSHARE)
 
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/PhotoShare/AlbumGroupDialog.h 
-		gui/PhotoShare/AlbumExtra.h 
-		gui/PhotoShare/PhotoDrop.h 
-		gui/PhotoShare/AlbumItem.h 
-		gui/PhotoShare/AlbumDialog.h 
-		gui/PhotoShare/PhotoItem.h 
-		gui/PhotoShare/PhotoShareItemHolder.h 
-		gui/PhotoShare/PhotoShare.h 
-		gui/PhotoShare/PhotoSlideShow.h 
-		gui/PhotoShare/PhotoDialog.h
+		src/gui/PhotoShare/AlbumGroupDialog.h 
+		src/gui/PhotoShare/AlbumExtra.h 
+		src/gui/PhotoShare/PhotoDrop.h 
+		src/gui/PhotoShare/AlbumItem.h 
+		src/gui/PhotoShare/AlbumDialog.h 
+		src/gui/PhotoShare/PhotoItem.h 
+		src/gui/PhotoShare/PhotoShareItemHolder.h 
+		src/gui/PhotoShare/PhotoShare.h 
+		src/gui/PhotoShare/PhotoSlideShow.h 
+		src/gui/PhotoShare/PhotoDialog.h
 		)
 	list(
-		APPEND RS_FORMS
-		gui/PhotoShare/AlbumExtra.ui 
-		gui/PhotoShare/PhotoItem.ui 
-		gui/PhotoShare/PhotoDialog.ui 
-		gui/PhotoShare/AlbumItem.ui 
-		gui/PhotoShare/AlbumDialog.ui 
-		gui/PhotoShare/PhotoShare.ui 
-		gui/PhotoShare/PhotoSlideShow.ui
+		APPEND RS_GUI_FORMS
+		src/gui/PhotoShare/AlbumExtra.ui 
+		src/gui/PhotoShare/PhotoItem.ui 
+		src/gui/PhotoShare/PhotoDialog.ui 
+		src/gui/PhotoShare/AlbumItem.ui 
+		src/gui/PhotoShare/AlbumDialog.ui 
+		src/gui/PhotoShare/PhotoShare.ui 
+		src/gui/PhotoShare/PhotoSlideShow.ui
 		)
 
 	list(
-		APPEND RS_SOURCES
-		gui/PhotoShare/AlbumGroupDialog.cpp 
-		gui/PhotoShare/AlbumExtra.cpp 
-		gui/PhotoShare/PhotoItem.cpp 
-		gui/PhotoShare/PhotoDialog.cpp 
-		gui/PhotoShare/PhotoDrop.cpp 
-		gui/PhotoShare/AlbumItem.cpp 
-		gui/PhotoShare/AlbumDialog.cpp 
-		gui/PhotoShare/PhotoShareItemHolder.cpp 
-		gui/PhotoShare/PhotoShare.cpp 
-		gui/PhotoShare/PhotoSlideShow.cpp
+		APPEND RS_GUI_SOURCES
+		src/gui/PhotoShare/AlbumGroupDialog.cpp 
+		src/gui/PhotoShare/AlbumExtra.cpp 
+		src/gui/PhotoShare/PhotoItem.cpp 
+		src/gui/PhotoShare/PhotoDialog.cpp 
+		src/gui/PhotoShare/PhotoDrop.cpp 
+		src/gui/PhotoShare/AlbumItem.cpp 
+		src/gui/PhotoShare/AlbumDialog.cpp 
+		src/gui/PhotoShare/PhotoShareItemHolder.cpp 
+		src/gui/PhotoShare/PhotoShare.cpp 
+		src/gui/PhotoShare/PhotoSlideShow.cpp
 		)
 
 	list(
-		APPEND RS_QTRESOURCES
-		gui/PhotoShare/Photo_images.qrc
+		APPEND RS_GUI_QTRESOURCES
+		src/gui/PhotoShare/Photo_images.qrc
 		)
 endif(RS_GXSPHOTOSHARE)
 
@@ -960,36 +957,36 @@ if(RS_GXSWIKIPOS)
 
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/WikiPoos/WikiDialog.h 
-		gui/WikiPoos/WikiAddDialog.h 
-		gui/WikiPoos/WikiEditDialog.h 
-		gui/gxs/WikiGroupDialog.h 
-		gui/gxs/RsGxsUpdateBroadcastBase.h 
-		gui/gxs/RsGxsUpdateBroadcastWidget.h 
-		gui/gxs/RsGxsUpdateBroadcastPage.h 
+		src/gui/WikiPoos/WikiDialog.h 
+		src/gui/WikiPoos/WikiAddDialog.h 
+		src/gui/WikiPoos/WikiEditDialog.h 
+		src/gui/gxs/WikiGroupDialog.h 
+		src/gui/gxs/RsGxsUpdateBroadcastBase.h 
+		src/gui/gxs/RsGxsUpdateBroadcastWidget.h 
+		src/gui/gxs/RsGxsUpdateBroadcastPage.h 
 		)
 
 	list(
-		APPEND RS_FORMS
-		gui/WikiPoos/WikiDialog.ui 
-		gui/WikiPoos/WikiAddDialog.ui 
-		gui/WikiPoos/WikiEditDialog.ui 
+		APPEND RS_GUI_FORMS
+		src/gui/WikiPoos/WikiDialog.ui 
+		src/gui/WikiPoos/WikiAddDialog.ui 
+		src/gui/WikiPoos/WikiEditDialog.ui 
 		)
 
 	list(
-		APPEND RS_SOURCES
-		gui/WikiPoos/WikiDialog.cpp 
-		gui/WikiPoos/WikiAddDialog.cpp 
-		gui/WikiPoos/WikiEditDialog.cpp 
-		gui/gxs/WikiGroupDialog.cpp 
-		gui/gxs/RsGxsUpdateBroadcastBase.cpp 
-		gui/gxs/RsGxsUpdateBroadcastWidget.cpp 
-		gui/gxs/RsGxsUpdateBroadcastPage.cpp 
+		APPEND RS_GUI_SOURCES
+		src/gui/WikiPoos/WikiDialog.cpp 
+		src/gui/WikiPoos/WikiAddDialog.cpp 
+		src/gui/WikiPoos/WikiEditDialog.cpp 
+		src/gui/gxs/WikiGroupDialog.cpp 
+		src/gui/gxs/RsGxsUpdateBroadcastBase.cpp 
+		src/gui/gxs/RsGxsUpdateBroadcastWidget.cpp 
+		src/gui/gxs/RsGxsUpdateBroadcastPage.cpp 
 		)
 
 	list(
-		APPEND RS_QTRESOURCES
-		gui/WikiPoos/Wiki_images.qrc
+		APPEND RS_GUI_QTRESOURCES
+		src/gui/WikiPoos/Wiki_images.qrc
 		)
 endif(RS_GXSWIKIPOS)
 	
@@ -1000,73 +997,73 @@ if(RS_GXSTHEWIRE)
 
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/TheWire/WireDialog.h 
-		gui/TheWire/WireGroupItem.h 
-		gui/TheWire/WireGroupDialog.h 
-		gui/TheWire/WireGroupExtra.h 
-		gui/TheWire/PulseAddDialog.h 
-		gui/TheWire/PulseViewItem.h 
-		gui/TheWire/PulseTopLevel.h 
-		gui/TheWire/PulseViewGroup.h 
-		gui/TheWire/PulseReply.h 
-		gui/TheWire/PulseReplySeperator.h 
-		gui/TheWire/PulseMessage.h 
+		src/gui/TheWire/WireDialog.h 
+		src/gui/TheWire/WireGroupItem.h 
+		src/gui/TheWire/WireGroupDialog.h 
+		src/gui/TheWire/WireGroupExtra.h 
+		src/gui/TheWire/PulseAddDialog.h 
+		src/gui/TheWire/PulseViewItem.h 
+		src/gui/TheWire/PulseTopLevel.h 
+		src/gui/TheWire/PulseViewGroup.h 
+		src/gui/TheWire/PulseReply.h 
+		src/gui/TheWire/PulseReplySeperator.h 
+		src/gui/TheWire/PulseMessage.h 
 		)
 
 	list(
-		APPEND RS_FORMS
-		gui/TheWire/WireDialog.ui 
-		gui/TheWire/WireGroupItem.ui 
-		gui/TheWire/WireGroupExtra.ui 
-		gui/TheWire/PulseAddDialog.ui 
-		gui/TheWire/PulseTopLevel.ui 
-		gui/TheWire/PulseViewGroup.ui 
-		gui/TheWire/PulseReply.ui 
-		gui/TheWire/PulseReplySeperator.ui 
-		gui/TheWire/PulseMessage.ui 
+		APPEND RS_GUI_FORMS
+		src/gui/TheWire/WireDialog.ui 
+		src/gui/TheWire/WireGroupItem.ui 
+		src/gui/TheWire/WireGroupExtra.ui 
+		src/gui/TheWire/PulseAddDialog.ui 
+		src/gui/TheWire/PulseTopLevel.ui 
+		src/gui/TheWire/PulseViewGroup.ui 
+		src/gui/TheWire/PulseReply.ui 
+		src/gui/TheWire/PulseReplySeperator.ui 
+		src/gui/TheWire/PulseMessage.ui 
 		)
 
 	list(
-		APPEND RS_SOURCES
-		gui/TheWire/WireDialog.cpp 
-		gui/TheWire/WireGroupItem.cpp 
-		gui/TheWire/WireGroupDialog.cpp 
-		gui/TheWire/WireGroupExtra.cpp 
-		gui/TheWire/PulseAddDialog.cpp 
-		gui/TheWire/PulseViewItem.cpp 
-		gui/TheWire/PulseTopLevel.cpp 
-		gui/TheWire/PulseViewGroup.cpp 
-		gui/TheWire/PulseReply.cpp 
-		gui/TheWire/PulseReplySeperator.cpp 
-		gui/TheWire/PulseMessage.cpp 
+		APPEND RS_GUI_SOURCES
+		src/gui/TheWire/WireDialog.cpp 
+		src/gui/TheWire/WireGroupItem.cpp 
+		src/gui/TheWire/WireGroupDialog.cpp 
+		src/gui/TheWire/WireGroupExtra.cpp 
+		src/gui/TheWire/PulseAddDialog.cpp 
+		src/gui/TheWire/PulseViewItem.cpp 
+		src/gui/TheWire/PulseTopLevel.cpp 
+		src/gui/TheWire/PulseViewGroup.cpp 
+		src/gui/TheWire/PulseReply.cpp 
+		src/gui/TheWire/PulseReplySeperator.cpp 
+		src/gui/TheWire/PulseMessage.cpp 
 		)
 
 	list(
-		APPEND RS_QTRESOURCES
-		RESOURCES += gui/TheWire/TheWire_images.qrc
+		APPEND RS_GUI_QTRESOURCES
+		RESOURCES += src/gui/TheWire/TheWire_images.qrc
 		)
 endif(RS_GXSTHEWIRE)
 
 if(RS_GXSIDENTITIES)
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/Identity/IdDialog.h 
-		gui/Identity/IdEditDialog.h 
-		gui/Identity/IdDetailsDialog.h 
+		src/gui/Identity/IdDialog.h 
+		src/gui/Identity/IdEditDialog.h 
+		src/gui/Identity/IdDetailsDialog.h 
 		)
 
 	list(
-		APPEND RS_FORMS
-		gui/Identity/IdDialog.ui 
-		gui/Identity/IdEditDialog.ui 
-		gui/Identity/IdDetailsDialog.ui 
+		APPEND RS_GUI_FORMS
+		src/gui/Identity/IdDialog.ui 
+		src/gui/Identity/IdEditDialog.ui 
+		src/gui/Identity/IdDetailsDialog.ui 
 		)
 
 	list(
-		APPEND RS_SOURCES
-		gui/Identity/IdDialog.cpp 
-		gui/Identity/IdEditDialog.cpp 
-		gui/Identity/IdDetailsDialog.cpp 
+		APPEND RS_GUI_SOURCES
+		src/gui/Identity/IdDialog.cpp 
+		src/gui/Identity/IdEditDialog.cpp 
+		src/gui/Identity/IdDetailsDialog.cpp 
 		)
 endif(RS_GXSIDENTITIES)
 	
@@ -1076,123 +1073,123 @@ if(RS_GXSCIRCLES)
 		)
 
 	list(
-		gui/Circles/CirclesDialog.h 
-		gui/Circles/CreateCircleDialog.h 
-		gui/People/PeopleDialog.h
-		gui/People/CircleWidget.h
-		gui/People/IdentityWidget.h
+		src/gui/Circles/CirclesDialog.h 
+		src/gui/Circles/CreateCircleDialog.h 
+		src/gui/People/PeopleDialog.h
+		src/gui/People/CircleWidget.h
+		src/gui/People/IdentityWidget.h
 		)
 
 	list(
-		gui/Circles/CirclesDialog.ui 
-		gui/Circles/CreateCircleDialog.ui 
-		gui/People/PeopleDialog.ui 
-		gui/People/CircleWidget.ui
-		gui/People/IdentityWidget.ui
+		src/gui/Circles/CirclesDialog.ui 
+		src/gui/Circles/CreateCircleDialog.ui 
+		src/gui/People/PeopleDialog.ui 
+		src/gui/People/CircleWidget.ui
+		src/gui/People/IdentityWidget.ui
 		)
 
 	list(
-		gui/Circles/CirclesDialog.cpp 
-		gui/Circles/CreateCircleDialog.cpp 
-		gui/People/PeopleDialog.cpp 
-		gui/People/CircleWidget.cpp
-		gui/People/IdentityWidget.cpp
+		src/gui/Circles/CirclesDialog.cpp 
+		src/gui/Circles/CreateCircleDialog.cpp 
+		src/gui/People/PeopleDialog.cpp 
+		src/gui/People/CircleWidget.cpp
+		src/gui/People/IdentityWidget.cpp
 		)
 endif(RS_GXSCIRCLES)
 
 if(RS_GXSGUI)
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/gxs/GxsGroupDialog.h 
-		gui/gxs/GxsIdDetails.h 
-		gui/gxs/GxsIdChooser.h
-		gui/gxs/GxsIdLabel.h 
-		gui/gxs/GxsCircleChooser.h 
-		gui/gxs/GxsCircleLabel.h 
-		gui/gxs/GxsIdTreeWidgetItem.h 
-		gui/gxs/GxsCommentTreeWidget.h 
-		gui/gxs/GxsCommentContainer.h 
-		gui/gxs/GxsCommentDialog.h 
-		gui/gxs/GxsCreateCommentDialog.h 
-		gui/gxs/GxsGroupFrameDialog.h 
-		gui/gxs/GxsMessageFrameWidget.h 
-		gui/gxs/GxsMessageFramePostWidget.h 
-		gui/gxs/GxsGroupFeedItem.h 
-		gui/gxs/GxsFeedItem.h 
-		gui/gxs/GxsGroupShareKey.h 
-		gui/gxs/GxsUserNotify.h 
-		gui/gxs/GxsFeedWidget.h 
-		util/TokenQueue.h 
-		util/RsGxsUpdateBroadcast.h 
+		src/gui/gxs/GxsGroupDialog.h 
+		src/gui/gxs/GxsIdDetails.h 
+		src/gui/gxs/GxsIdChooser.h
+		src/gui/gxs/GxsIdLabel.h 
+		src/gui/gxs/GxsCircleChooser.h 
+		src/gui/gxs/GxsCircleLabel.h 
+		src/gui/gxs/GxsIdTreeWidgetItem.h 
+		src/gui/gxs/GxsCommentTreeWidget.h 
+		src/gui/gxs/GxsCommentContainer.h 
+		src/gui/gxs/GxsCommentDialog.h 
+		src/gui/gxs/GxsCreateCommentDialog.h 
+		src/gui/gxs/GxsGroupFrameDialog.h 
+		src/gui/gxs/GxsMessageFrameWidget.h 
+		src/gui/gxs/GxsMessageFramePostWidget.h 
+		src/gui/gxs/GxsGroupFeedItem.h 
+		src/gui/gxs/GxsFeedItem.h 
+		src/gui/gxs/GxsGroupShareKey.h 
+		src/gui/gxs/GxsUserNotify.h 
+		src/gui/gxs/GxsFeedWidget.h 
+		src/util/TokenQueue.h 
+		src/util/RsGxsUpdateBroadcast.h 
 		)
 
 	list(
-		APPEND RS_FORMS
-		gui/gxs/GxsGroupDialog.ui 
-		gui/gxs/GxsCommentContainer.ui 
-		gui/gxs/GxsCommentDialog.ui 
-		gui/gxs/GxsCreateCommentDialog.ui 
-		gui/gxs/GxsGroupFrameDialog.ui
-		gui/gxs/GxsGroupShareKey.ui 
+		APPEND RS_GUI_FORMS
+		src/gui/gxs/GxsGroupDialog.ui 
+		src/gui/gxs/GxsCommentContainer.ui 
+		src/gui/gxs/GxsCommentDialog.ui 
+		src/gui/gxs/GxsCreateCommentDialog.ui 
+		src/gui/gxs/GxsGroupFrameDialog.ui
+		src/gui/gxs/GxsGroupShareKey.ui 
 		)
 	
 	list(
-		APPEND RS_SOURCES
-		gui/gxs/GxsGroupDialog.cpp 
-		gui/gxs/GxsIdDetails.cpp 
-		gui/gxs/GxsIdChooser.cpp 
-		gui/gxs/GxsIdLabel.cpp 
-		gui/gxs/GxsCircleChooser.cpp 
-		gui/gxs/GxsGroupShareKey.cpp 
-		gui/gxs/GxsCircleLabel.cpp 
-		gui/gxs/GxsIdTreeWidgetItem.cpp 
-		gui/gxs/GxsCommentTreeWidget.cpp 
-		gui/gxs/GxsCommentContainer.cpp 
-		gui/gxs/GxsCommentDialog.cpp 
-		gui/gxs/GxsCreateCommentDialog.cpp 
-		gui/gxs/GxsGroupFrameDialog.cpp 
-		gui/gxs/GxsMessageFrameWidget.cpp 
-		gui/gxs/GxsMessageFramePostWidget.cpp 
-		gui/gxs/GxsGroupFeedItem.cpp 
-		gui/gxs/GxsFeedItem.cpp 
-		gui/gxs/GxsUserNotify.cpp 
-		gui/gxs/GxsFeedWidget.cpp 
-		util/TokenQueue.cpp 
-		util/RsGxsUpdateBroadcast.cpp 
+		APPEND RS_GUI_SOURCES
+		src/gui/gxs/GxsGroupDialog.cpp 
+		src/gui/gxs/GxsIdDetails.cpp 
+		src/gui/gxs/GxsIdChooser.cpp 
+		src/gui/gxs/GxsIdLabel.cpp 
+		src/gui/gxs/GxsCircleChooser.cpp 
+		src/gui/gxs/GxsGroupShareKey.cpp 
+		src/gui/gxs/GxsCircleLabel.cpp 
+		src/gui/gxs/GxsIdTreeWidgetItem.cpp 
+		src/gui/gxs/GxsCommentTreeWidget.cpp 
+		src/gui/gxs/GxsCommentContainer.cpp 
+		src/gui/gxs/GxsCommentDialog.cpp 
+		src/gui/gxs/GxsCreateCommentDialog.cpp 
+		src/gui/gxs/GxsGroupFrameDialog.cpp 
+		src/gui/gxs/GxsMessageFrameWidget.cpp 
+		src/gui/gxs/GxsMessageFramePostWidget.cpp 
+		src/gui/gxs/GxsGroupFeedItem.cpp 
+		src/gui/gxs/GxsFeedItem.cpp 
+		src/gui/gxs/GxsUserNotify.cpp 
+		src/gui/gxs/GxsFeedWidget.cpp 
+		src/util/TokenQueue.cpp 
+		src/util/RsGxsUpdateBroadcast.cpp 
 		)
 endif(RS_GXSGUI)
 	
 if(RS_GXSFORUMS) 
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS 
-		gui/gxsforums/GxsForumsDialog.h 
-		gui/gxsforums/GxsForumGroupDialog.h 
-		gui/gxsforums/CreateGxsForumMsg.h 
-		gui/gxsforums/GxsForumThreadWidget.h 
-		gui/gxsforums/GxsForumModel.h 
-		gui/gxsforums/GxsForumUserNotify.h 
-		gui/feeds/GxsForumGroupItem.h 
-		gui/feeds/GxsForumMsgItem.h
+		src/gui/gxsforums/GxsForumsDialog.h 
+		src/gui/gxsforums/GxsForumGroupDialog.h 
+		src/gui/gxsforums/CreateGxsForumMsg.h 
+		src/gui/gxsforums/GxsForumThreadWidget.h 
+		src/gui/gxsforums/GxsForumModel.h 
+		src/gui/gxsforums/GxsForumUserNotify.h 
+		src/gui/feeds/GxsForumGroupItem.h 
+		src/gui/feeds/GxsForumMsgItem.h
 		)
 
 	list(
-		APPEND RS_FORMS
-		ui/gxsforums/CreateGxsForumMsg.ui 
-		gui/gxsforums/GxsForumThreadWidget.ui 
-		gui/feeds/GxsForumGroupItem.ui 
-		gui/feeds/GxsForumMsgItem.ui
+		APPEND RS_GUI_FORMS
+		src/gui/gxsforums/CreateGxsForumMsg.ui 
+		src/gui/gxsforums/GxsForumThreadWidget.ui 
+		src/gui/feeds/GxsForumGroupItem.ui 
+		src/gui/feeds/GxsForumMsgItem.ui
 		)
 
 	list(
-		APPEND RS_SOURCES
-		gui/gxsforums/GxsForumsDialog.cpp 
-		gui/gxsforums/GxsForumGroupDialog.cpp 
-		gui/gxsforums/CreateGxsForumMsg.cpp 
-		gui/gxsforums/GxsForumThreadWidget.cpp 
-		gui/gxsforums/GxsForumModel.cpp 
-		gui/gxsforums/GxsForumUserNotify.cpp 
-		gui/feeds/GxsForumGroupItem.cpp 
-		gui/feeds/GxsForumMsgItem.cpp
+		APPEND RS_GUI_SOURCES
+		src/gui/gxsforums/GxsForumsDialog.cpp 
+		src/gui/gxsforums/GxsForumGroupDialog.cpp 
+		src/gui/gxsforums/CreateGxsForumMsg.cpp 
+		src/gui/gxsforums/GxsForumThreadWidget.cpp 
+		src/gui/gxsforums/GxsForumModel.cpp 
+		src/gui/gxsforums/GxsForumUserNotify.cpp 
+		src/gui/feeds/GxsForumGroupItem.cpp 
+		src/gui/feeds/GxsForumMsgItem.cpp
 		)
 endif(RS_GXSFORUMS)
 	
@@ -1200,90 +1197,90 @@ endif(RS_GXSFORUMS)
 if(RS_GXSCHANNELS)
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/gxschannels/GxsChannelDialog.h 
-		gui/gxschannels/GxsChannelGroupDialog.h 
-		gui/gxschannels/CreateGxsChannelMsg.h 
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.h 
-		gui/gxschannels/GxsChannelPostsModel.h 
-		gui/gxschannels/GxsChannelPostFilesModel.h 
-		gui/gxschannels/GxsChannelPostThumbnail.h 
-		gui/gxschannels/GxsChannelFilesStatusWidget.h 
-		gui/feeds/GxsChannelGroupItem.h 
-		gui/feeds/GxsChannelPostItem.h 
-		gui/gxschannels/GxsChannelUserNotify.h
+		src/gui/gxschannels/GxsChannelDialog.h 
+		src/gui/gxschannels/GxsChannelGroupDialog.h 
+		src/gui/gxschannels/CreateGxsChannelMsg.h 
+		src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h 
+		src/gui/gxschannels/GxsChannelPostsModel.h 
+		src/gui/gxschannels/GxsChannelPostFilesModel.h 
+		src/gui/gxschannels/GxsChannelPostThumbnail.h 
+		src/gui/gxschannels/GxsChannelFilesStatusWidget.h 
+		src/gui/feeds/GxsChannelGroupItem.h 
+		src/gui/feeds/GxsChannelPostItem.h 
+		src/gui/gxschannels/GxsChannelUserNotify.h
 		)
 	
 	list(
-		APPEND RS_FORMS
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.ui 
-		gui/gxschannels/GxsChannelFilesStatusWidget.ui 
-		gui/gxschannels/CreateGxsChannelMsg.ui 
-		gui/feeds/GxsChannelGroupItem.ui 
-		gui/feeds/GxsChannelPostItem.ui
+		APPEND RS_GUI_FORMS
+		src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui 
+		src/gui/gxschannels/GxsChannelFilesStatusWidget.ui 
+		src/gui/gxschannels/CreateGxsChannelMsg.ui 
+		src/gui/feeds/GxsChannelGroupItem.ui 
+		src/gui/feeds/GxsChannelPostItem.ui
 		)
 	
 	list(
-		APPEND RS_SOURCES
-		gui/gxschannels/GxsChannelDialog.cpp 
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp 
-		gui/gxschannels/GxsChannelPostsModel.cpp 
-		gui/gxschannels/GxsChannelPostFilesModel.cpp 
-		gui/gxschannels/GxsChannelFilesStatusWidget.cpp 
-                gui/gxschannels/GxsChannelPostThumbnail.cpp 
-		gui/gxschannels/GxsChannelGroupDialog.cpp 
-		gui/gxschannels/CreateGxsChannelMsg.cpp 
-		gui/feeds/GxsChannelGroupItem.cpp 
-		gui/feeds/GxsChannelPostItem.cpp 
-		gui/gxschannels/GxsChannelUserNotify.cpp
+		APPEND RS_GUI_SOURCES
+		src/gui/gxschannels/GxsChannelDialog.cpp 
+		src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp 
+		src/gui/gxschannels/GxsChannelPostsModel.cpp 
+		src/gui/gxschannels/GxsChannelPostFilesModel.cpp 
+		src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp 
+                src/gui/gxschannels/GxsChannelPostThumbnail.cpp 
+		src/gui/gxschannels/GxsChannelGroupDialog.cpp 
+		src/gui/gxschannels/CreateGxsChannelMsg.cpp 
+		src/gui/feeds/GxsChannelGroupItem.cpp 
+		src/gui/feeds/GxsChannelPostItem.cpp 
+		src/gui/gxschannels/GxsChannelUserNotify.cpp
 		)
 endif(RS_GXSCHANNELS)
 	
 if(RS_GXSPOSTED)
 	list(
 		APPEND RS_IMPLEMENTATION_HEADERS
-		gui/Posted/PostedDialog.h 
-		gui/Posted/PostedListWidgetWithModel.h 
-		gui/Posted/PostedPostsModel.h 
-		gui/Posted/BoardPostDisplayWidget.h 
-		gui/Posted/PostedItem.h 
-		gui/Posted/PostedCardView.h 
-		gui/Posted/PostedGroupDialog.h 
-		gui/feeds/PostedGroupItem.h 
-		gui/Posted/PostedCreatePostDialog.h 
-		gui/Posted/PhotoView.h 
-		gui/Posted/PostedUserNotify.h
+		src/gui/Posted/PostedDialog.h 
+		src/gui/Posted/PostedListWidgetWithModel.h 
+		src/gui/Posted/PostedPostsModel.h 
+		src/gui/Posted/BoardPostDisplayWidget.h 
+		src/gui/Posted/PostedItem.h 
+		src/gui/Posted/PostedCardView.h 
+		src/gui/Posted/PostedGroupDialog.h 
+		src/gui/feeds/PostedGroupItem.h 
+		src/gui/Posted/PostedCreatePostDialog.h 
+		src/gui/Posted/PhotoView.h 
+		src/gui/Posted/PostedUserNotify.h
 		)
 
 	list(
-		APPEND RS_FORMS
-		gui/Posted/PostedListWidgetWithModel.ui 
-		gui/feeds/PostedGroupItem.ui 
-		gui/Posted/BoardPostDisplayWidget_compact.ui 
-		gui/Posted/BoardPostDisplayWidget_card.ui 
-		gui/Posted/PostedItem.ui 
-		gui/Posted/PostedCardView.ui 
-		gui/Posted/PostedCreatePostDialog.ui 
-		gui/Posted/PhotoView.ui 
+		APPEND RS_GUI_FORMS
+		src/gui/Posted/PostedListWidgetWithModel.ui 
+		src/gui/feeds/PostedGroupItem.ui 
+		src/gui/Posted/BoardPostDisplayWidget_compact.ui 
+		src/gui/Posted/BoardPostDisplayWidget_card.ui 
+		src/gui/Posted/PostedItem.ui 
+		src/gui/Posted/PostedCardView.ui 
+		src/gui/Posted/PostedCreatePostDialog.ui 
+		src/gui/Posted/PhotoView.ui 
 		)
 	
 	list(
-		APPEND RS_SOURCES
-		gui/Posted/PostedDialog.cpp 
-		gui/Posted/PostedListWidgetWithModel.cpp 
-		gui/Posted/BoardPostDisplayWidget.cpp 
-		gui/Posted/PostedPostsModel.cpp 
-		gui/feeds/PostedGroupItem.cpp 
-		gui/Posted/PostedItem.cpp 
-		gui/Posted/PostedCardView.cpp 
-		gui/Posted/PostedGroupDialog.cpp 
-		gui/Posted/PostedCreatePostDialog.cpp 
-		gui/Posted/PhotoView.cpp 
-		gui/Posted/PostedUserNotify.cpp
+		APPEND RS_GUI_SOURCES
+		src/gui/Posted/PostedDialog.cpp 
+		src/gui/Posted/PostedListWidgetWithModel.cpp 
+		src/gui/Posted/BoardPostDisplayWidget.cpp 
+		src/gui/Posted/PostedPostsModel.cpp 
+		src/gui/feeds/PostedGroupItem.cpp 
+		src/gui/Posted/PostedItem.cpp 
+		src/gui/Posted/PostedCardView.cpp 
+		src/gui/Posted/PostedGroupDialog.cpp 
+		src/gui/Posted/PostedCreatePostDialog.cpp 
+		src/gui/Posted/PhotoView.cpp 
+		src/gui/Posted/PostedUserNotify.cpp
 		)
 
 	list(
-		APPEND RS_QTRESOURCES
-		gui/Posted/Posted_images.qrc
+		APPEND RS_GUI_QTRESOURCES
+		src/gui/Posted/Posted_images.qrc
 		)
 endif(RS_GXSPOSTED)
 
diff --git a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h
index c0ae4b4b2..0445ab76f 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h
+++ b/retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h
@@ -18,6 +18,8 @@
  *                                                                             *
  *******************************************************************************/
 
+#pragma once
+
 #include "ui_BandwidthStatsWidget.h"
 #include "BWGraph.h"
 

From dd653e546223d3d0fc866904cdf9c69c00ccb4b3 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 26 Mar 2022 20:55:10 +0100
Subject: [PATCH 060/503] moved to cpp files some column defines that otherwise
 collapsed in .h files

---
 .../src/gui/FileTransfer/DLListDelegate.cpp   |  45 ++++--
 .../src/gui/FileTransfer/DLListDelegate.h     |  24 ---
 .../src/gui/FileTransfer/ULListDelegate.cpp   |  28 +++-
 .../src/gui/FileTransfer/ULListDelegate.h     |  13 --
 .../gui/NetworkDialog/pgpid_item_model.cpp    |  71 +++++----
 .../src/gui/NetworkDialog/pgpid_item_model.h  |  14 --
 .../src/gui/NetworkDialog/pgpid_item_proxy.h  |   8 +-
 retroshare-gui/src/gui/RemoteDirModel.cpp     | 141 ++++++++++--------
 retroshare-gui/src/gui/RemoteDirModel.h       |   9 --
 9 files changed, 174 insertions(+), 179 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
index 4385af476..0b8588f76 100644
--- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
@@ -32,6 +32,29 @@
 
 Q_DECLARE_METATYPE(FileProgressInfo)
 
+// Defines for download list list columns
+#define DLLISTDELEGATE_COLUMN_NAME         0
+#define DLLISTDELEGATE_COLUMN_SIZE         1
+#define DLLISTDELEGATE_COLUMN_COMPLETED    2
+#define DLLISTDELEGATE_COLUMN_DLSPEED      3
+#define DLLISTDELEGATE_COLUMN_PROGRESS     4
+#define DLLISTDELEGATE_COLUMN_SOURCES      5
+#define DLLISTDELEGATE_COLUMN_STATUS       6
+#define DLLISTDELEGATE_COLUMN_PRIORITY     7
+#define DLLISTDELEGATE_COLUMN_REMAINING    8
+#define DLLISTDELEGATE_COLUMN_DOWNLOADTIME 9
+#define DLLISTDELEGATE_COLUMN_ID          10
+#define DLLISTDELEGATE_COLUMN_LASTDL      11
+#define DLLISTDELEGATE_COLUMN_PATH        12
+#define DLLISTDELEGATE_COLUMN_COUNT       13
+
+#define PRIORITY_NULL     0.0
+#define PRIORITY_FASTER   0.1
+#define PRIORITY_AVERAGE  0.2
+#define PRIORITY_SLOWER   0.3
+
+#define MAX_CHAR_TMP 128
+
 DLListDelegate::DLListDelegate(QObject *parent) : QAbstractItemDelegate(parent)
 {
 }
@@ -69,7 +92,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
         }
 
         // draw the background color if not the progress column or if progress is not displayed
-        if(index.column() != COLUMN_PROGRESS) {
+        if(index.column() != DLLISTDELEGATE_COLUMN_PROGRESS) {
                 if(option.showDecorationSelected && (option.state & QStyle::State_Selected)) {
                         if(cg == QPalette::Normal && !(option.state & QStyle::State_Active)) {
                                 cg = QPalette::Inactive;
@@ -83,7 +106,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                 }
         }
 	switch(index.column()) {
-        case COLUMN_SIZE:
+        case DLLISTDELEGATE_COLUMN_SIZE:
 			fileSize = index.data().toLongLong();
                         if(fileSize <= 0){
                                 temp = "";
@@ -102,7 +125,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case COLUMN_REMAINING:
+        case DLLISTDELEGATE_COLUMN_REMAINING:
 			remaining = index.data().toLongLong();
 			if(remaining <= 0){
         temp = "";
@@ -121,7 +144,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case COLUMN_COMPLETED:
+        case DLLISTDELEGATE_COLUMN_COMPLETED:
 			completed = index.data().toLongLong();
                         if(completed <= 0){
                                 temp = "";
@@ -140,7 +163,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case COLUMN_DLSPEED:
+        case DLLISTDELEGATE_COLUMN_DLSPEED:
                         dlspeed = index.data().toDouble();
                         if (dlspeed <= 0) {
                             temp = "";
@@ -151,7 +174,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                         }
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case COLUMN_PROGRESS:
+        case DLLISTDELEGATE_COLUMN_PROGRESS:
 			{
 				// create a xProgressBar
 				FileProgressInfo pinfo = index.data(Qt::UserRole).value<FileProgressInfo>() ;
@@ -180,7 +203,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignCenter, newopt.text);
 			break;
-		case COLUMN_SOURCES:
+		case DLLISTDELEGATE_COLUMN_SOURCES:
 		{
 			double dblValue = index.data().toDouble();
 
@@ -188,7 +211,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			painter->drawText(option.rect, Qt::AlignCenter, temp);
 		}
 		break;
-		case COLUMN_PRIORITY:
+		case DLLISTDELEGATE_COLUMN_PRIORITY:
 		{
 			double dblValue = index.data().toDouble();
 			if (dblValue == PRIORITY_NULL)
@@ -205,7 +228,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			painter->drawText(option.rect, Qt::AlignCenter, temp);
 		}
 		break;
-		case COLUMN_DOWNLOADTIME:
+		case DLLISTDELEGATE_COLUMN_DOWNLOADTIME:
 			downloadtime = index.data().toLongLong();
 			minutes = downloadtime / 60;
 			seconds = downloadtime % 60;
@@ -225,7 +248,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 				temp = "" ;
 			painter->drawText(option.rect, Qt::AlignCenter, temp);
 			break;
-		case COLUMN_NAME:
+		case DLLISTDELEGATE_COLUMN_NAME:
 		{
 			// decoration
 			int pixOffset = 0;
@@ -254,7 +277,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			painter->drawText(option.rect.translated(pixOffset, 0), Qt::AlignLeft, temp);
 		}
 		break;
-    case COLUMN_LASTDL:
+    case DLLISTDELEGATE_COLUMN_LASTDL:
         if (index.data().value<QString>().isEmpty())
             break;
         qi64Value = index.data().value<qint64>();
diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
index 3b67934fe..ab11ad461 100644
--- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
+++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
@@ -24,30 +24,6 @@
 #include <QAbstractItemDelegate>
 #include "xprogressbar.h"
 
-
-// Defines for download list list columns
-#define COLUMN_NAME         0
-#define COLUMN_SIZE         1
-#define COLUMN_COMPLETED    2
-#define COLUMN_DLSPEED      3
-#define COLUMN_PROGRESS     4
-#define COLUMN_SOURCES      5
-#define COLUMN_STATUS       6
-#define COLUMN_PRIORITY     7
-#define COLUMN_REMAINING    8
-#define COLUMN_DOWNLOADTIME 9
-#define COLUMN_ID          10
-#define COLUMN_LASTDL      11
-#define COLUMN_PATH        12
-#define COLUMN_COUNT       13
-
-#define PRIORITY_NULL     0.0
-#define PRIORITY_FASTER   0.1
-#define PRIORITY_AVERAGE  0.2
-#define PRIORITY_SLOWER   0.3
-
-#define MAX_CHAR_TMP 128
-
 class QModelIndex;
 class QPainter;
 
diff --git a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
index c4c9bb90d..8b379d780 100644
--- a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
@@ -25,6 +25,18 @@
 
 Q_DECLARE_METATYPE(FileProgressInfo)
 
+// Defines for upload list list columns
+#define ULLISTDELEGATE_COLUMN_UNAME        0
+#define ULLISTDELEGATE_COLUMN_UPEER        1
+#define ULLISTDELEGATE_COLUMN_USIZE        2
+#define ULLISTDELEGATE_COLUMN_UTRANSFERRED 3
+#define ULLISTDELEGATE_COLUMN_ULSPEED      4
+#define ULLISTDELEGATE_COLUMN_UPROGRESS    5
+#define ULLISTDELEGATE_COLUMN_UHASH        6
+#define ULLISTDELEGATE_COLUMN_UCOUNT       7
+
+#define MAX_CHAR_TMP 128
+
 ULListDelegate::ULListDelegate(QObject *parent) : QAbstractItemDelegate(parent)
 {
 	;
@@ -65,7 +77,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 
 	// draw the background color
 	bool bDrawBackground = true;
-	if(index.column() == COLUMN_UPROGRESS) {
+	if(index.column() == ULLISTDELEGATE_COLUMN_UPROGRESS) {
 		FileProgressInfo pinfo = index.data().value<FileProgressInfo>() ;
 		bDrawBackground = (pinfo.type == FileProgressInfo::UNINIT);
 	}
@@ -84,7 +96,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 	}
 
 	switch(index.column()) {
-        case COLUMN_USIZE:
+        case ULLISTDELEGATE_COLUMN_USIZE:
 			fileSize = index.data().toLongLong();
                         if(fileSize <= 0){
                                 temp = "";
@@ -103,7 +115,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case COLUMN_UTRANSFERRED:
+        case ULLISTDELEGATE_COLUMN_UTRANSFERRED:
 			transferred = index.data().toLongLong();
                         if(transferred <= 0){
                                 temp = "";
@@ -122,7 +134,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case COLUMN_ULSPEED:
+        case ULLISTDELEGATE_COLUMN_ULSPEED:
                         ulspeed = index.data().toDouble();
                         if (ulspeed <= 0) {
                             temp = "";
@@ -133,7 +145,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                         }
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-		case COLUMN_UPROGRESS:
+		case ULLISTDELEGATE_COLUMN_UPROGRESS:
 			{
 				FileProgressInfo pinfo = index.data().value<FileProgressInfo>() ;
 				if (pinfo.type == FileProgressInfo::UNINIT)
@@ -143,7 +155,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 				painter->save() ;
 				xProgressBar progressBar(pinfo,option.rect,painter,0);// the 3rd param is the  color schema (0 is the default value)
 
-				QString ext = QFileInfo(QString::fromStdString(index.sibling(index.row(), COLUMN_UNAME).data().toString().toStdString())).suffix();;
+				QString ext = QFileInfo(QString::fromStdString(index.sibling(index.row(), ULLISTDELEGATE_COLUMN_UNAME).data().toString().toStdString())).suffix();;
 				if (ext == "rsfc" || ext == "rsrl" || ext == "dist" || ext == "rsfb")
 					progressBar.setColorSchema( 9);
 				else
@@ -157,8 +169,8 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignCenter, newopt.text);
 			break;
-		case COLUMN_UNAME:
-		case COLUMN_UPEER:
+		case ULLISTDELEGATE_COLUMN_UNAME:
+		case ULLISTDELEGATE_COLUMN_UPEER:
 			// decoration
 			value = index.data(Qt::DecorationRole);
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
diff --git a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.h b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.h
index 24a7d66d1..2f3aa4139 100644
--- a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.h
+++ b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.h
@@ -23,19 +23,6 @@
 
 #include <QAbstractItemDelegate>
 
-// Defines for upload list list columns
-#define COLUMN_UNAME        0
-#define COLUMN_UPEER        1
-#define COLUMN_USIZE        2
-#define COLUMN_UTRANSFERRED 3
-#define COLUMN_ULSPEED      4
-#define COLUMN_UPROGRESS    5
-#define COLUMN_UHASH        6
-#define COLUMN_UCOUNT       7
-
-
-#define MAX_CHAR_TMP 128
-
 class QModelIndex;
 class QPainter;
 
diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp
index 49bba065f..58a349514 100644
--- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp
@@ -24,6 +24,17 @@
 #include <QIcon>
 #include <QBrush>
 
+#define IMAGE_AUTHED         ":/images/accepted16.png"
+#define IMAGE_DENIED         ":/images/denied16.png"
+#define IMAGE_TRUSTED        ":/images/rs-2.png"
+
+#define PGP_ITEM_MODEL_COLUMN_CHECK        0
+#define PGP_ITEM_MODEL_COLUMN_PEERNAME     1
+#define PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER  2
+#define PGP_ITEM_MODEL_COLUMN_PEER_AUTH_ME 3
+#define PGP_ITEM_MODEL_COLUMN_PEERID       4
+#define PGP_ITEM_MODEL_COLUMN_LAST_USED    5
+#define PGP_ITEM_MODEL_COLUMN_COUNT        6
 
 /*TODO:
  * using list here for internal data storage is not best option
@@ -41,22 +52,22 @@ QVariant pgpid_item_model::headerData(int section, Qt::Orientation orientation,
         {
             switch(section)
             {
-            case COLUMN_CHECK:
+            case PGP_ITEM_MODEL_COLUMN_CHECK:
                 return QString(tr(" Do you accept connections signed by this profile?"));
                 break;
-            case COLUMN_PEERNAME:
+            case PGP_ITEM_MODEL_COLUMN_PEERNAME:
                 return QString(tr("Name of the profile"));
                 break;
-            case COLUMN_I_AUTH_PEER:
+            case PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER:
                 return QString(tr("This column indicates the trust level you indicated and whether you signed the profile PGP key"));
                 break;
-            case COLUMN_PEER_AUTH_ME:
+            case PGP_ITEM_MODEL_COLUMN_PEER_AUTH_ME:
                 return QString(tr("Did that peer sign your own profile PGP key"));
                 break;
-            case COLUMN_PEERID:
+            case PGP_ITEM_MODEL_COLUMN_PEERID:
                 return QString(tr("PGP Key Id of that profile"));
                 break;
-            case COLUMN_LAST_USED:
+            case PGP_ITEM_MODEL_COLUMN_LAST_USED:
                 return QString(tr("Last time this key was used (received time, or to check connection)"));
                 break;
             }
@@ -65,22 +76,22 @@ QVariant pgpid_item_model::headerData(int section, Qt::Orientation orientation,
         {
             switch(section)
             {
-            case COLUMN_CHECK:
+            case PGP_ITEM_MODEL_COLUMN_CHECK:
                 return QString(tr("Connections"));
                 break;
-            case COLUMN_PEERNAME:
+            case PGP_ITEM_MODEL_COLUMN_PEERNAME:
                 return QString(tr("Profile"));
                 break;
-            case COLUMN_I_AUTH_PEER:
+            case PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER:
                 return QString(tr("Trust level"));
                 break;
-            case COLUMN_PEER_AUTH_ME:
+            case PGP_ITEM_MODEL_COLUMN_PEER_AUTH_ME:
                 return QString(tr("Has signed your key?"));
                 break;
-            case COLUMN_PEERID:
+            case PGP_ITEM_MODEL_COLUMN_PEERID:
                 return QString(tr("Id"));
                 break;
-            case COLUMN_LAST_USED:
+            case PGP_ITEM_MODEL_COLUMN_LAST_USED:
                 return QString(tr("Last used"));
                 break;
             }
@@ -98,13 +109,13 @@ QVariant pgpid_item_model::headerData(int section, Qt::Orientation orientation,
         {
             switch(section)
             {
-            case COLUMN_CHECK:
+            case PGP_ITEM_MODEL_COLUMN_CHECK:
                 return 25*font_height;
                 break;
-            case COLUMN_PEERNAME: case COLUMN_I_AUTH_PEER: case COLUMN_PEER_AUTH_ME:
+            case PGP_ITEM_MODEL_COLUMN_PEERNAME: case PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER: case PGP_ITEM_MODEL_COLUMN_PEER_AUTH_ME:
                 return 200*font_height;
                 break;
-            case COLUMN_LAST_USED:
+            case PGP_ITEM_MODEL_COLUMN_LAST_USED:
                 return 75*font_height;
                 break;
             }
@@ -122,7 +133,7 @@ int pgpid_item_model::rowCount(const QModelIndex &/*parent*/) const
 
 int pgpid_item_model::columnCount(const QModelIndex &/*parent*/) const
 {
-    return COLUMN_COUNT;
+    return PGP_ITEM_MODEL_COLUMN_COUNT;
 }
 
 
@@ -148,20 +159,20 @@ QVariant pgpid_item_model::data(const QModelIndex &index, int role) const
     {
         switch(index.column())
         {
-        case COLUMN_LAST_USED:
+        case PGP_ITEM_MODEL_COLUMN_LAST_USED:
             return detail.lastUsed;
             break;
-        case COLUMN_I_AUTH_PEER:
+        case PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER:
         {
             if (detail.ownsign)
                 return RS_TRUST_LVL_ULTIMATE;
             return detail.trustLvl;
         }
             break;
-        case COLUMN_PEER_AUTH_ME:
+        case PGP_ITEM_MODEL_COLUMN_PEER_AUTH_ME:
             return detail.hasSignedMe;
             break;
-        case COLUMN_CHECK:
+        case PGP_ITEM_MODEL_COLUMN_CHECK:
             return detail.accept_connection;
             break;
         default:
@@ -174,13 +185,13 @@ QVariant pgpid_item_model::data(const QModelIndex &index, int role) const
     {
         switch(index.column())
         {
-        case COLUMN_PEERNAME:
+        case PGP_ITEM_MODEL_COLUMN_PEERNAME:
             return QString::fromUtf8(detail.name.c_str());
             break;
-        case COLUMN_PEERID:
+        case PGP_ITEM_MODEL_COLUMN_PEERID:
             return QString::fromStdString(detail.gpg_id.toStdString());
             break;
-        case COLUMN_I_AUTH_PEER:
+        case PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER:
         {
             if (detail.ownsign)
                 return tr("Personal signature");
@@ -199,7 +210,7 @@ QVariant pgpid_item_model::data(const QModelIndex &index, int role) const
             }
         }
             break;
-        case COLUMN_PEER_AUTH_ME:
+        case PGP_ITEM_MODEL_COLUMN_PEER_AUTH_ME:
         {
             if (detail.hasSignedMe)
                 return tr("Yes");
@@ -207,7 +218,7 @@ QVariant pgpid_item_model::data(const QModelIndex &index, int role) const
                 return tr("No");
         }
             break;
-        case COLUMN_LAST_USED:
+        case PGP_ITEM_MODEL_COLUMN_LAST_USED:
         {
             time_t now = time(NULL);
             uint64_t last_time_used = now - detail.lastUsed ;
@@ -226,7 +237,7 @@ QVariant pgpid_item_model::data(const QModelIndex &index, int role) const
             return lst_used_str;
         }
             break;
-        case COLUMN_CHECK:
+        case PGP_ITEM_MODEL_COLUMN_CHECK:
         {
             if (detail.accept_connection || rsPeers->getGPGOwnId() == detail.gpg_id)
                 return tr("Accepted");
@@ -242,7 +253,7 @@ QVariant pgpid_item_model::data(const QModelIndex &index, int role) const
     {
         switch(index.column())
         {
-        case COLUMN_I_AUTH_PEER:
+        case PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER:
         {
             if (detail.ownsign)
                 return tr("PGP key signed by you");
@@ -263,7 +274,7 @@ QVariant pgpid_item_model::data(const QModelIndex &index, int role) const
     {
         switch(index.column())
         {
-        case COLUMN_CHECK:
+        case PGP_ITEM_MODEL_COLUMN_CHECK:
         {
             if (detail.accept_connection)
                 return QIcon(IMAGE_AUTHED);
@@ -345,14 +356,14 @@ void pgpid_item_model::data_updated(std::list<RsPgpId> &new_neighs)
                 break;
             if(*i1 != *i2)
             {
-                QModelIndex topLeft = createIndex(ii1,0), bottomRight = createIndex(ii1, COLUMN_COUNT-1);
+                QModelIndex topLeft = createIndex(ii1,0), bottomRight = createIndex(ii1, PGP_ITEM_MODEL_COLUMN_COUNT-1);
                 emit dataChanged(topLeft, bottomRight);
             }
         }
     }
     if(new_size > old_size)
     {
-        QModelIndex topLeft = createIndex(old_size ? old_size -1 : 0 ,0), bottomRight = createIndex(new_size -1, COLUMN_COUNT-1);
+        QModelIndex topLeft = createIndex(old_size ? old_size -1 : 0 ,0), bottomRight = createIndex(new_size -1, PGP_ITEM_MODEL_COLUMN_COUNT-1);
         emit dataChanged(topLeft, bottomRight);
     }
     //dirty solution for initial data fetch
diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
index c4ae73400..e33987acd 100644
--- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
+++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
@@ -25,20 +25,6 @@
 #include <retroshare/rspeers.h>
 #include <QColor>
 
-#define IMAGE_AUTHED         ":/images/accepted16.png"
-#define IMAGE_DENIED         ":/images/denied16.png"
-#define IMAGE_TRUSTED        ":/images/rs-2.png"
-
-
-#define COLUMN_CHECK 0
-#define COLUMN_PEERNAME    1
-#define COLUMN_I_AUTH_PEER 2
-#define COLUMN_PEER_AUTH_ME 3
-#define COLUMN_PEERID      4
-#define COLUMN_LAST_USED   5
-#define COLUMN_COUNT 6
-
-
 class pgpid_item_model : public QAbstractTableModel
 {
     Q_OBJECT
diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.h b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.h
index 0260b815d..b892e093e 100644
--- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.h
+++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.h
@@ -35,12 +35,12 @@ public:
     pgpid_item_proxy(QObject *parent = nullptr);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 
-	bool lessThan(const QModelIndex &left, const QModelIndex &right) const override
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override
     {
         if(left.column() == COLUMN_LAST_USED)
-			return left.data(Qt::EditRole).toUInt() < right.data(Qt::EditRole).toUInt();
-		else
-			return left.data(Qt::DisplayRole).toString().toUpper() < right.data(Qt::DisplayRole).toString().toUpper();
+		return left.data(Qt::EditRole).toUInt() < right.data(Qt::EditRole).toUInt();
+	else
+		return left.data(Qt::DisplayRole).toString().toUpper() < right.data(Qt::DisplayRole).toString().toUpper();
     }
 
 public slots:
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index a6f31a428..05e19857f 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -48,6 +48,15 @@
  * #define RDM_SEARCH_DEBUG
  ****/
 
+#define REMOTEDIRMODEL_COLUMN_NAME          0
+#define REMOTEDIRMODEL_COLUMN_FILENB        1
+#define REMOTEDIRMODEL_COLUMN_SIZE          2
+#define REMOTEDIRMODEL_COLUMN_AGE           3
+#define REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS 4
+#define REMOTEDIRMODEL_COLUMN_WN_VISU_DIR   5
+#define REMOTEDIRMODEL_COLUMN_COUNT         6
+#define RETROSHARE_DIR_MODEL_FILTER_STRING "filtered"
+
 static const uint32_t FLAT_VIEW_MAX_REFS_PER_SECOND       = 2000 ;
 static const size_t   FLAT_VIEW_MAX_REFS_TABLE_SIZE       = 10000 ; //
 static const uint32_t FLAT_VIEW_MIN_DELAY_BETWEEN_UPDATES = 120 ;	// dont rebuild ref list more than every 2 mins.
@@ -295,11 +304,11 @@ int FlatStyle_RDM::rowCount(const QModelIndex &parent) const
 
 int TreeStyle_RDM::columnCount(const QModelIndex &/*parent*/) const
 {
-	return COLUMN_COUNT;
+	return REMOTEDIRMODEL_COLUMN_COUNT;
 }
 int FlatStyle_RDM::columnCount(const QModelIndex &/*parent*/) const
 {
-	return COLUMN_COUNT;
+	return REMOTEDIRMODEL_COLUMN_COUNT;
 }
 
 QString RetroshareDirModel::getFlagsString(FileStorageFlags flags)
@@ -416,7 +425,7 @@ QVariant RetroshareDirModel::filterRole(const DirDetails& details, int /*coln*/)
 
 QVariant RetroshareDirModel::decorationRole(const DirDetails& details,int coln) const
 {
-    if(coln == COLUMN_FRIEND_ACCESS)
+    if(coln == REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS)
     {
         if(details.type == DIR_TYPE_PERSON) return QVariant() ;
 
@@ -484,7 +493,7 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
 	{
 		switch(coln)
 		{
-		case COLUMN_NAME: {
+		case REMOTEDIRMODEL_COLUMN_NAME: {
 				//SharedDirStats stats ;
 				QString res ;
 
@@ -497,7 +506,7 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
 
 				return res ;
 			}
-		case COLUMN_FILENB: {
+		case REMOTEDIRMODEL_COLUMN_FILENB: {
 				SharedDirStats stats ;
 
 				if(RemoteMode)
@@ -516,7 +525,7 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
 				}
 				return tr("Empty");
 			}
-		case COLUMN_SIZE: {
+		case REMOTEDIRMODEL_COLUMN_SIZE: {
 				SharedDirStats stats ;
 
 				if(RemoteMode)
@@ -531,7 +540,7 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
 
 				return QString();
 			}
-		case COLUMN_AGE:
+		case REMOTEDIRMODEL_COLUMN_AGE:
 				if(!isNewerThanEpoque(details.max_mtime))
 					return QString();
 				else if(details.id != rsPeers->getOwnId())
@@ -547,13 +556,13 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
 	{
 		switch(coln)
 		{
-			case COLUMN_NAME:
+			case REMOTEDIRMODEL_COLUMN_NAME:
 				return QString::fromUtf8(details.name.c_str());
-			case COLUMN_FILENB:
+			case REMOTEDIRMODEL_COLUMN_FILENB:
 				return  QVariant();
-			case COLUMN_SIZE:
+			case REMOTEDIRMODEL_COLUMN_SIZE:
                 return  misc::friendlyUnit(details.size);
-			case COLUMN_AGE:
+			case REMOTEDIRMODEL_COLUMN_AGE:
 			{
 				if(details.type == DIR_TYPE_FILE)
 					return misc::timeRelativeToNow(details.max_mtime);
@@ -567,9 +576,9 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
 				else
 					return QString();
 			}
-			case COLUMN_FRIEND_ACCESS:
+			case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS:
 				return QVariant();
-			case COLUMN_WN_VISU_DIR:
+			case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR:
 				return getGroupsString(details.flags,details.parent_groups) ;
 
 			default:
@@ -580,22 +589,22 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const
 	{
 		switch(coln)
 		{
-			case COLUMN_NAME:
+			case REMOTEDIRMODEL_COLUMN_NAME:
 				return QString::fromUtf8(details.name.c_str());
 				break;
-			case COLUMN_FILENB:
+			case REMOTEDIRMODEL_COLUMN_FILENB:
                 if (details.children.size() > 1)
 				{
                     return QString::number(details.children.size()) + " " + tr("Files");
 				}
                 return QString::number(details.children.size()) + " " + tr("File");
-			case COLUMN_SIZE:
+			case REMOTEDIRMODEL_COLUMN_SIZE:
                 return  misc::friendlyUnit(details.size);
-            case COLUMN_AGE:
+            case REMOTEDIRMODEL_COLUMN_AGE:
 				return misc::timeRelativeToNow(details.max_mtime);
-			case COLUMN_FRIEND_ACCESS:
+			case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS:
 				return QVariant();
-			case COLUMN_WN_VISU_DIR:
+			case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR:
 				return getGroupsString(details.flags,details.parent_groups) ;
 
 			default:
@@ -650,12 +659,12 @@ QVariant FlatStyle_RDM::displayRole(const DirDetails& details,int coln) const
 	if (details.type == DIR_TYPE_FILE || details.type == DIR_TYPE_EXTRA_FILE) /* File */
 		switch(coln)
 		{
-			case COLUMN_NAME: return QString::fromUtf8(details.name.c_str());
-			case COLUMN_FILENB: return QString();
-            case COLUMN_SIZE: return misc::friendlyUnit(details.size);
-			case COLUMN_AGE: return misc::timeRelativeToNow(details.max_mtime);
-			case COLUMN_FRIEND_ACCESS: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
-			case COLUMN_WN_VISU_DIR: return computeDirectoryPath(details);
+			case REMOTEDIRMODEL_COLUMN_NAME: return QString::fromUtf8(details.name.c_str());
+			case REMOTEDIRMODEL_COLUMN_FILENB: return QString();
+            case REMOTEDIRMODEL_COLUMN_SIZE: return misc::friendlyUnit(details.size);
+			case REMOTEDIRMODEL_COLUMN_AGE: return misc::timeRelativeToNow(details.max_mtime);
+			case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
+			case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR: return computeDirectoryPath(details);
 			default:
 				return QVariant() ;
 		}
@@ -675,9 +684,9 @@ QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
 	{
 		switch(coln)
 		{
-			case COLUMN_NAME:
+			case REMOTEDIRMODEL_COLUMN_NAME:
 				return (RemoteMode)?(QString::fromUtf8(rsPeers->getPeerName(details.id).c_str())):tr("My files");
-			case COLUMN_FILENB: {
+			case REMOTEDIRMODEL_COLUMN_FILENB: {
 				SharedDirStats stats ;
 
 				if(RemoteMode)
@@ -687,7 +696,7 @@ QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
 
 				return (qulonglong) stats.total_number_of_files;
 			}
-			case COLUMN_SIZE: {
+			case REMOTEDIRMODEL_COLUMN_SIZE: {
 				SharedDirStats stats ;
 
 				if(RemoteMode)
@@ -697,7 +706,7 @@ QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
 
 				return (qulonglong) stats.total_shared_size;
 			}
-			case COLUMN_AGE:
+			case REMOTEDIRMODEL_COLUMN_AGE:
 				return details.max_mtime;
 			default:
 				return QString();
@@ -707,17 +716,17 @@ QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
 	{
 		switch(coln)
 		{
-			case COLUMN_NAME:
+			case REMOTEDIRMODEL_COLUMN_NAME:
 				return QString::fromUtf8(details.name.c_str());
-			case COLUMN_FILENB:
+			case REMOTEDIRMODEL_COLUMN_FILENB:
 				return (qulonglong) 0;
-			case COLUMN_SIZE:
+			case REMOTEDIRMODEL_COLUMN_SIZE:
                 return (qulonglong) details.size;
-			case COLUMN_AGE:
+			case REMOTEDIRMODEL_COLUMN_AGE:
 				return details.max_mtime;
-			case COLUMN_FRIEND_ACCESS:
+			case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS:
 				return getFlagsString(details.flags);
-			case COLUMN_WN_VISU_DIR:
+			case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR:
 				{
 					QString ind("");
 					if (ageIndicator != IND_ALWAYS)
@@ -732,15 +741,15 @@ QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
 	{
 		switch(coln)
 		{
-			case COLUMN_NAME:
+			case REMOTEDIRMODEL_COLUMN_NAME:
 				return QString::fromUtf8(details.name.c_str());
-			case COLUMN_FILENB:
+			case REMOTEDIRMODEL_COLUMN_FILENB:
                 return (qulonglong) details.children.size();
-			case COLUMN_SIZE:
+			case REMOTEDIRMODEL_COLUMN_SIZE:
 				return (qulonglong) 0;
-			case COLUMN_AGE:
+			case REMOTEDIRMODEL_COLUMN_AGE:
 				return details.max_mtime;
-			case COLUMN_FRIEND_ACCESS:
+			case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS:
 				return getFlagsString(details.flags);
 			default:
 				return tr("DIR");
@@ -760,12 +769,12 @@ QVariant FlatStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails&
 	{
 		switch(coln)
 		{
-			case COLUMN_NAME: return QString::fromUtf8(details.name.c_str());
-			case COLUMN_FILENB: return (qulonglong) 0;
-            case COLUMN_SIZE: return (qulonglong) details.size;
-			case COLUMN_AGE: return  details.max_mtime;
-			case COLUMN_FRIEND_ACCESS: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
-			case COLUMN_WN_VISU_DIR: {
+			case REMOTEDIRMODEL_COLUMN_NAME: return QString::fromUtf8(details.name.c_str());
+			case REMOTEDIRMODEL_COLUMN_FILENB: return (qulonglong) 0;
+            case REMOTEDIRMODEL_COLUMN_SIZE: return (qulonglong) details.size;
+			case REMOTEDIRMODEL_COLUMN_AGE: return  details.max_mtime;
+			case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
+			case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR: {
 				RS_STACK_MUTEX(_ref_mutex) ;
 
 				return computeDirectoryPath(details);
@@ -793,7 +802,7 @@ QVariant RetroshareDirModel::data(const QModelIndex &index, int role) const
 
 	if (role == Qt::TextAlignmentRole)
 	{
-		if((coln == COLUMN_FILENB) || (coln == COLUMN_SIZE))
+		if((coln == REMOTEDIRMODEL_COLUMN_FILENB) || (coln == REMOTEDIRMODEL_COLUMN_SIZE))
 			return int( Qt::AlignRight | Qt::AlignVCenter);
 		else
 			return QVariant();
@@ -895,7 +904,7 @@ QVariant TreeStyle_RDM::headerData(int section, Qt::Orientation orientation, int
 		int defw = QFontMetricsF(QWidget().font()).width(headerData(section,Qt::Horizontal,Qt::DisplayRole).toString()) ;
 		int defh = QFontMetricsF(QWidget().font()).height();
 
-		if (section < COLUMN_AGE)
+		if (section < REMOTEDIRMODEL_COLUMN_AGE)
 		{
 			defw = 200/16.0*defh;
 		}
@@ -909,7 +918,7 @@ QVariant TreeStyle_RDM::headerData(int section, Qt::Orientation orientation, int
 	{
 		switch(section)
 		{
-			case COLUMN_NAME:
+			case REMOTEDIRMODEL_COLUMN_NAME:
 				if (RemoteMode)
                     if(mUpdating)
 						return tr("Friends Directories [updating...]");
@@ -920,18 +929,18 @@ QVariant TreeStyle_RDM::headerData(int section, Qt::Orientation orientation, int
 						return tr("My Directories [updating...]");
 					else
 						return tr("My Directories");
-			case COLUMN_FILENB:
+			case REMOTEDIRMODEL_COLUMN_FILENB:
 				return tr("# Files");
-			case COLUMN_SIZE:
+			case REMOTEDIRMODEL_COLUMN_SIZE:
 				return tr("Size");
-			case COLUMN_AGE:
+			case REMOTEDIRMODEL_COLUMN_AGE:
 				return tr("Age");
-			case COLUMN_FRIEND_ACCESS:
+			case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS:
 				if (RemoteMode)
 					return tr("Friend");
 				else
 					return tr("Access");
-			case COLUMN_WN_VISU_DIR:
+			case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR:
 				if (RemoteMode)
 					return tr("What's new");
 				else
@@ -949,7 +958,7 @@ QVariant FlatStyle_RDM::headerData(int section, Qt::Orientation orientation, int
 		int defw = QFontMetricsF(QWidget().font()).width(headerData(section,Qt::Horizontal,Qt::DisplayRole).toString()) ;
 		int defh = QFontMetricsF(QWidget().font()).height();
 
-		if (section < COLUMN_AGE)
+		if (section < REMOTEDIRMODEL_COLUMN_AGE)
 		{
 			defw = defh*200/16.0;
 		}
@@ -963,24 +972,24 @@ QVariant FlatStyle_RDM::headerData(int section, Qt::Orientation orientation, int
 	{
 		switch(section)
 		{
-			case COLUMN_NAME:
+			case REMOTEDIRMODEL_COLUMN_NAME:
 				if (RemoteMode)
 				{
 					return tr("Friends Directories");
 				}
 				return tr("My Directories");
-			case COLUMN_FILENB:
+			case REMOTEDIRMODEL_COLUMN_FILENB:
 				return tr("# Files");
-			case COLUMN_SIZE:
+			case REMOTEDIRMODEL_COLUMN_SIZE:
 				return tr("Size");
-			case COLUMN_AGE:
+			case REMOTEDIRMODEL_COLUMN_AGE:
 				return tr("Age");
-			case COLUMN_FRIEND_ACCESS:
+			case REMOTEDIRMODEL_COLUMN_FRIEND_ACCESS:
 				if(RemoteMode)
 					return tr("Friend");
 				else
 					return tr("Share Flags");
-			case COLUMN_WN_VISU_DIR:
+			case REMOTEDIRMODEL_COLUMN_WN_VISU_DIR:
 				return tr("Directory");
 		}
 		return tr("Column %1").arg(section);
@@ -1096,7 +1105,7 @@ QModelIndex TreeStyle_RDM::parent( const QModelIndex & index ) const
 	std::cerr << "Creating index 3 row=" << details.prow << ", column=" << 0 << ", ref=" << (void*)details.parent << std::endl;
 #endif
 
-	return createIndex(details.prow, COLUMN_NAME, details.parent);
+	return createIndex(details.prow, REMOTEDIRMODEL_COLUMN_NAME, details.parent);
 }
 QModelIndex FlatStyle_RDM::parent( const QModelIndex & index ) const
 {
@@ -1167,7 +1176,7 @@ void RetroshareDirModel::postMods()
 
 	endResetModel();
 
-    emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,COLUMN_COUNT-1,(void*)NULL));
+    emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,REMOTEDIRMODEL_COLUMN_COUNT-1,(void*)NULL));
 }
 
 void FlatStyle_RDM::postMods()
@@ -1340,7 +1349,7 @@ void RetroshareDirModel::getDirDetailsFromSelect (const QModelIndexList &list, s
 	QModelIndexList::const_iterator it;
 	for(it = list.begin(); it != list.end(); ++it)
 	{
-		if(it->column()==COLUMN_FILENB)
+		if(it->column()==REMOTEDIRMODEL_COLUMN_FILENB)
 		{
 			void *ref = it -> internalPointer();
 
@@ -1377,7 +1386,7 @@ void RetroshareDirModel::getFileInfoFromIndexList(const QModelIndexList& list, s
 	std::set<std::string> already_in ;
 
 	for(QModelIndexList::const_iterator it(list.begin()); it != list.end(); ++it)
-		if(it->column()==COLUMN_NAME)
+		if(it->column()==REMOTEDIRMODEL_COLUMN_NAME)
 		{
 			void *ref = it -> internalPointer();
 
@@ -1458,7 +1467,7 @@ void RetroshareDirModel::openSelected(const QModelIndexList &qmil, bool openDir)
 
 void RetroshareDirModel::getFilePath(const QModelIndex& index, std::string& fullpath)
 {
-    void *ref = index.sibling(index.row(),COLUMN_FILENB).internalPointer();
+    void *ref = index.sibling(index.row(),REMOTEDIRMODEL_COLUMN_FILENB).internalPointer();
 
     DirDetails details ;
 
diff --git a/retroshare-gui/src/gui/RemoteDirModel.h b/retroshare-gui/src/gui/RemoteDirModel.h
index 9d94abf32..83028dd48 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.h
+++ b/retroshare-gui/src/gui/RemoteDirModel.h
@@ -32,15 +32,6 @@
 #include <stdint.h>
 #include <vector>
 
-#define COLUMN_NAME          0
-#define COLUMN_FILENB        1
-#define COLUMN_SIZE          2
-#define COLUMN_AGE           3
-#define COLUMN_FRIEND_ACCESS 4
-#define COLUMN_WN_VISU_DIR   5
-#define COLUMN_COUNT         6
-#define RETROSHARE_DIR_MODEL_FILTER_STRING "filtered"
-
 struct DirDetails;
 
 class DirDetailsVector : public DirDetails

From 8daa4dbf214c31228520ac5e1857052985fa381c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 26 Mar 2022 20:55:38 +0100
Subject: [PATCH 061/503] fixed include

---
 retroshare-gui/src/gui/AboutWidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
index 7dccb1693..b468550b1 100644
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -21,7 +21,7 @@
 
 #include "AboutDialog.h"
 #include "HelpDialog.h"
-#include "qmake_info.h"
+#include "include/qmake_info.h"
 #include "rshare.h"
 
 #ifdef RS_JSONAPI

From dc32b10ed651d0631fb1d31aa6c132c38e385c57 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 27 Mar 2022 19:34:09 +0200
Subject: [PATCH 062/503] added needed flags for GXS

---
 retroshare-gui/CMakeLists.txt     | 29 ++++++++++++++++++++++-------
 retroshare-gui/src/CMakeLists.txt | 17 ++++-------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/retroshare-gui/CMakeLists.txt b/retroshare-gui/CMakeLists.txt
index 0a44cfa82..fdd204005 100644
--- a/retroshare-gui/CMakeLists.txt
+++ b/retroshare-gui/CMakeLists.txt
@@ -31,12 +31,12 @@ option(
 	RS_DEVELOPMENT_BUILD
 	"Disable optimization to speed up build, enable verbose build log. \
 	 just for development purposes, not suitable for library usage"
-	OFF )
+	 ON )
 
 option(
 	RS_JSON_API
 	"Use restbed to expose libretroshare as JSON API via HTTP"
-	ON )
+	OFF )
 
 option(
 	RS_SERVICE_DESKTOP
@@ -48,6 +48,12 @@ option(
 	"Enable RetroShare login via terminal"
 	ON )
 
+option( RS_GXSGUI      "Enable GXS services in GUI" ON )
+option( RS_GXSCHANNELS "Enable GXS channels in GUI" ON )
+option( RS_GXSFORUMS   "Enable GXS forums in GUI"   ON )
+option( RS_GXSPOSTED   "Enable GXS posted in GUI"   ON )
+option( RS_GXSCIRCLES  "Enable GXS circles in GUI"  ON )
+
 cmake_dependent_option(
 	RS_SERVICE_TERMINAL_WEBUI_PASSWORD
 	"Enable settin Web UI password via terminal in retroshare-service"
@@ -71,9 +77,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-find_package( Qt5 COMPONENTS Widgets REQUIRED)
-find_package( Qt5 COMPONENTS Xml     REQUIRED)
-find_package( Qt5 COMPONENTS Network REQUIRED)
+find_package( Qt5 COMPONENTS Core         REQUIRED)
+find_package( Qt5 COMPONENTS Widgets      REQUIRED)
+find_package( Qt5 COMPONENTS Xml          REQUIRED)
+find_package( Qt5 COMPONENTS Network      REQUIRED)
+find_package( Qt5 COMPONENTS Multimedia   REQUIRED)
 find_package( Qt5 COMPONENTS PrintSupport REQUIRED)
 
 list( APPEND RS_LINK_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
@@ -96,9 +104,13 @@ endif(RS_DEVELOPMENT_BUILD)
 
 include(src/CMakeLists.txt)
 
-add_executable(${PROJECT_NAME} ${RS_GUI_SOURCES} ${RS_GUI_FORMS} ${RS_GUI_QTRESOURCES})
+qt5_wrap_ui(RS_UI_HEADERS ${RS_GUI_FORMS})
+
+add_executable(${PROJECT_NAME} ${RS_GUI_SOURCES} ${RS_UI_HEADERS} ${RS_GUI_QTRESOURCES})
 install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
 
+include_directories( ${CMAKE_BINARY_DIR} )
+
 ################################################################################
 
 if(RS_DEVELOPMENT_BUILD)
@@ -452,8 +464,11 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/s
 
 set( CMAKE_CXX_FLAGS "-Wno-deprecated-declarations" )
 target_compile_definitions(${PROJECT_NAME} PUBLIC RS_NO_WARN_DEPRECATED )
+target_compile_definitions(${PROJECT_NAME} PRIVATE TARGET=\"retroshare\")
 
-
+if(RS_GXS_CIRCLES)
+	target_compile_definitions(${PROJECT_NAME} PRIVATE RS_USE_CIRCLES )
+endif(RS_GXS_CIRCLES)
 
 #add_dependencies(${PROJECT_NAME} libretroshare)
 
diff --git a/retroshare-gui/src/CMakeLists.txt b/retroshare-gui/src/CMakeLists.txt
index 540363ea2..b936552ed 100644
--- a/retroshare-gui/src/CMakeLists.txt
+++ b/retroshare-gui/src/CMakeLists.txt
@@ -29,9 +29,6 @@ list(
 	src/gui/QuickStartWizard.cpp 
 	src/gui/StartDialog.cpp 
 	src/gui/HomePage.cpp
-        src/gui/PluginsPage.cpp 
-	src/gui/PluginManagerWidget.cpp 
-	src/gui/PluginManager.cpp
 	src/gui/ChatLobbyWidget.cpp 
 	src/gui/GetStartedDialog.cpp 
 	src/gui/GenCertDialog.cpp 
@@ -438,9 +435,6 @@ list(
 	src/gui/FriendsDialog.h 
 	src/gui/ServicePermissionDialog.h 
 	src/gui/RemoteDirModel.h 
-        src/gui/PluginsPage.h  
-	src/gui/PluginManagerWidget.h 
-	src/gui/PluginManager.h
 	src/gui/RetroShareLink.h 
 	src/gui/SearchTreeWidget.h 
 	src/gui/ShareManager.h 
@@ -778,9 +772,7 @@ endif(RS_UNFINISHED_TRANSLATIONS)
 
 if(RS_MESSENGER)
 
-	target_compile_definitions(
-		${PROJECT_NAME} PUBLIC MESSENGER_WINDOW
-		)
+	target_compile_definitions( ${PROJECT_NAME} PUBLIC MESSENGER_WINDOW )
 
 	list(
 		APPEND RS_GUI_SOURCES
@@ -1068,11 +1060,8 @@ if(RS_GXSIDENTITIES)
 endif(RS_GXSIDENTITIES)
 	
 if(RS_GXSCIRCLES)
-	target_compile_definitions(
-		${PROJECT_NAME} PUBLIC RS_USE_CIRCLES 
-		)
-
 	list(
+		APPEND RS_IMPLEMENTATION_HEADERS
 		src/gui/Circles/CirclesDialog.h 
 		src/gui/Circles/CreateCircleDialog.h 
 		src/gui/People/PeopleDialog.h
@@ -1081,6 +1070,7 @@ if(RS_GXSCIRCLES)
 		)
 
 	list(
+		APPEND RS_GUI_FORMS
 		src/gui/Circles/CirclesDialog.ui 
 		src/gui/Circles/CreateCircleDialog.ui 
 		src/gui/People/PeopleDialog.ui 
@@ -1089,6 +1079,7 @@ if(RS_GXSCIRCLES)
 		)
 
 	list(
+		APPEND RS_GUI_SOURCES
 		src/gui/Circles/CirclesDialog.cpp 
 		src/gui/Circles/CreateCircleDialog.cpp 
 		src/gui/People/PeopleDialog.cpp 

From 0cc813d093e66b7cd3657e137e3da92abb6c61db Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 27 Mar 2022 19:35:23 +0200
Subject: [PATCH 063/503] fixed naming of columns that colided because of
 common names

---
 .../src/gui/FileTransfer/DLListDelegate.cpp   |  43 +-
 .../src/gui/FileTransfer/DLListDelegate.h     |  44 +-
 .../gui/FileTransfer/SharedFilesDialog.cpp    |  70 +--
 .../src/gui/FileTransfer/TransfersDialog.cpp  | 406 +++++++++---------
 .../src/gui/FileTransfer/ULListDelegate.cpp   |  28 +-
 .../src/gui/FileTransfer/ULListDelegate.h     |  35 +-
 retroshare-gui/src/gui/MainWindow.cpp         |   2 -
 retroshare-gui/src/gui/NetworkDialog.cpp      |  20 +-
 .../gui/NetworkDialog/pgpid_item_model.cpp    |   8 -
 .../src/gui/NetworkDialog/pgpid_item_model.h  |   7 +
 .../gui/NetworkDialog/pgpid_item_proxy.cpp    |  20 +-
 .../src/gui/NetworkDialog/pgpid_item_proxy.h  |   9 +-
 12 files changed, 331 insertions(+), 361 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
index 0b8588f76..3fc982012 100644
--- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
@@ -32,27 +32,6 @@
 
 Q_DECLARE_METATYPE(FileProgressInfo)
 
-// Defines for download list list columns
-#define DLLISTDELEGATE_COLUMN_NAME         0
-#define DLLISTDELEGATE_COLUMN_SIZE         1
-#define DLLISTDELEGATE_COLUMN_COMPLETED    2
-#define DLLISTDELEGATE_COLUMN_DLSPEED      3
-#define DLLISTDELEGATE_COLUMN_PROGRESS     4
-#define DLLISTDELEGATE_COLUMN_SOURCES      5
-#define DLLISTDELEGATE_COLUMN_STATUS       6
-#define DLLISTDELEGATE_COLUMN_PRIORITY     7
-#define DLLISTDELEGATE_COLUMN_REMAINING    8
-#define DLLISTDELEGATE_COLUMN_DOWNLOADTIME 9
-#define DLLISTDELEGATE_COLUMN_ID          10
-#define DLLISTDELEGATE_COLUMN_LASTDL      11
-#define DLLISTDELEGATE_COLUMN_PATH        12
-#define DLLISTDELEGATE_COLUMN_COUNT       13
-
-#define PRIORITY_NULL     0.0
-#define PRIORITY_FASTER   0.1
-#define PRIORITY_AVERAGE  0.2
-#define PRIORITY_SLOWER   0.3
-
 #define MAX_CHAR_TMP 128
 
 DLListDelegate::DLListDelegate(QObject *parent) : QAbstractItemDelegate(parent)
@@ -92,7 +71,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
         }
 
         // draw the background color if not the progress column or if progress is not displayed
-        if(index.column() != DLLISTDELEGATE_COLUMN_PROGRESS) {
+        if(index.column() != COLUMN_PROGRESS) {
                 if(option.showDecorationSelected && (option.state & QStyle::State_Selected)) {
                         if(cg == QPalette::Normal && !(option.state & QStyle::State_Active)) {
                                 cg = QPalette::Inactive;
@@ -106,7 +85,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                 }
         }
 	switch(index.column()) {
-        case DLLISTDELEGATE_COLUMN_SIZE:
+        case COLUMN_SIZE:
 			fileSize = index.data().toLongLong();
                         if(fileSize <= 0){
                                 temp = "";
@@ -125,7 +104,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case DLLISTDELEGATE_COLUMN_REMAINING:
+        case COLUMN_REMAINING:
 			remaining = index.data().toLongLong();
 			if(remaining <= 0){
         temp = "";
@@ -144,7 +123,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case DLLISTDELEGATE_COLUMN_COMPLETED:
+        case COLUMN_COMPLETED:
 			completed = index.data().toLongLong();
                         if(completed <= 0){
                                 temp = "";
@@ -163,7 +142,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case DLLISTDELEGATE_COLUMN_DLSPEED:
+        case COLUMN_DLSPEED:
                         dlspeed = index.data().toDouble();
                         if (dlspeed <= 0) {
                             temp = "";
@@ -174,7 +153,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                         }
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case DLLISTDELEGATE_COLUMN_PROGRESS:
+        case COLUMN_PROGRESS:
 			{
 				// create a xProgressBar
 				FileProgressInfo pinfo = index.data(Qt::UserRole).value<FileProgressInfo>() ;
@@ -203,7 +182,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignCenter, newopt.text);
 			break;
-		case DLLISTDELEGATE_COLUMN_SOURCES:
+        case COLUMN_SOURCES:
 		{
 			double dblValue = index.data().toDouble();
 
@@ -211,7 +190,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			painter->drawText(option.rect, Qt::AlignCenter, temp);
 		}
 		break;
-		case DLLISTDELEGATE_COLUMN_PRIORITY:
+        case COLUMN_PRIORITY:
 		{
 			double dblValue = index.data().toDouble();
 			if (dblValue == PRIORITY_NULL)
@@ -228,7 +207,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			painter->drawText(option.rect, Qt::AlignCenter, temp);
 		}
 		break;
-		case DLLISTDELEGATE_COLUMN_DOWNLOADTIME:
+        case COLUMN_DOWNLOADTIME:
 			downloadtime = index.data().toLongLong();
 			minutes = downloadtime / 60;
 			seconds = downloadtime % 60;
@@ -248,7 +227,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 				temp = "" ;
 			painter->drawText(option.rect, Qt::AlignCenter, temp);
 			break;
-		case DLLISTDELEGATE_COLUMN_NAME:
+        case COLUMN_NAME:
 		{
 			// decoration
 			int pixOffset = 0;
@@ -277,7 +256,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			painter->drawText(option.rect.translated(pixOffset, 0), Qt::AlignLeft, temp);
 		}
 		break;
-    case DLLISTDELEGATE_COLUMN_LASTDL:
+    case COLUMN_LASTDL:
         if (index.data().value<QString>().isEmpty())
             break;
         qi64Value = index.data().value<qint64>();
diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
index ab11ad461..109d16ed3 100644
--- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
+++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
@@ -18,31 +18,41 @@
  *                                                                             *
  *******************************************************************************/
 
-#ifndef DLLISTDELEGATE_H
-#define DLLISTDELEGATE_H
+#pragma once
 
 #include <QAbstractItemDelegate>
 #include "xprogressbar.h"
+#include "FTListDelegate.h"
 
 class QModelIndex;
 class QPainter;
 
+class DLListDelegate: public QAbstractItemDelegate
+{
+public:
+    DLListDelegate(QObject *parent=0);
+    virtual ~DLListDelegate(){}
+    void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
+    QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const;
 
-class DLListDelegate: public QAbstractItemDelegate {
+    static constexpr int COLUMN_NAME        =  0;
+    static constexpr int COLUMN_SIZE        =  1;
+    static constexpr int COLUMN_COMPLETED   =  2;
+    static constexpr int COLUMN_DLSPEED     =  3;
+    static constexpr int COLUMN_PROGRESS    =  4;
+    static constexpr int COLUMN_SOURCES     =  5;
+    static constexpr int COLUMN_STATUS      =  6;
+    static constexpr int COLUMN_PRIORITY    =  7;
+    static constexpr int COLUMN_REMAINING   =  8;
+    static constexpr int COLUMN_DOWNLOADTIME=  9;
+    static constexpr int COLUMN_ID          = 10;
+    static constexpr int COLUMN_LASTDL      = 11;
+    static constexpr int COLUMN_PATH        = 12;
+    static constexpr int COLUMN_COUNT       = 13;
 
-	Q_OBJECT
-
-	public:
-		DLListDelegate(QObject *parent=0);
-        virtual ~DLListDelegate(){}
-		void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
-        QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const;
-
-	private:
-
-	public slots:
-
-	signals:
+    static constexpr float PRIORITY_NULL     = 0.0;
+    static constexpr float PRIORITY_FASTER   = 0.1;
+    static constexpr float PRIORITY_AVERAGE  = 0.2;
+    static constexpr float PRIORITY_SLOWER   = 0.3;
 };
-#endif
 
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index a7d61489a..a88784c12 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -55,6 +55,16 @@
 
 #include <set>
 
+#define SHARED_FILES_DIALOG_COLUMN_NAME          0
+#define SHARED_FILES_DIALOG_COLUMN_FILENB        1
+#define SHARED_FILES_DIALOG_COLUMN_SIZE          2
+#define SHARED_FILES_DIALOG_COLUMN_AGE           3
+#define SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS 4
+#define SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR   5
+#define SHARED_FILES_DIALOG_COLUMN_COUNT         6
+
+#define SHARED_FILES_DIALOG_FILTER_STRING "filtered"
+
 /* Images for context menu icons */
 #define IMAGE_DOWNLOAD       ":/icons/png/download.png"
 #define IMAGE_PLAY           ":/images/start.png"
@@ -187,17 +197,17 @@ SharedFilesDialog::SharedFilesDialog(bool remote_mode, QWidget *parent)
     tree_proxyModel->setSourceModel(tree_model);
     tree_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
     tree_proxyModel->setSortRole(RetroshareDirModel::SortRole);
-    tree_proxyModel->sort(COLUMN_NAME);
+    tree_proxyModel->sort(SHARED_FILES_DIALOG_COLUMN_NAME);
     tree_proxyModel->setFilterRole(RetroshareDirModel::FilterRole);
-    tree_proxyModel->setFilterRegExp(QRegExp(QString(RETROSHARE_DIR_MODEL_FILTER_STRING))) ;
+    tree_proxyModel->setFilterRegExp(QRegExp(QString(SHARED_FILES_DIALOG_FILTER_STRING))) ;
 
     flat_proxyModel = new SFDSortFilterProxyModel(flat_model, this);
     flat_proxyModel->setSourceModel(flat_model);
     flat_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
     flat_proxyModel->setSortRole(RetroshareDirModel::SortRole);
-    flat_proxyModel->sort(COLUMN_NAME);
+    flat_proxyModel->sort(SHARED_FILES_DIALOG_COLUMN_NAME);
     flat_proxyModel->setFilterRole(RetroshareDirModel::FilterRole);
-    flat_proxyModel->setFilterRegExp(QRegExp(QString(RETROSHARE_DIR_MODEL_FILTER_STRING))) ;
+    flat_proxyModel->setFilterRegExp(QRegExp(QString(SHARED_FILES_DIALOG_FILTER_STRING))) ;
 
     connect(ui.filterClearButton, SIGNAL(clicked()), this, SLOT(clearFilter()));
     connect(ui.filterStartButton, SIGNAL(clicked()), this, SLOT(startFilter()));
@@ -219,12 +229,12 @@ SharedFilesDialog::SharedFilesDialog(bool remote_mode, QWidget *parent)
     int charWidth = ui.dirTreeView->fontMetrics().horizontalAdvance("_");
 #endif
 
-    header->resizeSection ( COLUMN_NAME         , charWidth*100 );
-    header->resizeSection ( COLUMN_FILENB       , charWidth*15 );
-    header->resizeSection ( COLUMN_SIZE         , charWidth*10 );
-    header->resizeSection ( COLUMN_AGE          , charWidth*6 );
-    header->resizeSection ( COLUMN_FRIEND_ACCESS, charWidth*10 );
-    header->resizeSection ( COLUMN_WN_VISU_DIR  , charWidth*20 );
+    header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_NAME         , charWidth*100 );
+    header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_FILENB       , charWidth*15 );
+    header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_SIZE         , charWidth*10 );
+    header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_AGE          , charWidth*6 );
+    header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, charWidth*10 );
+    header->resizeSection ( SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR  , charWidth*20 );
 
     header->setStretchLastSection(true);
 
@@ -260,7 +270,7 @@ LocalSharedFilesDialog::LocalSharedFilesDialog(QWidget *parent)
     : SharedFilesDialog(false,parent)
 {
     // Hide columns after loading the settings
-    ui.dirTreeView->setColumnHidden(COLUMN_WN_VISU_DIR, false) ;
+    ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, false) ;
     ui.downloadButton->hide() ;
 
     // load settings
@@ -279,14 +289,14 @@ LocalSharedFilesDialog::LocalSharedFilesDialog(QWidget *parent)
 
     ui.titleBarPixmap->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_MYFILES)) ;
 
-    ui.dirTreeView->setItemDelegateForColumn(COLUMN_FRIEND_ACCESS,new ShareFlagsItemDelegate()) ;
+    ui.dirTreeView->setItemDelegateForColumn(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS,new ShareFlagsItemDelegate()) ;
 }
 
 RemoteSharedFilesDialog::RemoteSharedFilesDialog(QWidget *parent)
     : SharedFilesDialog(true,parent)
 {
-    ui.dirTreeView->setColumnHidden(COLUMN_FRIEND_ACCESS, false) ;
-    ui.dirTreeView->setColumnHidden(COLUMN_WN_VISU_DIR, true) ;
+    ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, false) ;
+    ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, true) ;
     ui.checkButton->hide() ;
 
     connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(downloadRemoteSelected()));
@@ -440,9 +450,9 @@ void SharedFilesDialog::changeCurrentViewModel(int viewTypeIndex)
     restoreExpandedPathsAndSelection(expanded_indexes,hidden_indexes,selected_indexes);
 
     QHeaderView * header = ui.dirTreeView->header () ;
-    QHeaderView_setSectionResizeModeColumn(header, COLUMN_NAME, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(header, SHARED_FILES_DIALOG_COLUMN_NAME, QHeaderView::Interactive);
 
-    ui.dirTreeView->header()->headerDataChanged(Qt::Horizontal, COLUMN_NAME, COLUMN_WN_VISU_DIR) ;
+    ui.dirTreeView->header()->headerDataChanged(Qt::Horizontal, SHARED_FILES_DIALOG_COLUMN_NAME, SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR) ;
 
 //    recursRestoreExpandedItems(ui.dirTreeView->rootIndex(),expanded_indexes);
     FilterItems();
@@ -452,9 +462,9 @@ void LocalSharedFilesDialog::showProperColumns()
 {
     if(model == tree_model)
     {
-        ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ;
-        ui.dirTreeView->setColumnHidden(COLUMN_FRIEND_ACCESS, false) ;
-        ui.dirTreeView->setColumnHidden(COLUMN_WN_VISU_DIR, false) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FILENB, false) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, false) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, false) ;
 #ifdef DONT_USE_SEARCH_IN_TREE_VIEW
         ui.filterLabel->hide();
         ui.filterPatternLineEdit->hide();
@@ -464,9 +474,9 @@ void LocalSharedFilesDialog::showProperColumns()
     }
     else
     {
-        ui.dirTreeView->setColumnHidden(COLUMN_FILENB, true) ;
-        ui.dirTreeView->setColumnHidden(COLUMN_FRIEND_ACCESS, true) ;
-        ui.dirTreeView->setColumnHidden(COLUMN_WN_VISU_DIR, false) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FILENB, true) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, true) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, false) ;
 #ifdef DONT_USE_SEARCH_IN_TREE_VIEW
         ui.filterLabel->show();
         ui.filterPatternLineEdit->show();
@@ -477,9 +487,9 @@ void RemoteSharedFilesDialog::showProperColumns()
 {
     if(model == tree_model)
     {
-        ui.dirTreeView->setColumnHidden(COLUMN_FILENB, false) ;
-        ui.dirTreeView->setColumnHidden(COLUMN_FRIEND_ACCESS, true) ;
-        ui.dirTreeView->setColumnHidden(COLUMN_WN_VISU_DIR, true) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FILENB, false) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, true) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, true) ;
 #ifdef DONT_USE_SEARCH_IN_TREE_VIEW
         ui.filterLabel->hide();
         ui.filterPatternLineEdit->hide();
@@ -489,9 +499,9 @@ void RemoteSharedFilesDialog::showProperColumns()
     }
     else
     {
-        ui.dirTreeView->setColumnHidden(COLUMN_FILENB, true) ;
-        ui.dirTreeView->setColumnHidden(COLUMN_FRIEND_ACCESS, false) ;
-        ui.dirTreeView->setColumnHidden(COLUMN_WN_VISU_DIR, false) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FILENB, true) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_FRIEND_ACCESS, false) ;
+        ui.dirTreeView->setColumnHidden(SHARED_FILES_DIALOG_COLUMN_WN_VISU_DIR, false) ;
 #ifdef DONT_USE_SEARCH_IN_TREE_VIEW
         ui.filterLabel->show();
         ui.filterPatternLineEdit->show();
@@ -1337,9 +1347,9 @@ void SharedFilesDialog::indicatorChanged(int index)
     ui.dirTreeView->update(ui.dirTreeView->rootIndex());
 
     if (correct_indicator[index] != IND_ALWAYS)
-        ui.dirTreeView->sortByColumn(COLUMN_AGE, Qt::AscendingOrder);
+        ui.dirTreeView->sortByColumn(SHARED_FILES_DIALOG_COLUMN_AGE, Qt::AscendingOrder);
     else
-        ui.dirTreeView->sortByColumn(COLUMN_NAME, Qt::AscendingOrder);
+        ui.dirTreeView->sortByColumn(SHARED_FILES_DIALOG_COLUMN_NAME, Qt::AscendingOrder);
 
     updateDisplay() ;
 }
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 035ed2ca6..ba5fc017d 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -144,7 +144,7 @@ public:
 	}
 	int columnCount(const QModelIndex &/*parent*/ = QModelIndex()) const
 	{
-		return COLUMN_COUNT ;
+        return DLListDelegate::COLUMN_COUNT ;
 	}
 	bool hasChildren(const QModelIndex &parent = QModelIndex()) const
 	{
@@ -176,7 +176,7 @@ public:
 
 	QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const
 	{
-		if(row < 0 || column < 0 || column >= COLUMN_COUNT)
+        if(row < 0 || column < 0 || column >= DLListDelegate::COLUMN_COUNT)
 			return QModelIndex();
 
 		void *parent_ref = (parent.isValid())?parent.internalPointer():NULL ;
@@ -258,19 +258,19 @@ public:
 		switch(section)
 		{
 		default:
-		case COLUMN_NAME:         return tr("Name", "i.e: file name");
-		case COLUMN_SIZE:         return tr("Size", "i.e: file size");
-		case COLUMN_COMPLETED:    return tr("Completed", "");
-		case COLUMN_DLSPEED:      return tr("Speed", "i.e: Download speed");
-		case COLUMN_PROGRESS:     return tr("Progress / Availability", "i.e: % downloaded");
-		case COLUMN_SOURCES:      return tr("Sources", "i.e: Sources");
-		case COLUMN_STATUS:       return tr("Status");
-		case COLUMN_PRIORITY:     return tr("Speed / Queue position");
-		case COLUMN_REMAINING:    return tr("Remaining");
-		case COLUMN_DOWNLOADTIME: return tr("Download time", "i.e: Estimated Time of Arrival / Time left");
-		case COLUMN_ID:           return tr("Hash");
-		case COLUMN_LASTDL:       return tr("Last Time Seen", "i.e: Last Time Receiced Data");
-		case COLUMN_PATH:         return tr("Path", "i.e: Where file is saved");
+        case DLListDelegate::COLUMN_NAME:         return tr("Name", "i.e: file name");
+        case DLListDelegate::COLUMN_SIZE:         return tr("Size", "i.e: file size");
+        case DLListDelegate::COLUMN_COMPLETED:    return tr("Completed", "");
+        case DLListDelegate::COLUMN_DLSPEED:      return tr("Speed", "i.e: Download speed");
+        case DLListDelegate::COLUMN_PROGRESS:     return tr("Progress / Availability", "i.e: % downloaded");
+        case DLListDelegate::COLUMN_SOURCES:      return tr("Sources", "i.e: Sources");
+        case DLListDelegate::COLUMN_STATUS:       return tr("Status");
+        case DLListDelegate::COLUMN_PRIORITY:     return tr("Speed / Queue position");
+        case DLListDelegate::COLUMN_REMAINING:    return tr("Remaining");
+        case DLListDelegate::COLUMN_DOWNLOADTIME: return tr("Download time", "i.e: Estimated Time of Arrival / Time left");
+        case DLListDelegate::COLUMN_ID:           return tr("Hash");
+        case DLListDelegate::COLUMN_LASTDL:       return tr("Last Time Seen", "i.e: Last Time Receiced Data");
+        case DLListDelegate::COLUMN_PATH:         return tr("Path", "i.e: Where file is saved");
 		}
 	}
 
@@ -352,19 +352,19 @@ public:
 		switch(col)
 		{
 		default:
-		case COLUMN_NAME:         return QVariant( QSize(factor * 170, factor*14.0f ));
-		case COLUMN_SIZE:         return QVariant( QSize(factor * 70 , factor*14.0f ));
-		case COLUMN_COMPLETED:    return QVariant( QSize(factor * 75 , factor*14.0f ));
-		case COLUMN_DLSPEED:      return QVariant( QSize(factor * 75 , factor*14.0f ));
-		case COLUMN_PROGRESS:     return QVariant( QSize(factor * 170, factor*14.0f ));
-		case COLUMN_SOURCES:      return QVariant( QSize(factor * 90 , factor*14.0f ));
-		case COLUMN_STATUS:       return QVariant( QSize(factor * 100, factor*14.0f ));
-		case COLUMN_PRIORITY:     return QVariant( QSize(factor * 100, factor*14.0f ));
-		case COLUMN_REMAINING:    return QVariant( QSize(factor * 100, factor*14.0f ));
-		case COLUMN_DOWNLOADTIME: return QVariant( QSize(factor * 100, factor*14.0f ));
-		case COLUMN_ID:           return QVariant( QSize(factor * 100, factor*14.0f ));
-		case COLUMN_LASTDL:       return QVariant( QSize(factor * 100, factor*14.0f ));
-		case COLUMN_PATH:         return QVariant( QSize(factor * 100, factor*14.0f ));
+        case DLListDelegate::COLUMN_NAME:         return QVariant( QSize(factor * 170, factor*14.0f ));
+        case DLListDelegate::COLUMN_SIZE:         return QVariant( QSize(factor * 70 , factor*14.0f ));
+        case DLListDelegate::COLUMN_COMPLETED:    return QVariant( QSize(factor * 75 , factor*14.0f ));
+        case DLListDelegate::COLUMN_DLSPEED:      return QVariant( QSize(factor * 75 , factor*14.0f ));
+        case DLListDelegate::COLUMN_PROGRESS:     return QVariant( QSize(factor * 170, factor*14.0f ));
+        case DLListDelegate::COLUMN_SOURCES:      return QVariant( QSize(factor * 90 , factor*14.0f ));
+        case DLListDelegate::COLUMN_STATUS:       return QVariant( QSize(factor * 100, factor*14.0f ));
+        case DLListDelegate::COLUMN_PRIORITY:     return QVariant( QSize(factor * 100, factor*14.0f ));
+        case DLListDelegate::COLUMN_REMAINING:    return QVariant( QSize(factor * 100, factor*14.0f ));
+        case DLListDelegate::COLUMN_DOWNLOADTIME: return QVariant( QSize(factor * 100, factor*14.0f ));
+        case DLListDelegate::COLUMN_ID:           return QVariant( QSize(factor * 100, factor*14.0f ));
+        case DLListDelegate::COLUMN_LASTDL:       return QVariant( QSize(factor * 100, factor*14.0f ));
+        case DLListDelegate::COLUMN_PATH:         return QVariant( QSize(factor * 100, factor*14.0f ));
 		}
 	}
 
@@ -374,11 +374,11 @@ public:
 		if(source_id == -1)  // toplevel
 			switch(col)
 			{
-			case COLUMN_NAME:           return QVariant(QString::fromUtf8(fileInfo.fname.c_str()));
-			case COLUMN_COMPLETED:      return QVariant((qlonglong)fileInfo.transfered);
-			case COLUMN_DLSPEED:        return QVariant((double)((fileInfo.downloadStatus == FT_STATE_DOWNLOADING) ? (fileInfo.tfRate * 1024.0) : 0.0));
-			case COLUMN_PROGRESS:       return QVariant((float)((fileInfo.size == 0) ? 0 : (fileInfo.transfered * 100.0 / (float)fileInfo.size)));
-			case COLUMN_STATUS:
+            case DLListDelegate::COLUMN_NAME:           return QVariant(QString::fromUtf8(fileInfo.fname.c_str()));
+            case DLListDelegate::COLUMN_COMPLETED:      return QVariant((qlonglong)fileInfo.transfered);
+            case DLListDelegate::COLUMN_DLSPEED:        return QVariant((double)((fileInfo.downloadStatus == FT_STATE_DOWNLOADING) ? (fileInfo.tfRate * 1024.0) : 0.0));
+            case DLListDelegate::COLUMN_PROGRESS:       return QVariant((float)((fileInfo.size == 0) ? 0 : (fileInfo.transfered * 100.0 / (float)fileInfo.size)));
+            case DLListDelegate::COLUMN_STATUS:
 			{
 				QString status;
 				switch (fileInfo.downloadStatus)
@@ -396,9 +396,9 @@ public:
 				return QVariant(status);
 			}
 
-			case COLUMN_PRIORITY:
+            case DLListDelegate::COLUMN_PRIORITY:
 			{
-				double priority = PRIORITY_NULL;
+                double priority = DLListDelegate::PRIORITY_NULL;
 
 				if (fileInfo.downloadStatus == FT_STATE_QUEUED)
 					priority = fileInfo.queue_position;
@@ -407,18 +407,18 @@ public:
 				else
 					switch (fileInfo.priority)
 					{
-					case SPEED_LOW:     priority = PRIORITY_SLOWER; break;
-					case SPEED_NORMAL:  priority = PRIORITY_AVERAGE; break;
-					case SPEED_HIGH:    priority = PRIORITY_FASTER; break;
-					default:            priority = PRIORITY_AVERAGE; break;
+                    case SPEED_LOW:     priority = DLListDelegate::PRIORITY_SLOWER; break;
+                    case SPEED_NORMAL:  priority = DLListDelegate::PRIORITY_AVERAGE; break;
+                    case SPEED_HIGH:    priority = DLListDelegate::PRIORITY_FASTER; break;
+                    default:            priority = DLListDelegate::PRIORITY_AVERAGE; break;
 					}
 
 				return QVariant(priority);
 			}
 
-			case COLUMN_REMAINING:       return QVariant((qlonglong)(fileInfo.size - fileInfo.transfered));
-			case COLUMN_DOWNLOADTIME:    return QVariant((qlonglong)(fileInfo.tfRate > 0)?( (fileInfo.size - fileInfo.transfered) / (fileInfo.tfRate * 1024.0) ) : 0);
-			case COLUMN_LASTDL:
+            case DLListDelegate::COLUMN_REMAINING:       return QVariant((qlonglong)(fileInfo.size - fileInfo.transfered));
+            case DLListDelegate::COLUMN_DOWNLOADTIME:    return QVariant((qlonglong)(fileInfo.tfRate > 0)?( (fileInfo.size - fileInfo.transfered) / (fileInfo.tfRate * 1024.0) ) : 0);
+            case DLListDelegate::COLUMN_LASTDL:
 			{
 				qint64 qi64LastDL = fileInfo.lastTS ;
 
@@ -437,7 +437,7 @@ public:
 				}
 				return QVariant(qi64LastDL) ;
 			}
-			case COLUMN_PATH:
+            case DLListDelegate::COLUMN_PATH:
 			{
 				QString strPath = QString::fromUtf8(fileInfo.path.c_str());
 				QString strPathAfterDL = strPath;
@@ -446,7 +446,7 @@ public:
 				return QVariant(strPathAfterDL);
 			}
 
-			case COLUMN_SOURCES:
+            case DLListDelegate::COLUMN_SOURCES:
 			{
 				int active = 0;
 				//QString fileHash = QString::fromStdString(fileInfo.hash.toStdString());
@@ -478,9 +478,9 @@ public:
 
 			}
 
-			case COLUMN_SIZE: return QVariant((qlonglong) fileInfo.size);
+            case DLListDelegate::COLUMN_SIZE: return QVariant((qlonglong) fileInfo.size);
 
-			case COLUMN_ID:   return QVariant(QString::fromStdString(fileInfo.hash.toStdString()));
+            case DLListDelegate::COLUMN_ID:   return QVariant(QString::fromStdString(fileInfo.hash.toStdString()));
 
 			default:
 				return QVariant("[ TODO ]");
@@ -492,16 +492,16 @@ public:
 			switch(col)
 			{
 			default:
-			case COLUMN_SOURCES:
-			case COLUMN_COMPLETED:
-			case COLUMN_REMAINING:
-			case COLUMN_LASTDL:
-			case COLUMN_ID:
-			case COLUMN_PATH:
-			case COLUMN_DOWNLOADTIME:
-			case COLUMN_SIZE:     return QVariant();
-			case COLUMN_PROGRESS: return QVariant( (fileInfo.size>0)?((fileInfo.peers[source_id].transfered % chunk_size)*100.0/fileInfo.size):0.0) ;
-			case COLUMN_DLSPEED:
+            case DLListDelegate::COLUMN_SOURCES:
+            case DLListDelegate::COLUMN_COMPLETED:
+            case DLListDelegate::COLUMN_REMAINING:
+            case DLListDelegate::COLUMN_LASTDL:
+            case DLListDelegate::COLUMN_ID:
+            case DLListDelegate::COLUMN_PATH:
+            case DLListDelegate::COLUMN_DOWNLOADTIME:
+            case DLListDelegate::COLUMN_SIZE:     return QVariant();
+            case DLListDelegate::COLUMN_PROGRESS: return QVariant( (fileInfo.size>0)?((fileInfo.peers[source_id].transfered % chunk_size)*100.0/fileInfo.size):0.0) ;
+            case DLListDelegate::COLUMN_DLSPEED:
 			{
 				double peerDlspeed = 0;
 				if((uint32_t)fileInfo.peers[source_id].status == FT_STATE_DOWNLOADING && fileInfo.downloadStatus != FT_STATE_PAUSED && fileInfo.downloadStatus != FT_STATE_COMPLETE)
@@ -509,13 +509,13 @@ public:
 
 				return QVariant((double)peerDlspeed) ;
 			}
-			case COLUMN_NAME:
+            case DLListDelegate::COLUMN_NAME:
 			{
 				QString iconName,tooltip;
 				return  QVariant(TransfersDialog::getPeerName(fileInfo.peers[source_id].peerId, iconName, tooltip));
 			}
 
-			case COLUMN_PRIORITY: return QVariant((double)PRIORITY_NULL);
+            case DLListDelegate::COLUMN_PRIORITY: return QVariant((double)DLListDelegate::PRIORITY_NULL);
 			}
 		}
 
@@ -527,7 +527,7 @@ public:
 		if(source_id == -1)
 			switch(col)
 			{
-			case COLUMN_PROGRESS:
+            case DLListDelegate::COLUMN_PROGRESS:
 			{
 				FileChunksInfo fcinfo;
 				if (!rsFiles->FileDownloadChunksDetails(fileInfo.hash, fcinfo))
@@ -554,7 +554,7 @@ public:
 				return QVariant::fromValue(pinfo);
 			}
 
-			case COLUMN_ID:   return QVariant(QString::fromStdString(fileInfo.hash.toStdString()));
+            case DLListDelegate::COLUMN_ID:   return QVariant(QString::fromStdString(fileInfo.hash.toStdString()));
 
 
 			default:
@@ -563,7 +563,7 @@ public:
 		else
 			switch(col)
 			{
-			case COLUMN_PROGRESS:
+            case DLListDelegate::COLUMN_PROGRESS:
 			{
 				FileChunksInfo fcinfo;
 				if (!rsFiles->FileDownloadChunksDetails(fileInfo.hash, fcinfo))
@@ -582,7 +582,7 @@ public:
 				return QVariant::fromValue(pinfo);
 			}
 
-			case COLUMN_ID: return QVariant(QString::fromStdString(fileInfo.hash.toStdString()) + QString::fromStdString(fileInfo.peers[source_id].peerId.toStdString()));
+            case DLListDelegate::COLUMN_ID: return QVariant(QString::fromStdString(fileInfo.hash.toStdString()) + QString::fromStdString(fileInfo.peers[source_id].peerId.toStdString()));
 
 			default:
 				return QVariant();
@@ -592,7 +592,7 @@ public:
 
 	QVariant decorationRole(const FileInfo& fileInfo,int source_id,int col) const
 	{
-		if(col == COLUMN_NAME)
+        if(col == DLListDelegate::COLUMN_NAME)
 		{
 			if(source_id == -1)
 				return QVariant(FilesDefs::getIconFromFileType(QString::fromUtf8(fileInfo.fname.c_str())));
@@ -666,7 +666,7 @@ public:
 
 			if(fileInfo.downloadStatus == FT_STATE_DOWNLOADING || old_status != fileInfo.downloadStatus)
 			{
-			 	QModelIndex topLeft = createIndex(i,0), bottomRight = createIndex(i, COLUMN_COUNT-1);
+                QModelIndex topLeft = createIndex(i,0), bottomRight = createIndex(i, DLListDelegate::COLUMN_COUNT-1);
 			 	emit dataChanged(topLeft, bottomRight);
 			}
 
@@ -674,7 +674,7 @@ public:
 			//
 			// if(!mDownloads.empty())
 			// {
-			// 	QModelIndex topLeft = createIndex(0,0), bottomRight = createIndex(mDownloads.size()-1, COLUMN_COUNT-1);
+            // 	QModelIndex topLeft = createIndex(0,0), bottomRight = createIndex(mDownloads.size()-1, DLListDelegate::COLUMN_COUNT-1);
 			// 	emit dataChanged(topLeft, bottomRight);
 			// 	mDownloads[i] = fileInfo ;
 			// }
@@ -761,8 +761,8 @@ public:
 			return QStandardItem::operator<(other);
 		}
 
-        QStandardItem *myName = myParent->child(index().row(), COLUMN_NAME);
-        QStandardItem *otherName = otherParent->child(other.index().row(), COLUMN_NAME);
+        QStandardItem *myName = myParent->child(index().row(), DLListDelegate::COLUMN_NAME);
+        QStandardItem *otherName = otherParent->child(other.index().row(), DLListDelegate::COLUMN_NAME);
 
 		if (header == NULL || header->sortIndicatorOrder() == Qt::AscendingOrder) {
 			/* Ascending */
@@ -847,41 +847,41 @@ TransfersDialog::TransfersDialog(QWidget *parent)
 
 //    /* Set header resize modes and initial section sizes Downloads TreeView*/
     QHeaderView * dlheader = ui.downloadList->header () ;
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_NAME, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_SIZE, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_COMPLETED, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_DLSPEED, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_PROGRESS, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_SOURCES, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_STATUS, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_PRIORITY, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_REMAINING, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_DOWNLOADTIME, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_ID, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_LASTDL, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(dlheader, COLUMN_PATH, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_NAME, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_SIZE, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_COMPLETED, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_DLSPEED, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_PROGRESS, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_SOURCES, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_STATUS, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_PRIORITY, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_REMAINING, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_DOWNLOADTIME, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_ID, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_LASTDL, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(dlheader, DLListDelegate::COLUMN_PATH, QHeaderView::Interactive);
 
     // set default column and sort order for download
-    ui.downloadList->sortByColumn(COLUMN_NAME, Qt::AscendingOrder);
+    ui.downloadList->sortByColumn(DLListDelegate::COLUMN_NAME, Qt::AscendingOrder);
 
     connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
     /* Add filter actions */
-    QString headerName = DLListModel->headerData(COLUMN_NAME, Qt::Horizontal).toString();
-    ui.filterLineEdit->addFilter(QIcon(), headerName, COLUMN_NAME , QString("%1 %2").arg(tr("Search"), headerName));
-    QString headerID = DLListModel->headerData(COLUMN_ID, Qt::Horizontal).toString();
-    ui.filterLineEdit->addFilter(QIcon(), headerID, COLUMN_ID , QString("%1 %2").arg(tr("Search"), headerID));
+    QString headerName = DLListModel->headerData(DLListDelegate::COLUMN_NAME, Qt::Horizontal).toString();
+    ui.filterLineEdit->addFilter(QIcon(), headerName, DLListDelegate::COLUMN_NAME , QString("%1 %2").arg(tr("Search"), headerName));
+    QString headerID = DLListModel->headerData(DLListDelegate::COLUMN_ID, Qt::Horizontal).toString();
+    ui.filterLineEdit->addFilter(QIcon(), headerID, DLListDelegate::COLUMN_ID , QString("%1 %2").arg(tr("Search"), headerID));
 
     connect( ui.uploadsList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( uploadsListCustomPopupMenu( QPoint ) ) );
 
     // Set Upload list model
-    ULListModel = new QStandardItemModel(0,COLUMN_UCOUNT);
-    ULListModel->setHeaderData(COLUMN_UNAME, Qt::Horizontal, tr("Name", "i.e: file name"));
-    ULListModel->setHeaderData(COLUMN_UPEER, Qt::Horizontal, tr("Peer", "i.e: user name / tunnel id"));
-    ULListModel->setHeaderData(COLUMN_USIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
-    ULListModel->setHeaderData(COLUMN_UTRANSFERRED, Qt::Horizontal, tr("Transferred", ""));
-    ULListModel->setHeaderData(COLUMN_ULSPEED, Qt::Horizontal, tr("Speed", "i.e: upload speed"));
-    ULListModel->setHeaderData(COLUMN_UPROGRESS, Qt::Horizontal, tr("Progress", "i.e: % uploaded"));
-    ULListModel->setHeaderData(COLUMN_UHASH, Qt::Horizontal, tr("Hash", ""));
+    ULListModel = new QStandardItemModel(0,ULListDelegate::COLUMN_UCOUNT);
+    ULListModel->setHeaderData(ULListDelegate::COLUMN_UNAME, Qt::Horizontal, tr("Name", "i.e: file name"));
+    ULListModel->setHeaderData(ULListDelegate::COLUMN_UPEER, Qt::Horizontal, tr("Peer", "i.e: user name / tunnel id"));
+    ULListModel->setHeaderData(ULListDelegate::COLUMN_USIZE, Qt::Horizontal, tr("Size", "i.e: file size"));
+    ULListModel->setHeaderData(ULListDelegate::COLUMN_UTRANSFERRED, Qt::Horizontal, tr("Transferred", ""));
+    ULListModel->setHeaderData(ULListDelegate::COLUMN_ULSPEED, Qt::Horizontal, tr("Speed", "i.e: upload speed"));
+    ULListModel->setHeaderData(ULListDelegate::COLUMN_UPROGRESS, Qt::Horizontal, tr("Progress", "i.e: % uploaded"));
+    ULListModel->setHeaderData(ULListDelegate::COLUMN_UHASH, Qt::Horizontal, tr("Hash", ""));
 
     ui.uploadsList->setModel(ULListModel);
 
@@ -901,22 +901,22 @@ TransfersDialog::TransfersDialog(QWidget *parent)
 
     /* Set header resize modes and initial section sizes Uploads TreeView*/
     QHeaderView * upheader = ui.uploadsList->header () ;
-    QHeaderView_setSectionResizeModeColumn(upheader, COLUMN_UNAME, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(upheader, COLUMN_UPEER, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(upheader, COLUMN_USIZE, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(upheader, COLUMN_UTRANSFERRED, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(upheader, COLUMN_ULSPEED, QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(upheader, COLUMN_UPROGRESS, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(upheader, ULListDelegate::COLUMN_UNAME, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(upheader, ULListDelegate::COLUMN_UPEER, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(upheader, ULListDelegate::COLUMN_USIZE, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(upheader, ULListDelegate::COLUMN_UTRANSFERRED, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(upheader, ULListDelegate::COLUMN_ULSPEED, QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(upheader, ULListDelegate::COLUMN_UPROGRESS, QHeaderView::Interactive);
 
-    upheader->resizeSection ( COLUMN_UNAME, 260 );
-    upheader->resizeSection ( COLUMN_UPEER, 120 );
-    upheader->resizeSection ( COLUMN_USIZE, 70 );
-    upheader->resizeSection ( COLUMN_UTRANSFERRED, 75 );
-    upheader->resizeSection ( COLUMN_ULSPEED, 75 );
-    upheader->resizeSection ( COLUMN_UPROGRESS, 170 );
+    upheader->resizeSection ( ULListDelegate::COLUMN_UNAME, 260 );
+    upheader->resizeSection ( ULListDelegate::COLUMN_UPEER, 120 );
+    upheader->resizeSection ( ULListDelegate::COLUMN_USIZE, 70 );
+    upheader->resizeSection ( ULListDelegate::COLUMN_UTRANSFERRED, 75 );
+    upheader->resizeSection ( ULListDelegate::COLUMN_ULSPEED, 75 );
+    upheader->resizeSection ( ULListDelegate::COLUMN_UPROGRESS, 170 );
 
     // set default column and sort order for upload
-    ui.uploadsList->sortByColumn(COLUMN_UNAME, Qt::AscendingOrder);
+    ui.uploadsList->sortByColumn(ULListDelegate::COLUMN_UNAME, Qt::AscendingOrder);
 
     QObject::connect(ui.downloadList->selectionModel(),SIGNAL(selectionChanged (const QItemSelection&, const QItemSelection&)),this,SLOT(showFileDetails())) ;
 
@@ -1174,18 +1174,18 @@ void TransfersDialog::processSettings(bool bLoad)
         // state of splitter
         ui.splitter->restoreState(Settings->value("Splitter").toByteArray());
 
-        setShowDLSizeColumn(Settings->value("showDLSizeColumn", !ui.downloadList->isColumnHidden(COLUMN_SIZE)).toBool());
-        setShowDLCompleteColumn(Settings->value("showDLCompleteColumn", !ui.downloadList->isColumnHidden(COLUMN_COMPLETED)).toBool());
-        setShowDLDLSpeedColumn(Settings->value("showDLDLSpeedColumn", !ui.downloadList->isColumnHidden(COLUMN_DLSPEED)).toBool());
-        setShowDLProgressColumn(Settings->value("showDLProgressColumn", !ui.downloadList->isColumnHidden(COLUMN_PROGRESS)).toBool());
-        setShowDLSourcesColumn(Settings->value("showDLSourcesColumn", !ui.downloadList->isColumnHidden(COLUMN_SOURCES)).toBool());
-        setShowDLStatusColumn(Settings->value("showDLStatusColumn", !ui.downloadList->isColumnHidden(COLUMN_STATUS)).toBool());
-        setShowDLPriorityColumn(Settings->value("showDLPriorityColumn", !ui.downloadList->isColumnHidden(COLUMN_PRIORITY)).toBool());
-        setShowDLRemainingColumn(Settings->value("showDLRemainingColumn", !ui.downloadList->isColumnHidden(COLUMN_REMAINING)).toBool());
-        setShowDLDownloadTimeColumn(Settings->value("showDLDownloadTimeColumn", !ui.downloadList->isColumnHidden(COLUMN_DOWNLOADTIME)).toBool());
-        setShowDLIDColumn(Settings->value("showDLIDColumn", !ui.downloadList->isColumnHidden(COLUMN_ID)).toBool());
-        setShowDLLastDLColumn(Settings->value("showDLLastDLColumn", !ui.downloadList->isColumnHidden(COLUMN_LASTDL)).toBool());
-        setShowDLPath(Settings->value("showDLPath", !ui.downloadList->isColumnHidden(COLUMN_PATH)).toBool());
+        setShowDLSizeColumn(Settings->value("showDLSizeColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_SIZE)).toBool());
+        setShowDLCompleteColumn(Settings->value("showDLCompleteColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_COMPLETED)).toBool());
+        setShowDLDLSpeedColumn(Settings->value("showDLDLSpeedColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_DLSPEED)).toBool());
+        setShowDLProgressColumn(Settings->value("showDLProgressColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PROGRESS)).toBool());
+        setShowDLSourcesColumn(Settings->value("showDLSourcesColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_SOURCES)).toBool());
+        setShowDLStatusColumn(Settings->value("showDLStatusColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_STATUS)).toBool());
+        setShowDLPriorityColumn(Settings->value("showDLPriorityColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PRIORITY)).toBool());
+        setShowDLRemainingColumn(Settings->value("showDLRemainingColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_REMAINING)).toBool());
+        setShowDLDownloadTimeColumn(Settings->value("showDLDownloadTimeColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_DOWNLOADTIME)).toBool());
+        setShowDLIDColumn(Settings->value("showDLIDColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_ID)).toBool());
+        setShowDLLastDLColumn(Settings->value("showDLLastDLColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_LASTDL)).toBool());
+        setShowDLPath(Settings->value("showDLPath", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PATH)).toBool());
 
         // selected tab
         ui.tabWidget->setCurrentIndex(Settings->value("selectedTab").toInt());
@@ -1199,18 +1199,18 @@ void TransfersDialog::processSettings(bool bLoad)
         // state of splitter
         Settings->setValue("Splitter", ui.splitter->saveState());
 
-        Settings->setValue("showDLSizeColumn", !ui.downloadList->isColumnHidden(COLUMN_SIZE));
-        Settings->setValue("showDLCompleteColumn", !ui.downloadList->isColumnHidden(COLUMN_COMPLETED));
-        Settings->setValue("showDLDLSpeedColumn", !ui.downloadList->isColumnHidden(COLUMN_DLSPEED));
-        Settings->setValue("showDLProgressColumn", !ui.downloadList->isColumnHidden(COLUMN_PROGRESS));
-        Settings->setValue("showDLSourcesColumn", !ui.downloadList->isColumnHidden(COLUMN_SOURCES));
-        Settings->setValue("showDLStatusColumn", !ui.downloadList->isColumnHidden(COLUMN_STATUS));
-        Settings->setValue("showDLPriorityColumn", !ui.downloadList->isColumnHidden(COLUMN_PRIORITY));
-        Settings->setValue("showDLRemainingColumn", !ui.downloadList->isColumnHidden(COLUMN_REMAINING));
-        Settings->setValue("showDLDownloadTimeColumn", !ui.downloadList->isColumnHidden(COLUMN_DOWNLOADTIME));
-        Settings->setValue("showDLIDColumn", !ui.downloadList->isColumnHidden(COLUMN_ID));
-        Settings->setValue("showDLLastDLColumn", !ui.downloadList->isColumnHidden(COLUMN_LASTDL));
-        Settings->setValue("showDLPath", !ui.downloadList->isColumnHidden(COLUMN_PATH));
+        Settings->setValue("showDLSizeColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_SIZE));
+        Settings->setValue("showDLCompleteColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_COMPLETED));
+        Settings->setValue("showDLDLSpeedColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_DLSPEED));
+        Settings->setValue("showDLProgressColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PROGRESS));
+        Settings->setValue("showDLSourcesColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_SOURCES));
+        Settings->setValue("showDLStatusColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_STATUS));
+        Settings->setValue("showDLPriorityColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PRIORITY));
+        Settings->setValue("showDLRemainingColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_REMAINING));
+        Settings->setValue("showDLDownloadTimeColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_DOWNLOADTIME));
+        Settings->setValue("showDLIDColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_ID));
+        Settings->setValue("showDLLastDLColumn", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_LASTDL));
+        Settings->setValue("showDLPath", !ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PATH));
 
         // selected tab
         Settings->setValue("selectedTab", ui.tabWidget->currentIndex());
@@ -1423,18 +1423,18 @@ void TransfersDialog::downloadListHeaderCustomPopupMenu( QPoint /*point*/ )
     std::cerr << "TransfersDialog::downloadListHeaderCustomPopupMenu()" << std::endl;
     QMenu contextMnu( this );
 
-    showDLSizeAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_SIZE));
-    showDLCompleteAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_COMPLETED));
-    showDLDLSpeedAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_DLSPEED));
-    showDLProgressAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_PROGRESS));
-    showDLSourcesAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_SOURCES));
-    showDLStatusAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_STATUS));
-    showDLPriorityAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_PRIORITY));
-    showDLRemainingAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_REMAINING));
-    showDLDownloadTimeAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_DOWNLOADTIME));
-    showDLIDAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_ID));
-    showDLLastDLAct->setChecked(!ui.downloadList->isColumnHidden(COLUMN_LASTDL));
-    showDLPath->setChecked(!ui.downloadList->isColumnHidden(COLUMN_PATH));
+    showDLSizeAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_SIZE));
+    showDLCompleteAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_COMPLETED));
+    showDLDLSpeedAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_DLSPEED));
+    showDLProgressAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PROGRESS));
+    showDLSourcesAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_SOURCES));
+    showDLStatusAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_STATUS));
+    showDLPriorityAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PRIORITY));
+    showDLRemainingAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_REMAINING));
+    showDLDownloadTimeAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_DOWNLOADTIME));
+    showDLIDAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_ID));
+    showDLLastDLAct->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_LASTDL));
+    showDLPath->setChecked(!ui.downloadList->isColumnHidden(DLListDelegate::COLUMN_PATH));
 
     QMenu *menu = contextMnu.addMenu(tr("Columns"));
     menu->addAction(showDLSizeAct);
@@ -1486,12 +1486,12 @@ void TransfersDialog::uploadsListHeaderCustomPopupMenu( QPoint /*point*/ )
 	std::cerr << "TransfersDialog::uploadsListHeaderCustomPopupMenu()" << std::endl;
 	QMenu contextMnu( this );
 
-	showULPeerAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_UPEER));
-	showULSizeAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_USIZE));
-	showULTransferredAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_UTRANSFERRED));
-	showULSpeedAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_ULSPEED));
-	showULProgressAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_UPROGRESS));
-	showULHashAct->setChecked(!ui.uploadsList->isColumnHidden(COLUMN_UHASH));
+    showULPeerAct->setChecked(!ui.uploadsList->isColumnHidden(ULListDelegate::COLUMN_UPEER));
+    showULSizeAct->setChecked(!ui.uploadsList->isColumnHidden(ULListDelegate::COLUMN_USIZE));
+    showULTransferredAct->setChecked(!ui.uploadsList->isColumnHidden(ULListDelegate::COLUMN_UTRANSFERRED));
+    showULSpeedAct->setChecked(!ui.uploadsList->isColumnHidden(ULListDelegate::COLUMN_ULSPEED));
+    showULProgressAct->setChecked(!ui.uploadsList->isColumnHidden(ULListDelegate::COLUMN_UPROGRESS));
+    showULHashAct->setChecked(!ui.uploadsList->isColumnHidden(ULListDelegate::COLUMN_UHASH));
 
 	QMenu *menu = contextMnu.addMenu(tr("Columns"));
 	menu->addAction(showULPeerAct);
@@ -1554,20 +1554,20 @@ int TransfersDialog::addULItem(int row, const FileInfo &fileInfo)
 		// change progress column to own class for sorting
 		//ULListModel->setItem(row, COLUMN_UPROGRESS, new ProgressItem(NULL));
 
-		ULListModel->setData(ULListModel->index(row, COLUMN_UNAME), fileName);
-		ULListModel->setData(ULListModel->index(row, COLUMN_UNAME), FilesDefs::getIconFromFileType(fileName), Qt::DecorationRole);
-		ULListModel->setData(ULListModel->index(row, COLUMN_UHASH), fileHash);
-		ULListModel->setData(ULListModel->index(row, COLUMN_UHASH), fileHash, Qt::UserRole);
+        ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UNAME), fileName);
+        ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UNAME), FilesDefs::getIconFromFileType(fileName), Qt::DecorationRole);
+        ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UHASH), fileHash);
+        ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UHASH), fileHash, Qt::UserRole);
 	}
 
-	ULListModel->setData(ULListModel->index(row, COLUMN_USIZE), QVariant((qlonglong)fileSize));
+    ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_USIZE), QVariant((qlonglong)fileSize));
 
 	//Reset Parent info if child present
-	ULListModel->setData(ULListModel->index(row, COLUMN_UPEER),        QVariant(QString(tr("%1 tunnels").arg(fileInfo.peers.size()))) );
-	ULListModel->setData(ULListModel->index(row, COLUMN_UPEER),        QIcon(), Qt::DecorationRole);
-	ULListModel->setData(ULListModel->index(row, COLUMN_UPEER),        QVariant(), Qt::ToolTipRole);
-	ULListModel->setData(ULListModel->index(row, COLUMN_UTRANSFERRED), QVariant());
-	ULListModel->setData(ULListModel->index(row, COLUMN_UPROGRESS),    QVariant());
+    ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UPEER),        QVariant(QString(tr("%1 tunnels").arg(fileInfo.peers.size()))) );
+    ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UPEER),        QIcon(), Qt::DecorationRole);
+    ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UPEER),        QVariant(), Qt::ToolTipRole);
+    ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UTRANSFERRED), QVariant());
+    ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UPROGRESS),    QVariant());
 
 	QStandardItem *ulItem = ULListModel->item(row);
 	std::set<int> used_rows ;
@@ -1617,11 +1617,11 @@ int TransfersDialog::addULItem(int row, const FileInfo &fileInfo)
 			//Only one peer so update parent
 			QString iconName;
 			QString tooltip;
-			ULListModel->setData(ULListModel->index(row, COLUMN_UPEER),        QVariant(getPeerName(transferInfo.peerId, iconName, tooltip)));
-			ULListModel->setData(ULListModel->index(row, COLUMN_UPEER),        QIcon(iconName), Qt::DecorationRole);
-			ULListModel->setData(ULListModel->index(row, COLUMN_UPEER),        QVariant(tooltip), Qt::ToolTipRole);
-			ULListModel->setData(ULListModel->index(row, COLUMN_UTRANSFERRED), QVariant(completed));
-			ULListModel->setData(ULListModel->index(row, COLUMN_UPROGRESS),    QVariant::fromValue(peerpinfo));
+            ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UPEER),        QVariant(getPeerName(transferInfo.peerId, iconName, tooltip)));
+            ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UPEER),        QIcon(iconName), Qt::DecorationRole);
+            ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UPEER),        QVariant(tooltip), Qt::ToolTipRole);
+            ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UTRANSFERRED), QVariant(completed));
+            ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_UPROGRESS),    QVariant::fromValue(peerpinfo));
 		} else {
 			int row_id = addPeerToULItem(ulItem, transferInfo.peerId, hashFileAndPeerId, completed, peerULSpeed, peerpinfo);
 
@@ -1632,7 +1632,7 @@ int TransfersDialog::addULItem(int row, const FileInfo &fileInfo)
 	}
 
 	// Update Parent UpLoad Speed
-	ULListModel->setData(ULListModel->index(row, COLUMN_ULSPEED), QVariant((double)peerULSpeedTotal));
+    ULListModel->setData(ULListModel->index(row, ULListDelegate::COLUMN_ULSPEED), QVariant((double)peerULSpeedTotal));
 
 
 	// This is not optimal, but we deal with a small number of elements. The reverse order is really important,
@@ -1653,7 +1653,7 @@ int TransfersDialog::addPeerToULItem(QStandardItem *ulItem, const RsPeerId& peer
 	int childRow = -1;
 
 	QStandardItem *childId = NULL;
-	for (int count = 0; (childId = ulItem->child(count, COLUMN_UHASH)) != NULL; ++count) {
+    for (int count = 0; (childId = ulItem->child(count, ULListDelegate::COLUMN_UHASH)) != NULL; ++count) {
 		if (childId->data(Qt::UserRole).toString() == coreID) {
 			childRow = count;
 			break;
@@ -1700,9 +1700,9 @@ int TransfersDialog::addPeerToULItem(QStandardItem *ulItem, const RsPeerId& peer
 		childRow = ulItem->rowCount() - 1;
 	} else {
 		// just update the child (peer)
-		ulItem->child(childRow, COLUMN_ULSPEED)->setData(QVariant((double)ulspeed), Qt::DisplayRole);
-		ulItem->child(childRow, COLUMN_UTRANSFERRED)->setData(QVariant((qlonglong)completed), Qt::DisplayRole);
-		ulItem->child(childRow, COLUMN_UPROGRESS)->setData(QVariant::fromValue(peerInfo), Qt::DisplayRole);
+        ulItem->child(childRow, ULListDelegate::COLUMN_ULSPEED)->setData(QVariant((double)ulspeed), Qt::DisplayRole);
+        ulItem->child(childRow, ULListDelegate::COLUMN_UTRANSFERRED)->setData(QVariant((qlonglong)completed), Qt::DisplayRole);
+        ulItem->child(childRow, ULListDelegate::COLUMN_UPROGRESS)->setData(QVariant::fromValue(peerInfo), Qt::DisplayRole);
 	}
 
 	return childRow;
@@ -1743,7 +1743,7 @@ void TransfersDialog::insertTransfers()
 	int rowCount = ULListModel->rowCount();
 
 	for (int row = 0; row < rowCount; ) {
-		RsFileHash hash ( ULListModel->item(row, COLUMN_UHASH)->data(Qt::UserRole).toString().toStdString());
+        RsFileHash hash ( ULListModel->item(row, ULListDelegate::COLUMN_UHASH)->data(Qt::UserRole).toString().toStdString());
 
 		std::set<RsFileHash>::iterator hashIt = hashs.find(hash);
 		if (hashIt == hashs.end()) {
@@ -1976,13 +1976,13 @@ void TransfersDialog::getDLSelectedItems(std::set<RsFileHash> *ids, std::set<int
 	if (ids) ids->clear();
 	if (rows) rows->clear();
 
-	QModelIndexList selectedRows = selection->selectedRows(COLUMN_ID);
+    QModelIndexList selectedRows = selection->selectedRows(DLListDelegate::COLUMN_ID);
 
 	int i, imax = selectedRows.count();
 	for (i = 0; i < imax; ++i) {
 		QModelIndex index = selectedRows.at(i);
 		if (index.parent().isValid() && index.model())
-			index = index.model()->index(index.parent().row(), COLUMN_ID);
+            index = index.model()->index(index.parent().row(), DLListDelegate::COLUMN_ID);
 
 		if (ids) {
 			ids->insert(RsFileHash(index.data(Qt::DisplayRole).toString().toStdString()));
@@ -2010,7 +2010,7 @@ void TransfersDialog::getULSelectedItems(std::set<RsFileHash> *ids, std::set<int
 
     foreach(index, indexes) {
         if (ids) {
-            QStandardItem *id = ULListModel->item(index.row(), COLUMN_UHASH);
+            QStandardItem *id = ULListModel->item(index.row(), ULListDelegate::COLUMN_UHASH);
             ids->insert(RsFileHash(id->data(Qt::DisplayRole).toString().toStdString()));
         }
         if (rows) {
@@ -2383,72 +2383,72 @@ return 0.0 ;
 
 double TransfersDialog::getSpeed(int row, QStandardItemModel *model)
 {
-    return model->data(model->index(row, COLUMN_DLSPEED), Qt::DisplayRole).toDouble();
+    return model->data(model->index(row, DLListDelegate::COLUMN_DLSPEED), Qt::DisplayRole).toDouble();
 }
 
 QString TransfersDialog::getFileName(int row, QStandardItemModel *model)
 {
-    return model->data(model->index(row, COLUMN_NAME), Qt::DisplayRole).toString();
+    return model->data(model->index(row, DLListDelegate::COLUMN_NAME), Qt::DisplayRole).toString();
 }
 
 QString TransfersDialog::getStatus(int row, QStandardItemModel *model)
 {
-    return model->data(model->index(row, COLUMN_STATUS), Qt::DisplayRole).toString();
+    return model->data(model->index(row, DLListDelegate::COLUMN_STATUS), Qt::DisplayRole).toString();
 }
 
 QString TransfersDialog::getID(int row, QStandardItemModel *model)
 {
-    return model->data(model->index(row, COLUMN_ID), Qt::UserRole).toString().left(40); // gets only the "hash" part of the name
+    return model->data(model->index(row, DLListDelegate::COLUMN_ID), Qt::UserRole).toString().left(40); // gets only the "hash" part of the name
 }
 
 QString TransfersDialog::getID(int row, QSortFilterProxyModel *filter)
 {
-	QModelIndex index = filter->mapToSource(filter->index(row, COLUMN_ID));
+    QModelIndex index = filter->mapToSource(filter->index(row, DLListDelegate::COLUMN_ID));
 
 	return filter->sourceModel()->data(index, Qt::UserRole).toString().left(40); // gets only the "hash" part of the name
 }
 
 QString TransfersDialog::getPriority(int row, QStandardItemModel *model)
 {
-    return model->data(model->index(row, COLUMN_PRIORITY), Qt::DisplayRole).toString();
+    return model->data(model->index(row, DLListDelegate::COLUMN_PRIORITY), Qt::DisplayRole).toString();
 }
 
 qlonglong TransfersDialog::getFileSize(int row, QStandardItemModel *model)
 {
 	bool ok = false;
-    return model->data(model->index(row, COLUMN_SIZE), Qt::DisplayRole).toULongLong(&ok);
+    return model->data(model->index(row, DLListDelegate::COLUMN_SIZE), Qt::DisplayRole).toULongLong(&ok);
 }
 
 qlonglong TransfersDialog::getTransfered(int row, QStandardItemModel *model)
 {
 	bool ok = false;
-    return model->data(model->index(row, COLUMN_COMPLETED), Qt::DisplayRole).toULongLong(&ok);
+    return model->data(model->index(row, DLListDelegate::COLUMN_COMPLETED), Qt::DisplayRole).toULongLong(&ok);
 }
 
 qlonglong TransfersDialog::getRemainingTime(int row, QStandardItemModel *model)
 {
 	bool ok = false;
-    return model->data(model->index(row, COLUMN_REMAINING), Qt::DisplayRole).toULongLong(&ok);
+    return model->data(model->index(row, DLListDelegate::COLUMN_REMAINING), Qt::DisplayRole).toULongLong(&ok);
 }
 
 qlonglong TransfersDialog::getDownloadTime(int row, QStandardItemModel *model)
 {
-    return model->data(model->index(row, COLUMN_DOWNLOADTIME), Qt::DisplayRole).toULongLong();
+    return model->data(model->index(row, DLListDelegate::COLUMN_DOWNLOADTIME), Qt::DisplayRole).toULongLong();
 }
 
 qlonglong TransfersDialog::getLastDL(int row, QStandardItemModel *model)
 {
-    return model->data(model->index(row, COLUMN_LASTDL), Qt::DisplayRole).toULongLong();
+    return model->data(model->index(row, DLListDelegate::COLUMN_LASTDL), Qt::DisplayRole).toULongLong();
 }
 
 qlonglong TransfersDialog::getPath(int row, QStandardItemModel *model)
 {
-    return model->data(model->index(row, COLUMN_PATH), Qt::DisplayRole).toULongLong();
+    return model->data(model->index(row, DLListDelegate::COLUMN_PATH), Qt::DisplayRole).toULongLong();
 }
 
 QString TransfersDialog::getSources(int row, QStandardItemModel *model)
 {
-	double dblValue =  model->data(model->index(row, COLUMN_SOURCES), Qt::DisplayRole).toDouble();
+    double dblValue =  model->data(model->index(row, DLListDelegate::COLUMN_SOURCES), Qt::DisplayRole).toDouble();
 	QString temp = QString("%1 (%2)").arg((int)dblValue).arg((int)((fmod(dblValue,1)*1000)+0.5));
 
 	return temp;
@@ -2608,25 +2608,25 @@ void TransfersDialog::collAutoOpen(const QString &fileHash)
 	}
 }
 
-void TransfersDialog::setShowDLSizeColumn        (bool show) { ui.downloadList->setColumnHidden(COLUMN_SIZE,         !show); }
-void TransfersDialog::setShowDLCompleteColumn    (bool show) { ui.downloadList->setColumnHidden(COLUMN_COMPLETED,    !show); }
-void TransfersDialog::setShowDLDLSpeedColumn     (bool show) { ui.downloadList->setColumnHidden(COLUMN_DLSPEED,      !show); }
-void TransfersDialog::setShowDLProgressColumn    (bool show) { ui.downloadList->setColumnHidden(COLUMN_PROGRESS,     !show); }
-void TransfersDialog::setShowDLSourcesColumn     (bool show) { ui.downloadList->setColumnHidden(COLUMN_SOURCES,      !show); }
-void TransfersDialog::setShowDLStatusColumn      (bool show) { ui.downloadList->setColumnHidden(COLUMN_STATUS,       !show); }
-void TransfersDialog::setShowDLPriorityColumn    (bool show) { ui.downloadList->setColumnHidden(COLUMN_PRIORITY,     !show); }
-void TransfersDialog::setShowDLRemainingColumn   (bool show) { ui.downloadList->setColumnHidden(COLUMN_REMAINING,    !show); }
-void TransfersDialog::setShowDLDownloadTimeColumn(bool show) { ui.downloadList->setColumnHidden(COLUMN_DOWNLOADTIME, !show); }
-void TransfersDialog::setShowDLIDColumn          (bool show) { ui.downloadList->setColumnHidden(COLUMN_ID,           !show); }
-void TransfersDialog::setShowDLLastDLColumn      (bool show) { ui.downloadList->setColumnHidden(COLUMN_LASTDL,       !show); }
-void TransfersDialog::setShowDLPath              (bool show) { ui.downloadList->setColumnHidden(COLUMN_PATH,         !show); }
+void TransfersDialog::setShowDLSizeColumn        (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_SIZE,         !show); }
+void TransfersDialog::setShowDLCompleteColumn    (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_COMPLETED,    !show); }
+void TransfersDialog::setShowDLDLSpeedColumn     (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_DLSPEED,      !show); }
+void TransfersDialog::setShowDLProgressColumn    (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_PROGRESS,     !show); }
+void TransfersDialog::setShowDLSourcesColumn     (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_SOURCES,      !show); }
+void TransfersDialog::setShowDLStatusColumn      (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_STATUS,       !show); }
+void TransfersDialog::setShowDLPriorityColumn    (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_PRIORITY,     !show); }
+void TransfersDialog::setShowDLRemainingColumn   (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_REMAINING,    !show); }
+void TransfersDialog::setShowDLDownloadTimeColumn(bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_DOWNLOADTIME, !show); }
+void TransfersDialog::setShowDLIDColumn          (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_ID,           !show); }
+void TransfersDialog::setShowDLLastDLColumn      (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_LASTDL,       !show); }
+void TransfersDialog::setShowDLPath              (bool show) { ui.downloadList->setColumnHidden(DLListDelegate::COLUMN_PATH,         !show); }
 
-void TransfersDialog::setShowULPeerColumn       (bool show) { ui.uploadsList->setColumnHidden(COLUMN_UPEER,        !show); }
-void TransfersDialog::setShowULSizeColumn       (bool show) { ui.uploadsList->setColumnHidden(COLUMN_USIZE,        !show); }
-void TransfersDialog::setShowULTransferredColumn(bool show) { ui.uploadsList->setColumnHidden(COLUMN_UTRANSFERRED, !show); }
-void TransfersDialog::setShowULSpeedColumn      (bool show) { ui.uploadsList->setColumnHidden(COLUMN_ULSPEED,      !show); }
-void TransfersDialog::setShowULProgressColumn   (bool show) { ui.uploadsList->setColumnHidden(COLUMN_UPROGRESS,    !show); }
-void TransfersDialog::setShowULHashColumn       (bool show) { ui.uploadsList->setColumnHidden(COLUMN_UHASH,        !show); }
+void TransfersDialog::setShowULPeerColumn       (bool show) { ui.uploadsList->setColumnHidden(ULListDelegate::COLUMN_UPEER,        !show); }
+void TransfersDialog::setShowULSizeColumn       (bool show) { ui.uploadsList->setColumnHidden(ULListDelegate::COLUMN_USIZE,        !show); }
+void TransfersDialog::setShowULTransferredColumn(bool show) { ui.uploadsList->setColumnHidden(ULListDelegate::COLUMN_UTRANSFERRED, !show); }
+void TransfersDialog::setShowULSpeedColumn      (bool show) { ui.uploadsList->setColumnHidden(ULListDelegate::COLUMN_ULSPEED,      !show); }
+void TransfersDialog::setShowULProgressColumn   (bool show) { ui.uploadsList->setColumnHidden(ULListDelegate::COLUMN_UPROGRESS,    !show); }
+void TransfersDialog::setShowULHashColumn       (bool show) { ui.uploadsList->setColumnHidden(ULListDelegate::COLUMN_UHASH,        !show); }
 
 void TransfersDialog::expandAllDL()
 {
diff --git a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
index 8b379d780..6bad045e0 100644
--- a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
@@ -25,26 +25,14 @@
 
 Q_DECLARE_METATYPE(FileProgressInfo)
 
-// Defines for upload list list columns
-#define ULLISTDELEGATE_COLUMN_UNAME        0
-#define ULLISTDELEGATE_COLUMN_UPEER        1
-#define ULLISTDELEGATE_COLUMN_USIZE        2
-#define ULLISTDELEGATE_COLUMN_UTRANSFERRED 3
-#define ULLISTDELEGATE_COLUMN_ULSPEED      4
-#define ULLISTDELEGATE_COLUMN_UPROGRESS    5
-#define ULLISTDELEGATE_COLUMN_UHASH        6
-#define ULLISTDELEGATE_COLUMN_UCOUNT       7
-
 #define MAX_CHAR_TMP 128
 
 ULListDelegate::ULListDelegate(QObject *parent) : QAbstractItemDelegate(parent)
 {
-	;
 }
 
 ULListDelegate::~ULListDelegate(void)
 {
-	;
 }
 
 void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const
@@ -77,7 +65,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 
 	// draw the background color
 	bool bDrawBackground = true;
-	if(index.column() == ULLISTDELEGATE_COLUMN_UPROGRESS) {
+    if(index.column() == COLUMN_UPROGRESS) {
 		FileProgressInfo pinfo = index.data().value<FileProgressInfo>() ;
 		bDrawBackground = (pinfo.type == FileProgressInfo::UNINIT);
 	}
@@ -96,7 +84,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 	}
 
 	switch(index.column()) {
-        case ULLISTDELEGATE_COLUMN_USIZE:
+        case COLUMN_USIZE:
 			fileSize = index.data().toLongLong();
                         if(fileSize <= 0){
                                 temp = "";
@@ -115,7 +103,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case ULLISTDELEGATE_COLUMN_UTRANSFERRED:
+        case COLUMN_UTRANSFERRED:
 			transferred = index.data().toLongLong();
                         if(transferred <= 0){
                                 temp = "";
@@ -134,7 +122,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-        case ULLISTDELEGATE_COLUMN_ULSPEED:
+        case COLUMN_ULSPEED:
                         ulspeed = index.data().toDouble();
                         if (ulspeed <= 0) {
                             temp = "";
@@ -145,7 +133,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                         }
 			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
-		case ULLISTDELEGATE_COLUMN_UPROGRESS:
+        case COLUMN_UPROGRESS:
 			{
 				FileProgressInfo pinfo = index.data().value<FileProgressInfo>() ;
 				if (pinfo.type == FileProgressInfo::UNINIT)
@@ -155,7 +143,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 				painter->save() ;
 				xProgressBar progressBar(pinfo,option.rect,painter,0);// the 3rd param is the  color schema (0 is the default value)
 
-				QString ext = QFileInfo(QString::fromStdString(index.sibling(index.row(), ULLISTDELEGATE_COLUMN_UNAME).data().toString().toStdString())).suffix();;
+                QString ext = QFileInfo(QString::fromStdString(index.sibling(index.row(), COLUMN_UNAME).data().toString().toStdString())).suffix();;
 				if (ext == "rsfc" || ext == "rsrl" || ext == "dist" || ext == "rsfb")
 					progressBar.setColorSchema( 9);
 				else
@@ -169,8 +157,8 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			}
 			painter->drawText(option.rect, Qt::AlignCenter, newopt.text);
 			break;
-		case ULLISTDELEGATE_COLUMN_UNAME:
-		case ULLISTDELEGATE_COLUMN_UPEER:
+        case COLUMN_UNAME:
+        case COLUMN_UPEER:
 			// decoration
 			value = index.data(Qt::DecorationRole);
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
diff --git a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.h b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.h
index 2f3aa4139..fc65c3a8f 100644
--- a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.h
+++ b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.h
@@ -18,30 +18,27 @@
  *                                                                             *
  *******************************************************************************/
 
-#ifndef ULLISTDELEGATE_H
-#define ULLISTDELEGATE_H
+#pragma once
 
 #include <QAbstractItemDelegate>
 
 class QModelIndex;
 class QPainter;
 
+class ULListDelegate: public QAbstractItemDelegate
+{
+public:
+    ULListDelegate(QObject *parent=0);
+    ~ULListDelegate();
+    void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
+    QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
 
-class ULListDelegate: public QAbstractItemDelegate {
-
-	Q_OBJECT
-
-	public:
-		ULListDelegate(QObject *parent=0);
-		~ULListDelegate();
-		void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
-		QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
-
-	private:
-
-	public slots:
-
-	signals:
+    static constexpr int COLUMN_UNAME        = 0;
+    static constexpr int COLUMN_UPEER        = 1;
+    static constexpr int COLUMN_USIZE        = 2;
+    static constexpr int COLUMN_UTRANSFERRED = 3;
+    static constexpr int COLUMN_ULSPEED      = 4;
+    static constexpr int COLUMN_UPROGRESS    = 5;
+    static constexpr int COLUMN_UHASH        = 6;
+    static constexpr int COLUMN_UCOUNT       = 7;
 };
-#endif
-
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 974715d63..de2ca8baf 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -466,10 +466,8 @@ void MainWindow::initStackedPage()
  }
 
 #ifndef RS_RELEASE_VERSION
-#ifdef PLUGINMGR
   addPage(pluginsPage = new gui::PluginsPage(ui->stackPages), grp, NULL);
 #endif
-#endif
 
 #undef GETSTARTED_GUI
 #ifdef GETSTARTED_GUI
diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index 1b02cbc7c..216117f67 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -73,7 +73,7 @@ NetworkDialog::NetworkDialog(QWidget */*parent*/)
     PGPIdItemProxy = new pgpid_item_proxy(this);
     connect(ui.onlyTrustedKeys, SIGNAL(toggled(bool)), PGPIdItemProxy, SLOT(use_only_trusted_keys(bool)));
     PGPIdItemProxy->setSourceModel(PGPIdItemModel);
-    PGPIdItemProxy->setFilterKeyColumn(COLUMN_PEERNAME);
+    PGPIdItemProxy->setFilterKeyColumn(pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERNAME);
     PGPIdItemProxy->setFilterCaseSensitivity(Qt::CaseInsensitive);
     PGPIdItemProxy->setSortRole(Qt::EditRole); //use edit role to get raw data since we do not have edit for this model.
     ui.connectTreeWidget->setModel(PGPIdItemProxy);
@@ -90,9 +90,9 @@ NetworkDialog::NetworkDialog(QWidget */*parent*/)
     ui.onlyTrustedKeys->setMinimumWidth(20*f);
 
     /* add filter actions */
-    ui.filterLineEdit->addFilter(QIcon(), tr("Name"), COLUMN_PEERNAME, tr("Search name"));
-    ui.filterLineEdit->addFilter(QIcon(), tr("Peer ID"), COLUMN_PEERID, tr("Search peer ID"));
-    ui.filterLineEdit->setCurrentFilter(COLUMN_PEERNAME);
+    ui.filterLineEdit->addFilter(QIcon(), tr("Name"), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERNAME, tr("Search name"));
+    ui.filterLineEdit->addFilter(QIcon(), tr("Peer ID"), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID, tr("Search peer ID"));
+    ui.filterLineEdit->setCurrentFilter(pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERNAME);
     connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), PGPIdItemProxy, SLOT(setFilterWildcard(QString)));
 }
 
@@ -120,7 +120,7 @@ void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ )
 
 	QMenu *contextMnu = new QMenu;
 
-	RsPgpId peer_id(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()) ;
+    RsPgpId peer_id(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID)).toString().toStdString()) ;
 
 	// That's what context menus are made for
 	RsPeerDetails detail;
@@ -179,7 +179,7 @@ void NetworkDialog::removeSelectedKeys()
 		return;
 
 	std::set<RsPgpId> selected;
-	selected.insert(RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()));
+    selected.insert(RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID)).toString().toStdString()));
 
 	removeKeys(selected);
 }
@@ -228,7 +228,7 @@ void NetworkDialog::denyFriend()
     if(l.empty())
         return;
 
-    RsPgpId peer_id(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString());
+    RsPgpId peer_id(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID)).toString().toStdString());
 	rsPeers->removeFriend(peer_id) ;
 
 	securedUpdateDisplay();
@@ -241,7 +241,7 @@ void NetworkDialog::makeFriend()
     if(l.empty())
         return;
 
-    PGPKeyDialog::showIt(RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()), PGPKeyDialog::PageDetails);
+    PGPKeyDialog::showIt(RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID)).toString().toStdString()), PGPKeyDialog::PageDetails);
 }
 
 /** Shows Peer Information/Auth Dialog */
@@ -251,7 +251,7 @@ void NetworkDialog::peerdetails()
     if(l.empty())
         return;
 
-    PGPKeyDialog::showIt(RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()), PGPKeyDialog::PageDetails);
+    PGPKeyDialog::showIt(RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID)).toString().toStdString()), PGPKeyDialog::PageDetails);
 }
 
 void NetworkDialog::copyLink()
@@ -261,7 +261,7 @@ void NetworkDialog::copyLink()
         return;
 
 
-    RsPgpId peer_id (ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), COLUMN_PEERID)).toString().toStdString()) ;
+    RsPgpId peer_id (ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l.begin()->row(), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID)).toString().toStdString()) ;
 
 	QList<RetroShareLink> urls;
 	RetroShareLink link = RetroShareLink::createPerson(peer_id);
diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp
index 58a349514..016692092 100644
--- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.cpp
@@ -28,14 +28,6 @@
 #define IMAGE_DENIED         ":/images/denied16.png"
 #define IMAGE_TRUSTED        ":/images/rs-2.png"
 
-#define PGP_ITEM_MODEL_COLUMN_CHECK        0
-#define PGP_ITEM_MODEL_COLUMN_PEERNAME     1
-#define PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER  2
-#define PGP_ITEM_MODEL_COLUMN_PEER_AUTH_ME 3
-#define PGP_ITEM_MODEL_COLUMN_PEERID       4
-#define PGP_ITEM_MODEL_COLUMN_LAST_USED    5
-#define PGP_ITEM_MODEL_COLUMN_COUNT        6
-
 /*TODO:
  * using list here for internal data storage is not best option
 */
diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
index e33987acd..7a17f48cb 100644
--- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
+++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_model.h
@@ -48,6 +48,13 @@ public:
     void setBackgroundColorDenied(QColor color) { mBackgroundColorDenied = color; }
     void setTextColor(QColor color) { mTextColor = color; }
 
+    static constexpr int PGP_ITEM_MODEL_COLUMN_CHECK        = 0;
+    static constexpr int PGP_ITEM_MODEL_COLUMN_PEERNAME     = 1;
+    static constexpr int PGP_ITEM_MODEL_COLUMN_I_AUTH_PEER  = 2;
+    static constexpr int PGP_ITEM_MODEL_COLUMN_PEER_AUTH_ME = 3;
+    static constexpr int PGP_ITEM_MODEL_COLUMN_PEERID       = 4;
+    static constexpr int PGP_ITEM_MODEL_COLUMN_LAST_USED    = 5;
+    static constexpr int PGP_ITEM_MODEL_COLUMN_COUNT        = 6;
 
 public slots:
     void data_updated(std::list<RsPgpId> &new_neighs);
diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp
index 29acee273..e7b81ef2b 100644
--- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.cpp
@@ -26,17 +26,13 @@
 #include <retroshare/rsdisc.h>
 #include <retroshare/rsmsgs.h>
 
-
-//TODO: set this defines in one place
-// Defines for key list columns
-#define COLUMN_CHECK 0
-#define COLUMN_PEERNAME    1
-#define COLUMN_I_AUTH_PEER 2
-#define COLUMN_PEER_AUTH_ME 3
-#define COLUMN_PEERID      4
-#define COLUMN_LAST_USED   5
-#define COLUMN_COUNT 6
-
+bool pgpid_item_proxy::lessThan(const QModelIndex &left, const QModelIndex &right) const 
+{
+    if(left.column() == pgpid_item_model::PGP_ITEM_MODEL_COLUMN_LAST_USED)
+		return left.data(Qt::EditRole).toUInt() < right.data(Qt::EditRole).toUInt();
+	else
+		return left.data(Qt::DisplayRole).toString().toUpper() < right.data(Qt::DisplayRole).toString().toUpper();
+}
 
 
 pgpid_item_proxy::pgpid_item_proxy(QObject *parent) :
@@ -57,7 +53,7 @@ bool pgpid_item_proxy::filterAcceptsRow(int sourceRow, const QModelIndex &source
     {
         if(!rsPeers)
             return false;
-        RsPgpId peer_id (sourceModel()->data(sourceModel()->index(sourceRow, COLUMN_PEERID, sourceParent)).toString().toStdString());
+        RsPgpId peer_id (sourceModel()->data(sourceModel()->index(sourceRow, pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID, sourceParent)).toString().toStdString());
         RsPeerDetails details;
         if(!rsPeers->getGPGDetails(peer_id, details))
             return false;
diff --git a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.h b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.h
index b892e093e..5608862a2 100644
--- a/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.h
+++ b/retroshare-gui/src/gui/NetworkDialog/pgpid_item_proxy.h
@@ -34,14 +34,7 @@ class pgpid_item_proxy :
 public:
     pgpid_item_proxy(QObject *parent = nullptr);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override
-    {
-        if(left.column() == COLUMN_LAST_USED)
-		return left.data(Qt::EditRole).toUInt() < right.data(Qt::EditRole).toUInt();
-	else
-		return left.data(Qt::DisplayRole).toString().toUpper() < right.data(Qt::DisplayRole).toString().toUpper();
-    }
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
 
 public slots:
     void use_only_trusted_keys(bool val);

From b3e6d96f3ba4d353e1767508ed75784fc0878247 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 27 Mar 2022 21:45:27 +0200
Subject: [PATCH 064/503] attempt to add samv3 to compilaiton

---
 retroshare-gui/CMakeLists.txt | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/CMakeLists.txt b/retroshare-gui/CMakeLists.txt
index fdd204005..314edf1ab 100644
--- a/retroshare-gui/CMakeLists.txt
+++ b/retroshare-gui/CMakeLists.txt
@@ -84,7 +84,7 @@ find_package( Qt5 COMPONENTS Network      REQUIRED)
 find_package( Qt5 COMPONENTS Multimedia   REQUIRED)
 find_package( Qt5 COMPONENTS PrintSupport REQUIRED)
 
-list( APPEND RS_LINK_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
+list( APPEND RS_LINK_LIBRARIES Qt5::Multimedia Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
 
 ################################################################################
 
@@ -188,13 +188,13 @@ if(RS_JSON_API)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC RS_JSONAPI)
 endif(RS_JSON_API)
 
-################################################################################
+################################# CMark ########################################
 
 if(RS_GUI_CMARK)
 	set(CMARK_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../supportlibs/cmark/")
 	if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
 		message( STATUS "cmark submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
-		add_subdirectory( "${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
+		add_subdirectory( "${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/cmark" )
 	else()
 		FetchContent_Declare(
 			cmark
@@ -208,6 +208,23 @@ if(RS_GUI_CMARK)
 	endif()
 endif(RS_GUI_CMARK)
 
+################################# LibSam v3 ####################################
+
+set(SAM3_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../supportlibs/libsam3/")
+if(EXISTS "${SAM3_DEVEL_DIR}/.git" )
+	message( STATUS "libsam3 submodule found at ${SAM3_DEVEL_DIR} using it" )
+	add_subdirectory( "${SAM3_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libsam3" )
+else()
+	FetchContent_Declare(
+		libsam3
+		GIT_REPOSITORY "https://github.com/i2p/libsam3.git"
+		GIT_TAG "origin/master"
+		GIT_SHALLOW TRUE
+		GIT_PROGRESS TRUE
+		TIMEOUT 10
+		)
+	FetchContent_MakeAvailable(libsam3)
+endif()
 
 ################################################################################
 #                                    TODO                                      #
@@ -463,7 +480,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${RS_LINK_LIBRARIES})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/)
 
 set( CMAKE_CXX_FLAGS "-Wno-deprecated-declarations" )
-target_compile_definitions(${PROJECT_NAME} PUBLIC RS_NO_WARN_DEPRECATED )
+target_compile_definitions(${PROJECT_NAME} PUBLIC  RS_NO_WARN_DEPRECATED )
+target_compile_definitions(${PROJECT_NAME} PRIVATE RS_RELEASE_VERSION )
 target_compile_definitions(${PROJECT_NAME} PRIVATE TARGET=\"retroshare\")
 
 if(RS_GXS_CIRCLES)

From 6be9bb579b6167fe2ee7a9841ed6a5b9d7a8791c Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 28 Mar 2022 12:01:55 +0200
Subject: [PATCH 065/503] Fix CMake build from source tarball

Set maximum tested version to C++17
Detect companion libraries from CMakeLists.txt not .git
---
 retroshare-service/CMakeLists.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index 2fcdabe28..672644369 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -73,6 +73,8 @@ list(
 
 add_executable(${PROJECT_NAME} ${RS_SERVICE_SOURCES})
 
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
+
 install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
 
 ################################################################################
@@ -84,10 +86,10 @@ endif(RS_DEVELOPMENT_BUILD)
 ################################################################################
 
 set(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/")
-if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
+if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/CMakeLists.txt" )
 	message(
 		STATUS
-		"libretroshare submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
+		"libretroshare source found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
 	add_subdirectory(
 		"${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
 else()
@@ -138,10 +140,10 @@ endif(RS_SERVICE_TERMINAL_LOGIN)
 
 if(RS_WEBUI)
 	set(RS_WEBUI_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../webui/")
-	if(EXISTS "${RS_WEBUI_DEVEL_DIR}/.git" )
+	if(EXISTS "${RS_WEBUI_DEVEL_DIR}/CMakeLists.txt" )
 		message(
 			STATUS
-			"RetroShare WebUI repository found at ${RS_WEBUI_DEVEL_DIR} using it" )
+			"RetroShare WebUI source found at ${RS_WEBUI_DEVEL_DIR} using it" )
 		add_subdirectory(
 			"${RS_WEBUI_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/webui" )
 	else()

From 07710f6a6c6baa7a599ecd923cf3533ef5ae6552 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 28 Mar 2022 12:03:22 +0200
Subject: [PATCH 066/503] Update submodules after MacOS build fix

---
 libbitdht     | 2 +-
 libretroshare | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libbitdht b/libbitdht
index 659423769..6abbec950 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 659423769541169457c41f71c8a038e2d64ba079
+Subproject commit 6abbec95073f3c1eb5059cbf8441111ef4a317a7
diff --git a/libretroshare b/libretroshare
index 940c2d888..a28ec6d8a 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 940c2d8882a53da3dfc72a35f6bdb81176d06c9a
+Subproject commit a28ec6d8a81581e330dcffc01197d2449e9dd3c0

From d9e94298e619567a9ce67461b3b8fe719f984526 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 28 Mar 2022 12:18:18 +0200
Subject: [PATCH 067/503] Update libretroshare submodule

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index a28ec6d8a..829afc62e 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit a28ec6d8a81581e330dcffc01197d2449e9dd3c0
+Subproject commit 829afc62ec25dc6823fc05d50faa68a52e9f09c7

From 28017566f169d13a4b5666f7dd3c10b2801a3270 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 28 Mar 2022 17:28:13 +0200
Subject: [PATCH 068/503] Update submodule

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index 829afc62e..0c4ac9f02 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 829afc62ec25dc6823fc05d50faa68a52e9f09c7
+Subproject commit 0c4ac9f02aaad606623da98f3d40174bb122e66d

From 3540b1ae38885ac2391ef021962b9d8b849fd68f Mon Sep 17 00:00:00 2001
From: Phenom <retrosharephenom@gmail.com>
Date: Mon, 28 Mar 2022 19:04:02 +0200
Subject: [PATCH 069/503] Fix ElidedLabel when Font size is not defined.

---
 retroshare-gui/src/gui/common/ElidedLabel.cpp          | 3 ++-
 retroshare-gui/src/gui/common/RSElidedItemDelegate.cpp | 9 +++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/common/ElidedLabel.cpp b/retroshare-gui/src/gui/common/ElidedLabel.cpp
index e44927df3..31351b08d 100644
--- a/retroshare-gui/src/gui/common/ElidedLabel.cpp
+++ b/retroshare-gui/src/gui/common/ElidedLabel.cpp
@@ -128,6 +128,7 @@ bool ElidedLabel::paintElidedLine( QPainter* painter, QString plainText
 
 	if (painter)
 	{
+		useFont.setPointSize(useFont.pointSize()); //Modify it to be copied in painter. Else painter keep defaut font size.
 		painter->save();
 		painter->setFont(useFont);
 	}
@@ -152,7 +153,7 @@ bool ElidedLabel::paintElidedLine( QPainter* painter, QString plainText
 			QTextLine lineEnd = textLayout.createLine();
 			if (!lineEnd.isValid() && (wordWrap
 #if QT_VERSION < QT_VERSION_CHECK(5,11,0)
-		                               || (fontMetrics.width(lastLine) < cr.width()) ))
+			                           || (fontMetrics.width(lastLine) < cr.width()) ))
 #else
 			                           || (fontMetrics.horizontalAdvance(lastLine) < cr.width()) ))
 #endif
diff --git a/retroshare-gui/src/gui/common/RSElidedItemDelegate.cpp b/retroshare-gui/src/gui/common/RSElidedItemDelegate.cpp
index 80f37befc..f90591d8c 100644
--- a/retroshare-gui/src/gui/common/RSElidedItemDelegate.cpp
+++ b/retroshare-gui/src/gui/common/RSElidedItemDelegate.cpp
@@ -143,8 +143,7 @@ void RSElidedItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
 		ownOption.font = font;
 		ownOption.fontMetrics = QFontMetrics(font);
 #ifdef DEBUG_EID_PAINT
-		QFontInfo info(font);
-		RsDbg(" RSEID: Found font in model:", info.family().toStdString());
+		RsDbg(" RSEID: Found font in model:", font.family().toStdString(), " size:", font.pointSize());
 #endif
 	}
 	// Get Text color from model if one exists
@@ -383,14 +382,12 @@ void RSElidedItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
 		ownOption.text = ownOption.text.prepend("__");
 #endif
 
-		QTextLayout textLayout(ownOption.text, painter->font());
-		QTextOption to = textLayout.textOption();
-		to.setWrapMode((ownOption.features & QStyleOptionViewItem::WrapText) ? QTextOption::WordWrap : QTextOption::NoWrap);
+		QTextOption::WrapMode wm = (ownOption.features & QStyleOptionViewItem::WrapText) ? QTextOption::WordWrap : QTextOption::NoWrap;
 		const int textHMargin = ownStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr, widget) + 1;
 		const int textVMargin = ownStyle->pixelMetric(QStyle::PM_FocusFrameVMargin, nullptr, widget) + 1;
 		textRect = textRect.adjusted(textHMargin, textVMargin, -textHMargin, -textVMargin); // remove width padding
 
-		ElidedLabel::paintElidedLine(painter,ownOption.text,textRect,ownOption.font,ownOption.displayAlignment,to.wrapMode(),mPaintRoundedRect);
+		ElidedLabel::paintElidedLine(painter,ownOption.text,textRect,ownOption.font,ownOption.displayAlignment,wm,mPaintRoundedRect);
 	}
 	painter->restore();
 #ifdef DEBUG_EID_PAINT

From 2b4e57133251a2d99b5f04ba0210e563cafb9220 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Tue, 29 Mar 2022 09:17:04 +0200
Subject: [PATCH 070/503] Update submodule

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index 0c4ac9f02..ee7bf5e32 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 0c4ac9f02aaad606623da98f3d40174bb122e66d
+Subproject commit ee7bf5e32ba49716a5b800611aa294ba29a5f004

From 065e6946c7a238916c8ba8904e6becc9abd5180a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 29 Mar 2022 22:02:56 +0200
Subject: [PATCH 071/503] improved display in GxsGroupDialog

---
 retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 110 +++++++++---------
 retroshare-gui/src/gui/gxs/GxsGroupDialog.ui  |  34 +++---
 retroshare-gui/src/gui/gxs/GxsIdDetails.cpp   |   8 +-
 retroshare-gui/src/gui/gxs/GxsIdLabel.cpp     |   5 +-
 4 files changed, 85 insertions(+), 72 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index f51c73be3..c6c3e8078 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -410,11 +410,8 @@ void GxsGroupDialog::setupReadonly()
 {
 
 	ui.publishGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PUBLISHSIGN));
-
 	ui.pubKeyShare_cb->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_SHAREKEYS));
-
 	ui.personalGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PERSONALSIGN));
-	
 	ui.idChooser->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_PERSONALSIGN));
 
 	//ui.distribGroupBox_2->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DISTRIBUTION));
@@ -470,7 +467,9 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description)
     ui.createdline->setText(DateTime::formatLongDateTime(mGrpMeta.mPublishTs));
 
 	link = RetroShareLink::createMessage(mGrpMeta.mAuthorId, "");
-	ui.authorValueLabel->setText(link.toHtml());
+
+    if(!mGrpMeta.mAuthorId.isNull())
+        ui.authorValueLabel->setText(link.toHtml());
 	
     ui.IDline->setText(QString::fromStdString(mGrpMeta.mGroupId.toStdString()));
     ui.descriptiontextEdit->setPlainText(description);
@@ -721,55 +720,57 @@ uint32_t GxsGroupDialog::getGroupSignFlags()
 
 void GxsGroupDialog::setGroupSignFlags(uint32_t signFlags)
 {
-	if (signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_ENCRYPTED) {
-		ui.publish_encrypt->setChecked(true);
-	} else if (signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_ALLSIGNED) {
-		ui.publish_required->setChecked(true);
-	} else if (signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_THREADHEAD) {
-		ui.publish_threads->setChecked(true);
-	} else if (signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_NONEREQ) {
-		ui.publish_open->setChecked(true);
-	}
+    if (signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_ENCRYPTED)
+        ui.publish_encrypt->setChecked(true);
+    else if (signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_ALLSIGNED)
+        ui.publish_required->setChecked(true);
+    else if (signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_THREADHEAD)
+        ui.publish_threads->setChecked(true);
+    else if (signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_NONEREQ)
+        ui.publish_open->setChecked(true);
 
-	if (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_REQUIRED) 
-		ui.personal_required->setChecked(true);
-    
-	if (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_IFNOPUBSIGN) 
-		ui.personal_ifnopub->setChecked(true);
-    
-        		if( (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN) && (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG))
-                    ui.antiSpam_perms_CB->setCurrentIndex(2) ;
-                else if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG)
-                    ui.antiSpam_perms_CB->setCurrentIndex(1) ;
-		else
-                    ui.antiSpam_perms_CB->setCurrentIndex(0) ;
-                
-        QString antispam_string ;
-        if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES) antispam_string += tr("Message tracking") ;
-	if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN)      antispam_string += (antispam_string.isNull()?"":" and ")+tr("PGP signature from known ID required") ;
-    	else
-	if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG)            antispam_string += (antispam_string.isNull()?"":" and ")+tr("PGP signature required") ;
-    
-    	ui.antiSpamValueLabel->setText(antispam_string) ;
-		//ui.antiSpam_trackMessages_2->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES) );
-		//ui.antiSpam_signedIds_2    ->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) );
-		//ui.SignEdIds->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) );
-		//ui.trackmessagesradioButton->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES) );
-    
-	/* guess at comments */
-	if ((signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_THREADHEAD) &&
-	    (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_IFNOPUBSIGN))
-	{
-        	// (cyril) very weird piece of code. Need to clear this up.
-        
-		ui.comments_allowed->setChecked(true);
-		ui.commentsValueLabel->setText("Allowed") ;
-	}
-	else
-	{
-		ui.comments_no->setChecked(true);
-		ui.commentsValueLabel->setText("Forbidden") ;
-	}
+
+    if (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_REQUIRED)
+        ui.personal_required->setChecked(true);
+
+    if (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_IFNOPUBSIGN)
+        ui.personal_ifnopub->setChecked(true);
+
+    if( (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN) && (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG))
+        ui.antiSpam_perms_CB->setCurrentIndex(2) ;
+    else if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG)
+        ui.antiSpam_perms_CB->setCurrentIndex(1) ;
+    else
+        ui.antiSpam_perms_CB->setCurrentIndex(0) ;
+
+    QString antispam_string ;
+    if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES) antispam_string += tr("Message tracking") ;
+    if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN)      antispam_string += (antispam_string.isNull()?"":" and ")+tr("PGP signature from known ID required") ;
+    else if(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG)        antispam_string += (antispam_string.isNull()?"":" and ")+tr("PGP signature required") ;
+
+    if(antispam_string.isNull())
+            antispam_string = tr("[None]");
+
+    ui.antiSpamValueLabel->setText(antispam_string) ;
+    //ui.antiSpam_trackMessages_2->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES) );
+    //ui.antiSpam_signedIds_2    ->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) );
+    //ui.SignEdIds->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) );
+    //ui.trackmessagesradioButton->setChecked((bool)(signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_TRACK_MESSAGES) );
+
+    /* guess at comments */
+    if ((signFlags & GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_THREADHEAD) &&
+                    (signFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_IFNOPUBSIGN))
+    {
+        // (cyril) very weird piece of code. Need to clear this up.
+
+        ui.comments_allowed->setChecked(true);
+        ui.commentsValueLabel->setText("Allowed") ;
+    }
+    else
+    {
+        ui.comments_no->setChecked(true);
+        ui.commentsValueLabel->setText("Forbidden") ;
+    }
 }
 
 /**** Above logic is flawed, and will be removed shortly
@@ -915,7 +916,10 @@ void GxsGroupDialog::setSelectedModerators(const std::set<RsGxsId>& ids)
 				moderatorsListString += link.toHtml() + "   ";
 
     }
-	//ui.moderatorsValueLabel->setId(det.mId);
+
+    if(moderatorsListString.isNull())
+        moderatorsListString = tr("[None]");
+
 	ui.moderatorsValueLabel->setText(moderatorsListString);
 }
 
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
index b42e777de..11dcb0613 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>701</width>
-    <height>529</height>
+    <width>746</width>
+    <height>590</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,7 +44,7 @@
       <enum>QFrame::Raised</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="createmode">
       <layout class="QGridLayout" name="createmode_GL">
@@ -575,7 +575,7 @@
           <item row="10" column="0">
            <widget class="QLabel" name="authorLabel">
             <property name="text">
-             <string>Author</string>
+             <string>Author:</string>
             </property>
            </widget>
           </item>
@@ -739,7 +739,11 @@
            </widget>
           </item>
           <item row="4" column="2">
-           <widget class="QLineEdit" name="createdline"/>
+           <widget class="QLineEdit" name="createdline">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
           <item row="4" column="0">
            <widget class="QLabel" name="createdlineLabel">
@@ -820,6 +824,16 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>GxsIdLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/gxs/GxsIdLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>RSComboBox</class>
+   <extends>QComboBox</extends>
+   <header>gui/common/RSComboBox.h</header>
+  </customwidget>
   <customwidget>
    <class>ClickableLabel</class>
    <extends>QLabel</extends>
@@ -846,11 +860,6 @@
    <extends>QComboBox</extends>
    <header>gui/gxs/GxsIdChooser.h</header>
   </customwidget>
-  <customwidget>
-   <class>GxsIdLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/gxs/GxsIdLabel.h</header>
-  </customwidget>
   <customwidget>
    <class>HeaderFrame</class>
    <extends>QFrame</extends>
@@ -862,11 +871,6 @@
    <extends>QTextEdit</extends>
    <header location="global">gui/common/MimeTextEdit.h</header>
   </customwidget>
-  <customwidget>
-   <class>RSComboBox</class>
-   <extends>QComboBox</extends>
-   <header>gui/common/RSComboBox.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../icons.qrc"/>
diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
index 338c8aabf..b1961a6e6 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
@@ -1073,11 +1073,13 @@ bool GxsIdDetails::MakeIdDesc(const RsGxsId &id, bool doIcons, QString &str, QLi
 
 QString GxsIdDetails::getName(const RsIdentityDetails &details)
 {
-	if( details.mReputation.mOverallReputationLevel ==
-	         RsReputationLevel::LOCALLY_NEGATIVE )
+    if( details.mReputation.mOverallReputationLevel == RsReputationLevel::LOCALLY_NEGATIVE )
 		return tr("[Banned]");
     
-    	QString name = QString::fromUtf8(details.mNickname.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE);
+    if( details.mId.isNull() )
+        return tr("[Nobody]");
+
+        QString name = QString::fromUtf8(details.mNickname.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE);
 
 	std::list<RsRecognTag>::const_iterator it;
 	for (it = details.mRecognTags.begin(); it != details.mRecognTags.end(); ++it)
diff --git a/retroshare-gui/src/gui/gxs/GxsIdLabel.cpp b/retroshare-gui/src/gui/gxs/GxsIdLabel.cpp
index 6cb741d14..62c15a699 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdLabel.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdLabel.cpp
@@ -60,7 +60,10 @@ void GxsIdLabel::setId(const RsGxsId &id)
 {
 	mId = id;
 
-	GxsIdDetails::process(mId, fillLabelCallback, this);
+    if(id.isNull())
+        setText(tr("[Nobody]"));
+    else
+        GxsIdDetails::process(mId, fillLabelCallback, this);
 }
 
 bool GxsIdLabel::getId(RsGxsId &id)

From 2cff9c8eb2ca8269397a78ca5ca937f3992498b5 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 30 Mar 2022 17:06:49 +0200
Subject: [PATCH 072/503] fixed compilation

---
 retroshare-gui/src/gui/FileTransfer/DLListDelegate.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
index 109d16ed3..19b9306a5 100644
--- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
+++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.h
@@ -22,7 +22,6 @@
 
 #include <QAbstractItemDelegate>
 #include "xprogressbar.h"
-#include "FTListDelegate.h"
 
 class QModelIndex;
 class QPainter;

From 36d3f1899ee98a5085a6d4c7fe418a07012085fe Mon Sep 17 00:00:00 2001
From: RETROSHARE Phenom <phenom@iMac-de-RETROSHARE-Phenom.local>
Date: Sat, 2 Apr 2022 14:30:18 +0200
Subject: [PATCH 073/503] Fix MacOS build

Need to use:
CONFIG+=rs_macos11.1 CONFIG+=no_rs_sam3 CONFIG+=no_rs_sam3_libsam3
CONFIG+=c++14
---
 retroshare-gui/src/gui/settings/ServerPage.cpp |  4 ++++
 retroshare.pri                                 | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index f840f90a6..5089bd90c 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -47,7 +47,9 @@
 #include <QTcpSocket>
 #include <QTimer>
 
+#ifdef RS_USE_I2P_SAM3
 #include <libsam3.h>
+#endif
 
 #define ICON_STATUS_UNKNOWN ":/images/ledoff1.png"
 #define ICON_STATUS_WORKING ":/images/yellowled.png"
@@ -1562,6 +1564,7 @@ void ServerPage::syncI2PProxyAddrSam(QString t)
 
 void ServerPage::taskFinished(taskTicket *&ticket)
 {
+#ifdef RS_USE_I2P_SAM3
 	switch (ticket->task) {
 	case autoProxyTask::receiveKey:
 	{
@@ -1629,6 +1632,7 @@ void ServerPage::taskFinished(taskTicket *&ticket)
 
     delete ticket;
 	ticket = nullptr;
+ #endif //RS_USE_I2P_SAM3
 }
 
 void ServerPage::connectionWithoutCert()
diff --git a/retroshare.pri b/retroshare.pri
index ce1bccc06..9ed316b9a 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -140,6 +140,7 @@ rs_macos10.12:CONFIG -= rs_macos10.11
 rs_macos10.13:CONFIG -= rs_macos10.11
 rs_macos10.14:CONFIG -= rs_macos10.11
 rs_macos10.15:CONFIG -= rs_macos10.11
+rs_macos11.1:CONFIG -= rs_macos10.11
 
 # To enable JSON API append the following assignation to qmake command line
 # "CONFIG+=rs_jsonapi"
@@ -790,6 +791,13 @@ macx-* {
 		QMAKE_CXXFLAGS += -Wno-nullability-completeness
 		QMAKE_CFLAGS += -Wno-nullability-completeness
 	}
+	rs_macos11.1 {
+		message(***retroshare.pri: Set Target and SDK to MacOS 11.1 )
+		QMAKE_MACOSX_DEPLOYMENT_TARGET=11.1
+		QMAKE_MAC_SDK = macosx11.1
+		QMAKE_CXXFLAGS += -Wno-nullability-completeness
+		QMAKE_CFLAGS += -Wno-nullability-completeness
+	}
 
 
 
@@ -798,6 +806,10 @@ macx-* {
 	INCLUDEPATH += "/usr/local/include"
 	RS_UPNP_LIB = miniupnpc
 	QT += macextras
+	INCLUDEPATH += "/usr/local/opt/openssl/include"
+	QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"
+	QMAKE_LIBDIR += "/usr/local/opt/sqlcipher/lib"
+	QMAKE_LIBDIR += "/usr/local/opt/miniupnpc/lib"
 }
 
 # If not yet defined attempt UPnP library autodetection should works at least

From 1085592449b47f89b7ef908b661665c31f3238d5 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 2 Apr 2022 16:53:29 +0200
Subject: [PATCH 074/503] turned drop menu for forum display type into a tool
 button group

---
 .../gui/gxsforums/GxsForumThreadWidget.cpp    | 41 +++++++---
 .../src/gui/gxsforums/GxsForumThreadWidget.h  |  8 +-
 .../src/gui/gxsforums/GxsForumThreadWidget.ui | 75 ++++++++++++++-----
 retroshare-gui/src/gui/icons.qrc              |  3 +
 .../src/gui/icons/svg/flat-view.svg           | 42 +++++++++++
 .../src/gui/icons/svg/lastpost-view.svg       | 52 +++++++++++++
 .../src/gui/icons/svg/threaded-view.svg       | 42 +++++++++++
 7 files changed, 234 insertions(+), 29 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/svg/flat-view.svg
 create mode 100644 retroshare-gui/src/gui/icons/svg/lastpost-view.svg
 create mode 100644 retroshare-gui/src/gui/icons/svg/threaded-view.svg

diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index 19c408336..e965dff4f 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -291,7 +291,6 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
 
     connect(ui->threadTreeWidget, SIGNAL(clicked(QModelIndex)), this, SLOT(clickedThread(QModelIndex)));
     connect(ui->threadTreeWidget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(changedSelection(const QModelIndex&,const QModelIndex&)));
-    connect(ui->viewBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changedViewBox()));
 
     //connect(ui->expandButton, SIGNAL(clicked()), this, SLOT(togglethreadview()));
     ui->expandButton->hide();
@@ -306,6 +305,10 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
 
     connect(ui->actionSave_image, SIGNAL(triggered()), this, SLOT(saveImage()));
 
+    connect(ui->threadedView_TB, SIGNAL(toggled(bool)), this, SLOT(toggleThreadedView(bool)));
+    connect(ui->flatView_TB, SIGNAL(toggled(bool)), this, SLOT(toggleFlatView(bool)));
+    connect(ui->latestPostInThreadView_TB, SIGNAL(toggled(bool)), this, SLOT(toggleLstPostInThreadView(bool)));
+
     /* Set own item delegate */
     RSElidedItemDelegate *itemDelegate = new RSElidedItemDelegate(this);
     itemDelegate->setSpacing(QSize(0, 2));
@@ -419,7 +422,9 @@ void GxsForumThreadWidget::blank()
     ui->forumName->setText("");
     ui->progressText->hide();
     ui->progressBar->hide();
-    ui->viewBox->setEnabled(false);
+    ui->threadedView_TB->setEnabled(false);
+    ui->flatView_TB->setEnabled(false);
+    ui->latestPostInThreadView_TB->setEnabled(false);
     ui->filterLineEdit->setEnabled(false);
 
     mThreadModel->clear();
@@ -454,7 +459,13 @@ void GxsForumThreadWidget::processSettings(bool load)
         ui->filterLineEdit->setCurrentFilter(Settings->value("filterColumn", RsGxsForumModel::COLUMN_THREAD_TITLE).toInt());
 
         // index of viewBox
-        ui->viewBox->setCurrentIndex(Settings->value("viewBox", VIEW_THREADED).toInt());
+        switch(Settings->value("viewBox", VIEW_THREADED).toInt())
+        {
+        default:
+        case VIEW_THREADED : ui->threadedView_TB->setChecked(true);  break;
+        case VIEW_FLAT     : ui->flatView_TB->setChecked(true);  break;
+        case VIEW_LAST_POST: ui->latestPostInThreadView_TB->setChecked(true);  break;
+        }
 
         // state of thread tree
         header->restoreState(Settings->value("ThreadTree").toByteArray());
@@ -1048,7 +1059,9 @@ void GxsForumThreadWidget::updateForumDescription(bool success)
 
     ui->newthreadButton->show();
     ui->forumName->setText(QString::fromUtf8(group.mMeta.mGroupName.c_str()));
-    ui->viewBox->setEnabled(true);
+    ui->flatView_TB->setEnabled(true);
+    ui->threadedView_TB->setEnabled(true);
+    ui->latestPostInThreadView_TB->setEnabled(true);
     ui->filterLineEdit->setEnabled(true);
 
     QString anti_spam_features1 ;
@@ -1817,21 +1830,25 @@ void GxsForumThreadWidget::saveImage()
     ImageUtil::extractImage(window(), cursor);
 }
 
-void GxsForumThreadWidget::changedViewBox()
+void GxsForumThreadWidget::toggleThreadedView(bool b)        { if(b) changedViewBox(VIEW_THREADED); }
+void GxsForumThreadWidget::toggleFlatView(bool b)            { if(b) changedViewBox(VIEW_FLAT); }
+void GxsForumThreadWidget::toggleLstPostInThreadView(bool b) { if(b) changedViewBox(VIEW_LAST_POST); }
+
+void GxsForumThreadWidget::changedViewBox(int view_mode)
 {
 	ui->threadTreeWidget->selectionModel()->clear();
 	ui->threadTreeWidget->selectionModel()->reset();
 	mThreadId.clear();
 
 	// save index
-	Settings->setValueToGroup("ForumThreadWidget", "viewBox", ui->viewBox->currentIndex());
+    Settings->setValueToGroup("ForumThreadWidget", "viewBox", view_mode);
 
-	if(ui->viewBox->currentIndex() == VIEW_FLAT)
+    if(view_mode == VIEW_FLAT)
 		mThreadModel->setTreeMode(RsGxsForumModel::TREE_MODE_FLAT);
 	else
 		mThreadModel->setTreeMode(RsGxsForumModel::TREE_MODE_TREE);
 
-	if(ui->viewBox->currentIndex() == VIEW_LAST_POST)
+    if(view_mode == VIEW_LAST_POST)
 		mThreadModel->setSortMode(RsGxsForumModel::SORT_MODE_CHILDREN_PUBLISH_TS);
 	else
 		mThreadModel->setSortMode(RsGxsForumModel::SORT_MODE_PUBLISH_TS);
@@ -1960,8 +1977,12 @@ void GxsForumThreadWidget::postForumLoading()
 	ui->forumName->setText(QString::fromUtf8(mForumGroup.mMeta.mGroupName.c_str()));
 	ui->threadTreeWidget->sortByColumn(RsGxsForumModel::COLUMN_THREAD_DATE, Qt::DescendingOrder);
 	ui->threadTreeWidget->update();
-	ui->viewBox->setEnabled(true);
-	ui->filterLineEdit->setEnabled(true);
+    ui->threadedView_TB->setEnabled(true);
+    ui->flatView_TB->setEnabled(true);
+    ui->flatView_TB->setEnabled(true);
+    ui->threadedView_TB->setEnabled(true);
+    ui->latestPostInThreadView_TB->setEnabled(true);
+    ui->filterLineEdit->setEnabled(true);
 
 	recursRestoreExpandedItems(mThreadProxyModel->mapFromSource(mThreadModel->root()),mSavedExpandedMessages);
 	//mUpdating = false;
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
index 29e56268f..6ca892e54 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
@@ -122,7 +122,11 @@ private slots:
 	void replytoforummessage();
 	void editforummessage();
 
-	void replyMessageData(const RsGxsForumMsg &msg);
+    void toggleThreadedView(bool);
+    void toggleFlatView(bool);
+    void toggleLstPostInThreadView(bool);
+
+    void replyMessageData(const RsGxsForumMsg &msg);
 	void editForumMessageData(const RsGxsForumMsg &msg);
 	void replyForumMessageData(const RsGxsForumMsg &msg);
 	void showAuthorInPeople(const RsGxsForumMsg& msg);
@@ -153,7 +157,7 @@ private slots:
 	void nextUnreadMessage();
 	void downloadAllFiles();
 
-	void changedViewBox();
+    void changedViewBox(int);
 	void flagperson();
 
 	void filterColumnChanged(int column);
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index c74ea5ebb..0682550cb 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
+    <width>848</width>
     <height>600</height>
    </rect>
   </property>
@@ -196,22 +196,63 @@
            </widget>
           </item>
           <item>
-           <widget class="RSComboBox" name="viewBox">
-            <item>
-             <property name="text">
-              <string>Lastest post in thread</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Threaded View</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Flat View</string>
-             </property>
-            </item>
+           <widget class="QToolButton" name="threadedView_TB">
+            <property name="toolTip">
+             <string>Threaded</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/svg/threaded-view.svg</normaloff>:/icons/svg/threaded-view.svg</iconset>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="autoExclusive">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="flatView_TB">
+            <property name="toolTip">
+             <string>Flat</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/svg/flat-view.svg</normaloff>:/icons/svg/flat-view.svg</iconset>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="autoExclusive">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="latestPostInThreadView_TB">
+            <property name="toolTip">
+             <string>Latest post in thread</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/svg/lastpost-view.svg</normaloff>:/icons/svg/lastpost-view.svg</iconset>
+            </property>
+            <property name="checkable">
+             <bool>true</bool>
+            </property>
+            <property name="autoExclusive">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index c5db35fa0..60cb262ca 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -1,6 +1,9 @@
 <RCC>
     <qresource prefix="/">
         <file>icons/onion.png</file>
+        <file>icons/svg/threaded-view.svg</file>
+        <file>icons/svg/flat-view.svg</file>
+        <file>icons/svg/lastpost-view.svg</file>
         <file>icons/svg/design.svg</file>
         <file>icons/svg/hidden.svg</file>
         <file>icons/svg/ratio-auto.svg</file>
diff --git a/retroshare-gui/src/gui/icons/svg/flat-view.svg b/retroshare-gui/src/gui/icons/svg/flat-view.svg
new file mode 100644
index 000000000..b08a1a281
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/flat-view.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="flat-view.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="21.666667"
+     inkscape:cx="11.976923"
+     inkscape:cy="14.284615"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid861" />
+  </sodipodi:namedview>
+  <path
+     d="M 7.838215,3.3529412 V 8.023513 H 21.849931 V 3.3529412 M 7.838215,19.699941 H 21.849931 V 15.029373 H 7.838215 m 0,-1.167644 H 21.849931 V 9.1911557 H 7.838215 M 2,8.023513 H 6.6705718 V 3.3529412 H 2 M 2,19.699941 H 6.6705718 V 15.029373 H 2 M 2,13.861729 H 6.6705718 V 9.1911557 H 2 Z"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1;stroke-width:1.16763" />
+</svg>
diff --git a/retroshare-gui/src/gui/icons/svg/lastpost-view.svg b/retroshare-gui/src/gui/icons/svg/lastpost-view.svg
new file mode 100644
index 000000000..16d0807e0
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/lastpost-view.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   id="svg4155"
+   version="1.1"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xml:space="preserve"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="lastpost.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     id="namedview4157"
+     showgrid="true"
+     inkscape:zoom="2.559375"
+     inkscape:cx="50.989012"
+     inkscape:cy="70.525031"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4163"
+     inkscape:pagecheckerboard="0"><inkscape:grid
+       type="xygrid"
+       id="grid1000" /></sodipodi:namedview><g
+     id="g4163"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+       style="fill:#039bd5;fill-opacity:1;stroke-width:0.17417"
+       d="m 47.937786,-33.592704 c -2.195225,0.591202 -3.96008,2.011428 -4.908361,3.94989 -0.657422,1.343879 -0.885211,2.505371 -0.885211,4.513722 v 1.543723 h 7.576248 7.576243 v -2.008406 c 0,-1.569306 -0.07866,-2.242047 -0.35999,-3.077018 -1.264976,-3.755027 -5.246239,-5.932553 -8.998929,-4.921911 z M 8.9114622,-17.659241 c -1.1381664,0.693924 -1.0973712,0.05515 -1.0320513,16.1595845 0.065262,16.0902865 0.00892,15.2373095 1.2192521,18.4595695 0.970175,2.582889 2.052272,4.220688 4.222592,6.390995 2.033849,2.033862 3.662408,3.152185 5.938844,4.078197 6.902518,2.807822 14.647617,1.166897 19.863655,-4.208426 2.952445,-3.042606 4.596608,-6.449549 5.103339,-10.574835 0.112417,-0.915188 0.181283,-7.0188401 0.181283,-16.0668641 V -18.012037 l -17.460193,6.94e-4 c -17.205424,7e-4 -17.4686098,0.0057 -18.0367208,0.352147 z m 26.7952308,6.48324 c 1.380323,0.696056 1.386149,0.728115 1.386149,7.6197876 0,6.7259344 -0.02415,6.876174 -1.218625,7.57032 -0.59212,0.3441097 -0.874028,0.3542584 -9.84041,0.3542584 h -9.23083 L 16.234308,3.962759 c -1.084414,-0.7734669 -1.085912,-0.7838002 -1.085912,-7.5189724 0,-5.0656377 0.0443,-6.1988228 0.258627,-6.6132466 0.278862,-0.539271 1.009156,-1.130339 1.570125,-1.270796 0.191584,-0.04795 4.309254,-0.09631 9.150385,-0.107416 8.801025,-0.02022 8.802134,-0.02017 9.57916,0.371671 z m -15.507462,7.6197876 v 2.96083152 h 5.921655 5.921667 V -3.5562134 -6.5170448 h -5.921667 -5.921655 z m 29.736881,1.2627076 C 49.873764,12.956614 49.860892,13.473202 49.503826,15.041605 48.37637,19.99395 46.443534,23.634086 43.125741,27.053559 l -1.732128,1.785207 H 53.960572 66.527529 V 20.330661 11.822557 L 65.354553,11.230456 C 61.206464,9.1365834 59.469916,3.9535107 61.509095,-0.24704876 c 0.671166,-1.38254644 2.462068,-3.24113514 3.753867,-3.89574194 3.43729,-1.7418049 7.405445,-1.1373825 10.08202,1.5356822 2.923458,2.91961507 3.446495,7.3504228 1.268375,10.7447307 -0.743063,1.1579669 -2.393539,2.6405978 -3.546947,3.1862458 l -0.965545,0.456779 v 8.494244 8.494245 l 1.415808,-0.136869 c 5.057631,-0.488921 10.14328,-3.301436 13.416779,-7.419863 1.882935,-2.368937 3.043293,-4.731514 3.945751,-8.03381 l 0.456216,-1.669398 0.0576,-13.7875249 c 0.06374,-15.2433331 0.101305,-14.6864341 -1.037769,-15.3809121 -0.569352,-0.347119 -0.824017,-0.3515 -20.465724,-0.352147 l -19.889205,-6.49e-4 z m 18.07184,2.98040769 C 66.386886,1.4401741 65.749175,3.2829955 66.542478,4.9217444 c 1.142589,2.3602739 4.470961,2.2422515 5.579341,-0.1978411 0.405948,-0.8936972 0.404373,-1.562476 -0.0058,-2.465756 C 71.628568,1.1847953 70.717221,0.56890065 69.514877,0.500286 68.923624,0.4665455 68.321766,0.541079 68.007952,0.68690189 Z M 66.527529,44.086991 c 0,8.307237 0.03736,9.747115 0.264202,10.185789 0.556264,1.075705 0.0757,1.039304 13.720562,1.039304 11.825221,0 12.448695,-0.01559 12.722813,-0.318512 0.158534,-0.175172 0.288242,-0.432111 0.288242,-0.570973 0,-0.138852 -0.615433,-1.3588 -1.367625,-2.710971 -0.752192,-1.352182 -1.420107,-2.595282 -1.484254,-2.762444 -0.07801,-0.203371 0.374467,-1.207564 1.367624,-3.035032 0.816339,-1.502109 1.484255,-2.850609 1.484255,-2.996669 0,-0.14607 -0.143329,-0.395277 -0.318503,-0.553811 C 92.915961,42.102228 91.919742,42.07542 82.493599,42.07542 H 72.100865 v -3.831664 -3.831664 h -2.786668 -2.786668 z"
+       id="path1038" /></g></svg>
diff --git a/retroshare-gui/src/gui/icons/svg/threaded-view.svg b/retroshare-gui/src/gui/icons/svg/threaded-view.svg
new file mode 100644
index 000000000..4210acc40
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/threaded-view.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg4"
+   sodipodi:docname="threaded-view.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="true"
+     inkscape:zoom="21.666667"
+     inkscape:cx="12.023077"
+     inkscape:cy="12.023077"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1133" />
+  </sodipodi:namedview>
+  <path
+     d="M3,3H9V7H3V3M15,10H21V14H15V10M15,17H21V21H15V17M13,13H7V18H13V20H7L5,20V9H7V11H13V13Z"
+     id="path2"
+     style="fill:#039bd5;fill-opacity:1" />
+</svg>

From 52d1e505ad3b152f9b644433d0b5176d0e2c5e71 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 5 Apr 2022 16:39:28 +0200
Subject: [PATCH 075/503] Added remove Avatar button

* Added remove Avatar button
---
 .../src/gui/Identity/IdEditDialog.cpp         | 25 +++++++++++++++++++
 .../src/gui/Identity/IdEditDialog.h           |  2 ++
 .../src/gui/Identity/IdEditDialog.ui          |  7 ++++++
 3 files changed, 34 insertions(+)

diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index 9396a9758..4b5095fb3 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -88,6 +88,7 @@ IdEditDialog::IdEditDialog(QWidget *parent) :
 	connect(ui->toolButton_Tag4, SIGNAL(clicked(bool)), this, SLOT(rmTag4()));
 	connect(ui->toolButton_Tag5, SIGNAL(clicked(bool)), this, SLOT(rmTag5()));
 	connect(ui->avatarButton, SIGNAL(clicked(bool)), this, SLOT(changeAvatar()));
+	connect(ui->removeButton, SIGNAL(clicked(bool)), this, SLOT(removeAvatar()));
 
     connect(ui->avatarLabel,SIGNAL(cleared()),this,SLOT(avatarCleared()));
 
@@ -102,6 +103,8 @@ IdEditDialog::IdEditDialog(QWidget *parent) :
 	ui->plainTextEdit_Tag->hide();
 	ui->label_TagCheck->hide();
 	ui->frame_Tags->setHidden(true);
+
+	updateInterface();
 }
 
 IdEditDialog::~IdEditDialog() {}
@@ -136,6 +139,8 @@ void IdEditDialog::changeAvatar()
 
     // shows the tooltip for a while
     QToolTip::showText( ui->avatarLabel->mapToGlobal( QPoint( 0, 0 ) ), ui->avatarLabel->toolTip() );
+
+	updateInterface();
 }
 
 void IdEditDialog::setupNewId(bool pseudo,bool enable_anon)
@@ -353,6 +358,7 @@ void IdEditDialog::loadExistingId(const RsGxsIdGroup& id_group)
 	ui->frame_Tags->setHidden(true);
 
 	loadRecognTags();
+	updateInterface();
 }
 
 #define MAX_RECOGN_TAGS 	5
@@ -679,3 +685,22 @@ void IdEditDialog::updateId()
 	accept();
 }
 
+void IdEditDialog::removeAvatar()
+{
+	ui->avatarLabel->setPicture(QPixmap());
+	mEditGroup.mImage.clear();
+
+	updateInterface();
+}
+
+void IdEditDialog::updateInterface()
+{
+	const QPixmap *pixmap = ui->avatarLabel->pixmap();
+	if (pixmap && !pixmap->isNull()) {
+		ui->removeButton->setEnabled(true);
+	} else if (mEditGroup.mImage.mSize != NULL) {
+		ui->removeButton->setEnabled(true);
+	} else {
+		ui->removeButton->setEnabled(false);
+	}
+}
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.h b/retroshare-gui/src/gui/Identity/IdEditDialog.h
index 8ee6b15c9..e5482cad5 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.h
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.h
@@ -54,6 +54,8 @@ private slots:
     void avatarCleared();
 
 	void changeAvatar();
+	void removeAvatar();
+	void updateInterface();
 
 	void addRecognTag();
 	void checkNewTag();
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.ui b/retroshare-gui/src/gui/Identity/IdEditDialog.ui
index 1b4e53186..d0a625c00 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.ui
@@ -369,6 +369,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QPushButton" name="removeButton">
+            <property name="text">
+             <string>Remove</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <spacer name="avatarVSpacer">
             <property name="orientation">

From de87938e6e1cd806d2ba3c5fe69a436dcbed0a1b Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Wed, 13 Apr 2022 12:01:01 +0200
Subject: [PATCH 076/503] Update libretroshare submodule

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index ee7bf5e32..72f8b7e8e 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit ee7bf5e32ba49716a5b800611aa294ba29a5f004
+Subproject commit 72f8b7e8e240923731a141c6f2a0438588f04f59

From 20335cf134eca4ce995715a60fdbbf048ef0c834 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 16 Apr 2022 18:45:38 +0200
Subject: [PATCH 077/503] fixed bug causing hidden nodes to crash at start

---
 retroshare-gui/src/gui/HomePage.cpp   | 21 ++++++++++++---------
 retroshare-gui/src/gui/MainWindow.cpp |  8 ++++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index dec4e9fec..ff7622b4b 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -207,19 +207,22 @@ HomePage::~HomePage()
 
 RetroshareInviteFlags HomePage::currentInviteFlags() const
 {
-     RetroshareInviteFlags invite_flags = RetroshareInviteFlags::NOTHING;
+    RetroshareInviteFlags invite_flags = RetroshareInviteFlags::NOTHING;
 
-    if(mIncludeLocIPact->isChecked())
-        invite_flags |= RetroshareInviteFlags::CURRENT_LOCAL_IP;
+    if(!RsAccounts::isHiddenNode())
+    {
+        if(mIncludeLocIPact->isChecked())
+            invite_flags |= RetroshareInviteFlags::CURRENT_LOCAL_IP;
 
-    if(mIncludeExtIPact->isChecked())
-        invite_flags |= RetroshareInviteFlags::CURRENT_EXTERNAL_IP;
+        if(mIncludeExtIPact->isChecked())
+            invite_flags |= RetroshareInviteFlags::CURRENT_EXTERNAL_IP;
 
-    if(mIncludeDNSact->isChecked())
-        invite_flags |= RetroshareInviteFlags::DNS;
+        if(mIncludeDNSact->isChecked())
+            invite_flags |= RetroshareInviteFlags::DNS;
 
-    if(mIncludeIPHistoryact->isChecked())
-        invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
+        if(mIncludeIPHistoryact->isChecked())
+            invite_flags |= RetroshareInviteFlags::FULL_IP_HISTORY;
+    }
 
     return invite_flags;
 }
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index de2ca8baf..0af20e824 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -485,11 +485,11 @@ void MainWindow::initStackedPage()
   addPage(newsFeed = new NewsFeed(ui->stackPages), grp, &notify);
 
   //List All notify before Setting was created
-  QList<QPair<MainPage*, QPair<QAction*, QListWidgetItem*> > >::iterator notifyIt;
-  for (notifyIt = notify.begin(); notifyIt != notify.end(); ++notifyIt) {
-      UserNotify *userNotify = notifyIt->first->getUserNotify();
+  for (auto notifyIt:notify)
+  {
+      UserNotify *userNotify = notifyIt.first->getUserNotify();
       if (userNotify) {
-          userNotify->initialize(ui->toolBarPage, notifyIt->second.first, notifyIt->second.second);
+          userNotify->initialize(ui->toolBarPage, notifyIt.second.first, notifyIt.second.second);
           connect(userNotify, SIGNAL(countChanged()), this, SLOT(updateTrayCombine()));
           userNotifyList.push_back(userNotify);
       }

From a61bd0a3788bdd12b78b9040c5f7376e29826a95 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 1 May 2022 21:53:00 +0200
Subject: [PATCH 078/503] fixed copy RS link in search dialog when clicking on
 a file with different names

---
 .../src/gui/FileTransfer/SearchDialog.cpp     | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 482ae39cd..b284fce3d 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -1455,33 +1455,40 @@ void SearchDialog::copyResultLink()
 {
     /* should also be able to handle multi-selection */
     QList<QTreeWidgetItem*> itemsForCopy = ui.searchResultWidget->selectedItems();
-    int numdls = itemsForCopy.size();
     QTreeWidgetItem * item;
 
-	QList<RetroShareLink> urls ;
+    std::map<RsFileHash,RetroShareLink> url_map;
 
-    for (int i = 0; i < numdls; ++i) 
-	 {
-		 item = itemsForCopy.at(i);
-		 // call copy
+    for (auto item:itemsForCopy)
+    {
+        // call copy
 
-		 if (!item->childCount()) 
-		 {
-			 std::cerr << "SearchDialog::copyResultLink() Calling set retroshare link";
-			 std::cerr << std::endl;
+        QString fhash = item->text(SR_HASH_COL);
+        RsFileHash hash(fhash.toStdString());
 
-			 QString fhash = item->text(SR_HASH_COL);
-			 qulonglong fsize = item->text(SR_SIZE_COL).toULongLong();
-			 QString fname = item->text(SR_NAME_COL);
+        if(!hash.isNull())
+        {
+            std::cerr << "SearchDialog::copyResultLink() Calling set retroshare link";
+            std::cerr << std::endl;
 
-			RetroShareLink link = RetroShareLink::createFile(fname, fsize, fhash);
-			if (link.valid()) {
-				std::cerr << "new link added to clipboard: " << link.toString().toStdString() << std::endl ;
-				urls.push_back(link) ;
-			}
-		 } 
-	 }
-	 RSLinkClipboard::copyLinks(urls) ;
+            qulonglong fsize = item->text(SR_SIZE_COL).toULongLong();
+            QString fname = item->text(SR_NAME_COL);
+
+            RetroShareLink link = RetroShareLink::createFile(fname, fsize, fhash);
+
+            if (link.valid())
+                url_map[hash] = link;
+        }
+    }
+    QList<RetroShareLink> urls ;
+
+    for(auto link:url_map)
+    {
+        std::cerr << "new link added to clipboard: " << link.second.toString().toStdString() << std::endl ;
+        urls.push_back(link.second);
+    }
+
+    RSLinkClipboard::copyLinks(urls) ;
 }
 
 void SearchDialog::sendLinkTo( )

From c6c6e11bec4a7473c950aac3e499c52e4a388dc9 Mon Sep 17 00:00:00 2001
From: chelovechishko <xaxaxa667@gmail.com>
Date: Tue, 3 May 2022 19:26:45 +0900
Subject: [PATCH 079/503] gui: chat: add auto shrink chattextedit

To shrink text edit form when it is convenient for browsing text browser.
It just shrink/unshrink the edit here and there when switching between chat rooms.

P.S. user should not resize chattextedit when it's shrinked
P.P.S. okey, there is no "unshrink" maybe, but hope it's not big deal
---
 retroshare-gui/src/gui/chat/ChatWidget.cpp    | 73 ++++++++++++++++++-
 retroshare-gui/src/gui/chat/ChatWidget.h      |  5 ++
 retroshare-gui/src/gui/chat/ChatWidget.ui     |  2 +-
 retroshare-gui/src/gui/settings/ChatPage.cpp  |  3 +
 retroshare-gui/src/gui/settings/ChatPage.ui   | 10 +++
 .../src/gui/settings/rsharesettings.cpp       | 10 +++
 .../src/gui/settings/rsharesettings.h         |  3 +
 7 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index a909e3e27..ab198fa33 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -474,6 +474,7 @@ void ChatWidget::processSettings(bool load)
 		// state of splitter
 		ui->chatVSplitter->restoreState(Settings->value("ChatSplitter").toByteArray());
 	} else {
+		shrinkChatTextEdit(false);
 		// save settings
 
 		// state of splitter
@@ -643,6 +644,16 @@ bool ChatWidget::eventFilter(QObject *obj, QEvent *event)
 		}
 
 	} else if (obj == ui->chatTextEdit) {
+		if (chatType() == CHATTYPE_LOBBY) {
+		    #define EVENT_IS(q_event) (event->type() == QEvent::q_event)
+			if (EVENT_IS(FocusIn)) {
+				if (was_shrinked) {
+					shrinkChatTextEdit(false);
+				}
+			}
+			#undef EVENT_IS
+		}
+
 		if (event->type() == QEvent::KeyPress) {
 
 			QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
@@ -905,11 +916,19 @@ void ChatWidget::showEvent(QShowEvent */*event*/)
 	QScrollBar *scrollbar = ui->textBrowser->verticalScrollBar();
 	bool is_scrollbar_at_end = scrollbar->value() == scrollbar->maximum();
 	bool is_chat_text_edit_empty = ui->chatTextEdit->toPlainText().isEmpty();
+	// show event will not be called on every change of focus
 	if (is_scrollbar_at_end || !is_chat_text_edit_empty) {
+		if (!firstShow) {
+			shrinkChatTextEdit(false);
+		}
 		focusDialog();
 	} else {
-		// otherwise focus will be get even not chat itself
+		// otherwise, focus will not even be gotten by chat itself
 		ui->textBrowser->setFocus();
+
+		if (!firstShow && !was_shrinked) {
+			shrinkChatTextEdit(true);
+		}
 	}
 	ChatUserNotify::clearWaitingChat(chatId);
 
@@ -923,6 +942,11 @@ void ChatWidget::showEvent(QShowEvent */*event*/)
 
 void ChatWidget::resizeEvent(QResizeEvent */*event*/)
 {
+	// it's about resize all chat window, not about chattextedit
+	// just unshrink it and do not bother
+	if (was_shrinked) {
+		shrinkChatTextEdit(false);
+	}
 	// Workaround: now the scroll position is correct calculated
 	QScrollBar *scrollbar = ui->textBrowser->verticalScrollBar();
 	scrollbar->setValue(scrollbar->maximum());
@@ -1967,3 +1991,50 @@ void ChatWidget::saveSticker()
 	filename = Emoticons::importedStickerPath() + "/" + filename + ".png";
 	ImageUtil::extractImage(window(), cursor, filename);
 }
+
+void ChatWidget::shrinkChatTextEdit(bool shrink_me)
+{
+	// here and at eventfiltert check
+	if (chatType() != CHATTYPE_LOBBY)
+		return;
+	if (!Settings->getShrinkChatTextEdit()) {
+		if (was_shrinked) {
+			ui->chatVSplitter->setSizes(_chatvsplitter_saved_size);
+		}
+		_chatvsplitter_saved_size.clear();
+		was_shrinked = false;
+	}
+
+	if (Settings->getShrinkChatTextEdit()) {
+		if (shrink_me) {
+			if (!was_shrinked) {
+				_chatvsplitter_saved_size = ui->chatVSplitter->sizes();
+
+				QList<int> shrinked_v_splitter_size = _chatvsplitter_saved_size;
+				// #define TEXT_BROWSER ui->chatVSplitter->indexOf(ui->textBrowser)
+				#define TEXT_BROWSER 0
+				// when you will update the layout one more time change this appropriately
+				// #define BELOW_TEXT_BROWSER ui->chatVSplitter->indexOf(ui->chatVSplitter->widget(1))
+				#define BELOW_TEXT_BROWSER 1
+				int height_diff = shrinked_v_splitter_size[BELOW_TEXT_BROWSER] - ui->chatTextEdit->minimumHeight(); 
+				shrinked_v_splitter_size[BELOW_TEXT_BROWSER] = ui->chatTextEdit->minimumHeight();
+				shrinked_v_splitter_size[TEXT_BROWSER] += height_diff;
+				ui->chatVSplitter->setSizes( shrinked_v_splitter_size );
+				#undef TEXT_BROWSER
+				#undef BELOW_TEXT_BROWSER
+				was_shrinked = true;
+			}
+		} else { // (!shrink_me)
+			if (was_shrinked) {
+				// to not shrink/unshrink at every entry into chat
+				// when unshrinked state is enough to a browser be scrollable, but shrinked - not
+				QScrollBar *scrollbar = ui->textBrowser->verticalScrollBar();
+				bool is_scrollbar_at_end = scrollbar->value() == scrollbar->maximum();
+				ui->chatVSplitter->setSizes(_chatvsplitter_saved_size);
+				if (is_scrollbar_at_end)
+					scrollbar->setValue(scrollbar->maximum());
+				was_shrinked = false;
+			}
+		}
+	}
+}
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.h b/retroshare-gui/src/gui/chat/ChatWidget.h
index b9ff7086f..82fb6a486 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.h
+++ b/retroshare-gui/src/gui/chat/ChatWidget.h
@@ -215,6 +215,8 @@ private:
 	void completeNickname(bool reverse);
     QAbstractItemModel *modelFromPeers();
 
+    void shrinkChatTextEdit(bool shrink_me);
+
     ChatId chatId;
 	QString title;
 	QString name;
@@ -264,6 +266,9 @@ private:
 	QCompleter *completer;
 	ImHistoryBrowser* imBrowser;
 
+	QList<int> _chatvsplitter_saved_size;
+	bool was_shrinked = false;
+
 	QList<ChatWidgetHolder*> mChatWidgetHolder;
 	ChatLobbyUserNotify* notify;
 
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui
index 879c99d00..d46093071 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.ui
+++ b/retroshare-gui/src/gui/chat/ChatWidget.ui
@@ -661,7 +661,7 @@ border-image: url(:/images/closepressed.png)
                <property name="minimumSize">
                 <size>
                  <width>0</width>
-                 <height>30</height>
+                 <height>40</height>
                 </size>
                </property>
                <property name="placeholderText">
diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp
index b240e216d..86cfaf816 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChatPage.cpp
@@ -135,6 +135,7 @@ void ChatPage::updateChatParams()
 	Settings->setChatSendAsPlainTextByDef(ui.sendAsPlainTextByDef->isChecked());
 	Settings->setChatLoadEmbeddedImages(ui.loadEmbeddedImages->isChecked());
 	Settings->setChatDoNotSendIsTyping(ui.DontSendTyping->isChecked());
+	Settings->setShrinkChatTextEdit(ui.shrinkChatTextEdit->isChecked());
 }
 
 void ChatPage::updateChatSearchParams()
@@ -248,6 +249,7 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags)
 	connect(ui.sendAsPlainTextByDef,       SIGNAL(toggled(bool)),            this, SLOT(updateChatParams()));
 	connect(ui.loadEmbeddedImages,         SIGNAL(toggled(bool)),            this, SLOT(updateChatParams()));
 	connect(ui.DontSendTyping,             SIGNAL(toggled(bool)),            this, SLOT(updateChatParams()));
+	connect(ui.shrinkChatTextEdit,         SIGNAL(toggled(bool)),            this, SLOT(updateChatParams()));
 
 	connect(ui.sbSearch_CharToStart,       SIGNAL(valueChanged(int)),        this, SLOT(updateChatSearchParams()));
 	connect(ui.cbSearch_CaseSensitively,   SIGNAL(toggled(bool)),            this, SLOT(updateChatSearchParams()));
@@ -403,6 +405,7 @@ ChatPage::load()
     whileBlocking(ui.sendAsPlainTextByDef)->setChecked(Settings->getChatSendAsPlainTextByDef());
     whileBlocking(ui.loadEmbeddedImages)->setChecked(Settings->getChatLoadEmbeddedImages());
     whileBlocking(ui.DontSendTyping)->setChecked(Settings->getChatDoNotSendIsTyping());
+    whileBlocking(ui.shrinkChatTextEdit)->setChecked(Settings->getShrinkChatTextEdit());
 
 	std::string advsetting;
 	if(rsConfig->getConfigurationOption(RS_CONFIG_ADVANCED, advsetting) && (advsetting == "YES"))
diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui
index f33362563..0f60752ac 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.ui
+++ b/retroshare-gui/src/gui/settings/ChatPage.ui
@@ -95,6 +95,16 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QCheckBox" name="shrinkChatTextEdit">
+                <property name="toolTip">
+                 <string>When focus on text browser after showing chat room</string>
+                </property>
+                <property name="text">
+                 <string>Shrink text edit field when not needed</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index 3411c78f7..586d4df4f 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -537,6 +537,16 @@ void RshareSettings::setChatSendAsPlainTextByDef(bool bValue)
 	setValueToGroup("Chat", "SendAsPlainTextByDef", bValue);
 }
 
+bool RshareSettings::getShrinkChatTextEdit()
+{
+	return valueFromGroup("Chat", "ShrinkChatTextEdit", false).toBool();
+}
+
+void RshareSettings::setShrinkChatTextEdit(bool bValue)
+{
+	setValueToGroup("Chat", "ShrinkChatTextEdit", bValue);
+}
+
 bool RshareSettings::getChatSearchShowBarByDefault()
 {
 	return valueFromGroup("Chat", "SearchShowBarByDefault", false).toBool();
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h
index abf728391..362e52606 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.h
+++ b/retroshare-gui/src/gui/settings/rsharesettings.h
@@ -217,6 +217,9 @@ public:
 	bool getChatSendAsPlainTextByDef();
 	void setChatSendAsPlainTextByDef(bool bValue);
 
+	bool getShrinkChatTextEdit();
+	void setShrinkChatTextEdit(bool bValue);
+
 	bool getChatSearchShowBarByDefault();
 	void setChatSearchShowBarByDefault(bool bValue);
 

From ed0ea3aa01107811bdffe66fa91051c38b823772 Mon Sep 17 00:00:00 2001
From: chelovechishko <xaxaxa667@gmail.com>
Date: Sun, 8 May 2022 20:38:35 +0900
Subject: [PATCH 080/503] gui: chat: add power to vote distant participant

If identity got deleted, then banned one should start
this distant conversation, if i am not mistaken.
---
 retroshare-gui/src/gui/chat/ChatLobbyDialog.h |  8 +--
 .../src/gui/chat/PopupChatWindow.cpp          | 57 +++++++++++++++++++
 retroshare-gui/src/gui/chat/PopupChatWindow.h |  6 ++
 3 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
index 429a5bfb4..065abacee 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
@@ -27,8 +27,8 @@
 #include "ChatDialog.h"
 #include "PopupChatWindow.h"
 
-Q_DECLARE_METATYPE(RsGxsId)
-Q_DECLARE_METATYPE(QList<RsGxsId>)
+// Q_DECLARE_METATYPE(RsGxsId)
+// Q_DECLARE_METATYPE(QList<RsGxsId>)
 
 class GxsIdChooser ;
 class QToolButton;
@@ -101,7 +101,7 @@ private:
     void muteParticipant(const RsGxsId& id);
     void unMuteParticipant(const RsGxsId& id);
     bool isNicknameInLobby(const RsGxsId& id);
-	
+
 	ChatLobbyId lobbyId;
 	QString _lobby_name ;
 	time_t lastUpdateListTime;
@@ -117,7 +117,7 @@ private:
 
 	/** Qt Designer generated object */
 	Ui::ChatLobbyDialog ui;
-	
+
 	/** Ignored Users in Chatlobby by nickname until we had implemented Peer Ids in ver 0.6 */
     std::set<RsGxsId> mutedParticipants;
 
diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp
index f9324d5fc..1f15345b1 100644
--- a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp
@@ -34,6 +34,7 @@
 #include "util/misc.h"
 #include "rshare.h"
 
+#include <retroshare/rsidentity.h>
 #include <retroshare/rsmsgs.h>
 #include <retroshare/rsnotify.h>
 
@@ -100,6 +101,17 @@ PopupChatWindow::PopupChatWindow(bool tabbed, QWidget *parent, Qt::WindowFlags f
 
 	connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint)));
 
+	voteNegative = new QAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-down.png"),
+		tr("Ban this person (Sets negative opinion)"), this);
+	voteNeutral  = new QAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-neutral.png"),
+		tr("Give neutral opinion"), this);
+	votePositive = new QAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-up.png"),
+		tr("Give positive opinion"), this);
+
+	connect(votePositive, SIGNAL(triggered()), this, SLOT(voteParticipant()));
+	connect(voteNeutral,  SIGNAL(triggered()), this, SLOT(voteParticipant()));
+	connect(voteNegative, SIGNAL(triggered()), this, SLOT(voteParticipant()));
+
 	connect(ui.tabWidget, SIGNAL(tabChanged(ChatDialog*)), this, SLOT(tabChanged(ChatDialog*)));
 	connect(ui.tabWidget, SIGNAL(tabClosed(ChatDialog*)), this, SLOT(tabClosed(ChatDialog*)));
 
@@ -116,6 +128,37 @@ void PopupChatWindow::showContextMenu(QPoint)
 	QMenu contextMnu(this);
     contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/highlight.png"),tr("Choose window color..."),this,SLOT(setStyle()));
 
+	ChatId ch_id = getCurrentDialog()->getChatId();
+	if (ch_id.isDistantChatId()) {
+		DistantChatPeerId dc_id = ch_id.toDistantChatId();
+		DistantChatPeerInfo dc_info;
+		if(rsMsgs->getDistantChatStatus(dc_id, dc_info)) {
+			RsGxsId gxs_id = dc_info.to_id;
+			if(!gxs_id.isNull() && !rsIdentity->isOwnId(gxs_id)) {
+			    contextMnu.addAction(votePositive);
+				contextMnu.addAction(voteNeutral);
+				contextMnu.addAction(voteNegative);
+
+				votePositive->setEnabled(false);
+				voteNeutral ->setEnabled(false);
+				voteNegative->setEnabled(false);
+
+				RsOpinion rs_rep;
+				rsReputations->getOwnOpinion(gxs_id, rs_rep);
+				if (rsReputations->getOwnOpinion(gxs_id, rs_rep)) {
+					votePositive->setEnabled(rs_rep != RsOpinion::POSITIVE);
+					voteNeutral->setEnabled( ( rs_rep == RsOpinion::POSITIVE )
+						|| ( rs_rep == RsOpinion::NEGATIVE ) );
+					voteNegative->setEnabled(rs_rep != RsOpinion::NEGATIVE);
+
+					votePositive->setData(QVariant::fromValue(gxs_id));
+					voteNeutral ->setData(QVariant::fromValue(gxs_id));
+					voteNegative->setData(QVariant::fromValue(gxs_id));
+				}
+			}
+		}
+	}
+
 	if (Settings->getChatFlags() & RS_CHAT_TABBED_WINDOW)
     {
         if(tabbedWindow)
@@ -457,3 +500,17 @@ void PopupChatWindow::blink(bool on)
 		setWindowIcon(on ? mBlinkIcon : *mEmptyIcon);
 	}
 }
+
+void PopupChatWindow::voteParticipant()
+{
+	QAction *act = dynamic_cast<QAction*>(sender()) ;
+	if (!act) {
+		return ;
+	}
+
+	RsOpinion opinion = RsOpinion::NEUTRAL;
+	if (act == voteNeutral)  opinion = RsOpinion::NEUTRAL;
+	if (act == votePositive) opinion = RsOpinion::POSITIVE;
+	if (act == voteNegative) opinion = RsOpinion::NEGATIVE;
+	rsReputations->setOwnOpinion(act->data().value<RsGxsId>(), opinion);
+}
diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.h b/retroshare-gui/src/gui/chat/PopupChatWindow.h
index 86f8ebc80..968531ea1 100644
--- a/retroshare-gui/src/gui/chat/PopupChatWindow.h
+++ b/retroshare-gui/src/gui/chat/PopupChatWindow.h
@@ -27,6 +27,8 @@
 #include "ui_PopupChatWindow.h"
 #include <retroshare/rstypes.h>
 #include <retroshare/rsmsgs.h>
+Q_DECLARE_METATYPE(RsGxsId)
+Q_DECLARE_METATYPE(QList<RsGxsId>)
 
 class ChatDialog;
 
@@ -67,6 +69,7 @@ private slots:
 	void setOnTop();
 	void blink(bool on);
 	void showContextMenu(QPoint p);
+	void voteParticipant();
 
 private:
 	bool tabbedWindow;
@@ -75,6 +78,9 @@ private:
 	ChatDialog *chatDialog;
 	QIcon mBlinkIcon;
 	QIcon *mEmptyIcon;
+	QAction* votePositive;
+	QAction* voteNegative;
+	QAction* voteNeutral;
 
 	ChatDialog *getCurrentDialog();
 	void saveSettings();

From ca0a441f3b2f693e1e6a17354cf2a13e277652e8 Mon Sep 17 00:00:00 2001
From: chelovechishko <xaxaxa667@gmail.com>
Date: Mon, 9 May 2022 00:27:50 +0900
Subject: [PATCH 081/503] gui: file: add power to change font size for
 displayed shared files

Added one more settings group "File".
---
 .../gui/FileTransfer/SharedFilesDialog.cpp    | 23 ++++++++++---
 .../src/gui/FileTransfer/SharedFilesDialog.h  |  2 ++
 .../src/gui/FileTransfer/SharedFilesDialog.ui |  5 ---
 .../src/gui/settings/TransferPage.cpp         | 12 +++++++
 .../src/gui/settings/TransferPage.h           |  1 +
 .../src/gui/settings/TransferPage.ui          | 34 +++++++++++++++++++
 6 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index a88784c12..14ffca561 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -241,10 +241,6 @@ SharedFilesDialog::SharedFilesDialog(bool remote_mode, QWidget *parent)
     /* Set Multi Selection */
     ui.dirTreeView->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-	QFontMetricsF fontMetrics(ui.dirTreeView->font());
-	int iconHeight = fontMetrics.height() * 1.5;
-	ui.dirTreeView->setIconSize(QSize(iconHeight, iconHeight));
-
   /* Hide platform specific features */
   copylinkAct = new QAction(QIcon(IMAGE_COPYLINK), tr( "Copy retroshare Links to Clipboard" ), this );
   connect( copylinkAct , SIGNAL( triggered() ), this, SLOT( copyLink() ) );
@@ -323,7 +319,7 @@ void SharedFilesDialog::hideEvent(QHideEvent *)
         model->setVisible(false) ;
 }
 
-void SharedFilesDialog::showEvent(QShowEvent *)
+void SharedFilesDialog::showEvent(QShowEvent *event)
 {
     if(model!=NULL)
     {
@@ -336,6 +332,10 @@ void SharedFilesDialog::showEvent(QShowEvent *)
 
         restoreExpandedPathsAndSelection(expanded_indexes,hidden_indexes,selected_indexes);
     }
+
+    if (!event->spontaneous()) {
+        updateFontSize();
+    }
 }
 RemoteSharedFilesDialog::~RemoteSharedFilesDialog()
 {
@@ -1686,3 +1686,16 @@ bool SharedFilesDialog::tree_FilterItem(const QModelIndex &index, const QString
     return (visible || visibleChildCount);
 }
 #endif
+
+void SharedFilesDialog::updateFontSize()
+{
+    int customFontSize = Settings->valueFromGroup("File", "MinimumFontSize", 11).toInt();
+    QFont newFont = ui.dirTreeView->font();
+    if (newFont.pointSize() != customFontSize) {
+        newFont.setPointSize(customFontSize);
+        QFontMetricsF fontMetrics(newFont);
+        int iconHeight = fontMetrics.height();
+        ui.dirTreeView->setFont(newFont);
+        ui.dirTreeView->setIconSize(QSize(iconHeight, iconHeight));
+    }
+}
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h
index c406821c9..7524d5035 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.h
@@ -117,6 +117,8 @@ protected:
 
   QModelIndexList getSelected();
 
+  void updateFontSize();
+
   /** Defines the actions for the context menu for QTreeWidget */
   QAction* copylinkAct;
   QAction* sendlinkAct;
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
index b732d0464..dbcba0011 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
@@ -356,11 +356,6 @@ border-image: url(:/images/closepressed.png)
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-          </font>
-         </property>
          <property name="contextMenuPolicy">
           <enum>Qt::CustomContextMenu</enum>
          </property>
diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index 2faa8d5f7..3575a5479 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -53,6 +53,7 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags)
 	QObject::connect(ui.partialButton, SIGNAL(clicked( bool ) ), this , SLOT( setPartialsDirectory() ) );
 	QObject::connect(ui.editShareButton, SIGNAL(clicked()), this, SLOT(editDirectories()));
 	QObject::connect(ui.autoCheckDirectories_CB, SIGNAL(clicked(bool)), this, SLOT(toggleAutoCheckDirectories(bool)));
+	QObject::connect(ui.minimumFontSize_SB, SIGNAL(valueChanged(int)), this, SLOT(updateFontSize())) ;
 
 	QObject::connect(ui.autoCheckDirectories_CB,     SIGNAL(toggled(bool)),    this,SLOT(updateAutoCheckDirectories())) ;
 	QObject::connect(ui.autoCheckDirectoriesDelay_SB,SIGNAL(valueChanged(int)),this,SLOT(updateAutoScanDirectoriesPeriod())) ;
@@ -188,6 +189,10 @@ void TransferPage::load()
 	whileBlocking(ui.suffixesIgnoreList_CB)->setChecked( ignore_flags & RS_FILE_SHARE_FLAGS_IGNORE_SUFFIXES ) ;
 	whileBlocking(ui.prefixesIgnoreList_LE)->setText( ignore_prefixes_string );
 	whileBlocking(ui.suffixesIgnoreList_LE)->setText( ignore_suffixes_string );
+
+	Settings->beginGroup(QString("File"));
+	whileBlocking(ui.minimumFontSize_SB)->setValue( Settings->value("MinimumFontSize", 11 ).toInt());
+	Settings->endGroup();
 }
 
 void TransferPage::updateDefaultStrategy(int i)
@@ -290,6 +295,13 @@ void TransferPage::editDirectories()
 	ShareManager::showYourself() ;
 }
 
+void TransferPage::updateFontSize()
+{
+	Settings->beginGroup(QString("File"));
+	Settings->setValue("MinimumFontSize", ui.minimumFontSize_SB->value());
+	Settings->endGroup();
+}
+
 void TransferPage::updateAutoCheckDirectories()       {    rsFiles->setWatchEnabled(ui.autoCheckDirectories_CB->isChecked()) ; }
 void TransferPage::updateAutoScanDirectoriesPeriod()  {    rsFiles->setWatchPeriod(ui.autoCheckDirectoriesDelay_SB->value()); }
 void TransferPage::updateShareDownloadDirectory()     {    rsFiles->shareDownloadDirectory(ui.shareDownloadDirectoryCB->isChecked());}
diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h
index 19ceedfca..1a88d29d5 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.h
+++ b/retroshare-gui/src/gui/settings/TransferPage.h
@@ -58,6 +58,7 @@ class TransferPage: public ConfigPage
 		void updateAutoDLColl();
 		void setPartialsDirectory();
 		void toggleAutoCheckDirectories(bool);
+		void updateFontSize();
 
 		void updateAutoCheckDirectories()       ;
 		void updateAutoScanDirectoriesPeriod()  ;
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index 982df905e..282c5ff51 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -299,6 +299,40 @@ p, li { white-space: pre-wrap; }
         </widget>
        </item>
        <item row="4" column="0">
+        <layout class="QHBoxLayout" name="minimumFontSizeHLayout">
+         <item>
+          <widget class="QLabel" name="minimumFontSizeLabel">
+           <property name="text">
+            <string>Minimum font size for Shared Files</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="minimumFontSize_SB">
+           <property name="minimum">
+            <number>11</number>
+           </property>
+           <property name="maximum">
+            <number>64</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="minimumFontSizeHSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="5" column="0">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>

From 8ab9adacef8ad40a84410fdd3b79593b6bffbe47 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 22 Jun 2022 15:13:07 +0200
Subject: [PATCH 082/503] removed token queue from circles

---
 .../src/gui/Circles/CirclesDialog.cpp         | 109 ++++++++++--------
 .../src/gui/Circles/CirclesDialog.h           |   8 +-
 2 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
index 41fd4e9f2..5c792c1d1 100644
--- a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
@@ -25,6 +25,7 @@
 #include "gui/Circles/CirclesDialog.h"
 #include "gui/Circles/CreateCircleDialog.h"
 #include "gui/common/UIStateHelper.h"
+#include "util/qtthreadsutils.h"
 
 #include <retroshare/rsgxscircles.h>
 #include <retroshare/rspeers.h>
@@ -72,9 +73,6 @@ CirclesDialog::CirclesDialog(QWidget *parent)
 
 	connect(ui.treeWidget_membership, SIGNAL(itemSelectionChanged()), this, SLOT(circle_selected()));
 
-	/* Setup TokenQueue */
-	mCircleQueue = new TokenQueue(rsGxsCircles->getTokenService(), this);
-	
 	/* Set header resize modes and initial section sizes */
 	QHeaderView * membership_header = ui.treeWidget_membership->header () ;
 	membership_header->resizeSection ( CIRCLEGROUP_CIRCLE_COL_GROUPNAME, 200 );
@@ -82,7 +80,6 @@ CirclesDialog::CirclesDialog(QWidget *parent)
 
 CirclesDialog::~CirclesDialog()
 {
-	delete mCircleQueue;
 }
 
 void CirclesDialog::todo()
@@ -564,37 +561,59 @@ void CirclesDialog::requestGroupMeta()
 {
 	mStateHelper->setLoading(CIRCLESDIALOG_GROUPMETA, true);
 
-	std::cerr << "CirclesDialog::requestGroupMeta()";
-	std::cerr << std::endl;
+    RsThread::async([this]()
+    {
+        std::list<RsGroupMetaData> circles;
 
-	mCircleQueue->cancelActiveRequestTokens(CIRCLESDIALOG_GROUPMETA);
+        if(!rsGxsCircles->getCirclesSummaries(circles))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to get circles summaries " << std::endl;
+            return;
+        }
 
-	RsTokReqOptions opts;
-	opts.mReqType = GXS_REQUEST_TYPE_GROUP_META;
+        RsQThreadUtils::postToObject( [this,circles]()
+        {
+            /* Here it goes any code you want to be executed on the Qt Gui
+             * thread, for example to update the data model with new information
+             * after a blocking call to RetroShare API complete, note that
+             * Qt::QueuedConnection is important!
+             */
 
-	uint32_t token;
-	mCircleQueue->requestGroupInfo(token,  RS_TOKREQ_ANSTYPE_SUMMARY, opts, CIRCLESDIALOG_GROUPMETA);
+            loadGroupMeta(circles);
+
+        }, this );
+    });
+//	std::cerr << "CirclesDialog::requestGroupMeta()";
+//	std::cerr << std::endl;
+//
+//	mCircleQueue->cancelActiveRequestTokens(CIRCLESDIALOG_GROUPMETA);
+//
+//	RsTokReqOptions opts;
+//	opts.mReqType = GXS_REQUEST_TYPE_GROUP_META;
+//
+//	uint32_t token;
+//	mCircleQueue->requestGroupInfo(token,  RS_TOKREQ_ANSTYPE_SUMMARY, opts, CIRCLESDIALOG_GROUPMETA);
 }
 
-void CirclesDialog::loadGroupMeta(const uint32_t &token)
+void CirclesDialog::loadGroupMeta(const std::list<RsGroupMetaData>& groupInfo)
 {
 	mStateHelper->setLoading(CIRCLESDIALOG_GROUPMETA, false);
 
-	std::cerr << "CirclesDialog::loadGroupMeta()";
-	std::cerr << std::endl;
+//	std::cerr << "CirclesDialog::loadGroupMeta()";
+//	std::cerr << std::endl;
 
 	ui.treeWidget_membership->clear();
 
-	std::list<RsGroupMetaData> groupInfo;
-	std::list<RsGroupMetaData>::iterator vit;
+//	std::list<RsGroupMetaData> groupInfo;
+//	std::list<RsGroupMetaData>::iterator vit;
 
-	if (!rsGxsCircles->getGroupSummary(token,groupInfo))
-	{
-		std::cerr << "CirclesDialog::loadGroupMeta() Error getting GroupMeta";
-		std::cerr << std::endl;
-		mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, false);
-		return;
-	}
+//	if (!rsGxsCircles->getGroupSummary(token,groupInfo))
+//	{
+//		std::cerr << "CirclesDialog::loadGroupMeta() Error getting GroupMeta";
+//		std::cerr << std::endl;
+//		mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, false);
+//		return;
+//	}
 
 	mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, true);
 
@@ -615,7 +634,7 @@ void CirclesDialog::loadGroupMeta(const uint32_t &token)
 	externalOtherCirclesItem->setText(0, tr("External Circles (Other)"));
 	ui.treeWidget_membership->addTopLevelItem(externalOtherCirclesItem);
 
-	for(vit = groupInfo.begin(); vit != groupInfo.end(); ++vit)
+    for(auto vit = groupInfo.begin(); vit != groupInfo.end(); ++vit)
 	{
 		/* Add Widget, and request Pages */
 		std::cerr << "CirclesDialog::loadGroupMeta() GroupId: " << vit->mGroupId;
@@ -648,24 +667,24 @@ void CirclesDialog::loadGroupMeta(const uint32_t &token)
 	}
 }
 
-void CirclesDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
-{
-	std::cerr << "CirclesDialog::loadRequest() UserType: " << req.mUserType;
-	std::cerr << std::endl;
-	
-	if (queue == mCircleQueue)
-	{
-		/* now switch on req */
-		switch(req.mUserType)
-		{
-			case CIRCLESDIALOG_GROUPMETA:
-				loadGroupMeta(req.mToken);
-				break;
-
-			default:
-				std::cerr << "CirclesDialog::loadRequest() ERROR: INVALID TYPE";
-				std::cerr << std::endl;
-				break;
-		}
-	}
-}
+// void CirclesDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
+// {
+// 	std::cerr << "CirclesDialog::loadRequest() UserType: " << req.mUserType;
+// 	std::cerr << std::endl;
+//
+// 	if (queue == mCircleQueue)
+// 	{
+// 		/* now switch on req */
+// 		switch(req.mUserType)
+// 		{
+// 			case CIRCLESDIALOG_GROUPMETA:
+// 				loadGroupMeta(req.mToken);
+// 				break;
+//
+// 			default:
+// 				std::cerr << "CirclesDialog::loadRequest() ERROR: INVALID TYPE";
+// 				std::cerr << std::endl;
+// 				break;
+// 		}
+// 	}
+// }
diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.h b/retroshare-gui/src/gui/Circles/CirclesDialog.h
index ac87f9f61..56011dc61 100644
--- a/retroshare-gui/src/gui/Circles/CirclesDialog.h
+++ b/retroshare-gui/src/gui/Circles/CirclesDialog.h
@@ -24,14 +24,13 @@
 #define MRK_CIRCLE_DIALOG_H
 
 #include "gui/gxs/RsGxsUpdateBroadcastPage.h"
-#include "util/TokenQueue.h"
 #include "ui_CirclesDialog.h"
 
 #define IMAGE_CIRCLES           ":/icons/png/circles.png"
 
 class UIStateHelper;
 
-class CirclesDialog : public MainPage, public TokenResponse
+class CirclesDialog : public MainPage
 {
 	Q_OBJECT
 
@@ -43,8 +42,6 @@ public:
 	virtual QString pageName() const { return tr("Circles") ; } //MainPage
 	virtual QString helpText() const { return ""; } //MainPage
 
-	void loadRequest(const TokenQueue *queue, const TokenRequest &req);
-
 protected:
 	virtual void updateDisplay(bool complete);
 
@@ -62,9 +59,8 @@ private:
 	void reloadAll();
 
 	void requestGroupMeta();
-	void loadGroupMeta(const uint32_t &token);
+    void loadGroupMeta(const std::list<RsGroupMetaData>& groupInfo);
 
-	TokenQueue *mCircleQueue;
 	UIStateHelper *mStateHelper;
 
 	/* UI - from Designer */

From 1ced2ff7f98ac2bcca01c0e44abd8dcfd8474c1a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 22 Jun 2022 15:15:09 +0200
Subject: [PATCH 083/503] cleaned CirclesDialog.cpp

---
 .../src/gui/Circles/CirclesDialog.cpp         | 47 +------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
index 5c792c1d1..5b1473423 100644
--- a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
@@ -80,6 +80,7 @@ CirclesDialog::CirclesDialog(QWidget *parent)
 
 CirclesDialog::~CirclesDialog()
 {
+    delete mCircleQueue;
 }
 
 void CirclesDialog::todo()
@@ -583,38 +584,14 @@ void CirclesDialog::requestGroupMeta()
 
         }, this );
     });
-//	std::cerr << "CirclesDialog::requestGroupMeta()";
-//	std::cerr << std::endl;
-//
-//	mCircleQueue->cancelActiveRequestTokens(CIRCLESDIALOG_GROUPMETA);
-//
-//	RsTokReqOptions opts;
-//	opts.mReqType = GXS_REQUEST_TYPE_GROUP_META;
-//
-//	uint32_t token;
-//	mCircleQueue->requestGroupInfo(token,  RS_TOKREQ_ANSTYPE_SUMMARY, opts, CIRCLESDIALOG_GROUPMETA);
 }
 
 void CirclesDialog::loadGroupMeta(const std::list<RsGroupMetaData>& groupInfo)
 {
 	mStateHelper->setLoading(CIRCLESDIALOG_GROUPMETA, false);
 
-//	std::cerr << "CirclesDialog::loadGroupMeta()";
-//	std::cerr << std::endl;
-
 	ui.treeWidget_membership->clear();
 
-//	std::list<RsGroupMetaData> groupInfo;
-//	std::list<RsGroupMetaData>::iterator vit;
-
-//	if (!rsGxsCircles->getGroupSummary(token,groupInfo))
-//	{
-//		std::cerr << "CirclesDialog::loadGroupMeta() Error getting GroupMeta";
-//		std::cerr << std::endl;
-//		mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, false);
-//		return;
-//	}
-
 	mStateHelper->setActive(CIRCLESDIALOG_GROUPMETA, true);
 
 	/* add the top level item */
@@ -666,25 +643,3 @@ void CirclesDialog::loadGroupMeta(const std::list<RsGroupMetaData>& groupInfo)
 		}
 	}
 }
-
-// void CirclesDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
-// {
-// 	std::cerr << "CirclesDialog::loadRequest() UserType: " << req.mUserType;
-// 	std::cerr << std::endl;
-//
-// 	if (queue == mCircleQueue)
-// 	{
-// 		/* now switch on req */
-// 		switch(req.mUserType)
-// 		{
-// 			case CIRCLESDIALOG_GROUPMETA:
-// 				loadGroupMeta(req.mToken);
-// 				break;
-//
-// 			default:
-// 				std::cerr << "CirclesDialog::loadRequest() ERROR: INVALID TYPE";
-// 				std::cerr << std::endl;
-// 				break;
-// 		}
-// 	}
-// }

From fd3a434e7116d51415b297a5b3b0e90545a22b22 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 22 Jun 2022 15:15:48 +0200
Subject: [PATCH 084/503] removed token queue traces left in IdEdit and
 IdDetail dialogs

---
 retroshare-gui/src/gui/Identity/IdDetailsDialog.h | 1 -
 retroshare-gui/src/gui/Identity/IdEditDialog.h    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDetailsDialog.h b/retroshare-gui/src/gui/Identity/IdDetailsDialog.h
index ba53b2bba..abefaf872 100644
--- a/retroshare-gui/src/gui/Identity/IdDetailsDialog.h
+++ b/retroshare-gui/src/gui/Identity/IdDetailsDialog.h
@@ -23,7 +23,6 @@
 
 #include <QDialog>
 
-#include "util/TokenQueue.h"
 #include <retroshare/rsidentity.h>
 
 namespace Ui {
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.h b/retroshare-gui/src/gui/Identity/IdEditDialog.h
index e5482cad5..714a79256 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.h
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.h
@@ -23,7 +23,6 @@
 
 #include <inttypes.h>
 
-#include "util/TokenQueue.h"
 #include <retroshare/rsidentity.h>
 #include <retroshare/rsgxsifacetypes.h>
 #include <QDialog>
@@ -71,7 +70,6 @@ private:
 	void updateIdType(bool pseudo);
 	void loadExistingId(const RsGxsIdGroup& id_group);
 	void setAvatar(const QPixmap &avatar);
-	void idCreated(uint32_t token);
 
 	void loadRecognTags();
 	// extract details.

From 6411d5507fcdaa5eebb891f1b5d74c22b87aec37 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 22 Jun 2022 15:36:27 +0200
Subject: [PATCH 085/503] fixed compilation

---
 retroshare-gui/src/gui/Circles/CirclesDialog.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
index 5b1473423..a05ff2f20 100644
--- a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp
@@ -80,7 +80,6 @@ CirclesDialog::CirclesDialog(QWidget *parent)
 
 CirclesDialog::~CirclesDialog()
 {
-    delete mCircleQueue;
 }
 
 void CirclesDialog::todo()

From 819dc173e069cab41b5335d052863a25602adb7e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 22 Jun 2022 15:43:57 +0200
Subject: [PATCH 086/503] removed TokenQueue from GxsMessageFrameWidget

---
 .../gui/Posted/PostedListWidgetWithModel.cpp  |  2 +-
 .../gui/Posted/PostedListWidgetWithModel.h    |  2 +-
 .../src/gui/gxs/GxsMessageFrameWidget.cpp     | 33 +------------------
 .../src/gui/gxs/GxsMessageFrameWidget.h       |  7 ++--
 .../GxsChannelPostsWidgetWithModel.cpp        |  2 +-
 .../GxsChannelPostsWidgetWithModel.h          |  2 +-
 .../gui/gxsforums/GxsForumThreadWidget.cpp    |  2 +-
 .../src/gui/gxsforums/GxsForumThreadWidget.h  |  2 +-
 8 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 7dcc767b8..7c55931fa 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -773,7 +773,7 @@ QIcon PostedListWidgetWithModel::groupIcon()
 	return QIcon(postedImage);
 }
 
-void PostedListWidgetWithModel::setAllMessagesReadDo(bool read, uint32_t &/*token*/)
+void PostedListWidgetWithModel::setAllMessagesReadDo(bool read)
 {
     if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags))
         return;
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
index a38e0d036..a447424e8 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
@@ -130,7 +130,7 @@ protected:
 #endif
 
 	/* GxsMessageFrameWidget */
-	virtual void setAllMessagesReadDo(bool read, uint32_t &token) override;
+    virtual void setAllMessagesReadDo(bool read) override;
 
 private slots:
 #ifdef TO_REMOVE
diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
index 8d9a89a47..1f55f514f 100644
--- a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
@@ -28,7 +28,6 @@ GxsMessageFrameWidget::GxsMessageFrameWidget(RsGxsIfaceHelper *ifaceImpl, QWidge
 {
 	mNextTokenType = 0;
 
-	mTokenQueue = new TokenQueue(ifaceImpl->getTokenService(), this);
 	mStateHelper = new UIStateHelper(this);
 
 	/* Set read status */
@@ -46,8 +45,6 @@ GxsMessageFrameWidget::~GxsMessageFrameWidget()
 
 		emit waitingChanged(this);
 	}
-
-	delete(mTokenQueue);
 }
 
 const RsGxsGroupId &GxsMessageFrameWidget::groupId()
@@ -95,34 +92,6 @@ void GxsMessageFrameWidget::setGroupId(const RsGxsGroupId &groupId)
 
 void GxsMessageFrameWidget::setAllMessagesRead(bool read)
 {
-	uint32_t token = 0;
-	setAllMessagesReadDo(read, token);
-
-	if (token) {
-		/* Wait for acknowlegde of the token */
-		mAcknowledgeReadStatusToken = token;
-		mTokenQueue->queueRequest(mAcknowledgeReadStatusToken, 0, 0, mTokenTypeAcknowledgeReadStatus);
-		mStateHelper->setLoading(mTokenTypeAcknowledgeReadStatus, true);
-
-		emit waitingChanged(this);
-	}
+    setAllMessagesReadDo(read);
 }
 
-void GxsMessageFrameWidget::loadRequest(const TokenQueue *queue, const TokenRequest &req)
-{
-	if (queue == mTokenQueue)
-	{
-		if (req.mUserType == mTokenTypeAcknowledgeReadStatus) {
-			if (mAcknowledgeReadStatusToken == req.mToken) {
-				/* Set read status is finished */
-				mStateHelper->setLoading(mTokenTypeAcknowledgeReadStatus, false);
-
-				emit waitingChanged(this);
-			}
-			return;
-		}
-	}
-
-	std::cerr << "GxsMessageFrameWidget::loadRequest() ERROR: INVALID TYPE";
-	std::cerr << std::endl;
-}
diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h
index 36c2f4f67..758088595 100644
--- a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h
+++ b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.h
@@ -22,12 +22,11 @@
 #define GXSMESSAGEFRAMEWIDGET_H
 
 #include "gui/gxs/RsGxsUpdateBroadcastWidget.h"
-#include "util/TokenQueue.h"
 
 struct RsGxsIfaceHelper;
 class UIStateHelper;
 
-class GxsMessageFrameWidget : public QWidget, public TokenResponse
+class GxsMessageFrameWidget : public QWidget
 {
 	Q_OBJECT
 
@@ -49,7 +48,6 @@ public:
 
 	/* GXS functions */
 	uint32_t nextTokenType() { return ++mNextTokenType; }
-	virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);
 
 signals:
 	void groupChanged(QWidget *widget);
@@ -58,10 +56,9 @@ signals:
     void groupDataLoaded();
 
 protected:
-	virtual void setAllMessagesReadDo(bool read, uint32_t &token) = 0;
+    virtual void setAllMessagesReadDo(bool read) = 0;
 
 protected:
-	TokenQueue *mTokenQueue;
 	UIStateHelper *mStateHelper;
 
 	/* Set read status */
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index d3c4070b0..129a6a1bf 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -1432,7 +1432,7 @@ public:
 	uint32_t mLastToken;
 };
 
-void GxsChannelPostsWidgetWithModel::setAllMessagesReadDo(bool read, uint32_t& /*token*/)
+void GxsChannelPostsWidgetWithModel::setAllMessagesReadDo(bool read)
 {
 	if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags))
 		return;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index eaac53c0f..d37b83f22 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -137,7 +137,7 @@ protected:
 #endif
 
 	/* GxsMessageFrameWidget */
-    virtual void setAllMessagesReadDo(bool read, uint32_t &token) override;
+    virtual void setAllMessagesReadDo(bool read) override;
 
 private slots:
 	void showPostDetails();
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index e965dff4f..5ea514a54 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -1503,7 +1503,7 @@ void GxsForumThreadWidget::markMsgAsUnreadChildren()
     markMsgAsReadUnread(false, true, false);
 }
 
-void GxsForumThreadWidget::setAllMessagesReadDo(bool read, uint32_t &/*token*/)
+void GxsForumThreadWidget::setAllMessagesReadDo(bool read)
 {
     markMsgAsReadUnread(read, true, true);
 }
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
index 6ca892e54..8e64c2b75 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
@@ -102,7 +102,7 @@ protected:
 	virtual void updateDisplay(bool complete);
 
 	/* GxsMessageFrameWidget */
-	virtual void setAllMessagesReadDo(bool read, uint32_t &token);
+    virtual void setAllMessagesReadDo(bool read);
     
 	void setMessageLoadingError(const QString& error);
 private slots:

From 299ad1b1e1acafd480d2664d8a86bdb9a540caae Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 22 Jun 2022 19:07:35 +0200
Subject: [PATCH 087/503] removed TokenQueue in CommentsTreeWidget for the
 display of comments

---
 .../src/gui/gxs/GxsCommentTreeWidget.cpp      | 147 ++++++++++++++----
 .../src/gui/gxs/GxsCommentTreeWidget.h        |   6 +-
 2 files changed, 125 insertions(+), 28 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index 343f88c91..f12c238bd 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -25,6 +25,7 @@
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/gxs/GxsCreateCommentDialog.h"
 #include "gui/gxs/GxsIdTreeWidgetItem.h"
+#include "util/qtthreadsutils.h"
 
 #include <QAbstractTextDocumentLayout>
 #include <QApplication>
@@ -540,14 +541,86 @@ void GxsCommentTreeWidget::service_requestComments(const RsGxsGroupId& group_id,
         ids_to_ask.push_back(std::make_pair(group_id,*it));
     }
 
-	RsTokReqOptions opts;
-	opts.mReqType = GXS_REQUEST_TYPE_MSG_RELATED_DATA;
-	opts.mOptions = RS_TOKREQOPT_MSG_THREAD | RS_TOKREQOPT_MSG_LATEST;
+   RsThread::async([this,group_id,msgIds]()
+    {
+        std::vector<RsGxsComment> comments;
 
-	uint32_t token;
-	mTokenQueue->requestMsgRelatedInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, ids_to_ask, GXSCOMMENTS_LOADTHREAD);
+        if(!mCommentService->getRelatedComments(group_id,msgIds,comments))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to get circles summaries " << std::endl;
+            return;
+        }
+
+        RsQThreadUtils::postToObject( [this,comments]()
+        {
+            /* Here it goes any code you want to be executed on the Qt Gui
+             * thread, for example to update the data model with new information
+             * after a blocking call to RetroShare API complete, note that
+             * Qt::QueuedConnection is important!
+             */
+
+            clearItems();
+
+            service_loadThread(comments);
+
+            completeItems();
+
+            emit commentsLoaded(treeCount(this));
+
+        }, this );
+    });
+    // RsTokReqOptions opts;
+    // opts.mReqType = GXS_REQUEST_TYPE_MSG_RELATED_DATA;
+    // opts.mOptions = RS_TOKREQOPT_MSG_THREAD | RS_TOKREQOPT_MSG_LATEST;
+
+    // uint32_t token;
+    // mTokenQueue->requestMsgRelatedInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, ids_to_ask, GXSCOMMENTS_LOADTHREAD);
 }
 
+#ifdef TODO
+void GxsCommentTreeWidget::async_msg_action(const CmtMethod &action)
+{
+    RsThread::async([this,action]()
+    {
+        // 1 - get message data from p3GxsForums
+
+        std::set<RsGxsMessageId> msgs_to_request ;
+        std::vector<RsGxsForumMsg> msgs;
+
+        msgs_to_request.insert(mThreadId);
+
+        if(!rsGxsForums->getForumContent(groupId(),msgs_to_request,msgs))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum message info for forum " << groupId() << " and thread " << mThreadId << std::endl;
+            return;
+        }
+
+        if(msgs.size() != 1)
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " more than 1 or no msgs selected in forum " << groupId() << std::endl;
+            return;
+        }
+
+        // 2 - sort the messages into a proper hierarchy
+
+        RsGxsForumMsg msg = msgs[0];
+
+        // 3 - update the model in the UI thread.
+
+        RsQThreadUtils::postToObject( [msg,action,this]()
+        {
+            /* Here it goes any code you want to be executed on the Qt Gui
+             * thread, for example to update the data model with new information
+             * after a blocking call to RetroShare API complete */
+
+            (this->*action)(msg);
+
+        }, this );
+
+    });
+}
+#endif
+
 
 /* Generic Handling */
 void GxsCommentTreeWidget::clearItems()
@@ -673,7 +746,7 @@ void GxsCommentTreeWidget::addItem(RsGxsMessageId itemId, RsGxsMessageId parentI
 	}
 }
 
-int treeCount(QTreeWidget *tree, QTreeWidgetItem *parent = 0)
+int GxsCommentTreeWidget::treeCount(QTreeWidget *tree, QTreeWidgetItem *parent)
 {
     int count = 0;
     if (parent == 0)
@@ -694,16 +767,16 @@ int treeCount(QTreeWidget *tree, QTreeWidgetItem *parent = 0)
     }
     return count;
 }
-void GxsCommentTreeWidget::loadThread(const uint32_t &token)
-{
-	clearItems();
-
-	service_loadThread(token);
-
-	completeItems();
-
-    emit commentsLoaded(treeCount(this));
-}
+// void GxsCommentTreeWidget::loadThread(const uint32_t &token)
+// {
+// 	clearItems();
+//
+// 	service_loadThread(token);
+//
+// 	completeItems();
+//
+//     emit commentsLoaded(treeCount(this));
+// }
 
 void GxsCommentTreeWidget::acknowledgeComment(const uint32_t &token)
 {
@@ -725,14 +798,10 @@ void GxsCommentTreeWidget::acknowledgeVote(const uint32_t &token)
 	}
 }
 
-
-void GxsCommentTreeWidget::service_loadThread(const uint32_t &token)
+void GxsCommentTreeWidget::service_loadThread(const std::vector<RsGxsComment>& comments)
 {
-	std::cerr << "GxsCommentTreeWidget::service_loadThread() ERROR must be overloaded!";
-	std::cerr << std::endl;
-
-	std::vector<RsGxsComment> comments;
-	mCommentService->getRelatedComments(token, comments);
+    std::cerr << "GxsCommentTreeWidget::service_loadThread() ERROR must be overloaded!";
+    std::cerr << std::endl;
 
     // This is inconsistent since we cannot know here that all comments are for the same thread. However they are only
     // requested in requestComments() where a single MsgId is used.
@@ -751,6 +820,32 @@ void GxsCommentTreeWidget::service_loadThread(const uint32_t &token)
     insertComments(comments);
 }
 
+
+// void GxsCommentTreeWidget::service_loadThread(const uint32_t &token)
+// {
+// 	std::cerr << "GxsCommentTreeWidget::service_loadThread() ERROR must be overloaded!";
+// 	std::cerr << std::endl;
+//
+// 	std::vector<RsGxsComment> comments;
+// 	mCommentService->getRelatedComments(token, comments);
+//
+//     // This is inconsistent since we cannot know here that all comments are for the same thread. However they are only
+//     // requested in requestComments() where a single MsgId is used.
+//
+//     if(mUseCache)
+//     {
+//         QMutexLocker lock(&mCacheMutex);
+//
+//         if(!comments.empty())
+//         {
+//             std::cerr << "Updating cache with " << comments.size() << " for thread " << comments[0].mMeta.mThreadId << std::endl;
+//             mCommentsCache[comments[0].mMeta.mThreadId] = comments;
+//         }
+//     }
+//
+//     insertComments(comments);
+// }
+
 void GxsCommentTreeWidget::insertComments(const std::vector<RsGxsComment>& comments)
 {
     std::list<RsGxsMessageId> new_comments;
@@ -886,9 +981,9 @@ void GxsCommentTreeWidget::loadRequest(const TokenQueue *queue, const TokenReque
 							acknowledgeComment(req.mToken);
 						}
 						break;
-					case RS_TOKREQ_ANSTYPE_DATA:
-						loadThread(req.mToken);
-						break;
+//					case RS_TOKREQ_ANSTYPE_DATA:
+//						loadThread(req.mToken);
+//						break;
 				}
 			}
 			break;
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
index c4840eb46..c750b1fcd 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
@@ -56,7 +56,7 @@ protected:
 
     /* to be overloaded */
     virtual void service_requestComments(const RsGxsGroupId &group_id, const std::set<RsGxsMessageId> &msgIds);
-    virtual void service_loadThread(const uint32_t &token);
+    virtual void service_loadThread(const std::vector<RsGxsComment>& comments);
 
     virtual QTreeWidgetItem *service_createMissingItem(const RsGxsMessageId& parent);
 
@@ -66,10 +66,12 @@ protected:
     void acknowledgeComment(const uint32_t& token);
     void acknowledgeVote(const uint32_t &token);
 
-    void loadThread(const uint32_t &token);
+    //void loadThread(const uint32_t &token);
 
     void insertComments(const std::vector<RsGxsComment>& comments);
     void addItem(RsGxsMessageId itemId, RsGxsMessageId parentId, QTreeWidgetItem *item);
+
+    static int treeCount(QTreeWidget *tree, QTreeWidgetItem *parent = 0);
 public slots:
     void customPopUpMenu(const QPoint& point);
     void setCurrentCommentMsgId(QTreeWidgetItem* current, QTreeWidgetItem* previous);

From cf61cb3780f319215eca4aad8331612bd7203d10 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 22 Jun 2022 21:07:29 +0200
Subject: [PATCH 088/503] fixed bug introduced by last commit

---
 retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index f12c238bd..481ad0e81 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -530,24 +530,13 @@ void GxsCommentTreeWidget::service_requestComments(const RsGxsGroupId& group_id,
     std::cerr << "GxsCommentTreeWidget::service_requestComments for group " << group_id << std::endl;
 #endif
 
-    std::vector<RsGxsGrpMsgIdPair> ids_to_ask;
-
-    for(std::set<RsGxsMessageId>::const_iterator it(msgIds.begin());it!=msgIds.end();++it)
-    {
-#ifdef DEBUG_GXSCOMMENT_TREEWIDGET
-        std::cerr << "   asking for msg " << *it << std::endl;
-#endif
-
-        ids_to_ask.push_back(std::make_pair(group_id,*it));
-    }
-
    RsThread::async([this,group_id,msgIds]()
     {
         std::vector<RsGxsComment> comments;
 
         if(!mCommentService->getRelatedComments(group_id,msgIds,comments))
         {
-            std::cerr << __PRETTY_FUNCTION__ << " failed to get circles summaries " << std::endl;
+            std::cerr << __PRETTY_FUNCTION__ << " failed to get comments" << std::endl;
             return;
         }
 

From f4f799ec58d6fc95c662510aad11f7f10e75ae42 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 22 Jun 2022 01:38:47 +0200
Subject: [PATCH 089/503] Windows MinGW build: - Upgraded MSYS2 - Upgraded
 OpenSSL-1.1.1p - Added build of WebUI

---
 build_scripts/Windows/build-libs/Makefile     |  2 +-
 build_scripts/Windows/build.bat               |  2 +-
 .../Windows/build/build-installer.bat         |  1 +
 build_scripts/Windows/build/build.bat         | 43 +++++++++++++++++++
 build_scripts/Windows/build/env.bat           |  7 +++
 build_scripts/Windows/build/pack.bat          |  4 +-
 build_scripts/Windows/env/env-msys2.bat       |  3 +-
 .../Windows/env/tools/prepare-msys2.bat       | 32 +++++++-------
 .../Windows/env/tools/root/update-msys2.bat   | 11 ++---
 .../Windows/installer/lang/ca_ES.nsh          |  2 +
 build_scripts/Windows/installer/lang/de.nsh   |  2 +
 build_scripts/Windows/installer/lang/en.nsh   |  2 +
 build_scripts/Windows/installer/lang/es.nsh   |  2 +
 build_scripts/Windows/installer/lang/fr.nsh   |  2 +
 build_scripts/Windows/installer/lang/pl.nsh   |  2 +
 build_scripts/Windows/installer/lang/ru.nsh   |  2 +
 build_scripts/Windows/installer/lang/tr.nsh   |  2 +
 build_scripts/Windows/installer/lang/ts/en.ts | 14 ++++++
 .../Windows/installer/lang/zh_CN.nsh          |  2 +
 .../Windows/installer/retroshare-Qt5.nsi      | 17 ++++++++
 20 files changed, 124 insertions(+), 30 deletions(-)

diff --git a/build_scripts/Windows/build-libs/Makefile b/build_scripts/Windows/build-libs/Makefile
index cadd5ef18..b7efeaa37 100644
--- a/build_scripts/Windows/build-libs/Makefile
+++ b/build_scripts/Windows/build-libs/Makefile
@@ -1,7 +1,7 @@
 ZLIB_VERSION=1.2.11
 BZIP2_VERSION=1.0.8
 MINIUPNPC_VERSION=2.2.3
-OPENSSL_VERSION=1.1.1m
+OPENSSL_VERSION=1.1.1p
 SPEEX_VERSION=1.2.0
 SPEEXDSP_VERSION=1.2.0
 LIBXML2_VERSION=2.9.12
diff --git a/build_scripts/Windows/build.bat b/build_scripts/Windows/build.bat
index 352274122..4cec821b8 100644
--- a/build_scripts/Windows/build.bat
+++ b/build_scripts/Windows/build.bat
@@ -13,7 +13,7 @@ call "%~dp0build-libs\build-libs.bat"
 if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL%
 
 %cecho% info "Build %SourceName%"
-call "%~dp0build\build.bat" release autologin jsonapi plugins nativedialogs service
+call "%~dp0build\build.bat" release autologin webui plugins nativedialogs service
 if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Pack %SourceName%"
diff --git a/build_scripts/Windows/build/build-installer.bat b/build_scripts/Windows/build/build-installer.bat
index 85500ef41..7209afb6e 100644
--- a/build_scripts/Windows/build/build-installer.bat
+++ b/build_scripts/Windows/build/build-installer.bat
@@ -40,6 +40,7 @@ set NSIS_PARAM=%NSIS_PARAM% /DARCHITECTURE="%GCCArchitecture%"
 set NSIS_PARAM=%NSIS_PARAM% /DDATE="%RsDate%"
 
 if exist "%EnvTorPath%\Tor\tor.exe" set NSIS_PARAM=%NSIS_PARAM% /DTORDIR="%EnvTorPath%\Tor"
+if exist "%RsWebuiBuildPath%" set NSIS_PARAM=%NSIS_PARAM% /DWEBUIDIR="%RsWebuiBuildPath%"
 
 :: Get compiled version
 call "%ToolsPath%\get-rs-version.bat" "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\retroshare.exe" RsVersion
diff --git a/build_scripts/Windows/build/build.bat b/build_scripts/Windows/build/build.bat
index 23a89038e..9755fdadf 100644
--- a/build_scripts/Windows/build/build.bat
+++ b/build_scripts/Windows/build/build.bat
@@ -52,6 +52,7 @@ title Build - %SourceName%-%RsBuildConfig% [qmake]
 set RS_QMAKE_CONFIG=%RsBuildConfig%
 if "%ParamAutologin%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_autologin
 if "%ParamJsonApi%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_jsonapi
+if "%ParamWebui%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_webui
 if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retroshare_plugins
 if "%ParamUseNativeDialogs%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_use_native_dialogs
 if "%ParamService%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_service
@@ -70,6 +71,14 @@ title Build - %SourceName%-%RsBuildConfig% [make]
 mingw32-make -j %CoreCount%
 if errorlevel 1 goto error
 
+:: Webui
+if "%ParamWebui%"=="1" (
+	call :build-webui
+	if errorlevel 1 goto error
+) else (
+	if exist "%RsWebuiBuildPath%" call "%ToolsPath%\remove-dir.bat" "%RsWebuiBuildPath%"
+)
+
 echo.
 echo === Changelog
 echo.
@@ -89,3 +98,37 @@ exit /B %ERRORLEVEL%
 echo Failed to initialize environment.
 endlocal
 exit /B 1
+
+:build-webui
+echo.
+echo === webui
+echo.
+title Build webui
+
+if not exist "%RsWebuiPath%" (
+	echo Checking out webui source into %RsWebuiPath%
+	git clone https://github.com/RetroShare/RSNewWebUI.git "%RsWebuiPath%"
+	if errorlevel 1 exit /B 1
+) else (
+	echo Webui source found at %RsWebuiPath%
+	pushd "%RsWebuiPath%"
+	git pull
+	popd
+	if errorlevel 1 exit /B 1
+)
+
+pushd "%RsWebuiPath%\webui-src\make-src"
+call build.bat
+popd
+if errorlevel 1 exit /B 1
+
+if not exist "%RsWebuiPath%\webui" (
+	%cecho% error "Webui is enabled, but no webui data found at %RsWebuiPath%\webui"
+	exit /B 1
+)
+
+if exist "%RsWebuiBuildPath%" call "%ToolsPath%\remove-dir.bat" "%RsWebuiBuildPath%"
+move "%RsWebuiPath%\webui" "%RsWebuiBuildPath%"
+if errorlevel 1 exit /B 1
+
+exit /B 0
diff --git a/build_scripts/Windows/build/env.bat b/build_scripts/Windows/build/env.bat
index c1b18492f..b605cf502 100644
--- a/build_scripts/Windows/build/env.bat
+++ b/build_scripts/Windows/build/env.bat
@@ -4,6 +4,7 @@ set ParamDebug=0
 set ParamAutologin=0
 set ParamPlugins=0
 set ParamJsonApi=0
+set ParamWebui=0
 set ParamService=0
 set ParamFriendServer=0
 set ParamEmbeddedFriendServer=0
@@ -26,6 +27,9 @@ if "%~1" NEQ "" (
 			set ParamAutologin=1
 		) else if "%%~a"=="jsonapi" (
 			set ParamJsonApi=1
+		) else if "%%~a"=="webui" (
+			set ParamJsonApi=1
+			set ParamWebui=1
 		) else if "%%~a"=="service" (
 			set ParamService=1
 		) else if "%%~a"=="friendserver" (
@@ -101,6 +105,8 @@ set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%GCCArchitecture%-%RsBuildConfig%
 set RsDeployPath=%DeployPath%\Qt-%QtVersion%-%GCCArchitecture%%RsType%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
+set RsWebuiPath=%RootPath%\%SourceName%-webui
+set RsWebuiBuildPath=%BuildPath%\Qt-%QtVersion%-%GCCArchitecture%-%RsBuildConfig%\webui
 
 if not exist "%~dp0env-mod.bat" goto no_mod
 call "%~dp0env-mod.bat"
@@ -120,6 +126,7 @@ if "%Module%"=="build" (
 	echo Optional parameter ^(need clean when changed^)
 	echo autologin             Build with autologin
 	echo jsonapi               Build with jsonapi
+	echo webui                 Build with jsonapi and webui
 	echo service               Build service
 	echo friendserver          Build Friend Server
 	echo embedded-friendserver Build with embedded Friend Server
diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat
index 6ec70c199..0dbf6e82d 100644
--- a/build_scripts/Windows/build/pack.bat
+++ b/build_scripts/Windows/build/pack.bat
@@ -181,10 +181,10 @@ copy "%SourcePath%\libbitdht\src\bitdht\bdboot.txt" "%RsDeployPath%" %Quite%
 echo copy changelog.txt
 copy "%RsBuildPath%\changelog.txt" "%RsDeployPath%" %Quite%
 
-if exist "%SourcePath%\libresapi\src\webui" (
+if exist "%RsWebuiBuildPath%" (
 	echo copy webui
 	mkdir "%RsDeployPath%\webui"
-	xcopy /S "%SourcePath%\libresapi\src\webui" "%RsDeployPath%\webui" %Quite%
+	xcopy /S "%RsWebuiBuildPath%" "%RsDeployPath%\webui" %Quite%
 )
 
 if "%ParamTor%"=="1" (
diff --git a/build_scripts/Windows/env/env-msys2.bat b/build_scripts/Windows/env/env-msys2.bat
index b99ede679..fee7e46b9 100644
--- a/build_scripts/Windows/env/env-msys2.bat
+++ b/build_scripts/Windows/env/env-msys2.bat
@@ -5,7 +5,6 @@
 call "%~dp0env.bat"
 if errorlevel 1 goto error_env
 
-rem openssl x86 doesn't compile with mingw64 x64
 :: Get gcc versions
 call "%ToolsPath%\get-gcc-version.bat" GCCVersion GCCArchitecture
 if "%GCCVersion%"=="" %cecho% error "Cannot get gcc version." & exit /B 1
@@ -27,7 +26,7 @@ set EnvMSYS2Path=%EnvRootPath%\msys2
 call "%~dp0tools\prepare-msys2.bat" %1
 if errorlevel 1 exit /B %ERRORLEVEL%
 
-set EnvMSYS2SH=%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\sh.exe
+set EnvMSYS2SH=%EnvMSYS2Path%\msys64\usr\bin\sh.exe
 if not exist "%EnvMSYS2SH%" if errorlevel 1 goto error_env
 
 set EnvMSYS2Cmd="%EnvMSYS2SH%" -lc
diff --git a/build_scripts/Windows/env/tools/prepare-msys2.bat b/build_scripts/Windows/env/tools/prepare-msys2.bat
index a0483289a..79ddb32c3 100644
--- a/build_scripts/Windows/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows/env/tools/prepare-msys2.bat
@@ -16,7 +16,15 @@ if "%~1"=="clean" (
 	goto exit
 )
 
-if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
+set MSYS2Version=20220503
+
+set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
+set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
+set CMakeInstall=cmake-3.19.0-win32-x86.zip
+set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
+set CMakeUnpackPath=%EnvMSYS2Path%\msys64
+
+if exist "%CMakeUnpackPath%\usr\bin\pacman.exe" (
 	if "%~1"=="reinstall" (
 		choice /M "Found existing MSYS2 version. Do you want to proceed?"
 		if !ERRORLEVEL!==2 goto exit
@@ -25,18 +33,10 @@ if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
 	)
 )
 
-if "%MSYS2Architecture%"=="i686" set MSYS2Version=20210705
-if "%MSYS2Architecture%"=="x86_64" set MSYS2Version=20210725
 
-set MSYS2Install=msys2-base-%MSYS2Architecture%-%MSYS2Version%.tar.xz
-set MSYS2Url=https://repo.msys2.org/distrib/%MSYS2Architecture%/%MSYS2Install%
-set CMakeInstall=cmake-3.19.0-win32-x86.zip
-set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
-set CMakeUnpackPath=%EnvMSYS2Path%\msys%MSYS2Base%
-
-if exist "%EnvMSYS2Path%\msys%MSYS2Base%" (
+if exist "%CMakeUnpackPath%" (
 	%cecho% info "Remove previous MSYS2 version"
-	call "%ToolsPath%\remove-dir.bat" "%EnvMSYS2Path%\msys%MSYS2Base%"
+	call "%ToolsPath%\remove-dir.bat" "%CMakeUnpackPath%"
 )
 
 %cecho% info "Download installation files"
@@ -47,7 +47,7 @@ if not exist "%EnvDownloadPath%\%CMakeInstall%" call "%ToolsPath%\download-file.
 if not exist "%EnvDownloadPath%\%CMakeInstall%" %cecho% error "Cannot download CMake" & goto error
 
 %cecho% info "Unpack MSYS2"
-"%EnvSevenZipExe%" x -so "%EnvDownloadPath%\%MSYS2Install%" | "%EnvSevenZipExe%" x -y -si -ttar -o"%EnvMSYS2Path%"
+"%EnvDownloadPath%\%MSYS2Install%" -y -o"%EnvMSYS2Path%"
 
 %cecho% info "Unpack CMake"
 "%EnvSevenZipExe%" x -o"%CMakeUnpackPath%" "%EnvDownloadPath%\%CMakeInstall%"
@@ -59,19 +59,19 @@ if "%CMakeVersion%"=="" %cecho% error "CMake version not found." & goto :exit
 %cecho% info "Found CMake version %CMakeVersion%"
 
 set FoundProfile=
-for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%EnvMSYS2Path%\msys%MSYS2Base%\etc\profile"') do set FoundProfile=%%F
+for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%CMakeUnpackPath%\etc\profile"') do set FoundProfile=%%F
 
 if "%FoundProfile%"=="0" (
-	echo export PATH="${PATH}:/%CMakeVersion%/bin">>"%EnvMSYS2Path%\msys%MSYS2Base%\etc\profile"
+	echo export PATH="${PATH}:/%CMakeVersion%/bin">>"%CMakeUnpackPath%\etc\profile"
 )
 
-set MSYS2SH=%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\sh
+set MSYS2SH=%CMakeUnpackPath%\usr\bin\sh
 
 %cecho% info "Initialize MSYS2"
 "%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
 "%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-call "%EnvMSYS2Path%\msys%MSYS2Base%\autorebase.bat"
+call "%CMakeUnpackPath%\autorebase.bat"
 
 :exit
 endlocal
diff --git a/build_scripts/Windows/env/tools/root/update-msys2.bat b/build_scripts/Windows/env/tools/root/update-msys2.bat
index a3d2398cd..ddd5bdd0f 100644
--- a/build_scripts/Windows/env/tools/root/update-msys2.bat
+++ b/build_scripts/Windows/env/tools/root/update-msys2.bat
@@ -2,18 +2,13 @@
 
 setlocal
 
-if exist "%~dp0msys2\msys32" call :update 32
-if exist "%~dp0msys2\msys64" call :update 64
+if not exist "%~dp0msys2\msys64" goto :EOF
 
-goto :EOF
+set MSYS2SH=%~dp0msys2\msys64\usr\bin\sh
 
-:update
-set MSYS2SH=%~dp0msys2\msys%~1\usr\bin\sh
-
-echo Update MSYS2 %~1
+echo Update MSYS2
 "%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
 "%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-:exit
 endlocal
 goto :EOF
diff --git a/build_scripts/Windows/installer/lang/ca_ES.nsh b/build_scripts/Windows/installer/lang/ca_ES.nsh
index 1d4d7496e..4279f8174 100644
--- a/build_scripts/Windows/installer/lang/ca_ES.nsh
+++ b/build_scripts/Windows/installer/lang/ca_ES.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instal·la ${APPNAME} i els components necessaris."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installs Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/lang/de.nsh b/build_scripts/Windows/installer/lang/de.nsh
index 2d22e8be4..d67eb3e6f 100644
--- a/build_scripts/Windows/installer/lang/de.nsh
+++ b/build_scripts/Windows/installer/lang/de.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installiert ${APPNAME} und die benötigten Komponenten."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installiert Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installiert WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installiert Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/lang/en.nsh b/build_scripts/Windows/installer/lang/en.nsh
index b076e271f..7ecb92979 100644
--- a/build_scripts/Windows/installer/lang/en.nsh
+++ b/build_scripts/Windows/installer/lang/en.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installs Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/lang/es.nsh b/build_scripts/Windows/installer/lang/es.nsh
index a105ba450..5f0a8aeee 100644
--- a/build_scripts/Windows/installer/lang/es.nsh
+++ b/build_scripts/Windows/installer/lang/es.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instala ${APPNAME} y los componentes requeridos."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installs Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/lang/fr.nsh b/build_scripts/Windows/installer/lang/fr.nsh
index bfc5a30c8..e55ca2466 100644
--- a/build_scripts/Windows/installer/lang/fr.nsh
+++ b/build_scripts/Windows/installer/lang/fr.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installe ${APPNAME} et les composants requis."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installs Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/lang/pl.nsh b/build_scripts/Windows/installer/lang/pl.nsh
index c92a4a730..44b3b70a1 100644
--- a/build_scripts/Windows/installer/lang/pl.nsh
+++ b/build_scripts/Windows/installer/lang/pl.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instaluje ${APPNAME} oraz wymagane komponenty."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installs Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/lang/ru.nsh b/build_scripts/Windows/installer/lang/ru.nsh
index 33df21106..969d58629 100644
--- a/build_scripts/Windows/installer/lang/ru.nsh
+++ b/build_scripts/Windows/installer/lang/ru.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "Установка ${APPNAME} и необходимых компонентов."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installs Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/lang/tr.nsh b/build_scripts/Windows/installer/lang/tr.nsh
index d45fe6c73..70a475a86 100644
--- a/build_scripts/Windows/installer/lang/tr.nsh
+++ b/build_scripts/Windows/installer/lang/tr.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "${APPNAME} ve gerekli bileşenleri kurar."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installs Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/lang/ts/en.ts b/build_scripts/Windows/installer/lang/ts/en.ts
index e96aabc6d..cb38b6d94 100644
--- a/build_scripts/Windows/installer/lang/ts/en.ts
+++ b/build_scripts/Windows/installer/lang/ts/en.ts
@@ -22,6 +22,20 @@
     <translation type="unfinished"></translation> 
   </message> 
 </context> 
+<context> 
+  <name>Section_WebUI</name> 
+  <message> 
+    <source>WebUI</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_WebUI_Desc</name> 
+  <message> 
+    <source>Installs WebUI.</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
 <context> 
   <name>Section_Service</name> 
   <message> 
diff --git a/build_scripts/Windows/installer/lang/zh_CN.nsh b/build_scripts/Windows/installer/lang/zh_CN.nsh
index e3a59a980..7d9a3cc02 100644
--- a/build_scripts/Windows/installer/lang/zh_CN.nsh
+++ b/build_scripts/Windows/installer/lang/zh_CN.nsh
@@ -2,6 +2,8 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
 !insertmacro LANG_STRING Section_Service "Service"
 !insertmacro LANG_STRING Section_Service_Desc "Installs Service."
 !insertmacro LANG_STRING Section_FriendServer "Friend Server"
diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi
index 13a2b4d47..3a7fbf37f 100644
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@@ -71,6 +71,14 @@ ${!defineifexist} TOR_EXISTS "${TORDIR}\tor.exe"
 !endif
 !endif
 
+# WebUI
+!ifdef WEBUIDIR
+${!defineifexist} WEBUI_EXISTS "${WEBUIDIR}\index.html"
+!ifndef WEBUI_EXISTS
+!error "WebUI files not found"
+!endif
+!endif
+
 # Friend Server
 !ifdef TOR_EXISTS
 # Add Friend Server with Tor only
@@ -314,6 +322,14 @@ SectionEnd
   SectionEnd
 !endif
 
+# WebUI
+!ifdef WEBUI_EXISTS
+  Section /o $(Section_WebUI) Section_WebUI
+    SetOutPath "$INSTDIR\webui"
+    File /r "${WEBUIDIR}\*"
+  SectionEnd
+!endif
+
 # Plugins
 ${!defineifexist} PLUGIN_FEEDREADER_EXISTS "${RELEASEDIR}\plugins\FeedReader\lib\FeedReader.dll"
 ${!defineifexist} PLUGIN_VOIP_EXISTS "${RELEASEDIR}\plugins\VOIP\lib\VOIP.dll"
@@ -447,6 +463,7 @@ SectionEnd
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${Section_Link} $(Section_Link_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_AutoStart} $(Section_AutoStart_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_Tor} $(Section_Tor_Desc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Section_WebUI} $(Section_WebUI_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_Service} $(Section_Service_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_FriendServer} $(Section_FriendServer_Desc)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

From 54fd77822d6810936841c4d7b8e9f209703a07c6 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 30 Jun 2022 14:43:04 +0200
Subject: [PATCH 090/503] fixed blocking API for votes

---
 .../gui/Posted/PostedListWidgetWithModel.cpp  |  7 ++-
 .../src/gui/gxs/GxsCommentTreeWidget.cpp      | 49 +++++++------------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 7c55931fa..0db786c01 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -1204,7 +1204,12 @@ void PostedListWidgetWithModel::voteMsg(RsGxsGrpMsgIdPair msg,bool up_or_down)
         return;
     }
 
-    rsPosted->voteForPost(up_or_down,msg.first,msg.second,voter_id);
+    RsGxsVoteType tvote = up_or_down?(RsGxsVoteType::UP):(RsGxsVoteType::DOWN);
+
+    std::string error_str;
+    RsGxsMessageId vote_id;
+    if(!rsPosted->voteForPost(msg.first,msg.second,voter_id,tvote,vote_id,error_str))
+        QMessageBox::critical(nullptr,tr("Could not vote"), tr("Error occured while voting: ")+QString::fromStdString(error_str));
 }
 
 #ifdef TODO
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index 481ad0e81..4d5fd4708 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -32,6 +32,7 @@
 #include <QTextEdit>
 #include <QHeaderView>
 #include <QClipboard>
+#include <QMessageBox>
 #include <QDateTime>
 #include <QMenu>
 #include <QMimeData>
@@ -402,35 +403,27 @@ void GxsCommentTreeWidget::setVoteId(const RsGxsId &voterId)
 void GxsCommentTreeWidget::vote(const RsGxsGroupId &groupId, const RsGxsMessageId &threadId, 
 					const RsGxsMessageId &parentId, const RsGxsId &authorId, bool up)
 {
-        RsGxsVote vote;
+    RsThread::async([this,groupId,threadId,parentId,authorId,up]()
+    {
+        std::string error_string;
+        RsGxsMessageId vote_id;
+        RsGxsVoteType tvote = up?(RsGxsVoteType::UP):(RsGxsVoteType::DOWN);
 
-        vote.mMeta.mGroupId = groupId;
-        vote.mMeta.mThreadId = threadId;
-        vote.mMeta.mParentId = parentId;
-        vote.mMeta.mAuthorId = authorId;
+        bool res = mCommentService->voteForComment(groupId, threadId, parentId, authorId,tvote,vote_id, error_string);
 
-	if (up)
-	{
-		vote.mVoteType = GXS_VOTE_UP;
-	}
-	else
-	{
-		vote.mVoteType = GXS_VOTE_DOWN;
-	}
+        RsQThreadUtils::postToObject( [this,res,error_string]()
+        {
 
-#ifdef DEBUG_GXSCOMMENT_TREEWIDGET
-        std::cerr << "GxsCommentTreeWidget::vote()";
-        std::cerr << std::endl;
+            if(res)
+                service_requestComments(mGroupId,mMsgVersions);
+            else
+                QMessageBox::critical(nullptr,tr("Cannot vote"),tr("Error while voting: ")+QString::fromStdString(error_string));
+        });
+    });
 
-        std::cerr << "GroupId : " << vote.mMeta.mGroupId << std::endl;
-        std::cerr << "ThreadId : " << vote.mMeta.mThreadId << std::endl;
-        std::cerr << "ParentId : " << vote.mMeta.mParentId << std::endl;
-        std::cerr << "AuthorId : " << vote.mMeta.mAuthorId << std::endl;
-#endif
-
-	uint32_t token;
-        mCommentService->createNewVote(token, vote);
-        mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, COMMENT_VOTE_ACK);
+    //	uint32_t token;
+    //  mCommentService->createNewVote(token, vote);
+    //  mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, COMMENT_VOTE_ACK);
 }
 
 
@@ -558,12 +551,6 @@ void GxsCommentTreeWidget::service_requestComments(const RsGxsGroupId& group_id,
 
         }, this );
     });
-    // RsTokReqOptions opts;
-    // opts.mReqType = GXS_REQUEST_TYPE_MSG_RELATED_DATA;
-    // opts.mOptions = RS_TOKREQOPT_MSG_THREAD | RS_TOKREQOPT_MSG_LATEST;
-
-    // uint32_t token;
-    // mTokenQueue->requestMsgRelatedInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, ids_to_ask, GXSCOMMENTS_LOADTHREAD);
 }
 
 #ifdef TODO

From cdc650540b5c7259fea5ad19d62747a0323f9388 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 4 Jul 2022 17:25:11 +0200
Subject: [PATCH 091/503] removed token queue from CreateCircleDialog

---
 .../src/gui/Circles/CreateCircleDialog.cpp    | 234 ++++++++++--------
 1 file changed, 124 insertions(+), 110 deletions(-)

diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
index c5c58cb14..f878721c9 100644
--- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
@@ -422,7 +422,7 @@ void CreateCircleDialog::createCircle()
         close() ;
         return ;
     }
-    
+
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
     std::cerr << "CreateCircleDialog::createCircle()";
     std::cerr << std::endl;
@@ -431,10 +431,10 @@ void CreateCircleDialog::createCircle()
     QString name = ui.circleName->text();
 
     if(name.isEmpty()) {
-	    /* error message */
-	    QMessageBox::warning(this, tr("RetroShare"),tr("Please set a name for your Circle"), QMessageBox::Ok, QMessageBox::Ok);
+        /* error message */
+        QMessageBox::warning(this, tr("RetroShare"),tr("Please set a name for your Circle"), QMessageBox::Ok, QMessageBox::Ok);
 
-	    return; //Don't add  a empty Subject!!
+        return; //Don't add  a empty Subject!!
     }
 
     RsGxsCircleGroup circle = mCircleGroup;	// init with loaded group
@@ -448,23 +448,23 @@ void CreateCircleDialog::createCircle()
     {
     case GxsIdChooser::KnowId:
     case GxsIdChooser::UnKnowId:
-	    circle.mMeta.mAuthorId = authorId;
+        circle.mMeta.mAuthorId = authorId;
         circle.mMeta.mAuthenFlags = GXS_SERV::GRP_OPTION_AUTHEN_AUTHOR_SIGN;
 
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG
-	    std::cerr << "CreateCircleDialog::createCircle() AuthorId: " << authorId;
-	    std::cerr << std::endl;
+        std::cerr << "CreateCircleDialog::createCircle() AuthorId: " << authorId;
+        std::cerr << std::endl;
 #endif
 
-	    break;
+        break;
     case GxsIdChooser::NoId:
     case GxsIdChooser::None:
         circle.mMeta.mAuthorId.clear();
         circle.mMeta.mAuthenFlags = 0;
     default: ;
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-	    std::cerr << "CreateCircleDialog::createCircle() No AuthorId Chosen!";
-	    std::cerr << std::endl;
+        std::cerr << "CreateCircleDialog::createCircle() No AuthorId Chosen!";
+        std::cerr << std::endl;
 #endif
     }
 
@@ -472,144 +472,163 @@ void CreateCircleDialog::createCircle()
     /* copy Ids from GUI */
     QTreeWidget *tree = ui.treeWidget_membership;
     int count = tree->topLevelItemCount();
-    for(int i = 0; i < count; ++i)  
+    for(int i = 0; i < count; ++i)
     {
-	    QTreeWidgetItem *item = tree->topLevelItem(i);
-	    QString keyId = item->text(RSCIRCLEID_COL_KEYID);
+        QTreeWidgetItem *item = tree->topLevelItem(i);
+        QString keyId = item->text(RSCIRCLEID_COL_KEYID);
 
-	    /* insert into circle */
-	    if (mIsExternalCircle) 
-	    {
-		    RsGxsId key_id_gxs(keyId.toStdString()) ;
+        /* insert into circle */
+        if (mIsExternalCircle)
+        {
+            RsGxsId key_id_gxs(keyId.toStdString()) ;
 
-		    if(key_id_gxs.isNull())
-		    {
-			    std::cerr << "Error: Not a proper keyID: " << keyId.toStdString() << std::endl;
-			    continue ;
-		    } 
+            if(key_id_gxs.isNull())
+            {
+                std::cerr << "Error: Not a proper keyID: " << keyId.toStdString() << std::endl;
+                continue ;
+            }
 
-		    circle.mInvitedMembers.insert(key_id_gxs) ;
+            circle.mInvitedMembers.insert(key_id_gxs) ;
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-		    std::cerr << "CreateCircleDialog::createCircle() Inserting Member: " << keyId.toStdString();
-		    std::cerr << std::endl;
+            std::cerr << "CreateCircleDialog::createCircle() Inserting Member: " << keyId.toStdString();
+            std::cerr << std::endl;
 #endif
-	    } 
-	    else 
-	    {
-		    RsPgpId key_id_pgp(keyId.toStdString()) ;
+        }
+        else
+        {
+            RsPgpId key_id_pgp(keyId.toStdString()) ;
 
-		    if(key_id_pgp.isNull())
-		    {
-			    std::cerr << "Error: Not a proper PGP keyID: " << keyId.toStdString() << std::endl;
-			    continue ;
-		    } 
+            if(key_id_pgp.isNull())
+            {
+                std::cerr << "Error: Not a proper PGP keyID: " << keyId.toStdString() << std::endl;
+                continue ;
+            }
 
-		    circle.mLocalFriends.insert(key_id_pgp) ;
+            circle.mLocalFriends.insert(key_id_pgp) ;
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-		    std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString();
-		    std::cerr << std::endl;
+            std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString();
+            std::cerr << std::endl;
 #endif
-	    }
+        }
 
     }
 
-    if (mIsExternalCircle) 
+    if (mIsExternalCircle)
     {
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-	    std::cerr << "CreateCircleDialog::createCircle() External Circle";
-	    std::cerr << std::endl;
+        std::cerr << "CreateCircleDialog::createCircle() External Circle";
+        std::cerr << std::endl;
 #endif
 
-	    // set distribution from GUI.
-	    circle.mMeta.mCircleId.clear() ;
+        // set distribution from GUI.
+        circle.mMeta.mCircleId.clear() ;
         circle.mMeta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC;
 
-	    if (ui.radioButton_Public->isChecked()) {
+        if (ui.radioButton_Public->isChecked()) {
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-		    std::cerr << "CreateCircleDialog::createCircle() Public Circle";
-		    std::cerr << std::endl;
+            std::cerr << "CreateCircleDialog::createCircle() Public Circle";
+            std::cerr << std::endl;
 #endif
 
-		    circle.mMeta.mCircleType =  GXS_CIRCLE_TYPE_PUBLIC;
+            circle.mMeta.mCircleType =  GXS_CIRCLE_TYPE_PUBLIC;
 
-	    } else if (ui.radioButton_Self->isChecked()) {
+        } else if (ui.radioButton_Self->isChecked()) {
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-		    std::cerr << "CreateCircleDialog::createCircle() ExtSelfRef Circle";
-		    std::cerr << std::endl;
+            std::cerr << "CreateCircleDialog::createCircle() ExtSelfRef Circle";
+            std::cerr << std::endl;
 #endif
 
-		    circle.mMeta.mCircleType =  GXS_CIRCLE_TYPE_EXT_SELF;
-	    } else if (ui.radioButton_Restricted->isChecked()) {
+            circle.mMeta.mCircleType =  GXS_CIRCLE_TYPE_EXT_SELF;
+        } else if (ui.radioButton_Restricted->isChecked()) {
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-		    std::cerr << "CreateCircleDialog::createCircle() External (Other) Circle";
-		    std::cerr << std::endl;
+            std::cerr << "CreateCircleDialog::createCircle() External (Other) Circle";
+            std::cerr << std::endl;
 #endif
 
-		    circle.mMeta.mCircleType =  GXS_CIRCLE_TYPE_EXTERNAL;
+            circle.mMeta.mCircleType =  GXS_CIRCLE_TYPE_EXTERNAL;
 
-		    /* grab circle ID from chooser */
-		    RsGxsCircleId chosenId;
-		    if (ui.circleComboBox->getChosenCircle(chosenId)) {
+            /* grab circle ID from chooser */
+            RsGxsCircleId chosenId;
+            if (ui.circleComboBox->getChosenCircle(chosenId)) {
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-			    std::cerr << "CreateCircleDialog::createCircle() ChosenId: " << chosenId;
-			    std::cerr << std::endl;
+                std::cerr << "CreateCircleDialog::createCircle() ChosenId: " << chosenId;
+                std::cerr << std::endl;
 #endif
 
-			    circle.mMeta.mCircleId = chosenId;
-		    } else {//if (ui.circleComboBox->getChosenCircle(chosenId))
+                circle.mMeta.mCircleId = chosenId;
+            } else {//if (ui.circleComboBox->getChosenCircle(chosenId))
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-			    std::cerr << "CreateCircleDialog::createCircle() Error no Id Chosen";
-			    std::cerr << std::endl;
+                std::cerr << "CreateCircleDialog::createCircle() Error no Id Chosen";
+                std::cerr << std::endl;
 #endif
 
-			    QMessageBox::warning(this, tr("RetroShare"),tr("No Restriction Circle Selected"), QMessageBox::Ok, QMessageBox::Ok);
-			    return; 
-		    }//else (ui.circleComboBox->getChosenCircle(chosenId))
-	    } 
-	    else 
-	    {
-		    QMessageBox::warning(this, tr("RetroShare"),tr("No Circle Limitations Selected"), QMessageBox::Ok, QMessageBox::Ok);
-		    return; 
-	    }
-    } 
-    else 
-    {
-#ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-	    std::cerr << "CreateCircleDialog::createCircle() Personal Circle";
-	    std::cerr << std::endl;
-#endif
-
-	    // set personal distribution
-	    circle.mMeta.mCircleId.clear() ;
-	    circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_LOCAL;
-    }
-
-    uint32_t token;
-    
-    if(mIsExistingCircle) 
-    {
-#ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-	    std::cerr << "CreateCircleDialog::updateCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl;
-	    std::cerr << "CreateCircleDialog::updateCircle() : mCircleId: " << circle.mMeta.mCircleId << std::endl;
-	    std::cerr << "CreateCircleDialog::updateCircle() : mGroupId: " << circle.mMeta.mGroupId << std::endl;
-
-	    std::cerr << "CreateCircleDialog::updateCircle() Checks and Balances Okay - calling service proper.."<< std::endl;
-#endif
-
-	    rsGxsCircles->updateGroup(token, circle);
+                QMessageBox::warning(this, tr("RetroShare"),tr("No Restriction Circle Selected"), QMessageBox::Ok, QMessageBox::Ok);
+                return;
+            }//else (ui.circleComboBox->getChosenCircle(chosenId))
+        }
+        else
+        {
+            QMessageBox::warning(this, tr("RetroShare"),tr("No Circle Limitations Selected"), QMessageBox::Ok, QMessageBox::Ok);
+            return;
+        }
     }
     else
-    {    
+    {
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-	    std::cerr << "CreateCircleDialog::createCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl;
-	    std::cerr << "CreateCircleDialog::createCircle() : mCircleId: " << circle.mMeta.mCircleId << std::endl;
-
-	    std::cerr << "CreateCircleDialog::createCircle() Checks and Balances Okay - calling service proper.."<< std::endl;
+        std::cerr << "CreateCircleDialog::createCircle() Personal Circle";
+        std::cerr << std::endl;
 #endif
 
-	    rsGxsCircles->createGroup(token, circle);
+        // set personal distribution
+        circle.mMeta.mCircleId.clear() ;
+        circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_LOCAL;
     }
 
+
+    RsThread::async([&circle,this]()
+    {
+        RsGxsCircleId circleId;
+
+        if(mIsExistingCircle)
+        {
+#ifdef DEBUG_CREATE_CIRCLE_DIALOG
+            std::cerr << "CreateCircleDialog::updateCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl;
+            std::cerr << "CreateCircleDialog::updateCircle() : mCircleId: " << circle.mMeta.mCircleId << std::endl;
+            std::cerr << "CreateCircleDialog::updateCircle() : mGroupId: " << circle.mMeta.mGroupId << std::endl;
+
+            std::cerr << "CreateCircleDialog::updateCircle() Checks and Balances Okay - calling service proper.."<< std::endl;
+#endif
+            rsGxsCircles->editCircle(circle);
+
+            circleId = RsGxsCircleId(circle.mMeta.mGroupId);
+        }
+        else
+        {
+#ifdef DEBUG_CREATE_CIRCLE_DIALOG
+            std::cerr << "CreateCircleDialog::createCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl;
+            std::cerr << "CreateCircleDialog::createCircle() : mCircleId: " << circle.mMeta.mCircleId << std::endl;
+
+            std::cerr << "CreateCircleDialog::createCircle() Checks and Balances Okay - calling service proper.."<< std::endl;
+#endif
+            rsGxsCircles->createCircle(circle.mMeta.mGroupName,
+                                       static_cast<RsGxsCircleType>(circle.mMeta.mCircleType),
+                                       circleId,
+                                       circle.mMeta.mCircleId,
+                                       circle.mMeta.mAuthorId,
+                                       circle.mInvitedMembers,
+                                       circle.mLocalFriends);
+        }
+
+        RsQThreadUtils::postToObject( [this,circle,circleId]()
+        {
+            if(!mIsExistingCircle)
+                QMessageBox::information(nullptr,tr("Circle created"),
+                                         tr("Your new circle has been created:\n   Name: %1\n   Id: %2.")
+                                            .arg(QString::fromUtf8(circle.mMeta.mGroupName.c_str()))
+                                            .arg(QString::fromStdString(circleId.toStdString())));
+        });
+    });
+
     close();
 }
 
@@ -810,11 +829,6 @@ void CreateCircleDialog::loadIdentities()
 
 void CreateCircleDialog::fillIdentitiesList(const std::vector<RsGxsIdGroup>& id_groups)
 {
-#ifdef DEBUG_CREATE_CIRCLE_DIALOG 
-	std::cerr << "CreateCircleDialog::loadIdentities(" << token << ")";
-	std::cerr << std::endl;
-#endif
-
 	QTreeWidget *tree = ui.treeWidget_IdList;
 	tree->clear();
 

From 73279db2c5e2347e972f3b8c7d96179be6e63d6f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 6 Jul 2022 17:13:34 +0200
Subject: [PATCH 092/503] removed tokens from boards and added missing blocking
 API calls

---
 .../src/gui/Posted/PostedCreatePostDialog.cpp | 17 +++++++++--
 .../src/gui/Posted/PostedDialog.cpp           | 28 -------------------
 retroshare-gui/src/gui/Posted/PostedItem.cpp  | 20 +++++++------
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
index ce22fa7f3..c1e0ce5ad 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
@@ -28,6 +28,7 @@
 #include "ui_PostedCreatePostDialog.h"
 
 #include "util/misc.h"
+#include "util/qtthreadsutils.h"
 #include "util/RichTextEdit.h"
 #include "gui/feeds/SubFileItem.h"
 #include "util/rsdir.h"
@@ -178,10 +179,20 @@ void PostedCreatePostDialog::createPost()
 		return;
 	}
 
-	uint32_t token;
-	mPosted->createPost(token, post);
+    RsThread::async([this,post]()
+    {
+        RsGxsMessageId post_id;
 
-	accept();
+        bool res = rsPosted->createPost(post,post_id);
+
+        RsQThreadUtils::postToObject( [res,this]()
+        {
+            if(!res)
+                QMessageBox::information(nullptr,tr("Error while creating post"),tr("An error occurred while creating the post."));
+
+            accept();
+        }, this );
+    });
 }
 
 void PostedCreatePostDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
diff --git a/retroshare-gui/src/gui/Posted/PostedDialog.cpp b/retroshare-gui/src/gui/Posted/PostedDialog.cpp
index 33a9c5854..6d41767d2 100644
--- a/retroshare-gui/src/gui/Posted/PostedDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedDialog.cpp
@@ -217,34 +217,6 @@ QWidget *PostedDialog::createCommentHeaderWidget(const RsGxsGroupId &grpId, cons
 	return new PostedItem(NULL, 0, grpId, msgId, true, false);
 }
 
-#ifdef TO_REMOVE
-void PostedDialog::loadGroupSummaryToken(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo, RsUserdata *&userdata)
-{
-	std::vector<RsPostedGroup> groups;
-	rsPosted->getGroupData(token, groups);
-
-	/* Save groups to fill description */
-	PostedGroupInfoData *postedData = new PostedGroupInfoData;
-	userdata = postedData;
-
-	std::vector<RsPostedGroup>::iterator groupIt;
-	for (groupIt = groups.begin(); groupIt != groups.end(); ++groupIt) {
-		RsPostedGroup &group = *groupIt;
-		groupInfo.push_back(group.mMeta);
-		
-		if (group.mGroupImage.mData != NULL) {
-			QPixmap image;
-			GxsIdDetails::loadPixmapFromData(group.mGroupImage.mData, group.mGroupImage.mSize, image,GxsIdDetails::ORIGINAL);
-			postedData->mIcon[group.mMeta.mGroupId] = image;
-		}
-
-		if (!group.mDescription.empty()) {
-			postedData->mDescription[group.mMeta.mGroupId] = QString::fromUtf8(group.mDescription.c_str());
-		}
-	}
-}
-#endif
-
 void PostedDialog::groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo)
 {
 	GxsGroupFrameDialog::groupInfoToGroupItemInfo(groupData, groupItemInfo);
diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
index d9242c571..dcb5c2c97 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
@@ -279,16 +279,20 @@ void BasePostedItem::loadComments()
 }
 void BasePostedItem::readToggled(bool checked)
 {
-	if (mInFill) {
-		return;
-	}
+    if (mInFill) {
+        return;
+    }
 
-	RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
+    RsThread::async([this,checked]()
+    {
+        RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
+        rsPosted->setPostReadStatus(msgPair, !checked);
 
-	uint32_t token;
-	rsPosted->setMessageReadStatus(token, msgPair, !checked);
-
-	setReadStatus(false, checked);
+        RsQThreadUtils::postToObject( [checked,this]()
+        {
+            setReadStatus(false, checked);
+        }, this );
+    });
 }
 
 void BasePostedItem::readAndClearItem()

From e0c3f274694691a630b216d14ae7778fabfc445f Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Fri, 8 Jul 2022 22:01:08 +0200
Subject: [PATCH 093/503] Fixed generating changelog in Windows MinGW build

---
 build_scripts/Windows/tools/generate-changelog.bat | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build_scripts/Windows/tools/generate-changelog.bat b/build_scripts/Windows/tools/generate-changelog.bat
index c38225045..2eb87ced6 100644
--- a/build_scripts/Windows/tools/generate-changelog.bat
+++ b/build_scripts/Windows/tools/generate-changelog.bat
@@ -18,6 +18,8 @@ copy nul %logfile% > nul
 
 pushd %~1
 
+set Percent=%%
+
 set last=HEAD
 for /f %%t in ('git tag --sort=-taggerdate --merged ^| findstr v') do (
 	echo generating changelog for !last!..%%t	
@@ -30,7 +32,7 @@ for /f %%t in ('git tag --sort=-taggerdate --merged ^| findstr v') do (
 	rem echo !last! ---^> %%t >> %logfile%
 	echo ----------------------------------------------- >> %logfile%
 	echo. >> %logfile%
-	git log %%t..!last! --no-merges "--pretty=format:%%h %%ai %%<(10,trunc)%%an %%s" >> %logfile%
+	git log %%t..!last! --no-merges "--pretty=format:!Percent!h !Percent!ai !Percent!<(10,trunc)!Percent!an !Percent!s" >> %logfile%
 	echo. >> %logfile%
 	echo. >> %logfile%
 	set last=%%t

From 1089d1470e28e483d74b2d8f2079eafe62b293e3 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 9 Jul 2022 15:49:33 +0200
Subject: [PATCH 094/503] update posts list after vote

---
 retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 0db786c01..1eae122fe 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -1190,8 +1190,7 @@ void PostedListWidgetWithModel::subscribeGroup(bool subscribe)
 
 	RsThread::async([=]()
 	{
-        uint32_t token;
-		rsPosted->subscribeToGroup(token,grpId, subscribe);
+		rsPosted->subscribeToBoard(grpId, subscribe);
 	} );
 }
 
@@ -1210,6 +1209,8 @@ void PostedListWidgetWithModel::voteMsg(RsGxsGrpMsgIdPair msg,bool up_or_down)
     RsGxsMessageId vote_id;
     if(!rsPosted->voteForPost(msg.first,msg.second,voter_id,tvote,vote_id,error_str))
         QMessageBox::critical(nullptr,tr("Could not vote"), tr("Error occured while voting: ")+QString::fromStdString(error_str));
+    else
+        updateDisplay(true);
 }
 
 #ifdef TODO

From ac4b9b297131df19a21f9489a5b9c2df2d5b49a6 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 9 Jul 2022 22:33:42 +0200
Subject: [PATCH 095/503] removed token system from GxsCommentDialog

---
 .../gui/Posted/PostedListWidgetWithModel.cpp  |   2 +-
 .../src/gui/feeds/BoardsCommentsItem.cpp      |  16 ++-
 .../src/gui/feeds/ChannelsCommentsItem.cpp    |   2 +-
 .../src/gui/feeds/GxsChannelPostItem.cpp      |   2 +-
 .../src/gui/feeds/GxsForumMsgItem.cpp         |  19 +--
 .../src/gui/gxs/GxsCommentContainer.cpp       |   2 +-
 .../src/gui/gxs/GxsCommentDialog.cpp          |   8 +-
 retroshare-gui/src/gui/gxs/GxsCommentDialog.h |   4 +-
 .../src/gui/gxs/GxsCommentTreeWidget.cpp      | 123 +-----------------
 .../src/gui/gxs/GxsCommentTreeWidget.h        |  13 +-
 .../src/gui/gxs/GxsGroupFrameDialog.cpp       |   2 +-
 .../gui/gxschannels/GxsChannelPostsModel.cpp  |   4 +-
 .../GxsChannelPostsWidgetWithModel.cpp        |   4 +-
 13 files changed, 42 insertions(+), 159 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 1eae122fe..9a46b65f0 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -795,7 +795,7 @@ void PostedListWidgetWithModel::openComments(const RsGxsMessageId& msgId)
     ui->idChooser->getChosenId(current_author);
 
     RsPostedPost post = index.data(Qt::UserRole).value<RsPostedPost>() ;
-    auto *commentDialog = new GxsCommentDialog(this,current_author,rsPosted->getTokenService(),rsPosted);
+    auto *commentDialog = new GxsCommentDialog(this,current_author,rsPosted);
 
     std::set<RsGxsMessageId> msg_versions({post.mMeta.mMsgId});
     commentDialog->commentLoad(post.mMeta.mGroupId, msg_versions, post.mMeta.mMsgId);
diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
index 814a915d9..02af1afc3 100644
--- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
@@ -28,6 +28,7 @@
 #include "gui/feeds/FeedHolder.h"
 #include "gui/RetroShareLink.h"
 #include "gui/gxs/GxsIdDetails.h"
+#include "util/qtthreadsutils.h"
 #include "util/DateTime.h"
 #include "util/misc.h"
 #include "util/stringutil.h"
@@ -286,12 +287,15 @@ void BaseBoardsCommentsItem::readToggled(bool checked)
 		return;
 	}
 
-	RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
-
-	uint32_t token;
-	rsPosted->setMessageReadStatus(token, msgPair, !checked);
-
-	setReadStatus(false, checked);
+    RsThread::async( [this,checked]() {
+		RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
+        
+        rsPosted->setCommentReadStatus(msgPair, !checked);
+        
+        RsQThreadUtils::postToObject( [this,checked]() {
+			setReadStatus(false, checked);
+        } );
+    });
 }
 
 void BaseBoardsCommentsItem::readAndClearItem()
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
index 7f1b23a92..296f3f173 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
@@ -617,7 +617,7 @@ void ChannelsCommentsItem::readToggled(bool /*checked*/)
 
 	RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
 
-	rsGxsChannels->markRead(msgPair, isUnread());
+    rsGxsChannels->setCommentReadStatus(msgPair, isUnread());
 
 	//setReadStatus(false, checked); // Updated by events
 }
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
index 962ee5327..102dfb637 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
@@ -850,7 +850,7 @@ void GxsChannelPostItem::readToggled(bool /*checked*/)
 
 	RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
 
-	rsGxsChannels->markRead(msgPair, isUnread());
+    rsGxsChannels->setMessageReadStatus(msgPair, isUnread());
 
 	//setReadStatus(false, checked); // Updated by events
 }
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
index 5c33b4f13..8bf4899f1 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
@@ -475,18 +475,21 @@ void GxsForumMsgItem::unsubscribeForum()
 
 void GxsForumMsgItem::setAsRead()
 {
-	if (mInFill) {
-		return;
-	}
+    if (mInFill) {
+        return;
+    }
 
-	mCloseOnRead = false;
+    mCloseOnRead = false;
 
-	RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
+    RsThread::async( [this]() {
+        RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
 
-	uint32_t token;
-	rsGxsForums->setMessageReadStatus(token, msgPair, true);
+        rsGxsForums->markRead(msgPair, true);
 
-	setReadStatus(false, false);
+        RsQThreadUtils::postToObject( [this]() {
+            setReadStatus(false, true);
+        } );
+    });
 }
 
 void GxsForumMsgItem::on_linkActivated(QString link)
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentContainer.cpp b/retroshare-gui/src/gui/gxs/GxsCommentContainer.cpp
index b80539cea..5d899104e 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentContainer.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentContainer.cpp
@@ -60,7 +60,7 @@ void GxsCommentContainer::commentLoad(const RsGxsGroupId &grpId, const std::set<
 		comments += "...";
 	}
 
-    GxsCommentDialog *commentDialog = new GxsCommentDialog(this, RsGxsId(),getTokenService(), getCommentService());
+    GxsCommentDialog *commentDialog = new GxsCommentDialog(this, RsGxsId(),getCommentService());
 
 	QWidget *commentHeader = createHeaderWidget(grpId, msgId);
 	commentDialog->setCommentHeader(commentHeader);
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
index b610f9dd3..80d7c9739 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
@@ -30,13 +30,13 @@
 #include <QDateTime>
 
 /** Constructor */
-GxsCommentDialog::GxsCommentDialog(QWidget *parent, const RsGxsId &default_author, RsTokenService *token_service, RsGxsCommentService *comment_service)
+GxsCommentDialog::GxsCommentDialog(QWidget *parent, const RsGxsId &default_author, RsGxsCommentService *comment_service)
 	: QWidget(parent), ui(new Ui::GxsCommentDialog)
 {
 	/* Invoke the Qt Designer generated QObject setup routine */
 	ui->setupUi(this);
 
-    setTokenService(token_service,comment_service);
+    setTokenService(comment_service);
     init(default_author);
 }
 	
@@ -67,9 +67,9 @@ void GxsCommentDialog::init(const RsGxsId& default_author)
 	ui->sortBox->setIconSize(QSize(S*1.5,S*1.5));
 }
 
-void GxsCommentDialog::setTokenService(RsTokenService *token_service, RsGxsCommentService *comment_service)
+void GxsCommentDialog::setTokenService(RsGxsCommentService *comment_service)
 {
-	ui->treeWidget->setup(token_service, comment_service);
+    ui->treeWidget->setup(comment_service);
 }
 
 GxsCommentDialog::GxsCommentDialog(QWidget *parent,const RsGxsId &default_author)
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.h b/retroshare-gui/src/gui/gxs/GxsCommentDialog.h
index 4be6edede..ed3c048e6 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.h
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.h
@@ -33,10 +33,10 @@ class GxsCommentDialog: public QWidget
 
 public:
     GxsCommentDialog(QWidget *parent=nullptr,const RsGxsId& default_author=RsGxsId());
-    GxsCommentDialog(QWidget *parent,const RsGxsId& default_author, RsTokenService *token_service, RsGxsCommentService *comment_service);
+    GxsCommentDialog(QWidget *parent, const RsGxsId& default_author, RsGxsCommentService *comment_service);
 	virtual ~GxsCommentDialog();
 
-    void setTokenService(RsTokenService *token_service, RsGxsCommentService *comment_service);
+    void setTokenService(RsGxsCommentService *comment_service);
 	void setCommentHeader(QWidget *header);
     void commentLoad(const RsGxsGroupId &grpId, const std::set<RsGxsMessageId> &msg_versions, const RsGxsMessageId &most_recent_msgId, bool use_cache=false);
     void commentClear();
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index 4d5fd4708..0b65b7c3d 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -249,7 +249,7 @@ void GxsCommentTreeWidget::mouseMoveEvent(QMouseEvent *e)
 }
 
 GxsCommentTreeWidget::GxsCommentTreeWidget(QWidget *parent)
-    :QTreeWidget(parent), mTokenQueue(NULL), mRsTokenService(NULL), mCommentService(NULL)
+    :QTreeWidget(parent), mCommentService(NULL)
 {
     setVerticalScrollMode(ScrollPerPixel);
 	setContextMenuPolicy(Qt::CustomContextMenu);
@@ -299,9 +299,6 @@ void GxsCommentTreeWidget::updateContent()
 }
 GxsCommentTreeWidget::~GxsCommentTreeWidget()
 {
-	if (mTokenQueue) {
-		delete(mTokenQueue);
-	}
 }
 
 void GxsCommentTreeWidget::setCurrentCommentMsgId(QTreeWidgetItem *current, QTreeWidgetItem *previous)
@@ -420,10 +417,6 @@ void GxsCommentTreeWidget::vote(const RsGxsGroupId &groupId, const RsGxsMessageI
                 QMessageBox::critical(nullptr,tr("Cannot vote"),tr("Error while voting: ")+QString::fromStdString(error_string));
         });
     });
-
-    //	uint32_t token;
-    //  mCommentService->createNewVote(token, vote);
-    //  mTokenQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_ACK, COMMENT_VOTE_ACK);
 }
 
 
@@ -478,12 +471,10 @@ void GxsCommentTreeWidget::copyComment()
 	clipboard->setMimeData(mimeData, QClipboard::Clipboard);
 }
 
-void GxsCommentTreeWidget::setup(RsTokenService *token_service, RsGxsCommentService *comment_service)
+void GxsCommentTreeWidget::setup(RsGxsCommentService *comment_service)
 {
-	mRsTokenService = token_service;
 	mCommentService = comment_service;
-	mTokenQueue = new TokenQueue(token_service, this);
-	connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(customPopUpMenu(QPoint)));
+    connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(customPopUpMenu(QPoint)));
 	connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(setCurrentCommentMsgId(QTreeWidgetItem*, QTreeWidgetItem*)));
 
 	return;
@@ -743,36 +734,6 @@ int GxsCommentTreeWidget::treeCount(QTreeWidget *tree, QTreeWidgetItem *parent)
     }
     return count;
 }
-// void GxsCommentTreeWidget::loadThread(const uint32_t &token)
-// {
-// 	clearItems();
-//
-// 	service_loadThread(token);
-//
-// 	completeItems();
-//
-//     emit commentsLoaded(treeCount(this));
-// }
-
-void GxsCommentTreeWidget::acknowledgeComment(const uint32_t &token)
-{
-	RsGxsGrpMsgIdPair msgId;
-	mCommentService->acknowledgeComment(token, msgId);
-
-	// simply reload data
-	service_requestComments(mGroupId,mMsgVersions);
-}
-
-
-void GxsCommentTreeWidget::acknowledgeVote(const uint32_t &token)
-{
-	RsGxsGrpMsgIdPair msgId;
-	if (mCommentService->acknowledgeVote(token, msgId))
-	{
-		// reload data if vote was added.
-		service_requestComments(mGroupId,mMsgVersions);
-	}
-}
 
 void GxsCommentTreeWidget::service_loadThread(const std::vector<RsGxsComment>& comments)
 {
@@ -796,32 +757,6 @@ void GxsCommentTreeWidget::service_loadThread(const std::vector<RsGxsComment>& c
     insertComments(comments);
 }
 
-
-// void GxsCommentTreeWidget::service_loadThread(const uint32_t &token)
-// {
-// 	std::cerr << "GxsCommentTreeWidget::service_loadThread() ERROR must be overloaded!";
-// 	std::cerr << std::endl;
-//
-// 	std::vector<RsGxsComment> comments;
-// 	mCommentService->getRelatedComments(token, comments);
-//
-//     // This is inconsistent since we cannot know here that all comments are for the same thread. However they are only
-//     // requested in requestComments() where a single MsgId is used.
-//
-//     if(mUseCache)
-//     {
-//         QMutexLocker lock(&mCacheMutex);
-//
-//         if(!comments.empty())
-//         {
-//             std::cerr << "Updating cache with " << comments.size() << " for thread " << comments[0].mMeta.mThreadId << std::endl;
-//             mCommentsCache[comments[0].mMeta.mThreadId] = comments;
-//         }
-//     }
-//
-//     insertComments(comments);
-// }
-
 void GxsCommentTreeWidget::insertComments(const std::vector<RsGxsComment>& comments)
 {
     std::list<RsGxsMessageId> new_comments;
@@ -892,10 +827,7 @@ void GxsCommentTreeWidget::insertComments(const std::vector<RsGxsComment>& comme
     // now set all loaded comments as not new, since they have been loaded.
 
     for(auto cid:new_comments)
-    {
-        uint32_t token=0;
-        mCommentService->setCommentAsRead(token,mGroupId,cid);
-    }
+        mCommentService->setCommentReadStatus(RsGxsGrpMsgIdPair(mGroupId,cid),true);
 }
 
 QTreeWidgetItem *GxsCommentTreeWidget::service_createMissingItem(const RsGxsMessageId& parent)
@@ -923,50 +855,3 @@ QTreeWidgetItem *GxsCommentTreeWidget::service_createMissingItem(const RsGxsMess
 	return item;
 }	
 
-
-
-void GxsCommentTreeWidget::loadRequest(const TokenQueue *queue, const TokenRequest &req)
-{
-#ifdef DEBUG_GXSCOMMENT_TREEWIDGET
-	std::cerr << "GxsCommentTreeWidget::loadRequest() UserType: " << req.mUserType;
-	std::cerr << std::endl;
-#endif
-		
-	if (queue != mTokenQueue)
-	{
-		std::cerr << "GxsCommentTreeWidget::loadRequest() Queue ERROR";
-		std::cerr << std::endl;
-		return;
-	}
-		
-	/* now switch on req */
-		switch(req.mType)
-	{
-		
-			case TOKENREQ_MSGINFO:
-			{
-				switch(req.mAnsType)
-				{
-					case RS_TOKREQ_ANSTYPE_ACK:
-						if (req.mUserType == COMMENT_VOTE_ACK)
-						{
-							acknowledgeVote(req.mToken);
-						}
-						else
-						{
-							acknowledgeComment(req.mToken);
-						}
-						break;
-//					case RS_TOKREQ_ANSTYPE_DATA:
-//						loadThread(req.mToken);
-//						break;
-				}
-			}
-			break;
-			default:
-					std::cerr << "GxsCommentTreeWidget::loadRequest() UNKNOWN UserType ";
-					std::cerr << std::endl;
-					break;
-
-	}
-}
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
index c750b1fcd..43a6f55a5 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
@@ -24,26 +24,24 @@
 #include <QTreeWidget>
 #include <QMutex>
 
-#include "util/TokenQueue.h"
 #include <retroshare/rsgxscommon.h>
 #include <retroshare/rsidentity.h>
 
 class RSTreeWidgetItemCompareRole;
 
-class GxsCommentTreeWidget : public QTreeWidget, public TokenResponse
+class GxsCommentTreeWidget : public QTreeWidget
 {
     Q_OBJECT
         
 public:
     GxsCommentTreeWidget(QWidget *parent = 0);
     ~GxsCommentTreeWidget();
-    void setup(RsTokenService *token_service, RsGxsCommentService *comment_service);
+    void setup(RsGxsCommentService *comment_service);
 
     void requestComments(const RsGxsGroupId& group, const std::set<RsGxsMessageId> &message_versions, const RsGxsMessageId &most_recent_message);
     void getCurrentMsgId(RsGxsMessageId& parentId);
     void applyRankings(std::map<RsGxsMessageId, uint32_t>& positions);
 
-    void loadRequest(const TokenQueue *queue, const TokenRequest &req);
     void setVoteId(const RsGxsId &voterId);
 
     void setUseCache(bool b) { mUseCache = b ;}
@@ -63,11 +61,6 @@ protected:
     void clearItems();
     void completeItems();
 
-    void acknowledgeComment(const uint32_t& token);
-    void acknowledgeVote(const uint32_t &token);
-
-    //void loadThread(const uint32_t &token);
-
     void insertComments(const std::vector<RsGxsComment>& comments);
     void addItem(RsGxsMessageId itemId, RsGxsMessageId parentId, QTreeWidgetItem *item);
 
@@ -114,8 +107,6 @@ protected:
 	
 	RSTreeWidgetItemCompareRole *commentsRole;
 
-    TokenQueue *mTokenQueue;
-    RsTokenService *mRsTokenService;
     RsGxsCommentService *mCommentService;
 
     bool mUseCache;
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 425b87faf..283d1f48f 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -724,7 +724,7 @@ void GxsGroupFrameDialog::loadComment(const RsGxsGroupId &grpId, const QVector<R
 			comments += "…";
 		}
 
-		commentDialog = new GxsCommentDialog(this,RsGxsId(), mInterface->getTokenService(), commentService);
+        commentDialog = new GxsCommentDialog(this,RsGxsId(), commentService);
 
 		QWidget *commentHeader = createCommentHeaderWidget(grpId, most_recent_msgId);
 		if (commentHeader) {
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 31eef8242..06b671532 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -798,7 +798,7 @@ void RsGxsChannelPostsModel::setAllMsgReadStatus(bool read_status)
     for(uint32_t i=0;i<pairs.size();++i)
         RsThread::async([p=pairs[i], read_status]()	// use async because each markRead() waits for the token to complete in order to properly acknowledge it.
         {
-            if(!rsGxsChannels->markRead(p,read_status))
+            if(!rsGxsChannels->setMessageReadStatus(p,read_status))
                 RsErr() << "setAllMsgReadStatus: failed to change status of msg " << p.first << " in group " << p.second << " to status " << read_status << std::endl;
         });
 }
@@ -816,7 +816,7 @@ void RsGxsChannelPostsModel::setMsgReadStatus(const QModelIndex& i,bool read_sta
 	if(!convertRefPointerToTabEntry(ref,entry) || entry >= mFilteredPosts.size())
 		return ;
 
-    rsGxsChannels->markRead(RsGxsGrpMsgIdPair(mPosts[mFilteredPosts[entry]].mMeta.mGroupId,mPosts[mFilteredPosts[entry]].mMeta.mMsgId),read_status);
+    rsGxsChannels->setMessageReadStatus(RsGxsGrpMsgIdPair(mPosts[mFilteredPosts[entry]].mMeta.mGroupId,mPosts[mFilteredPosts[entry]].mMeta.mMsgId),read_status);
 }
 
 QModelIndex RsGxsChannelPostsModel::getIndexOfMessage(const RsGxsMessageId& mid) const
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 129a6a1bf..9fe8e830e 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -487,7 +487,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
     setAutoDownload(false);
 #endif
 
-    ui->commentsDialog->setTokenService(rsGxsChannels->getTokenService(),rsGxsChannels);
+    ui->commentsDialog->setTokenService(rsGxsChannels);
 
 	/* Initialize GUI */
 	settingsChanged();
@@ -852,7 +852,7 @@ void GxsChannelPostsWidgetWithModel::showPostDetails()
 		postId.second = post.mMeta.mMsgId;
 		postId.first  = post.mMeta.mGroupId;
 
-		RsThread::async([postId]() { rsGxsChannels->markRead(postId, true) ; } );
+        RsThread::async([postId]() { rsGxsChannels->setMessageReadStatus(postId, true) ; } );
 	}
 
 	updateDAll_PB();

From 0488293a1f340bf8fc7b8d478fb9bcd28e1e9bad Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 10 Jul 2022 21:34:24 +0200
Subject: [PATCH 096/503] removed more token queue system from forums and
 comments

---
 .../src/gui/gxs/GxsCommentDialog.cpp          |   4 +-
 retroshare-gui/src/gui/gxs/GxsCommentDialog.h |   2 +-
 .../src/gui/gxs/GxsCreateCommentDialog.h      |   1 -
 retroshare-gui/src/gui/gxs/GxsFeedItem.h      |   5 -
 .../GxsChannelPostsWidgetWithModel.cpp        |   2 +-
 .../src/gui/gxsforums/CreateGxsForumMsg.cpp   | 330 +++++++-----------
 .../src/gui/gxsforums/CreateGxsForumMsg.h     |  14 +-
 7 files changed, 129 insertions(+), 229 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
index 80d7c9739..7b9e28131 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
@@ -36,7 +36,7 @@ GxsCommentDialog::GxsCommentDialog(QWidget *parent, const RsGxsId &default_autho
 	/* Invoke the Qt Designer generated QObject setup routine */
 	ui->setupUi(this);
 
-    setTokenService(comment_service);
+    setGxsService(comment_service);
     init(default_author);
 }
 	
@@ -67,7 +67,7 @@ void GxsCommentDialog::init(const RsGxsId& default_author)
 	ui->sortBox->setIconSize(QSize(S*1.5,S*1.5));
 }
 
-void GxsCommentDialog::setTokenService(RsGxsCommentService *comment_service)
+void GxsCommentDialog::setGxsService(RsGxsCommentService *comment_service)
 {
     ui->treeWidget->setup(comment_service);
 }
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.h b/retroshare-gui/src/gui/gxs/GxsCommentDialog.h
index ed3c048e6..6a3eee16c 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.h
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.h
@@ -36,7 +36,7 @@ public:
     GxsCommentDialog(QWidget *parent, const RsGxsId& default_author, RsGxsCommentService *comment_service);
 	virtual ~GxsCommentDialog();
 
-    void setTokenService(RsGxsCommentService *comment_service);
+    void setGxsService(RsGxsCommentService *comment_service);
 	void setCommentHeader(QWidget *header);
     void commentLoad(const RsGxsGroupId &grpId, const std::set<RsGxsMessageId> &msg_versions, const RsGxsMessageId &most_recent_msgId, bool use_cache=false);
     void commentClear();
diff --git a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.h b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.h
index 1f38e2a98..4a21c6457 100644
--- a/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.h
+++ b/retroshare-gui/src/gui/gxs/GxsCreateCommentDialog.h
@@ -25,7 +25,6 @@
 #include <retroshare/rsidentity.h>
 
 #include "retroshare/rsgxscommon.h"
-#include "util/TokenQueue.h"
 
 namespace Ui {
 	class GxsCreateCommentDialog;
diff --git a/retroshare-gui/src/gui/gxs/GxsFeedItem.h b/retroshare-gui/src/gui/gxs/GxsFeedItem.h
index c7c16ea79..bc75d1837 100644
--- a/retroshare-gui/src/gui/gxs/GxsFeedItem.h
+++ b/retroshare-gui/src/gui/gxs/GxsFeedItem.h
@@ -52,11 +52,6 @@ protected:
 	//virtual bool isLoading();
 	//virtual void fillDisplay(RsGxsUpdateBroadcastBase *updateBroadcastBase, bool complete);
 
-#ifdef TO_REMOVE
-	/* TokenResponse */
-	virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);
-#endif
-
 protected slots:
 	void comments(const QString &title);
 	void copyMessageLink();
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 9fe8e830e..2a2d12046 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -487,7 +487,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
     setAutoDownload(false);
 #endif
 
-    ui->commentsDialog->setTokenService(rsGxsChannels);
+    ui->commentsDialog->setGxsService(rsGxsChannels);
 
 	/* Initialize GUI */
 	settingsChanged();
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
index ffbcb2493..26e2ab608 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
@@ -39,6 +39,7 @@
 
 #include "util/HandleRichText.h"
 #include "util/misc.h"
+#include "util/qtthreadsutils.h"
 
 #include <sys/stat.h>
 #include <iostream>
@@ -60,10 +61,6 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
 
 	setAttribute(Qt::WA_DeleteOnClose, true);
 
-	/* Setup Queue */
-	mForumQueue = new TokenQueue(rsGxsForums->getTokenService(), this);
-	mCirclesQueue = new TokenQueue(rsGxsCircles->getTokenService(), this);
-
 	/* Setup UI helper */
 	mStateHelper = new UIStateHelper(this);
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.postButton);
@@ -133,8 +130,6 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
 CreateGxsForumMsg::~CreateGxsForumMsg()
 {
     processSettings(false);
-	delete(mForumQueue);
-	delete(mCirclesQueue);
 }
 
 void CreateGxsForumMsg::processSettings(bool load)
@@ -194,59 +189,109 @@ void  CreateGxsForumMsg::newMsg()
 		return;
 	}
 
-	{/* request Data */
 		mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, true);
 
-		RsTokReqOptions opts;
-		opts.mReqType = GXS_REQUEST_TYPE_GROUP_META;
+        RsThread::async( [this]()
+        {
+            // We only need group Meta information, but forums do not provide it currently
 
-                std::list<RsGxsGroupId> groupIds;
-		groupIds.push_back(mForumId);
+            std::vector<RsGxsForumGroup> forums_info;
+            rsGxsForums->getForumsInfo(std::list<RsGxsGroupId>{ mForumId },forums_info);
 
-		//std::cerr << "ForumsV2Dialog::newMsg() Requesting Group Summary(" << mForumId << ")"<< std::endl;
 
-		uint32_t token;
-		mForumQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_SUMMARY, opts, groupIds, CREATEGXSFORUMMSG_FORUMINFO);
-	}/* request Data */
+            RsQThreadUtils::postToObject( [this,forums_info]()
+            {
+                if(forums_info.size() != 1)
+                {
+                    RsErr() << "Cannot retrieve group information for forum " << mForumId ;
+                  mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, false);
+                  mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, false);
+                  return;
+             }
+             auto fg(forums_info.front());
 
-	if (mParentId.isNull()) {
+             const RsGroupMetaData& fi(fg.mMeta);
+             mForumMetaLoaded = true;
+             mForumMeta = fi;
+
+             if(!fi.mCircleId.isNull())
+                  loadCircleInfo(RsGxsGroupId(fi.mCircleId));
+
+             loadFormInformation();
+
+             mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, false);
+             mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, false);
+
+            },this);
+        });
+
+    if (mParentId.isNull())
+    {
 		mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, true);
 		mParentMsgLoaded = true;
-	} else {
+    }
+    else
+    {
 		mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, true);
 
-		RsTokReqOptions opts;
-		opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
+        RsThread::async( [this]() {
 
-		GxsMsgReq msgIds;
-		std::set<RsGxsMessageId> &vect = msgIds[mForumId];
-		vect.insert(mParentId);
+            std::vector<RsGxsForumMsg> parent_msgs;
+            rsGxsForums->getForumContent(mForumId,std::set<RsGxsMessageId>{ mParentId },parent_msgs);
 
-		//std::cerr << "ForumsV2Dialog::newMsg() Requesting Parent Summary(" << mParentId << ")";
-		//std::cerr << std::endl;
+            RsQThreadUtils::postToObject( [this,parent_msgs]() {
+                if(parent_msgs.size() != 1)
+                {
+                    RsErr() << "Cannot get parent message from forum." ;
 
-		uint32_t token;
-		mForumQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, CREATEGXSFORUMMSG_PARENTMSG);
-	}
+                    mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, false);
+                    mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, false);
 
-	if (mOrigMsgId.isNull()) {
+                    return ;
+                }
+
+                mParentMsg = parent_msgs.front();
+                mParentMsgLoaded = true;
+
+                loadFormInformation();
+
+            },this);
+        });
+    }
+
+    if (mOrigMsgId.isNull())
+    {
 		mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, true);
 		mOrigMsgLoaded = true;
-	} else {
-		mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG, true);
+    }
+    else
+    {
+        mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG  , true);
 
-		RsTokReqOptions opts;
-		opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
+        RsThread::async( [this]() {
 
-		GxsMsgReq msgIds;
-		std::set<RsGxsMessageId> &vect = msgIds[mForumId];
-		vect.insert(mOrigMsgId);
+            std::vector<RsGxsForumMsg> orig_msgs;
+            rsGxsForums->getForumContent(mForumId,std::set<RsGxsMessageId>{ mOrigMsgId },orig_msgs);
 
-		//std::cerr << "ForumsV2Dialog::newMsg() Requesting Parent Summary(" << mParentId << ")";
-		//std::cerr << std::endl;
+            RsQThreadUtils::postToObject( [this,orig_msgs]() {
+                if(orig_msgs.size() != 1)
+                {
+                    RsErr() << "Cannot get parent message from forum." ;
+
+                    mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, false);
+                    mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG, false);
+
+                    return ;
+                }
+
+                mOrigMsg = orig_msgs.front();
+                mOrigMsgLoaded = true;
+
+                loadFormInformation();
+
+            },this);
+        });
 
-		uint32_t token;
-		mForumQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, msgIds, CREATEGXSFORUMMSG_ORIGMSG);
 	}
 }
 
@@ -330,7 +375,7 @@ void  CreateGxsForumMsg::loadFormInformation()
 	else if (!mParentId.isNull())
 	{
 		QString title = QString::fromUtf8(mParentMsg.mMeta.mMsgName.c_str());
-		name += " " + tr("In Reply to") + ": ";
+        name += " - " + tr("In Reply to") + ": ";
 		name += title;
 
 		QString text = title;
@@ -583,181 +628,52 @@ void CreateGxsForumMsg::fileHashingFinished(QList<HashedFile> hashedFiles)
 	ui.hashGroupBox->hide();
 }
 
-void CreateGxsForumMsg::loadForumInfo(const uint32_t &token)
-{
-    //std::cerr << "CreateGxsForumMsg::loadForumInfo()";
-    //std::cerr << std::endl;
-
-    std::list<RsGroupMetaData> groupInfo;
-    rsGxsForums->getGroupSummary(token, groupInfo);
-
-    if (groupInfo.size() == 1)
-    {
-	    RsGroupMetaData fi = groupInfo.front();
-
-	    mForumMeta = fi;
-	    mForumMetaLoaded = true;
-
-	    if(!fi.mCircleId.isNull())
-	    {
-		    //std::cerr << "Circle ID is not null: " << fi.mCircleId << ": loading circle info to add constraint to the GXS ID chooser." << std::endl;
-
-		    RsTokReqOptions opts;
-		    opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
-
-		    std::list<RsGxsGroupId> groupIds;
-		    groupIds.push_back(RsGxsGroupId(fi.mCircleId));
-            		uint32_t _token;
-
-		    mCirclesQueue->requestGroupInfo(_token, RS_TOKREQ_ANSTYPE_DATA, opts, groupIds, CREATEGXSFORUMMSG_CIRCLENFO);
-	    }
-
-	    loadFormInformation();
-    }
-    else
-    {
-	    std::cerr << "CreateGxsForumMsg::loadForumInfo() ERROR INVALID Number of Forums";
-	    std::cerr << std::endl;
-
-	    mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, false);
-	    mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, false);
-    }
-}
-void CreateGxsForumMsg::loadForumCircleInfo(const uint32_t& token)
+void CreateGxsForumMsg::loadCircleInfo(const RsGxsGroupId& circle_id)
 {
     //std::cerr << "Loading forum circle info" << std::endl;
     
-    std::vector<RsGxsCircleGroup> circle_grp_v ;
-    rsGxsCircles->getGroupData(token, circle_grp_v);
-
-    if (circle_grp_v.empty())
+    RsThread::async( [circle_id,this]()
     {
-        std::cerr << "(EE) unexpected empty result from getGroupData. Cannot process circle now!" << std::endl;
-        return ;
-    }
-        
-    if (circle_grp_v.size() != 1)
-    {
-        std::cerr << "(EE) very weird result from getGroupData. Should get exactly one circle" << std::endl;
-        return ;
-    }
-    
-    RsGxsCircleGroup cg = circle_grp_v.front();
+        std::vector<RsGxsCircleGroup> circle_grp_v ;
+        rsGxsCircles->getCirclesInfo(std::list<RsGxsGroupId>{ circle_id }, circle_grp_v);
 
-    mForumCircleData = cg;
-    mForumCircleLoaded = true;
-
-    //std::cerr << "Loaded content of circle " << cg.mMeta.mGroupId << std::endl;
-    
-    //for(std::set<RsGxsId>::const_iterator it(cg.mInvitedMembers.begin());it!=cg.mInvitedMembers.end();++it)
-	//    std::cerr << "  added constraint to circle element " << *it << std::endl;
-    
-    ui.idChooser->setIdConstraintSet(cg.mInvitedMembers) ;
-    ui.idChooser->setFlags(IDCHOOSER_NO_CREATE | ui.idChooser->flags()) ;	// since there's a circle involved, no ID creation can be needed
-    
-    RsGxsId tmpid ;
-    if(ui.idChooser->countEnabledEntries() == 0)
-    {
-        QMessageBox::information(NULL,tr("No compatible ID for this forum"),tr("None of your identities is allowed to post in this forum. This could be due to the forum being limited to a circle that contains none of your identities, or forum flags requiring a PGP-signed identity.")) ;
-        close() ;
-    }
-}
-
-void CreateGxsForumMsg::loadOrigMsg(const uint32_t &token)
-{
-	//std::cerr << "CreateGxsForumMsg::loadParentMsg()";
-	//std::cerr << std::endl;
-
-	// Only grab one.... ignore more (shouldn't be any).
-	std::vector<RsGxsForumMsg> msgs;
-	if (rsGxsForums->getMsgData(token, msgs))
-	{
-		if (msgs.size() != 1)
-		{
-			/* error */
-			std::cerr << "CreateGxsForumMsg::loadOrigMsg() ERROR wrong number of msgs";
-			std::cerr << std::endl;
-
-			mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, false);
-			mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG, false);
-
-			return;
-		}
-
-		mOrigMsg = msgs[0];
-		mOrigMsgLoaded = true;
-
-		loadFormInformation();
-	}
-}
-
-
-void CreateGxsForumMsg::loadParentMsg(const uint32_t &token)
-{
-	//std::cerr << "CreateGxsForumMsg::loadParentMsg()";
-	//std::cerr << std::endl;
-
-	// Only grab one.... ignore more (shouldn't be any).
-	std::vector<RsGxsForumMsg> msgs;
-	if (rsGxsForums->getMsgData(token, msgs))
-	{
-		if (msgs.size() != 1)
-		{
-			/* error */
-			std::cerr << "CreateGxsForumMsg::loadParentMsg() ERROR wrong number of msgs";
-			std::cerr << std::endl;
-
-			mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, false);
-			mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, false);
-
-			return;
-		}
-
-		mParentMsg = msgs[0];
-		mParentMsgLoaded = true;
-
-		loadFormInformation();
-	}
-}
-
-void CreateGxsForumMsg::loadRequest(const TokenQueue *queue, const TokenRequest &req)
-{
-	//std::cerr << "CreateGxsForum::loadRequest() UserType: " << req.mUserType;
-	//std::cerr << std::endl;
-
-	if (queue == mForumQueue)
-	{
-		/* now switch on req */
-		switch(req.mUserType)
-		{
-			case CREATEGXSFORUMMSG_FORUMINFO:
-				loadForumInfo(req.mToken);
-				break;
-			case CREATEGXSFORUMMSG_ORIGMSG:
-				loadOrigMsg(req.mToken);
-				break;
-			case CREATEGXSFORUMMSG_PARENTMSG:
-				loadParentMsg(req.mToken);
-				break;
-			default:
-				std::cerr << "CreateGxsForumMsg::loadRequest() UNKNOWN UserType " << req.mUserType << " for token request in mForumQueue";
-				std::cerr << std::endl;
-		}
-	}
-    
-    	if(queue == mCirclesQueue)
+        if (circle_grp_v.empty())
         {
-            switch(req.mUserType)
-            {
-            case CREATEGXSFORUMMSG_CIRCLENFO:
-                loadForumCircleInfo(req.mToken) ;
-                break ;
-            default:
-				std::cerr << "CreateGxsForumMsg::loadRequest() UNKNOWN UserType " << req.mUserType << " for token request in mCirclesQueue";
-				std::cerr << std::endl;
-            }
+            std::cerr << "(EE) unexpected empty result from getGroupData. Cannot process circle now!" << std::endl;
+            return ;
         }
+
+        if (circle_grp_v.size() != 1)
+        {
+            std::cerr << "(EE) very weird result from getGroupData. Should get exactly one circle" << std::endl;
+            return ;
+        }
+
+        RsGxsCircleGroup cg = circle_grp_v.front();
+
+        RsQThreadUtils::postToObject( [cg,this]()
+        {
+            mForumCircleData = cg;
+            mForumCircleLoaded = true;
+
+            //std::cerr << "Loaded content of circle " << cg.mMeta.mGroupId << std::endl;
+
+            //for(std::set<RsGxsId>::const_iterator it(cg.mInvitedMembers.begin());it!=cg.mInvitedMembers.end();++it)
+            //    std::cerr << "  added constraint to circle element " << *it << std::endl;
+
+            ui.idChooser->setIdConstraintSet(cg.mInvitedMembers) ;
+            ui.idChooser->setFlags(IDCHOOSER_NO_CREATE | ui.idChooser->flags()) ;	// since there's a circle involved, no ID creation can be needed
+
+            RsGxsId tmpid ;
+            if(ui.idChooser->countEnabledEntries() == 0)
+            {
+                QMessageBox::information(NULL,tr("No compatible ID for this forum"),tr("None of your identities is allowed to post in this forum. This could be due to the forum being limited to a circle that contains none of your identities, or forum flags requiring a PGP-signed identity.")) ;
+                close() ;
+            }
+        }, this);
+    });
 }
+
 void CreateGxsForumMsg::setSubject(const QString& msg)
 {
 	ui.forumSubject->setText(msg);
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h
index 0bb2b22b2..c542e881d 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h
@@ -23,14 +23,12 @@
 
 #include "ui_CreateGxsForumMsg.h"
 
-#include "util/TokenQueue.h"
-
 #include <retroshare/rsgxsforums.h>
 #include <retroshare/rsgxscircles.h>
 
 class UIStateHelper;
 
-class CreateGxsForumMsg : public QDialog, public TokenResponse
+class CreateGxsForumMsg : public QDialog
 {
 	Q_OBJECT
 
@@ -39,7 +37,6 @@ public:
 	~CreateGxsForumMsg();
 
 	void newMsg(); /* cleanup */
-	virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req);
 	void insertPastedText(const QString& msg) ;
 	void setSubject(const QString& msg);
 
@@ -58,15 +55,11 @@ private slots:
 protected:
 	void closeEvent (QCloseEvent * event);
     
+    void loadCircleInfo(const RsGxsGroupId& circle_id);
 private:
     void processSettings(bool load);
     void loadFormInformation();
 
-	void loadForumInfo(const uint32_t &token);
-	void loadParentMsg(const uint32_t &token);
-	void loadOrigMsg(const uint32_t &token);
-    	void loadForumCircleInfo(const uint32_t &token);
-
 	 RsGxsGroupId mForumId;
 	 RsGxsCircleId mCircleId ;
 	 RsGxsMessageId mParentId;
@@ -84,9 +77,6 @@ private:
 	RsGroupMetaData mForumMeta;
 	RsGxsCircleGroup mForumCircleData ;
 
-	TokenQueue *mForumQueue;
-	TokenQueue *mCirclesQueue;
-    
 	UIStateHelper *mStateHelper;
 
 	/** Qt Designer generated object */

From a1c33bf1723a80acbd63ab0fe5fc79b1eece7d8f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 11 Jul 2022 23:15:09 +0200
Subject: [PATCH 097/503] removed unused include

---
 libbitdht                                  | 2 +-
 libretroshare                              | 2 +-
 retroshare-gui/src/gui/gxs/GxsUserNotify.h | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libbitdht b/libbitdht
index 6abbec950..659423769 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 6abbec95073f3c1eb5059cbf8441111ef4a317a7
+Subproject commit 659423769541169457c41f71c8a038e2d64ba079
diff --git a/libretroshare b/libretroshare
index 72f8b7e8e..86745109f 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 72f8b7e8e240923731a141c6f2a0438588f04f59
+Subproject commit 86745109f35dddbf9de9ff84537a1c97fa1d30b3
diff --git a/retroshare-gui/src/gui/gxs/GxsUserNotify.h b/retroshare-gui/src/gui/gxs/GxsUserNotify.h
index f9c5cd616..cfbec97be 100644
--- a/retroshare-gui/src/gui/gxs/GxsUserNotify.h
+++ b/retroshare-gui/src/gui/gxs/GxsUserNotify.h
@@ -24,9 +24,8 @@
 #include <QObject>
 #include "gui/common/UserNotify.h"
 #include "gui/gxs/GxsGroupFrameDialog.h"
-#include "util/TokenQueue.h"
 
-struct RsGxsIfaceHelper;
+class RsGxsIfaceHelper;
 class RsGxsUpdateBroadcastBase;
 
 class GxsUserNotify : public UserNotify

From 4cba9815f81d18e63a389ddcfbd3a72b58e9d81b Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Thu, 23 Jun 2022 22:09:15 +0200
Subject: [PATCH 098/503] Added Doxygen to Windows MinGW build

---
 build_scripts/Windows/env/env.bat                |  3 +++
 .../Windows/env/tools/prepare-tools.bat          | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/build_scripts/Windows/env/env.bat b/build_scripts/Windows/env/env.bat
index bc95045b0..185a421a9 100644
--- a/build_scripts/Windows/env/env.bat
+++ b/build_scripts/Windows/env/env.bat
@@ -28,6 +28,9 @@ if errorlevel 1 exit /B %ERRORLEVEL%
 set PATH=%EnvToolsPath%\MinGit\cmd;%EnvToolsPath%\cmake\bin;%PATH%
 set HOME=%EnvToolsPath%\MinGit\home
 
+:: Add Doxygen to PATH
+set PATH=%EnvToolsPath%\doxygen;%PATH%
+
 exit /B 0
 
 :error_env
diff --git a/build_scripts/Windows/env/tools/prepare-tools.bat b/build_scripts/Windows/env/tools/prepare-tools.bat
index d53a70cf6..94f213460 100644
--- a/build_scripts/Windows/env/tools/prepare-tools.bat
+++ b/build_scripts/Windows/env/tools/prepare-tools.bat
@@ -16,6 +16,9 @@ set NSISInstallPath=%EnvToolsPath%\NSIS
 set MinGitInstall=MinGit-2.28.0-32-bit.zip
 set MinGitUrl=https://github.com/git-for-windows/git/releases/download/v2.28.0.windows.1/%MinGitInstall%
 set MinGitInstallPath=%EnvToolsPath%\MinGit
+set DoxygenInstall=doxygen-1.9.4.windows.x64.bin.zip
+set DoxygenUrl=https://www.doxygen.nl/files/%DoxygenInstall%
+set DoxygenInstallPath=%EnvToolsPath%\doxygen
 set CMakeVersion=cmake-3.19.0-win32-x86
 set CMakeInstall=%CMakeVersion%.zip
 set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
@@ -135,6 +138,19 @@ if not exist "%MinGitInstallPath%\cmd\git.exe" (
 	"%EnvSevenZipExe%" x -o"%MinGitInstallPath%" "%EnvDownloadPath%\%MinGitInstall%"
 )
 
+if not exist "%EnvDownloadPath%\%DoxygenInstall%" call "%ToolsPath%\remove-dir.bat" "%DoxygenInstallPath%"
+if not exist "%DoxygenInstallPath%\doxygen.exe" (
+	if exist "%DoxygenInstallPath%" call "%ToolsPath%\remove-dir.bat" "%DoxygenInstallPath%"
+
+	%cecho% info "Download Doxygen installation"
+
+	if not exist "%EnvDownloadPath%\%DoxygenInstall%" call "%ToolsPath%\download-file.bat" "%DoxygenUrl%" "%EnvDownloadPath%\%DoxygenInstall%"
+	if not exist "%EnvDownloadPath%\%DoxygenInstall%" %cecho% error "Cannot download doxygen installation" & goto error
+
+	%cecho% info "Unpack Doxygen"
+	"%EnvSevenZipExe%" x -o"%DoxygenInstallPath%" "%EnvDownloadPath%\%DoxygenInstall%"
+)
+
 if not exist "%EnvDownloadPath%\%CMakeInstall%" call "%ToolsPath%\remove-dir.bat" "%CMakeInstallPath%"
 if not exist "%CMakeInstallPath%\bin\cmake.exe" (
 	%cecho% info "Download CMake installation"

From d143355a0927733f43ae84db4e6cd31fca8a7160 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 13 Jul 2022 16:00:47 +0200
Subject: [PATCH 099/503] added "Loading..." message when loading posts in
 channels

---
 .../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 2a2d12046..c6afc2ca9 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -901,7 +901,10 @@ void GxsChannelPostsWidgetWithModel::updateGroupData()
             }
 
             mGroup = group;
-			mChannelPostsModel->updateChannel(groupId());
+
+            ui->postsTree->setPlaceholderText(tr("Loading..."));
+
+            mChannelPostsModel->updateChannel(groupId());
             whileBlocking(ui->filterLineEdit)->clear();
             whileBlocking(ui->showUnread_TB)->setChecked(false);
 
@@ -944,6 +947,9 @@ void GxsChannelPostsWidgetWithModel::postChannelPostLoad()
 	ui->channelFiles_TV->sortByColumn(ui->channelFiles_TV->header()->sortIndicatorSection()
 	                                  ,ui->channelFiles_TV->header()->sortIndicatorOrder());
 
+    // if there's no posts, this is what's going to be displayed.
+    ui->postsTree->setPlaceholderText(tr("No posts available in this channel."));
+
     ui->infoPosts->setText(QString::number(mChannelPostsModel->getNumberOfPosts()) + " / " + QString::number(mGroup.mMeta.mVisibleMsgCount));
 
     // now compute aspect ratio for posts. We do that by looking at the 5 latest posts and compute the best aspect ratio for them.

From 43fb720a98fffc73b76bb11651e87475363eda60 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 18 Jul 2022 14:49:58 +0200
Subject: [PATCH 100/503] fixed update of Forum msg creation window

---
 .../src/gui/gxsforums/CreateGxsForumMsg.cpp   | 220 +++++++-----------
 1 file changed, 81 insertions(+), 139 deletions(-)

diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
index 26e2ab608..e93b81c08 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
@@ -189,172 +189,115 @@ void  CreateGxsForumMsg::newMsg()
 		return;
 	}
 
-		mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, true);
-
-        RsThread::async( [this]()
-        {
-            // We only need group Meta information, but forums do not provide it currently
-
-            std::vector<RsGxsForumGroup> forums_info;
-            rsGxsForums->getForumsInfo(std::list<RsGxsGroupId>{ mForumId },forums_info);
-
-
-            RsQThreadUtils::postToObject( [this,forums_info]()
-            {
-                if(forums_info.size() != 1)
-                {
-                    RsErr() << "Cannot retrieve group information for forum " << mForumId ;
-                  mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, false);
-                  mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, false);
-                  return;
-             }
-             auto fg(forums_info.front());
-
-             const RsGroupMetaData& fi(fg.mMeta);
-             mForumMetaLoaded = true;
-             mForumMeta = fi;
-
-             if(!fi.mCircleId.isNull())
-                  loadCircleInfo(RsGxsGroupId(fi.mCircleId));
-
-             loadFormInformation();
-
-             mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, false);
-             mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, false);
-
-            },this);
-        });
+    mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, true);
 
     if (mParentId.isNull())
     {
-		mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, true);
-		mParentMsgLoaded = true;
+        mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, false);
+        mParentMsgLoaded = true;
     }
     else
     {
-		mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, true);
-
-        RsThread::async( [this]() {
-
-            std::vector<RsGxsForumMsg> parent_msgs;
-            rsGxsForums->getForumContent(mForumId,std::set<RsGxsMessageId>{ mParentId },parent_msgs);
-
-            RsQThreadUtils::postToObject( [this,parent_msgs]() {
-                if(parent_msgs.size() != 1)
-                {
-                    RsErr() << "Cannot get parent message from forum." ;
-
-                    mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, false);
-                    mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, false);
-
-                    return ;
-                }
-
-                mParentMsg = parent_msgs.front();
-                mParentMsgLoaded = true;
-
-                loadFormInformation();
-
-            },this);
-        });
+        mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, true);
+        mParentMsgLoaded = false;
     }
 
     if (mOrigMsgId.isNull())
     {
-		mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, true);
-		mOrigMsgLoaded = true;
+        mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, false);
+        mOrigMsgLoaded = true;
     }
     else
     {
-        mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG  , true);
+        mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG, true);
+        mOrigMsgLoaded = false;
+    }
 
-        RsThread::async( [this]() {
+    RsThread::async( [this]()
+    {
+        // We only need group Meta information, but forums do not provide it currently
 
+        std::vector<RsGxsForumGroup> forums_info;
+        rsGxsForums->getForumsInfo(std::list<RsGxsGroupId>{ mForumId },forums_info);
+
+        // Load parent message
+
+        RsGxsForumMsg parent_msg;
+
+        if(!mParentId.isNull())
+        {
+            std::vector<RsGxsForumMsg> parent_msgs;
+            rsGxsForums->getForumContent(mForumId,std::set<RsGxsMessageId>{ mParentId },parent_msgs);
+
+            if(parent_msgs.size() == 1)
+                parent_msg = *parent_msgs.begin();
+            else
+                RsErr() << "Cannot get parent message " << mParentId << " from forum." ;
+        }
+
+        // Load original message (edit mode)
+
+        RsGxsForumMsg orig_msg;
+
+        if(!mOrigMsgId.isNull())
+        {
             std::vector<RsGxsForumMsg> orig_msgs;
             rsGxsForums->getForumContent(mForumId,std::set<RsGxsMessageId>{ mOrigMsgId },orig_msgs);
 
-            RsQThreadUtils::postToObject( [this,orig_msgs]() {
-                if(orig_msgs.size() != 1)
-                {
-                    RsErr() << "Cannot get parent message from forum." ;
+            if(orig_msgs.size() == 1)
+                orig_msg = *orig_msgs.begin();
+            else
+                RsErr() << "Cannot get orig message " << mOrigMsgId << " from forum." ;
+        }
 
-                    mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, false);
-                    mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG, false);
+        // Now update GUI with all that nice data
 
-                    return ;
-                }
+        RsQThreadUtils::postToObject( [this,forums_info,parent_msg,orig_msg]()
+        {
+            if(forums_info.size() != 1)
+            {
+                RsErr() << "Cannot retrieve group information for forum " << mForumId ;
 
-                mOrigMsg = orig_msgs.front();
+                return;
+            }
+            auto fg(forums_info.front());
+
+            mForumMetaLoaded = true;
+            mForumMeta = fg.mMeta;
+
+            if(!parent_msg.mMsg.empty())
+            {
+                mParentMsg = parent_msg;
+                mParentMsgLoaded = true;
+            }
+            if(!orig_msg.mMsg.empty())
+            {
+                mOrigMsg = orig_msg;
                 mOrigMsgLoaded = true;
+            }
 
-                loadFormInformation();
+            if(!mForumMeta.mCircleId.isNull())
+                loadCircleInfo(RsGxsGroupId(mForumMeta.mCircleId));
 
-            },this);
-        });
+            // Now update the GUI
 
-	}
+            mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, mParentMsgLoaded);
+            mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, false);
+
+            mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, mOrigMsgLoaded);
+            mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG, false);
+
+            mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, mForumMetaLoaded);
+            mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, false);
+
+            loadFormInformation();
+
+        },this);
+    });
 }
 
 void  CreateGxsForumMsg::loadFormInformation()
 {
-	if (!mOrigMsgId.isNull())
-	{
-		if (mOrigMsgLoaded) {
-			mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, true);
-			mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG, false);
-		} else {
-			//std::cerr << "CreateGxsForumMsg::loadMsgInformation() ParentMsg not Loaded Yet";
-			//std::cerr << std::endl;
-
-			mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, false);
-
-			return;
-		}
-	}
-    else
-    {
-		mStateHelper->setActive(CREATEGXSFORUMMSG_ORIGMSG, true);
-		mStateHelper->setLoading(CREATEGXSFORUMMSG_ORIGMSG, false);
-	}
-
-
-	if (!mParentId.isNull())
-	{
-		if (mParentMsgLoaded) {
-			mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, true);
-			mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, false);
-		} else {
-			//std::cerr << "CreateGxsForumMsg::loadMsgInformation() ParentMsg not Loaded Yet";
-			//std::cerr << std::endl;
-
-			mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, false);
-
-			return;
-		}
-	}
-    else
-    {
-		mStateHelper->setActive(CREATEGXSFORUMMSG_PARENTMSG, true);
-		mStateHelper->setLoading(CREATEGXSFORUMMSG_PARENTMSG, false);
-	}
-
-	if (mForumMetaLoaded) {
-		mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, true);
-		mStateHelper->setLoading(CREATEGXSFORUMMSG_FORUMINFO, false);
-	} else {
-		//std::cerr << "CreateGxsForumMsg::loadMsgInformation() ForumMeta not Loaded Yet";
-		//std::cerr << std::endl;
-
-		mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, false);
-
-		return;
-	}
-
-	//std::cerr << "CreateGxsForumMsg::loadMsgInformation() Data Available!";
-	//std::cerr << std::endl;
-
-	//std::cerr << "CreateGxsForumMsg::loadMsgInformation() using signFlags=" << std::hex << mForumMeta.mSignFlags << std::dec << std::endl;
-    
     uint32_t fl = IDCHOOSER_ID_REQUIRED ;
 
 	if( (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG) || (mForumMeta.mSignFlags & GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_GPG_KNOWN))
@@ -369,9 +312,7 @@ void  CreateGxsForumMsg::loadFormInformation()
 	QString subj;
 
     if(!mOrigMsgId.isNull())
-    {
         subj = QString::fromUtf8(mOrigMsg.mMeta.mMsgName.c_str());
-    }
 	else if (!mParentId.isNull())
 	{
 		QString title = QString::fromUtf8(mParentMsg.mMeta.mMsgName.c_str());
@@ -388,6 +329,7 @@ void  CreateGxsForumMsg::loadFormInformation()
 
 	ui.forumName->setText(misc::removeNewLine(name));
 
+    std::cerr << "Setting name to \"" << misc::removeNewLine(name).toStdString() << std::endl;
 	if(!subj.isNull())
 		ui.forumSubject->setText(misc::removeNewLine(subj));
 

From 82f981c9db75e0b88406a08e2e95ba77b69f9aee Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 4 Aug 2022 19:10:47 +0200
Subject: [PATCH 101/503] continue cleanign the old token system

---
 retroshare-gui/src/gui/NewsFeed.h             |  1 -
 .../gui/Posted/PostedListWidgetWithModel.cpp  | 45 -------------------
 retroshare-gui/src/gui/feeds/GxsCircleItem.h  |  2 -
 retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 10 +----
 retroshare-gui/src/gui/gxs/GxsGroupDialog.h   |  5 ---
 .../GxsChannelPostsWidgetWithModel.cpp        |  4 --
 6 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/retroshare-gui/src/gui/NewsFeed.h b/retroshare-gui/src/gui/NewsFeed.h
index 2e3d7e5ed..2b246fb4c 100644
--- a/retroshare-gui/src/gui/NewsFeed.h
+++ b/retroshare-gui/src/gui/NewsFeed.h
@@ -24,7 +24,6 @@
 #include <retroshare-gui/mainpage.h>
 
 #include "gui/feeds/FeedHolder.h"
-#include "util/TokenQueue.h"
 #include <retroshare-gui/RsAutoUpdatePage.h>
 
 #define IMAGE_NEWSFEED ":/icons/png/newsfeed.png"
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 9a46b65f0..a9c0a95a7 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -1213,48 +1213,3 @@ void PostedListWidgetWithModel::voteMsg(RsGxsGrpMsgIdPair msg,bool up_or_down)
         updateDisplay(true);
 }
 
-#ifdef TODO
-class PostedPostsReadData
-{
-public:
-	PostedPostsReadData(bool read)
-	{
-		mRead = read;
-		mLastToken = 0;
-	}
-
-public:
-	bool mRead;
-	uint32_t mLastToken;
-};
-
-static void setAllMessagesReadCallback(FeedItem *feedItem, void *data)
-{
-	GxsChannelPostItem *channelPostItem = dynamic_cast<GxsChannelPostItem*>(feedItem);
-	if (!channelPostItem) {
-		return;
-	}
-
-	GxsChannelPostsReadData *readData = (GxsChannelPostsReadData*) data;
-	bool isRead = !channelPostItem->isUnread() ;
-
-	if(channelPostItem->isLoaded() && (isRead == readData->mRead))
-		return ;
-
-	RsGxsGrpMsgIdPair msgPair = std::make_pair(channelPostItem->groupId(), channelPostItem->messageId());
-	rsGxsChannels->setMessageReadStatus(readData->mLastToken, msgPair, readData->mRead);
-}
-
-void PostedListWidgetWithModel::setAllMessagesReadDo(bool read, uint32_t &token)
-{
-	if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {
-		return;
-	}
-
-	GxsChannelPostsReadData data(read);
-	//ui->feedWidget->withAll(setAllMessagesReadCallback, &data);
-
-	token = data.mLastToken;
-}
-
-#endif
diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.h b/retroshare-gui/src/gui/feeds/GxsCircleItem.h
index dc83dd30d..74f2cf44a 100644
--- a/retroshare-gui/src/gui/feeds/GxsCircleItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.h
@@ -24,8 +24,6 @@
 #include <retroshare/rsgxscircles.h>
 #include "FeedItem.h"
 
-#include "util/TokenQueue.h"
-
 namespace Ui {
 class GxsCircleItem;
 }
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index c6c3e8078..432684362 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -672,15 +672,9 @@ void GxsGroupDialog::createGroup()
 
 	if (service_createGroup(meta))
 	{
-        // now update the UI
 #warning Missing code here!
-#ifdef TODO
-        //
-		// get the Queue to handle response. What is this for?
-		if(mExternalTokenQueue != NULL)
-			mExternalTokenQueue->queueRequest(token, TOKENREQ_GROUPINFO, RS_TOKREQ_ANSTYPE_ACK, GXSGROUP_NEWGROUPID);
-#endif
-	}
+        // now update the UI
+    }
 
 	close();
 }
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h
index 4860f52a8..b5e9417d0 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.h
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.h
@@ -23,8 +23,6 @@
 
 #include "ui_GxsGroupDialog.h"
 
-#include "util/TokenQueue.h"
-
 /********
  * Notes:
  *
@@ -284,9 +282,6 @@ private:
 
 	std::list<std::string> mShareList;
 	QPixmap mPicture;
-	RsTokenService *mTokenService;
-	TokenQueue *mExternalTokenQueue;
-	TokenQueue *mInternalTokenQueue;
 	RsGroupMetaData mGrpMeta;
 
 	Mode mMode;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index c6afc2ca9..fbf09350a 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -56,8 +56,6 @@
  * #define DEBUG_CHANNEL
  ***/
 
-//static const int mTokenTypeGroupData = 1;
-
 static const int CHANNEL_TABS_DETAILS= 0;
 static const int CHANNEL_TABS_POSTS  = 1;
 static const int CHANNEL_TABS_FILES  = 2;
@@ -1430,12 +1428,10 @@ public:
 	explicit GxsChannelPostsReadData(bool read)
 	{
 		mRead = read;
-		mLastToken = 0;
 	}
 
 public:
 	bool mRead;
-	uint32_t mLastToken;
 };
 
 void GxsChannelPostsWidgetWithModel::setAllMessagesReadDo(bool read)

From 807232ffa5ec7e64632772edcbf1c61a44bc8c0a Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Thu, 4 Aug 2022 12:48:44 +0200
Subject: [PATCH 102/503] Fixed crash when closing forum message item in
 activity stream with set as read and remove

---
 retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp | 16 +++++++++-------
 retroshare-gui/src/gui/feeds/GxsForumMsgItem.h   |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
index 8bf4899f1..556dd1108 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
@@ -411,7 +411,7 @@ void GxsForumMsgItem::doExpand(bool open)
 			ui->parentFrame->show();
 		}
 
-		setAsRead();
+		setAsRead(true);
 	}
 	else
 	{
@@ -459,7 +459,7 @@ void GxsForumMsgItem::readAndClearItem()
 	std::cerr << std::endl;
 #endif
 
-	setAsRead();
+	setAsRead(false);
 	removeItem();
 }
 
@@ -473,7 +473,7 @@ void GxsForumMsgItem::unsubscribeForum()
 	unsubscribe();
 }
 
-void GxsForumMsgItem::setAsRead()
+void GxsForumMsgItem::setAsRead(bool doUpdate)
 {
     if (mInFill) {
         return;
@@ -481,14 +481,16 @@ void GxsForumMsgItem::setAsRead()
 
     mCloseOnRead = false;
 
-    RsThread::async( [this]() {
+    RsThread::async( [this, doUpdate]() {
         RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
 
         rsGxsForums->markRead(msgPair, true);
 
-        RsQThreadUtils::postToObject( [this]() {
-            setReadStatus(false, true);
-        } );
+        if (doUpdate) {
+            RsQThreadUtils::postToObject( [this]() {
+                setReadStatus(false, true);
+            } );
+        }
     });
 }
 
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h
index 17287ada1..34166ee59 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h
@@ -82,7 +82,7 @@ private:
     void fillParentMessage();
     void fillExpandFrame();
 	void setReadStatus(bool isNew, bool isUnread);
-	void setAsRead();
+	void setAsRead(bool doUpdate);
 
 private:
 	bool mInFill;

From b4d2904adf45c61dc7b07f8486df6b2270a6aca7 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 16 Aug 2022 22:12:37 +0200
Subject: [PATCH 103/503] fixed two bugs in Create/Edit circle dialog, causing
 crashes

---
 .../src/gui/Circles/CreateCircleDialog.cpp    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
index f878721c9..3c323e286 100644
--- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
@@ -584,12 +584,13 @@ void CreateCircleDialog::createCircle()
         circle.mMeta.mCircleType = GXS_CIRCLE_TYPE_LOCAL;
     }
 
+    bool is_existing_circle(mIsExistingCircle);
 
-    RsThread::async([&circle,this]()
+    RsThread::async([circle,is_existing_circle]()
     {
         RsGxsCircleId circleId;
 
-        if(mIsExistingCircle)
+        if(is_existing_circle)
         {
 #ifdef DEBUG_CREATE_CIRCLE_DIALOG
             std::cerr << "CreateCircleDialog::updateCircle() : mCircleType: " << circle.mMeta.mCircleType << std::endl;
@@ -598,7 +599,7 @@ void CreateCircleDialog::createCircle()
 
             std::cerr << "CreateCircleDialog::updateCircle() Checks and Balances Okay - calling service proper.."<< std::endl;
 #endif
-            rsGxsCircles->editCircle(circle);
+            rsGxsCircles->editCircle(*const_cast<RsGxsCircleGroup*>(&circle)); // const_cast: Not nice, but simpler.
 
             circleId = RsGxsCircleId(circle.mMeta.mGroupId);
         }
@@ -619,14 +620,14 @@ void CreateCircleDialog::createCircle()
                                        circle.mLocalFriends);
         }
 
-        RsQThreadUtils::postToObject( [this,circle,circleId]()
-        {
-            if(!mIsExistingCircle)
-                QMessageBox::information(nullptr,tr("Circle created"),
-                                         tr("Your new circle has been created:\n   Name: %1\n   Id: %2.")
-                                            .arg(QString::fromUtf8(circle.mMeta.mGroupName.c_str()))
-                                            .arg(QString::fromStdString(circleId.toStdString())));
-        });
+        if(!is_existing_circle)
+            RsQThreadUtils::postToObject( [circle,circleId]()
+            {
+                    QMessageBox::information(nullptr,tr("Circle created"),
+                                             tr("Your new circle has been created:\n   Name: %1\n   Id: %2.")
+                                                .arg(QString::fromUtf8(circle.mMeta.mGroupName.c_str()))
+                                                .arg(QString::fromStdString(circleId.toStdString())));
+            });
     });
 
     close();

From c167fb8448a5578a6b41763e5645eb59bc61e672 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 19 Aug 2022 18:36:11 +0200
Subject: [PATCH 104/503] using actual limits for max TR/s in the GUI

---
 libretroshare                                    | 2 +-
 retroshare-gui/src/gui/settings/TransferPage.cpp | 6 ++++++
 retroshare-gui/src/gui/settings/TransferPage.ui  | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libretroshare b/libretroshare
index 86745109f..8f3a30705 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 86745109f35dddbf9de9ff84537a1c97fa1d30b3
+Subproject commit 8f3a3070519322a66b0e83ecb2035e0ac7e67e58
diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index 3575a5479..c0cf3608f 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -40,6 +40,12 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags)
     /* Invoke the Qt Designer generated object setup routine */
     ui.setupUi(this);
 
+    int max_tr_low,max_tr_high;
+    rsTurtle->getMaxTRForwardRateLimits(max_tr_low,max_tr_high);
+
+    ui._max_tr_up_per_sec_SB->setMinimum(max_tr_low);
+    ui._max_tr_up_per_sec_SB->setMaximum(max_tr_high);
+
     QObject::connect(ui._queueSize_SB,SIGNAL(valueChanged(int)),this,SLOT(updateQueueSize(int))) ;
     QObject::connect(ui._max_up_SB,SIGNAL(valueChanged(int)),this,SLOT(updateMaxUploadSlots(int))) ;
     QObject::connect(ui._defaultStrategy_CB,SIGNAL(activated(int)),this,SLOT(updateDefaultStrategy(int))) ;
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index 282c5ff51..7370f4706 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>701</width>
-    <height>527</height>
+    <height>632</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
@@ -289,7 +289,7 @@
           <string>&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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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;span style=&quot; font-family:'Sans'; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;

From 2c6781758184df090290911385319d231af788a1 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 21 Aug 2022 12:18:01 +0200
Subject: [PATCH 105/503] fixed font problem introduced in last commit

---
 retroshare-gui/src/gui/settings/TransferPage.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index 7370f4706..e8cc22228 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -289,7 +289,7 @@
           <string>&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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; 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;span style=&quot; font-family:'Sans'; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;

From 87be1e353efd2589f495be4e0716f8ab7da2f87e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 27 Sep 2022 23:56:17 +0200
Subject: [PATCH 106/503] fixed bug in friendserver randomly dropping some
 incoming packets

---
 retroshare-friendserver/src/network.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/retroshare-friendserver/src/network.cc b/retroshare-friendserver/src/network.cc
index a607a89c2..b5d9e076a 100644
--- a/retroshare-friendserver/src/network.cc
+++ b/retroshare-friendserver/src/network.cc
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <netinet/tcp.h>
 
 #include "util/rsnet.h"
 #include "util/rsprint.h"
@@ -45,6 +46,9 @@ FsNetworkInterface::FsNetworkInterface(const std::string& listening_address,uint
     mClintListn = 0;
     mClintListn = socket(AF_INET, SOCK_STREAM, 0); // creating socket
 
+    int flags=1;
+    setsockopt(mClintListn,SOL_SOCKET,TCP_NODELAY,(char*)&flags,sizeof(flags));
+
     unix_fcntl_nonblock(mClintListn);
 
     struct sockaddr_in ipOfServer;
@@ -104,7 +108,7 @@ void FsNetworkInterface::threadTick()
 
     RS_STACK_MUTEX(mFsNiMtx);
     for(auto& it:mConnections)
-        if(it.second.bio->isactive())
+        if(it.second.bio->isactive() || it.second.bio->moretoread(0))
             it.second.pqi_thread->tick();
     else
             to_close.push_back(it.first);
@@ -147,6 +151,9 @@ bool FsNetworkInterface::checkForNewConnections()
 
     // Make the socket non blocking so that we can read from it and return if nothing comes
 
+    int flags=1;
+    setsockopt(clintConnt,SOL_SOCKET,TCP_NODELAY,(char*)&flags,sizeof(flags));
+
     unix_fcntl_nonblock(clintConnt);
 
     // Create connection info

From 6c4e918b367f942044abe0258be3c07e31a2faf3 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 3 Oct 2022 18:35:52 +0200
Subject: [PATCH 107/503] fixed compilation on windows

---
 retroshare-friendserver/src/network.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/retroshare-friendserver/src/network.cc b/retroshare-friendserver/src/network.cc
index b5d9e076a..426d54de8 100644
--- a/retroshare-friendserver/src/network.cc
+++ b/retroshare-friendserver/src/network.cc
@@ -26,7 +26,14 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/types.h>
+
+#ifdef WINDOWS_SYS
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
 #include <netinet/tcp.h>
+#endif
 
 #include "util/rsnet.h"
 #include "util/rsprint.h"

From d307b46c1584d3f2e0ecc0afe83fc69f0accf8f0 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 3 Oct 2022 23:06:08 +0200
Subject: [PATCH 108/503] added async testing of friend server

---
 .../src/gui/FriendServerControl.cpp           | 69 ++++++++++++-------
 retroshare-gui/src/gui/FriendServerControl.h  |  3 +-
 retroshare-gui/src/gui/FriendServerControl.ui | 11 +--
 3 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index 5842516ed..0a0e286f0 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -45,6 +45,7 @@ FriendServerControl::FriendServerControl(QWidget *parent)
     setupUi(this);
 
     friendServerOnOff_CB->setEnabled(false); // until FS is connected.
+    mCurrentlyCheckingServerAddress = false;
 
     if(!rsFriendServer)
     {
@@ -80,13 +81,12 @@ FriendServerControl::FriendServerControl(QWidget *parent)
 
     QObject::connect(friendServerOnOff_CB,SIGNAL(toggled(bool)),this,SLOT(onOnOffClick(bool)));
     QObject::connect(torServerFriendsToRequest_SB,SIGNAL(valueChanged(int)),this,SLOT(onFriendsToRequestChanged(int)));
-    QObject::connect(torServerAddress_LE,SIGNAL(editingFinished()),this,SLOT(onOnionAddressEdit()));
+    QObject::connect(torServerAddress_LE,SIGNAL(textEdited(const QString&)),this,SLOT(onOnionAddressEdit(const QString&)));
     QObject::connect(torServerPort_SB,SIGNAL(valueChanged(int)),this,SLOT(onOnionPortEdit(int)));
 
     QObject::connect(mConnectionCheckTimer,SIGNAL(timeout()),this,SLOT(checkServerAddress()));
 
     mCheckingServerMovie = new QMovie(":/images/loader/circleball-16.gif");
-    serverStatusCheckResult_LB->setMovie(mCheckingServerMovie);
 
     updateFriendServerStatusIcon(false);
 }
@@ -130,33 +130,53 @@ void FriendServerControl::onOnionPortEdit(int)
     }
 }
 
-void FriendServerControl::onOnionAddressEdit()
+void FriendServerControl::onOnionAddressEdit(const QString&)
 {
+    while(mCurrentlyCheckingServerAddress)
+    {
+        std::cerr << "  waiting for free slot" << std::endl;
+        std::this_thread::sleep_for(std::chrono::milliseconds(500));	// wait for ongoing check to finish.
+    }
+
+    std::cerr << "Resetting connection proxy timer" << std::endl;
+
     // Setup timer to auto-check the friend server address
-    mConnectionCheckTimer->stop();
     mConnectionCheckTimer->setSingleShot(true);
     mConnectionCheckTimer->setInterval(5000); // check in 5 secs unless something is changed in the mean time.
-
     mConnectionCheckTimer->start();
-
-    if(mCheckingServerMovie->fileName() != QString(":/images/loader/circleball-16.gif" ))
-    {
-        mCheckingServerMovie->setFileName(":/images/loader/circleball-16.gif");
-        mCheckingServerMovie->start();
-    }
 }
 
 void FriendServerControl::checkServerAddress()
 {
-    rsFriendServer->checkServerAddress_async(torServerAddress_LE->text().toStdString(),torServerPort_SB->value(),5000,
-                                       [this](const std::string& address,uint16_t port,bool test_result)
-                                        {
-                                            if(test_result)
-                                                rsFriendServer->setServerAddress(address,port);
+    std::cerr << "In checkServerAddress() ..." << std::endl;
 
-                                            RsQThreadUtils::postToObject( [=]()  {  updateFriendServerStatusIcon(test_result); },this);
-                                        }
-    );
+    mCurrentlyCheckingServerAddress = true;
+
+    serverStatusCheckResult_LB->setMovie(mCheckingServerMovie);
+    serverStatusCheckResult_LB->setToolTip(tr("Friend server is currently reachable.")) ;
+    mCheckingServerMovie->setFileName(":/images/loader/circleball-16.gif");
+    mCheckingServerMovie->start();
+
+    RsThread::async( [this]()
+    {
+        auto port = torServerPort_SB->value();
+        auto addr = torServerAddress_LE->text().toStdString();
+
+        std::cerr << "calling sync test..." << std::endl;
+        bool succeed = rsFriendServer->checkServerAddress(addr,port,5000);
+        std::cerr << "result is " << succeed << std::endl;
+
+        RsQThreadUtils::postToObject( [addr,port,succeed,this]()
+        {
+            if(succeed)
+                rsFriendServer->setServerAddress(addr,port);
+
+            mCheckingServerMovie->stop();
+            updateFriendServerStatusIcon(succeed);
+            mCurrentlyCheckingServerAddress = false;
+
+        },this);
+    });
 }
 
 void FriendServerControl::onNbFriendsToRequestsChanged(int n)
@@ -166,23 +186,22 @@ void FriendServerControl::onNbFriendsToRequestsChanged(int n)
 
 void FriendServerControl::updateFriendServerStatusIcon(bool ok)
 {
-    mCheckingServerMovie->stop();
+    std::cerr << "updating proxy status icon" << std::endl;
 
     if(ok)
     {
-        torServerStatus_LB->setToolTip(tr("Friend server is currently reachable.")) ;
-        mCheckingServerMovie->setFileName(ICON_STATUS_OK);
+        serverStatusCheckResult_LB->setToolTip(tr("Friend server is currently reachable.")) ;
+        serverStatusCheckResult_LB->setPixmap(QPixmap(ICON_STATUS_OK));
         friendServerOnOff_CB->setEnabled(true);
     }
     else
     {
         rsFriendServer->stopServer();
-        torServerStatus_LB->setToolTip(tr("The proxy is not enabled or broken.\nAre all services up and running fine??\nAlso check your ports!")) ;
-        mCheckingServerMovie->setFileName(ICON_STATUS_UNKNOWN);
+        serverStatusCheckResult_LB->setToolTip(tr("The proxy is not enabled or broken.\nAre all services up and running fine??\nAlso check your ports!")) ;
+        serverStatusCheckResult_LB->setPixmap(QPixmap(ICON_STATUS_UNKNOWN));
         friendServerOnOff_CB->setChecked(false);
         friendServerOnOff_CB->setEnabled(false);
     }
-    mCheckingServerMovie->start();
 }
 
 
diff --git a/retroshare-gui/src/gui/FriendServerControl.h b/retroshare-gui/src/gui/FriendServerControl.h
index 832c67f39..fafd26f82 100644
--- a/retroshare-gui/src/gui/FriendServerControl.h
+++ b/retroshare-gui/src/gui/FriendServerControl.h
@@ -35,7 +35,7 @@ public:
 
 protected slots:
     void onOnOffClick(bool b);
-    void onOnionAddressEdit();
+    void onOnionAddressEdit(const QString &);
     void onOnionPortEdit(int);
     void onNbFriendsToRequestsChanged(int n);
     void checkServerAddress();
@@ -45,4 +45,5 @@ private:
 
     QTimer *mConnectionCheckTimer;
     QMovie *mCheckingServerMovie;
+    bool 	mCurrentlyCheckingServerAddress;
 };
diff --git a/retroshare-gui/src/gui/FriendServerControl.ui b/retroshare-gui/src/gui/FriendServerControl.ui
index 4eed774ad..1455de71e 100644
--- a/retroshare-gui/src/gui/FriendServerControl.ui
+++ b/retroshare-gui/src/gui/FriendServerControl.ui
@@ -59,13 +59,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QLabel" name="torServerStatus_LB">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
@@ -88,7 +81,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="icon">
-        <iconset resource="icons.qrc">
+        <iconset resource="images.qrc">
          <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
        </property>
        <property name="checkable">
@@ -205,7 +198,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="icons.qrc"/>
+  <include location="images.qrc"/>
  </resources>
  <connections/>
 </ui>

From f3ee68411d8c8c3da109a12b526c5183a0f3119f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 6 Oct 2022 14:26:53 +0200
Subject: [PATCH 109/503] added missing documentation in
 BinInterface::readdata(), and fixed bug in FdBinInterface not implementing
 readdata() correctly

---
 retroshare-friendserver/src/network.cc        | 37 +++++++++++++------
 .../src/gui/FriendServerControl.cpp           |  2 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/retroshare-friendserver/src/network.cc b/retroshare-friendserver/src/network.cc
index 426d54de8..f28a38de0 100644
--- a/retroshare-friendserver/src/network.cc
+++ b/retroshare-friendserver/src/network.cc
@@ -113,15 +113,19 @@ void FsNetworkInterface::threadTick()
 
     std::list<RsPeerId> to_close;
 
-    RS_STACK_MUTEX(mFsNiMtx);
-    for(auto& it:mConnections)
-        if(it.second.bio->isactive() || it.second.bio->moretoread(0))
+    {
+        RS_STACK_MUTEX(mFsNiMtx);
+        for(auto& it:mConnections)
+        {
             it.second.pqi_thread->tick();
-    else
-            to_close.push_back(it.first);
 
-    for(const auto& pid:to_close)
-        locked_closeConnection(pid);
+            if(!it.second.bio->isactive() && !it.second.bio->moretoread(0))
+                to_close.push_back(it.first);
+        }
+
+        for(const auto& pid:to_close)
+            locked_closeConnection(pid);
+    }
 
     std::this_thread::sleep_for(std::chrono::milliseconds(200));
 }
@@ -165,12 +169,17 @@ bool FsNetworkInterface::checkForNewConnections()
 
     // Create connection info
 
+    RsDbg() << "  Creating connection data." ;
+
     ConnectionData c;
     c.socket = clintConnt;
     c.client_address = addr;
-
     RsPeerId pid = makePeerId(clintConnt);
 
+    RsDbg() << "  socket: " << clintConnt;
+    RsDbg() << "  client address: " <<  sockaddr_storage_tostring(*(sockaddr_storage*)&addr);
+    RsDbg() << "  peer id: " << pid ;
+
     // Setup a pqistreamer to deserialize whatever comes from this connection
 
     RsSerialiser *rss = new RsSerialiser ;
@@ -183,11 +192,14 @@ bool FsNetworkInterface::checkForNewConnections()
     c.pqi_thread = pqi;
     c.bio = bio;
 
-    pqi->start();
+    {
+        RS_STACK_MUTEX(mFsNiMtx);
+        mConnections[pid] = c;
 
-    RS_STACK_MUTEX(mFsNiMtx);
-    mConnections[pid] = c;
+        pqi->start();
+    }
 
+    RsDbg() << "  streamer has properly started." ;
     return true;
 }
 
@@ -195,6 +207,8 @@ bool FsNetworkInterface::RecvItem(RsItem *item)
 {
     RS_STACK_MUTEX(mFsNiMtx);
 
+    RsDbg() << "FsNetworkInterface: received item " << (void*)item;
+
     auto it = mConnections.find(item->PeerId());
 
     if(it == mConnections.end())
@@ -219,6 +233,7 @@ RsItem *FsNetworkInterface::GetItem()
             RsItem *item = it.second.incoming_items.front();
             it.second.incoming_items.pop_front();
 
+            RsDbg() << "FsNetworkInterface: returning item " << (void*)item << " to caller.";
             return item;
         }
     }
diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index 0a0e286f0..5b3fdf994 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -153,7 +153,7 @@ void FriendServerControl::checkServerAddress()
     mCurrentlyCheckingServerAddress = true;
 
     serverStatusCheckResult_LB->setMovie(mCheckingServerMovie);
-    serverStatusCheckResult_LB->setToolTip(tr("Friend server is currently reachable.")) ;
+    serverStatusCheckResult_LB->setToolTip(tr("Trying to contact friend server\nThis may take up to 1 min.")) ;
     mCheckingServerMovie->setFileName(":/images/loader/circleball-16.gif");
     mCheckingServerMovie->start();
 

From efa00b2802abfda11b0be4ff2b1aa2913e6074fd Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 13 Oct 2022 16:24:14 +0200
Subject: [PATCH 110/503] changed the underlying logic of FS to allow UI to get
 information about ongoing connections

---
 retroshare-friendserver/src/friendserver.cc | 261 ++++++++++++--------
 retroshare-friendserver/src/friendserver.h  |  32 ++-
 2 files changed, 189 insertions(+), 104 deletions(-)

diff --git a/retroshare-friendserver/src/friendserver.cc b/retroshare-friendserver/src/friendserver.cc
index e63156ae6..19c53e767 100644
--- a/retroshare-friendserver/src/friendserver.cc
+++ b/retroshare-friendserver/src/friendserver.cc
@@ -77,27 +77,40 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
 
         // First of all, read PGP key and short invites, parse them, and check that they contain the same information
 
-        std::map<RsPeerId,PeerInfo>::iterator pi = handleIncomingClientData(item->pgp_public_key_b64,item->short_invite);
+        RsPeerId pid;
 
-        // No need to test for it==mCurrentClients.end() because it will be directly caught by the exception handling below even before.
-        // Respond with a list of potential friends
+        if(!handleIncomingClientData(item->pgp_public_key_b64,item->short_invite,pid))
+        {
+            RsErr() << "Client data is dropped because of error." ;
+            return ;
+        }
+
+        // All good.
+
+        auto pi(mCurrentClientPeers.find(pid));
+
+        // Update the list of closest peers for other peers, based on which known friends it reports, and of current peer depending
+        // on friendship levels of other peers.
+
+        updateClosestPeers(pi->first,pi->second.pgp_fingerprint,item->already_received_peers);
 
         RsDbg() << "Sending response item to " << item->PeerId() ;
 
         RsFriendServerServerResponseItem sr_item;
 
-        std::map<RsPeerId,RsPgpFingerprint> friends;
-        sr_item.nonce = pi->second.last_nonce;
-        sr_item.friend_invites = computeListOfFriendInvites(item->n_requested_friends,item->already_received_peers,pi->first,friends);
+        std::set<RsPeerId> friends;
+        sr_item.unique_identifier = pi->second.last_identifier;
+        sr_item.friend_invites = computeListOfFriendInvites(pi->first,item->n_requested_friends,item->already_received_peers,friends);
         sr_item.PeerId(item->PeerId());
 
-        // Update the have_added_as_friend for the list of each peer. We do that before sending because sending destroys
-        // the item.
+        // Update friendship levels of the peer that will receive the new list
 
-        for(const auto& pid:friends)
+        for(auto fr:friends)
         {
-            auto& p(mCurrentClientPeers[pid.first]);
-            p.have_added_this_peer[computePeerDistance(p.pgp_fingerprint, pi->second.pgp_fingerprint)] = pi->first;
+            auto& p(pi->second.friendship_levels[fr]);
+
+            if(static_cast<int>(p) < static_cast<int>(RsFriendServer::PeerFriendshipLevel::HAS_KEY))
+                p = RsFriendServer::PeerFriendshipLevel::HAS_KEY;
         }
 
         // Now encrypt the item with the public PGP key of the destination. This prevents the wrong person to request for
@@ -126,9 +139,6 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
         // Send the item.
         mni->SendItem(encrypted_response_item);
 
-        // Update the list of closest peers for all peers currently in the database.
-
-        updateClosestPeers(pi->first,pi->second.pgp_fingerprint);
     }
     catch(std::exception& e)
     {
@@ -142,14 +152,14 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
     }
 }
 
-std::map<std::string, bool> FriendServer::computeListOfFriendInvites(uint32_t nb_reqs_invites,
-                                                                     const std::set<RsPeerId>& already_known_peers,
-                                                                     const RsPeerId &pid,
-                                                                     std::map<RsPeerId,RsPgpFingerprint>& friends)
+std::map<std::string,RsFriendServer::PeerFriendshipLevel> FriendServer::computeListOfFriendInvites(const RsPeerId &pid, uint32_t nb_reqs_invites,
+                                              const std::map<RsPeerId,RsFriendServer::PeerFriendshipLevel>& already_known_peers,
+                                              std::set<RsPeerId>& chosen_peers) const
 {
     // Strategy: we want to return the same set of friends for a given PGP profile key.
     // Still, using some closest distance strategy, the n-closest peers for profile A is not the
-    // same set than the n-closest peers for profile B. We have multiple options:
+    // same set than the n-closest peers for profile B, so some peers will not be in both sets.
+    // We have multiple options:
     //
     // Option 1:
     //
@@ -169,41 +179,45 @@ std::map<std::string, bool> FriendServer::computeListOfFriendInvites(uint32_t nb
     //
     // So we choose Option 2.
 
-    std::map<std::string,bool> res;
+    std::map<std::string,RsFriendServer::PeerFriendshipLevel> res;
+    chosen_peers.clear();
+    auto pinfo_it(mCurrentClientPeers.find(pid));
 
-    auto add_from = [&res,&friends,nb_reqs_invites,already_known_peers,this](bool added,
-                                                         const std::map<PeerInfo::PeerDistance, RsPeerId>& lst) -> bool
+    if(pinfo_it == mCurrentClientPeers.end())
     {
-        for(const auto& pid:lst)
-            if(already_known_peers.find(pid.second) == already_known_peers.end())
-            {
-                const auto p = mCurrentClientPeers.find(pid.second);
-                res.insert(std::make_pair(p->second.short_certificate,added));
-                friends.insert(std::make_pair(p->first,p->second.pgp_fingerprint));
-
-                if(res.size() + already_known_peers.size() >= nb_reqs_invites)
-                    return true;
-            }
-
-        return false;
-    };
-
-    const auto& pinfo(mCurrentClientPeers[pid]);
-
-    // First add from peers who already added the current peer as friend, and leave if we already have enough
-
-    if(add_from(true,pinfo.have_added_this_peer))
+        RsErr() << "inconsistency in computeListOfFriendInvites. Something's wrong in the code." ;
         return res;
+    }
+    auto pinfo(pinfo_it->second);
 
-    add_from(false,pinfo.closest_peers);
+    for(const auto& pit:pinfo.closest_peers)
+        if(already_known_peers.find(pit.second) == already_known_peers.end())
+        {
+            const auto p = mCurrentClientPeers.find(pit.second);
+
+            if(p == mCurrentClientPeers.end())	// should not happen, but just an extra security.
+                continue;
+
+            auto pp = p->second.friendship_levels.find(pid);
+
+            auto peer_friendship_level = (pp==p->second.friendship_levels.end())?(RsFriendServer::PeerFriendshipLevel::UNKNOWN):(pp->second);
+
+            res[p->second.short_certificate] = peer_friendship_level;
+            chosen_peers.insert(p->first);
+
+            if(res.size() + already_known_peers.size() >= nb_reqs_invites)
+                break;
+        }
 
     return res;
 }
 
-std::map<RsPeerId,PeerInfo>::iterator FriendServer::handleIncomingClientData(const std::string& pgp_public_key_b64,const std::string& short_invite_b64)
+bool FriendServer::handleIncomingClientData(const std::string& pgp_public_key_b64,const std::string& short_invite_b64,RsPeerId& pid)
 {
     // 1 - Check that the incoming data is sound.
 
+    try
+    {
         RsDbg() << "  Checking item data...";
 
         std::string error_string;
@@ -239,24 +253,21 @@ std::map<RsPeerId,PeerInfo>::iterator FriendServer::handleIncomingClientData(con
         // 3 - if the key is not already here, add it to keyring.
 
         {
-        RsPgpFingerprint fpr_test;
-        if(mPgpHandler->isPgpPubKeyAvailable(RsPgpId::fromBufferUnsafe(received_key_info.fingerprint+12)))
-            RsDbg() << "    PGP Key is already into keyring.";
-        else
-        {
-            RsPgpId pgp_id;
-            if(!mPgpHandler->LoadCertificateFromBinaryData(key_binary_data.data(),key_binary_data.size(), pgp_id, error_string))
-                throw std::runtime_error("Cannot load client's pgp public key into keyring: " + error_string) ;
+            RsPgpFingerprint fpr_test;
+            if(mPgpHandler->isPgpPubKeyAvailable(RsPgpId::fromBufferUnsafe(received_key_info.fingerprint+12)))
+                RsDbg() << "    PGP Key is already into keyring.";
+            else
+            {
+                RsPgpId pgp_id;
+                if(!mPgpHandler->LoadCertificateFromBinaryData(key_binary_data.data(),key_binary_data.size(), pgp_id, error_string))
+                    throw std::runtime_error("Cannot load client's pgp public key into keyring: " + error_string) ;
 
-            RsDbg() << "    Public key added to keyring.";
-            RsDbg() << "    Sync-ing the PGP keyring on disk";
+                RsDbg() << "    Public key added to keyring.";
+                RsDbg() << "    Sync-ing the PGP keyring on disk";
 
-            mPgpHandler->syncDatabase();
+                mPgpHandler->syncDatabase();
+            }
         }
-        }
-
-        // All good.
-
         // Store/update the peer info
 
         auto& pi(mCurrentClientPeers[shortInviteDetails.id]);
@@ -265,13 +276,19 @@ std::map<RsPeerId,PeerInfo>::iterator FriendServer::handleIncomingClientData(con
         pi.last_connection_TS = time(nullptr);
         pi.pgp_fingerprint = shortInviteDetails.fpr;
 
-        while(pi.last_nonce == 0)					// reuse the same identifier (so it's not really a nonce, but it's kept secret whatsoever).
-            pi.last_nonce = RsRandom::random_u64();
+        while(pi.last_identifier == 0)					// reuse the same identifier (so it's not really a nonce, but it's kept secret whatsoever).
+            pi.last_identifier = RsRandom::random_u64();
 
-        return mCurrentClientPeers.find(shortInviteDetails.id);
+        pid = shortInviteDetails.id;
+        return true;
+    }
+    catch (std::exception& e)
+    {
+        RsErr() << "Exception while adding client data: " << e.what() ;
+        return false;
+    }
 }
 
-
 void FriendServer::handleClientRemove(const RsFriendServerClientRemoveItem *item)
 {
     RsDbg() << "Received a client remove item:" << *item ;
@@ -284,14 +301,14 @@ void FriendServer::handleClientRemove(const RsFriendServerClientRemoveItem *item
         return;
     }
 
-    if(it->second.last_nonce != item->nonce)
+    if(it->second.last_identifier != item->unique_identifier)
     {
-        RsErr() << "  ERROR: Client supplied a nonce " << std::hex << item->nonce << std::dec << " that is not correct (expected "
-                << std::hex << it->second.last_nonce << std::dec << ")";
+        RsErr() << "  ERROR: Client supplied a nonce " << std::hex << item->unique_identifier << std::dec << " that is not correct (expected "
+                << std::hex << it->second.last_identifier << std::dec << ")";
         return;
     }
 
-    RsDbg() << "  Nonce is correct: " << std::hex << item->nonce << std::dec << ". Removing peer " << item->peer_id ;
+    RsDbg() << "  Nonce is correct: " << std::hex << item->unique_identifier << std::dec << ". Removing peer " << item->peer_id ;
 
     removePeer(item->peer_id);
 }
@@ -310,7 +327,7 @@ void FriendServer::removePeer(const RsPeerId& peer_id)
         for(auto pit(it.second.closest_peers.begin());pit!=it.second.closest_peers.end();)
             if(pit->second == peer_id)
             {
-                RsDbg() << "  Removing from n-closest peers of peer " << pit->first ;
+                RsDbg() << "  Removing from n-closest peers of peer " << it.first ;
 
                 auto tmp(pit);
                 ++tmp;
@@ -320,27 +337,26 @@ void FriendServer::removePeer(const RsPeerId& peer_id)
             else
                 ++pit;
 
-        // Also remove that peer from peers that have accepted each peer
+        // Also remove that peer from friendship levels of that particular peer.
 
-        for(auto fit(it.second.have_added_this_peer.begin());fit!=it.second.have_added_this_peer.end();)
-            if(fit->second == peer_id)
-            {
-                RsDbg() << "  Removing from have_added_as_friend peers of peer " << fit->first ;
+        auto fit = it.second.friendship_levels.find(peer_id);
 
-                auto tmp(fit);
-                ++tmp;
-                it.second.have_added_this_peer.erase(fit);
-                fit=tmp;
-            }
-            else
-                ++fit;
+        if(fit != it.second.friendship_levels.end())
+        {
+            RsDbg() << "  Removing from have_added_as_friend peers of peer " << it.first ;
+            it.second.friendship_levels.erase(fit);
+        }
     }
 }
 
 PeerInfo::PeerDistance FriendServer::computePeerDistance(const RsPgpFingerprint& p1,const RsPgpFingerprint& p2)
 {
-    std::cerr << "Computing peer distance: p1=" << p1 << " p2=" << p2 << " p1^p2=" << (p1^p2) << " distance=" << ((p1^p2)^mRandomPeerBias) << std::endl;
-    return (p1 ^ p2)^mRandomPeerBias;
+    auto res = (p1 ^ p2)^mRandomPeerBias;
+    auto res2 = RsDirUtil::sha1sum(res.toByteArray(),res.SIZE_IN_BYTES);	// sha1sum prevents reverse finding the random bias
+
+    std::cerr << "Computing peer distance: p1=" << p1 << " p2=" << p2 << " p1^p2=" << (p1^p2) << " distance=" << res2 << std::endl;
+
+    return res2;
 }
 FriendServer::FriendServer(const std::string& base_dir,const std::string& listening_address,uint16_t listening_port)
     : mListeningAddress(listening_address),mListeningPort(listening_port)
@@ -389,18 +405,73 @@ void FriendServer::autoWash()
         removePeer(peer_id);
 }
 
-void FriendServer::updateClosestPeers(const RsPeerId& pid,const RsPgpFingerprint& fpr)
+void FriendServer::updateClosestPeers(const RsPeerId& pid,const RsPgpFingerprint& fpr,const std::map<RsPeerId,RsFriendServer::PeerFriendshipLevel>& friended_peers)
 {
+    auto find_multi = [](PeerInfo::PeerDistance dist,std::map< std::pair<RsFriendServer::PeerFriendshipLevel,PeerInfo::PeerDistance>,RsPeerId >& mp)
+            -> std::map< std::pair<RsFriendServer::PeerFriendshipLevel,PeerInfo::PeerDistance>,RsPeerId >::iterator
+    {
+        auto it = mp.find(std::make_pair(RsFriendServer::PeerFriendshipLevel::UNKNOWN,dist)) ;
+
+        if(it == mp.end()) it = mp.find(std::make_pair(RsFriendServer::PeerFriendshipLevel::NO_KEY          ,dist));
+        if(it == mp.end()) it = mp.find(std::make_pair(RsFriendServer::PeerFriendshipLevel::HAS_KEY         ,dist));
+        if(it == mp.end()) it = mp.find(std::make_pair(RsFriendServer::PeerFriendshipLevel::HAS_ACCEPTED_KEY,dist));
+
+        return it;
+    };
+    auto remove_from_map = [find_multi](PeerInfo::PeerDistance dist,
+                                std::map< std::pair<RsFriendServer::PeerFriendshipLevel,
+                                PeerInfo::PeerDistance>,RsPeerId>& mp) -> bool
+    {
+        auto mpit = find_multi(dist,mp);
+
+        if(mpit != mp.end())
+        {
+            mp.erase(mpit);
+            return true;
+        }
+        else
+            return false;
+    };
+
+    auto& pit(mCurrentClientPeers[pid]);
+
     for(auto& it:mCurrentClientPeers)
         if(it.first != pid)
         {
+            // 1 - for all existing peers, update the level at which the given peer has added the peer as friend.
+
+            auto peer_iterator = friended_peers.find(it.first);
+            auto peer_friendship_level = (peer_iterator==friended_peers.end())? (RsFriendServer::PeerFriendshipLevel::UNKNOWN):(peer_iterator->second);
+
             PeerInfo::PeerDistance d = computePeerDistance(fpr,it.second.pgp_fingerprint);
 
-            it.second.closest_peers.insert(std::make_pair(d,pid));
+            // Remove the peer from the map. This is costly. I need to find something better. If the peer is already
+            // in the list, it has a map key with the same distance.
 
-            if(it.second.closest_peers.size() > MAXIMUM_PEERS_TO_REQUEST)
+            remove_from_map(d,it.second.closest_peers);
+
+            it.second.closest_peers[std::make_pair(peer_friendship_level,d)] = pid;
+
+            while(it.second.closest_peers.size() > MAXIMUM_PEERS_TO_REQUEST)
                 it.second.closest_peers.erase(std::prev(it.second.closest_peers.end()));
+
+            // 2 - for the current peer, update the list of closest peers
+
+            auto pit2 = it.second.friendship_levels.find(pid);
+            peer_friendship_level = (pit2==it.second.friendship_levels.end())? (RsFriendServer::PeerFriendshipLevel::UNKNOWN):(pit2->second);
+
+            remove_from_map(d,pit.closest_peers);
+
+            pit.closest_peers[std::make_pair(peer_friendship_level,d)] = it.first;
+
+            while(pit.closest_peers.size() > MAXIMUM_PEERS_TO_REQUEST)
+                pit.closest_peers.erase(std::prev(pit.closest_peers.end()));
         }
+
+    // Also update the friendship levels for the current peer, of all friends from the list.
+
+    for(auto it:friended_peers)
+        pit.friendship_levels[it.first] = it.second;
 }
 
 Sha1CheckSum FriendServer::computeDataHash()
@@ -416,17 +487,18 @@ Sha1CheckSum FriendServer::computeDataHash()
         s << inf.pgp_fingerprint;
         s << inf.short_certificate;
         s << (uint64_t)inf.last_connection_TS;
-        s << inf.last_nonce;
+        s << inf.last_identifier;
 
         for(auto d(inf.closest_peers.begin());d!=inf.closest_peers.end();++d)
         {
-            s << d->first ;
+            s << static_cast<uint32_t>(d->first.first) ;
+            s << d->first.second ;
             s << d->second;
         }
-        for(auto d(inf.have_added_this_peer.begin());d!=inf.have_added_this_peer.end();++d)
+        for(auto d:inf.friendship_levels)
         {
-            s << d->first ;
-            s << d->second;
+            s << d.first ;
+            s << static_cast<uint32_t>(d.second);
         }
     }
     return s.hash();
@@ -449,16 +521,11 @@ void FriendServer::debugPrint(bool force)
 
         for(const auto& it:mCurrentClientPeers)
         {
-            RsDbg() << "   " << it.first << ": nonce=" << std::hex << it.second.last_nonce << std::dec << " fpr: " << it.second.pgp_fingerprint << ", last contact: " << now - it.second.last_connection_TS << " secs ago.";
+            RsDbg() << "   " << it.first << ": identifier=" << std::hex << it.second.last_identifier << std::dec << " fpr: " << it.second.pgp_fingerprint << ", last contact: " << now - it.second.last_connection_TS << " secs ago.";
             RsDbg() << "   Closest peers:" ;
 
-            for(const auto& pit:it.second.closest_peers)
-                RsDbg() << "      " << pit.second << " distance=" << pit.first ;
-
-            RsDbg() << "   Have added this peer:" ;
-
-            for(const auto& pit:it.second.have_added_this_peer)
-                RsDbg() << "      " << pit.second << " distance=" << pit.first ;
+            for(auto pit:it.second.closest_peers)
+                RsDbg() << "      " << pit.second << " distance=" << pit.first.second << " Peer reciprocal status:" << static_cast<int>(pit.first.first);
         }
 
         RsDbg() << "===============================================";
diff --git a/retroshare-friendserver/src/friendserver.h b/retroshare-friendserver/src/friendserver.h
index 7b688147a..476ce3cf3 100644
--- a/retroshare-friendserver/src/friendserver.h
+++ b/retroshare-friendserver/src/friendserver.h
@@ -24,23 +24,39 @@
 #include "util/rsthreads.h"
 #include "pqi/pqistreamer.h"
 #include "pgp/pgphandler.h"
+#include "retroshare/rsfriendserver.h"
 
 #include "network.h"
 
 class RsFriendServerClientRemoveItem;
 class RsFriendServerClientPublishItem;
 
+// Storage for peer-related information as known by the friend server.
+// Peers send to the friend server the list of peers they already have, with their own friendship level with that peer.
+// The FS needs to send back a list of peers, with the friendship level to the current peer.
+// In the list of closest peers, the reverse friendship levels are stored: for a peer A the reverse friendship level to peer B is whether B has
+// added A as friend or not.
+// In the list of friends for a peer, the forward FL is stored. The forward FL of a peer A to a peer B is whether A has added B as friend or not.
+
 struct PeerInfo
 {
-    typedef RsPgpFingerprint PeerDistance;
+    typedef Sha1CheckSum PeerDistance;
 
     RsPgpFingerprint pgp_fingerprint;
     std::string short_certificate;
     rstime_t last_connection_TS;
-    uint64_t last_nonce;
+    uint64_t last_identifier;
 
-    std::map<PeerDistance,RsPeerId> closest_peers;
-    std::map<PeerDistance,RsPeerId> have_added_this_peer;
+    // The following map contains the list of closest peers. The sorting is based
+    // on a combination of the peer XOR distance and the friendship level, so that
+    // peers which already have added a peer are considered first as potential receivers of his key.
+    // The friendship level here is a reverse FL, e.g. whether each closest peer has added the current peer as friend.
+
+    std::map<std::pair<RsFriendServer::PeerFriendshipLevel,PeerDistance>,RsPeerId > closest_peers;	// limited in size.
+
+    // Which peers have received the key for that particular peer, along with the direct friendship level: whether current peer has added each peer.
+
+    std::map<RsPeerId,RsFriendServer::PeerFriendshipLevel> friendship_levels;	// unlimited in size, but no distance sorting.
 };
 
 class FriendServer : public RsTickingThread
@@ -60,16 +76,18 @@ private:
     void handleClientPublish(const RsFriendServerClientPublishItem *item);
 
     // Updates for each peer in the database, the list of closest peers w.r.t. some arbitrary distance.
-    void updateClosestPeers(const RsPeerId& pid,const RsPgpFingerprint& fpr);
+    void updateClosestPeers(const RsPeerId& pid, const RsPgpFingerprint& fpr, const std::map<RsPeerId, RsFriendServer::PeerFriendshipLevel> &friended_peers);
 
     // removes a single peer from all lists.
     void removePeer(const RsPeerId& peer_id);
 
     // Adds the incoming peer data to the list of current clients and returns the
-    std::map<RsPeerId,PeerInfo>::iterator handleIncomingClientData(const std::string& pgp_public_key_b64,const std::string& short_invite_b64);
+    bool handleIncomingClientData(const std::string& pgp_public_key_b64, const std::string& short_invite_b64, RsPeerId &pid);
 
     // Computes the appropriate list of short invites to send to a given peer.
-    std::map<std::string, bool> computeListOfFriendInvites(uint32_t nb_reqs_invites, const std::set<RsPeerId> &already_received_peers, const RsPeerId &pid, std::map<RsPeerId,RsPgpFingerprint>& friends);
+    std::map<std::string,RsFriendServer::PeerFriendshipLevel> computeListOfFriendInvites(const RsPeerId &pid, uint32_t nb_reqs_invites,
+                                                                                         const std::map<RsPeerId,RsFriendServer::PeerFriendshipLevel>& already_known_peers,
+                                                                                         std::set<RsPeerId>& chosen_peers) const;
 
     // Compute the distance between peers using the random bias (It's not really a distance though. I'm not sure about the triangular inequality).
     PeerInfo::PeerDistance computePeerDistance(const RsPgpFingerprint &p1, const RsPgpFingerprint &p2);

From 2702edab30eb65fccdc78aa9cb62e98a350a7ebf Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 13 Oct 2022 23:10:24 +0200
Subject: [PATCH 111/503] fix storing graph style

---
 .../gui/statistics/BandwidthGraphWindow.cpp    | 18 +++++++++---------
 .../src/gui/statistics/BandwidthGraphWindow.ui | 12 ++++++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
index 87a87a5f8..f621d355b 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
+++ b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
@@ -42,7 +42,7 @@
 #define DEFAULT_ALWAYS_ON_TOP   false
 #define DEFAULT_OPACITY         100
 #define DEFAULT_STYLE           LineGraph
-#define DEFAULT_GRAPHCOLOR      DefaultColor
+#define DEFAULT_GRAPHCOLOR      false
 #define DEFAULT_DIRECTION       DefaultDirection
 
 #define ADD_TO_FILTER(f,v,b)  (f = ((b) ? ((f) | (v)) : ((f) & ~(v))))
@@ -135,16 +135,16 @@ void BandwidthGraph::toggleReceiveRate(bool b)
 
 void BandwidthGraph::switchGraphColor()
 {
-   if(ui.frmGraph->getFlags() & RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE)
-   {
-      ui.frmGraph->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
-      ui.btnGraphColor->setIcon(FilesDefs::getIconFromQtResourcePath(IMG_GRAPH_LIGHT));
-   }
-  else
+   if(ui.btnGraphColor->isChecked())
    {
       ui.frmGraph->setFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
       ui.btnGraphColor->setIcon(FilesDefs::getIconFromQtResourcePath(IMG_GRAPH_DARK));
    }
+   else
+   {
+      ui.frmGraph->resetFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
+      ui.btnGraphColor->setIcon(FilesDefs::getIconFromQtResourcePath(IMG_GRAPH_LIGHT));
+   }
 
    saveSettings();
 }
@@ -158,9 +158,9 @@ BandwidthGraph::loadSettings()
   setOpacity(ui.sldrOpacity->value());
 
   /* Set whether we are plotting bandwidth as area graphs or not */
-  int graphColor = getSetting(SETTING_GRAPHCOLOR, DEFAULT_GRAPHCOLOR).toInt();
+  ui.btnGraphColor->setChecked(getSetting(SETTING_GRAPHCOLOR, DEFAULT_GRAPHCOLOR).toBool());
 
-  if(graphColor>0)
+  if(ui.btnGraphColor->isChecked())
   {
       ui.frmGraph->setFlags(RSGraphWidget::RSGRAPH_FLAGS_DARK_STYLE);
       ui.btnGraphColor->setIcon(FilesDefs::getIconFromQtResourcePath(IMG_GRAPH_DARK));
diff --git a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.ui b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.ui
index 56f1818f8..17d2ee6c5 100644
--- a/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.ui
+++ b/retroshare-gui/src/gui/statistics/BandwidthGraphWindow.ui
@@ -61,7 +61,7 @@
          <string>PushButton</string>
         </property>
         <property name="checkable">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
        </widget>
       </item>
@@ -180,7 +180,15 @@
       <property name="frameShadow">
        <enum>QFrame::Raised</enum>
       </property>
-      <widget class="QWidget" name="">
+      <widget class="QWidget" name="layoutWidget">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>218</width>
+         <height>88</height>
+        </rect>
+       </property>
        <layout class="QVBoxLayout" name="_3">
         <property name="spacing">
          <number>1</number>

From 5847b08766d60d5422cbe2493c3b998d57ee9f41 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 19 Oct 2022 17:24:58 +0200
Subject: [PATCH 112/503] added display of friend status in FS

---
 retroshare-friendserver/src/friendserver.cc   | 23 ++++-
 .../src/gui/FriendServerControl.cpp           | 91 ++++++++++++++++++-
 retroshare-gui/src/gui/FriendServerControl.h  |  7 ++
 retroshare-gui/src/gui/FriendServerControl.ui | 38 +++++++-
 4 files changed, 155 insertions(+), 4 deletions(-)

diff --git a/retroshare-friendserver/src/friendserver.cc b/retroshare-friendserver/src/friendserver.cc
index 19c53e767..19c286256 100644
--- a/retroshare-friendserver/src/friendserver.cc
+++ b/retroshare-friendserver/src/friendserver.cc
@@ -103,18 +103,29 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
         sr_item.friend_invites = computeListOfFriendInvites(pi->first,item->n_requested_friends,item->already_received_peers,friends);
         sr_item.PeerId(item->PeerId());
 
+        RsDbg() << "  Got " << sr_item.friend_invites.size() << " closest peers not in the list." ;
+        RsDbg() << "  Updating local information for destination peer." ;
+
         // Update friendship levels of the peer that will receive the new list
 
         for(auto fr:friends)
         {
             auto& p(pi->second.friendship_levels[fr]);
 
+            RsDbg() << "  Already a friend: " << fr << ", with local status " << static_cast<int>(p) ;
+
             if(static_cast<int>(p) < static_cast<int>(RsFriendServer::PeerFriendshipLevel::HAS_KEY))
+            {
                 p = RsFriendServer::PeerFriendshipLevel::HAS_KEY;
+                RsDbg() << "    --> updating status to HAS_KEY" ;
+            }
         }
 
         // Now encrypt the item with the public PGP key of the destination. This prevents the wrong person to request for
         // someone else's data.
+
+        RsDbg() << "  Encrypting item..." ;
+
         RsFriendServerEncryptedServerResponseItem *encrypted_response_item = new RsFriendServerEncryptedServerResponseItem;
         uint32_t serialized_clear_size = FsSerializer().size(&sr_item);
         RsTemporaryMemory serialized_clear_mem(serialized_clear_size);
@@ -137,8 +148,9 @@ void FriendServer::handleClientPublish(const RsFriendServerClientPublishItem *it
         memcpy(encrypted_response_item->bin_data,encrypted_mem,encrypted_mem_size);
 
         // Send the item.
-        mni->SendItem(encrypted_response_item);
 
+        RsDbg() << "  Sending item..." ;
+        mni->SendItem(encrypted_response_item);
     }
     catch(std::exception& e)
     {
@@ -191,8 +203,11 @@ std::map<std::string,RsFriendServer::PeerFriendshipLevel> FriendServer::computeL
     auto pinfo(pinfo_it->second);
 
     for(const auto& pit:pinfo.closest_peers)
+    {
         if(already_known_peers.find(pit.second) == already_known_peers.end())
         {
+            RsDbg() << "  peer " << pit.second << ": not in supplied list => adding it.";
+
             const auto p = mCurrentClientPeers.find(pit.second);
 
             if(p == mCurrentClientPeers.end())	// should not happen, but just an extra security.
@@ -208,6 +223,12 @@ std::map<std::string,RsFriendServer::PeerFriendshipLevel> FriendServer::computeL
             if(res.size() + already_known_peers.size() >= nb_reqs_invites)
                 break;
         }
+        else
+        {
+            auto p = already_known_peers.find(pit.second);
+            RsDbg() << "  peer " << pit.second << ": already in supplied list, with status " << static_cast<int>(p->second) << ". Not adding it.";
+        }
+    }
 
     return res;
 }
diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index 5b3fdf994..5d5dfcb41 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -37,6 +37,11 @@
 #define ICON_STATUS_UNKNOWN ":/images/ledoff1.png"
 #define ICON_STATUS_OK      ":/images/ledon1.png"
 
+#define NAME_COLUMN 0
+#define NODE_COLUMN 1
+#define ADDR_COLUMN 2
+#define STAT_COLUMN 3
+
 /** Constructor */
 FriendServerControl::FriendServerControl(QWidget *parent)
     : MainPage(parent)
@@ -71,6 +76,8 @@ FriendServerControl::FriendServerControl(QWidget *parent)
 
     mConnectionCheckTimer = new QTimer;
 
+    whileBlocking(autoAccept_CB)->setChecked(rsFriendServer->autoAddFriends());
+
     // init values
 
     torServerFriendsToRequest_SB->setValue(rsFriendServer->friendsToRequest());
@@ -83,18 +90,51 @@ FriendServerControl::FriendServerControl(QWidget *parent)
     QObject::connect(torServerFriendsToRequest_SB,SIGNAL(valueChanged(int)),this,SLOT(onFriendsToRequestChanged(int)));
     QObject::connect(torServerAddress_LE,SIGNAL(textEdited(const QString&)),this,SLOT(onOnionAddressEdit(const QString&)));
     QObject::connect(torServerPort_SB,SIGNAL(valueChanged(int)),this,SLOT(onOnionPortEdit(int)));
+    QObject::connect(autoAccept_CB,SIGNAL(toggled(bool)),this,SLOT(onAutoAddFriends(bool)));
 
     QObject::connect(mConnectionCheckTimer,SIGNAL(timeout()),this,SLOT(checkServerAddress()));
 
     mCheckingServerMovie = new QMovie(":/images/loader/circleball-16.gif");
 
     updateFriendServerStatusIcon(false);
+
+    mEventHandlerId = 0;
+
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
+    {
+        RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
+    }, mEventHandlerId, RsEventType::FRIEND_SERVER );
+}
+
+void FriendServerControl::onAutoAddFriends(bool b)
+{
+    rsFriendServer->setAutoAddFriends(b);
+}
+void FriendServerControl::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
+{
+    if(event->mType != RsEventType::FRIEND_SERVER) return;
+
+    const RsFriendServerEvent *fe = dynamic_cast<const RsFriendServerEvent*>(event.get());
+    if(!fe)
+        return;
+
+    switch(fe->mFriendServerEventType)
+    {
+    case RsFriendServerEventCode::PEER_INFO_CHANGED: updateContactsStatus();
+        break;
+
+    default:
+    case RsFriendServerEventCode::UNKNOWN: break;
+    }
+
 }
 
 FriendServerControl::~FriendServerControl()
 {
     delete mCheckingServerMovie;
     delete mConnectionCheckTimer;
+
+    rsEvents->unregisterEventsHandler(mEventHandlerId);
 }
 
 void FriendServerControl::onOnOffClick(bool b)
@@ -193,6 +233,7 @@ void FriendServerControl::updateFriendServerStatusIcon(bool ok)
         serverStatusCheckResult_LB->setToolTip(tr("Friend server is currently reachable.")) ;
         serverStatusCheckResult_LB->setPixmap(QPixmap(ICON_STATUS_OK));
         friendServerOnOff_CB->setEnabled(true);
+        status_TW->setEnabled(true);
     }
     else
     {
@@ -201,8 +242,56 @@ void FriendServerControl::updateFriendServerStatusIcon(bool ok)
         serverStatusCheckResult_LB->setPixmap(QPixmap(ICON_STATUS_UNKNOWN));
         friendServerOnOff_CB->setChecked(false);
         friendServerOnOff_CB->setEnabled(false);
+        status_TW->setEnabled(false);
+    }
+}
+
+void FriendServerControl::updateContactsStatus()
+{
+    std::map<RsPeerId,RsFriendServer::RsFsPeerInfo> pinfo = rsFriendServer->getPeersInfo();
+
+    status_TW->clear();
+    int row = 0;
+    status_TW->setRowCount(pinfo.size());
+    status_TW->setColumnCount(4);
+
+    status_TW->setHorizontalHeaderItem(NAME_COLUMN,new QTableWidgetItem(QObject::tr("Name")));
+    status_TW->setHorizontalHeaderItem(NODE_COLUMN,new QTableWidgetItem(QObject::tr("Node")));
+    status_TW->setHorizontalHeaderItem(ADDR_COLUMN,new QTableWidgetItem(QObject::tr("Address")));
+    status_TW->setHorizontalHeaderItem(STAT_COLUMN,new QTableWidgetItem(QObject::tr("Status")));
+
+    for(auto it:pinfo)
+    {
+        uint32_t err_code=0;
+        RsPeerDetails details;
+
+        rsPeers->parseShortInvite(it.second.mInvite,details,err_code);
+
+        status_TW->setItem(row,NAME_COLUMN,new QTableWidgetItem(QString::fromStdString(details.name)));
+        status_TW->setItem(row,NODE_COLUMN,new QTableWidgetItem(QString::fromStdString(details.id.toStdString())));
+        status_TW->setItem(row,ADDR_COLUMN,new QTableWidgetItem(QString::fromStdString(details.hiddenNodeAddress)+":"+QString::number(details.hiddenNodePort)));
+
+        QString status_string;
+        if(details.accept_connection)
+            status_string += QString("Friend");
+        else
+            status_string += QString("Not friend");
+
+        status_string += QString(" / ");
+
+        switch(it.second.mPeerLevel)
+        {
+        case RsFriendServer::PeerFriendshipLevel::NO_KEY:   status_string += "Doesn't have my key" ; break;
+        case RsFriendServer::PeerFriendshipLevel::HAS_KEY:  status_string += "Has my key" ; break;
+        case RsFriendServer::PeerFriendshipLevel::HAS_ACCEPTED_KEY:  status_string += "Has friended me" ; break;
+        default:
+        case RsFriendServer::PeerFriendshipLevel::UNKNOWN:  status_string += "Unkn" ; break;
+        }
+
+        status_TW->setItem(row,STAT_COLUMN,new QTableWidgetItem(status_string));
+
+        row++;
     }
 }
 
 
-
diff --git a/retroshare-gui/src/gui/FriendServerControl.h b/retroshare-gui/src/gui/FriendServerControl.h
index fafd26f82..4470e4402 100644
--- a/retroshare-gui/src/gui/FriendServerControl.h
+++ b/retroshare-gui/src/gui/FriendServerControl.h
@@ -22,6 +22,8 @@
 
 #include <QGraphicsScene>
 
+#include "retroshare/rsevents.h"
+
 #include "retroshare-gui/mainpage.h"
 #include "ui_FriendServerControl.h"
 
@@ -39,11 +41,16 @@ protected slots:
     void onOnionPortEdit(int);
     void onNbFriendsToRequestsChanged(int n);
     void checkServerAddress();
+    void onAutoAddFriends(bool b);
 
 private:
+    void updateContactsStatus();
     void updateFriendServerStatusIcon(bool ok);
+    void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 
     QTimer *mConnectionCheckTimer;
     QMovie *mCheckingServerMovie;
     bool 	mCurrentlyCheckingServerAddress;
+
+    RsEventsHandlerId_t mEventHandlerId;
 };
diff --git a/retroshare-gui/src/gui/FriendServerControl.ui b/retroshare-gui/src/gui/FriendServerControl.ui
index 1455de71e..f548ce2a4 100644
--- a/retroshare-gui/src/gui/FriendServerControl.ui
+++ b/retroshare-gui/src/gui/FriendServerControl.ui
@@ -81,7 +81,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="icon">
-        <iconset resource="images.qrc">
+        <iconset resource="icons.qrc">
          <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
        </property>
        <property name="checkable">
@@ -179,9 +179,43 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="autoAccept_CB">
+        <property name="toolTip">
+         <string>Auto accept received certificates as friends</string>
+        </property>
+        <property name="text">
+         <string>Auto-accept</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QTableWidget" name="status_TW">
+     <column>
+      <property name="text">
+       <string>Name</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Node ID</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Address</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Status</string>
+      </property>
+     </column>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -198,7 +232,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="images.qrc"/>
+  <include location="icons.qrc"/>
  </resources>
  <connections/>
 </ui>

From 24ad687c7fe83f9f823e2069f0a8a6fdff26bfc9 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 25 Oct 2022 09:37:42 +0200
Subject: [PATCH 113/503] added control over received peers from FS

---
 .../src/gui/FriendServerControl.cpp           | 98 +++++++++++++++----
 retroshare-gui/src/gui/FriendServerControl.h  | 11 ++-
 retroshare-gui/src/gui/FriendServerControl.ui |  3 +
 3 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index 5d5dfcb41..746966e41 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -22,6 +22,7 @@
 #include <QMovie>
 #include <QMessageBox>
 #include <QTcpSocket>
+#include <QMenu>
 
 #include "retroshare/rsfriendserver.h"
 #include "retroshare/rstor.h"
@@ -78,13 +79,13 @@ FriendServerControl::FriendServerControl(QWidget *parent)
 
     whileBlocking(autoAccept_CB)->setChecked(rsFriendServer->autoAddFriends());
 
-    // init values
+    // Init values
 
-    torServerFriendsToRequest_SB->setValue(rsFriendServer->friendsToRequest());
-    torServerAddress_LE->setText(QString::fromStdString(rsFriendServer->friendsServerAddress().c_str()));
-    torServerPort_SB->setValue(rsFriendServer->friendsServerPort());
+    whileBlocking(torServerFriendsToRequest_SB)->setValue(rsFriendServer->friendsToRequest());
+    whileBlocking(torServerAddress_LE)->setText(QString::fromStdString(rsFriendServer->friendsServerAddress().c_str()));
+    whileBlocking(torServerPort_SB)->setValue(rsFriendServer->friendsServerPort());
 
-    // connect slignals/slots
+    // Connect slignals/slots
 
     QObject::connect(friendServerOnOff_CB,SIGNAL(toggled(bool)),this,SLOT(onOnOffClick(bool)));
     QObject::connect(torServerFriendsToRequest_SB,SIGNAL(valueChanged(int)),this,SLOT(onFriendsToRequestChanged(int)));
@@ -93,17 +94,29 @@ FriendServerControl::FriendServerControl(QWidget *parent)
     QObject::connect(autoAccept_CB,SIGNAL(toggled(bool)),this,SLOT(onAutoAddFriends(bool)));
 
     QObject::connect(mConnectionCheckTimer,SIGNAL(timeout()),this,SLOT(checkServerAddress()));
+    QObject::connect(status_TW, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(launchStatusContextMenu(QPoint)));
 
     mCheckingServerMovie = new QMovie(":/images/loader/circleball-16.gif");
 
     updateFriendServerStatusIcon(false);
 
-    mEventHandlerId = 0;
+    makeFriend_ACT             = new QAction(tr("Make friend"));			// makes SSL-only friend with the peer
+
+    QObject::connect(makeFriend_ACT,SIGNAL(triggered()),this,SLOT(makeFriend()));
+
+    mEventHandlerId_fs = 0;
 
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
     {
         RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
-    }, mEventHandlerId, RsEventType::FRIEND_SERVER );
+    }, mEventHandlerId_fs, RsEventType::FRIEND_SERVER );
+
+    mEventHandlerId_peer = 0;
+
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
+    {
+        RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
+    }, mEventHandlerId_peer, RsEventType::PEER_CONNECTION );
 }
 
 void FriendServerControl::onAutoAddFriends(bool b)
@@ -112,21 +125,34 @@ void FriendServerControl::onAutoAddFriends(bool b)
 }
 void FriendServerControl::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
 {
-    if(event->mType != RsEventType::FRIEND_SERVER) return;
-
-    const RsFriendServerEvent *fe = dynamic_cast<const RsFriendServerEvent*>(event.get());
-    if(!fe)
-        return;
-
-    switch(fe->mFriendServerEventType)
     {
-    case RsFriendServerEventCode::PEER_INFO_CHANGED: updateContactsStatus();
-        break;
+        const RsFriendServerEvent *fe = dynamic_cast<const RsFriendServerEvent*>(event.get());
 
-    default:
-    case RsFriendServerEventCode::UNKNOWN: break;
+        if(fe)
+            switch(fe->mFriendServerEventType)
+            {
+            case RsFriendServerEventCode::PEER_INFO_CHANGED: updateContactsStatus();
+                break;
+
+            default:
+            case RsFriendServerEventCode::UNKNOWN: break;
+            }
     }
 
+    {
+        const RsConnectionEvent *pe = dynamic_cast<const RsConnectionEvent*>(event.get());
+
+        if(pe)
+            switch(pe->mConnectionInfoCode)
+            {
+            case RsConnectionEventCode::PEER_ADDED:
+            case RsConnectionEventCode::PEER_REMOVED:
+            case RsConnectionEventCode::PEER_CONNECTED: updateContactsStatus();
+                break;
+
+            default: ;
+            }
+    }
 }
 
 FriendServerControl::~FriendServerControl()
@@ -134,9 +160,23 @@ FriendServerControl::~FriendServerControl()
     delete mCheckingServerMovie;
     delete mConnectionCheckTimer;
 
-    rsEvents->unregisterEventsHandler(mEventHandlerId);
+    rsEvents->unregisterEventsHandler(mEventHandlerId_fs);
+    rsEvents->unregisterEventsHandler(mEventHandlerId_peer);
 }
 
+void FriendServerControl::launchStatusContextMenu(QPoint p)
+{
+    RsPeerId peer_id = getCurrentPeer();
+
+    RsPeerDetails det;
+    if(rsPeers->getPeerDetails(peer_id,det) && det.accept_connection)
+        return;
+
+    QMenu contextMnu(this);
+    contextMnu.addAction(makeFriend_ACT);
+
+    contextMnu.exec(QCursor::pos());
+}
 void FriendServerControl::onOnOffClick(bool b)
 {
     if(b)
@@ -294,4 +334,24 @@ void FriendServerControl::updateContactsStatus()
     }
 }
 
+RsPeerId FriendServerControl::getCurrentPeer()
+{
+    QTableWidgetItem *item = status_TW->currentItem();
+
+    if(!item)
+        return RsPeerId();
+
+    return RsPeerId(status_TW->item(item->row(),NODE_COLUMN)->text().toStdString());
+}
+void FriendServerControl::makeFriend()
+{
+    RsPeerId peer_id = getCurrentPeer();
+
+    rsFriendServer->allowPeer(peer_id);
+}
+
+
+
+
+
 
diff --git a/retroshare-gui/src/gui/FriendServerControl.h b/retroshare-gui/src/gui/FriendServerControl.h
index 4470e4402..ddc66ee8a 100644
--- a/retroshare-gui/src/gui/FriendServerControl.h
+++ b/retroshare-gui/src/gui/FriendServerControl.h
@@ -42,8 +42,11 @@ protected slots:
     void onNbFriendsToRequestsChanged(int n);
     void checkServerAddress();
     void onAutoAddFriends(bool b);
+    void launchStatusContextMenu(QPoint p);
+    void makeFriend();
 
 private:
+    RsPeerId getCurrentPeer();
     void updateContactsStatus();
     void updateFriendServerStatusIcon(bool ok);
     void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
@@ -52,5 +55,11 @@ private:
     QMovie *mCheckingServerMovie;
     bool 	mCurrentlyCheckingServerAddress;
 
-    RsEventsHandlerId_t mEventHandlerId;
+    RsEventsHandlerId_t mEventHandlerId_fs;
+    RsEventsHandlerId_t mEventHandlerId_peer;
+
+    QAction *makeFriend_ACT;
+    QAction *unmakeFriend_ACT;
+    QAction *removePeer_ACT;
+    QAction *removePeerPermanently_ACT;
 };
diff --git a/retroshare-gui/src/gui/FriendServerControl.ui b/retroshare-gui/src/gui/FriendServerControl.ui
index f548ce2a4..e3faac36b 100644
--- a/retroshare-gui/src/gui/FriendServerControl.ui
+++ b/retroshare-gui/src/gui/FriendServerControl.ui
@@ -194,6 +194,9 @@
    </item>
    <item>
     <widget class="QTableWidget" name="status_TW">
+     <property name="contextMenuPolicy">
+      <enum>Qt::CustomContextMenu</enum>
+     </property>
      <column>
       <property name="text">
        <string>Name</string>

From 4d386e9cf15b818df4e026c3b372eed6c938a430 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 25 Oct 2022 14:19:57 +0200
Subject: [PATCH 114/503] added online status for FS

---
 retroshare-gui/src/gui/FriendServerControl.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index 746966e41..f2edd28a3 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -134,6 +134,9 @@ void FriendServerControl::handleEvent_main_thread(std::shared_ptr<const RsEvent>
             case RsFriendServerEventCode::PEER_INFO_CHANGED: updateContactsStatus();
                 break;
 
+            case RsFriendServerEventCode::FRIEND_SERVER_STATUS_CHANGED: updateFriendServerStatusIcon(fe->mFriendServerStatus == RsFriendServerStatus::ONLINE);
+                break;
+
             default:
             case RsFriendServerEventCode::UNKNOWN: break;
             }

From 666f01452bd10327d586ccd1ae40d240cc71a8dd Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 28 Oct 2022 11:41:41 +0200
Subject: [PATCH 115/503] added auto-test of saved onion address for FS

---
 retroshare-gui/src/gui/FriendServerControl.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/FriendServerControl.cpp b/retroshare-gui/src/gui/FriendServerControl.cpp
index f2edd28a3..7b031e7e2 100644
--- a/retroshare-gui/src/gui/FriendServerControl.cpp
+++ b/retroshare-gui/src/gui/FriendServerControl.cpp
@@ -82,8 +82,6 @@ FriendServerControl::FriendServerControl(QWidget *parent)
     // Init values
 
     whileBlocking(torServerFriendsToRequest_SB)->setValue(rsFriendServer->friendsToRequest());
-    whileBlocking(torServerAddress_LE)->setText(QString::fromStdString(rsFriendServer->friendsServerAddress().c_str()));
-    whileBlocking(torServerPort_SB)->setValue(rsFriendServer->friendsServerPort());
 
     // Connect slignals/slots
 
@@ -98,6 +96,10 @@ FriendServerControl::FriendServerControl(QWidget *parent)
 
     mCheckingServerMovie = new QMovie(":/images/loader/circleball-16.gif");
 
+    // Do not block signal for these two, since we want to trigger a test to initialise the online status.
+    torServerAddress_LE->setText(QString::fromStdString(rsFriendServer->friendsServerAddress().c_str()));
+    torServerPort_SB->setValue(rsFriendServer->friendsServerPort());
+
     updateFriendServerStatusIcon(false);
 
     makeFriend_ACT             = new QAction(tr("Make friend"));			// makes SSL-only friend with the peer

From 486aa83680a2d359025613be44cabe871e6b44e3 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 2 Nov 2022 21:00:24 +0100
Subject: [PATCH 116/503] added parameter to supply user defined tor executable
 path

---
 .../src/retroshare-friendserver.cc             | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/retroshare-friendserver/src/retroshare-friendserver.cc b/retroshare-friendserver/src/retroshare-friendserver.cc
index d80ad71d6..36b4dd2c2 100644
--- a/retroshare-friendserver/src/retroshare-friendserver.cc
+++ b/retroshare-friendserver/src/retroshare-friendserver.cc
@@ -47,17 +47,22 @@ int main(int argc, char* argv[])
 	//RsControl::earlyInitNotificationSystem();
 
     std::string base_directory = "FSData";
+    std::string tor_executable_path ;
 
 	argstream as(argc,argv);
 
     as >> parameter( 'c',"base-dir", base_directory, "set base directory to store data files (keys, etc)", false )
-	   >> help( 'h', "help", "Display this Help" );
+       >> parameter( 't',"tor-executable", tor_executable_path, "set absolute path for tor executable", false )
+       >> help( 'h', "help", "Display this Help" );
 
 	as.defaultErrorHandling(true, true);
 
     RsConfigOptions conf;
     conf.main_executable_path = argv[0];
 
+    if(!tor_executable_path.empty())
+        RsTor::setTorExecutablePath(tor_executable_path);
+
     RsInit::InitRsConfig();
     RsInit::InitRetroShare(conf);
 
@@ -68,6 +73,17 @@ int main(int argc, char* argv[])
         RsErr() << "Cannot create base directory \"" << base_directory << "\". Check permissions, paths, etc." ;
         return 1;
     }
+
+    // Check the existance of the Tor executable path
+
+    if (!RsDirUtil::fileExists(RsTor::torExecutablePath()))
+    {
+        RsErr() << "Tor executable not found. Try supplying the full path for tor executable with the -t option.";
+        return 1;
+    }
+    else
+        RsDbg() << "Using Tor executable: \"" << RsTor::torExecutablePath() << "\"";
+
     // Create/start TorManager
 
     RsTor::setTorDataDirectory(RsDirUtil::makePath(base_directory,"tor"));

From f7c22af9953c2d4065e8d0917b36b011c62922d8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 2 Nov 2022 21:03:20 +0100
Subject: [PATCH 117/503] improved debug output

---
 retroshare-friendserver/src/retroshare-friendserver.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/retroshare-friendserver/src/retroshare-friendserver.cc b/retroshare-friendserver/src/retroshare-friendserver.cc
index 36b4dd2c2..6c5cba940 100644
--- a/retroshare-friendserver/src/retroshare-friendserver.cc
+++ b/retroshare-friendserver/src/retroshare-friendserver.cc
@@ -76,13 +76,15 @@ int main(int argc, char* argv[])
 
     // Check the existance of the Tor executable path
 
-    if (!RsDirUtil::fileExists(RsTor::torExecutablePath()))
+    auto tor_path = RsTor::torExecutablePath();
+
+    if (!RsDirUtil::fileExists(tor_path))
     {
-        RsErr() << "Tor executable not found. Try supplying the full path for tor executable with the -t option.";
+        RsErr() << "Tor executable \"" << tor_path << "\" not found. Try supplying the correct full path for a tor executable with the -t option.";
         return 1;
     }
     else
-        RsDbg() << "Using Tor executable: \"" << RsTor::torExecutablePath() << "\"";
+        RsDbg() << "Using Tor executable: \"" << tor_path << "\"";
 
     // Create/start TorManager
 

From d6aa58d52c14f2f3aa48c3d31d93cef6634f33f7 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 5 Nov 2022 20:17:55 +0100
Subject: [PATCH 118/503] added some documentation to the friend server

---
 retroshare-friendserver/src/friendserver.h | 81 ++++++++++++++++++++--
 1 file changed, 75 insertions(+), 6 deletions(-)

diff --git a/retroshare-friendserver/src/friendserver.h b/retroshare-friendserver/src/friendserver.h
index 476ce3cf3..259b0e5ba 100644
--- a/retroshare-friendserver/src/friendserver.h
+++ b/retroshare-friendserver/src/friendserver.h
@@ -31,12 +31,81 @@
 class RsFriendServerClientRemoveItem;
 class RsFriendServerClientPublishItem;
 
-// Storage for peer-related information as known by the friend server.
-// Peers send to the friend server the list of peers they already have, with their own friendship level with that peer.
-// The FS needs to send back a list of peers, with the friendship level to the current peer.
-// In the list of closest peers, the reverse friendship levels are stored: for a peer A the reverse friendship level to peer B is whether B has
-// added A as friend or not.
-// In the list of friends for a peer, the forward FL is stored. The forward FL of a peer A to a peer B is whether A has added B as friend or not.
+// +================================================================+
+// |     o---o                                             o        |
+// |      \ /         - Retroshare Friend Server -        / \       |
+// |       o                                             o---o      |
+// +================================================================+
+//
+// The friend server facilitates a group of RS Tor-nodes to make friends. It maintains a pool of
+// participants (RS nodes currently susbscribing to the friend server) and advertise them to each other
+// as possible friends. Its goal is to allow new RS users to quickly experiment with the software without
+// compromising their anonymity.
+//
+// Implementation
+// ==============
+//
+//   The implementation is entirely client-based: clients make a request, and get a response. No connection is maintained
+// beyond this interaction. Consequently, the friend server returns a random ID to each client that the client can use to
+// e.g. signal its departure from the friend server and the release of its data.
+//
+// Both client and server use a binary interface linked to a proxy-connected socket to stream RS items, everything
+// happenning on top of Tor connections.
+//
+// Algorithms
+// ==========
+//
+//   * Protocol
+//
+//               Retroshare Client                                              Server (Friend Server)
+//
+//                                      ------------ Tor connection -------->   no action
+//               Server online MSG      <-------------- Tor ACK ------------
+//
+//
+//               Friend Req. loop       ------------ Friend Request -------->   Friend list calculation / update
+//                                      <---------- Friend list + ID --------
+//
+//
+//                  FS disabled         ------------ FS Close + ID --------->   Data cleaning, peer removal.
+//
+//
+//   * Friend selection
+//
+//      In order to reduce the ease to retrieve the list of all participants to a friend server, the
+//      friend server always returns the same list of friends to a given peer. To do so, participants are sorted
+//		for each peer, using a XOR distance such as:
+//
+//                   d(P1,P2) = P1 (XOR) P2 (XOR) R
+//
+//      ...where R is a random bias.
+//
+//      Since being in the n closest peers is not a reflexive relationship (P1 may be within the n closest peers
+//      to P2 but P2 may not be in the n closest peers to P1), selected friends for peer A are picked from both
+//      the closest peers of A, and the peers that received the RS certificate of A.
+//
+//      Another important effect of the stability of retrieved friends is to maintain a network that is not
+//      fully connected and stable over time, which corresponds to the mesh model of the RS network.
+//
+//   * Peer friendship level
+//
+//      For display purposes, the friend server also stores the "friendship level" for each pair of peers,
+//      that means whether the peer has added the other peer as friend, or only reveived his key, etc.
+//
+// 		Peers send to the friend server the list of peers they already have, with their own friendship
+//      level with that peer. The FS needs to send back a list of peers, with the friendship level to the current peer.
+// 		In the list of closest peers, the reverse friendship levels are stored: for a peer A the reverse friendship
+//      level to peer B is whether B has added A as friend or not.In the list of friends for a peer, the forward FL
+//      is stored. The forward FL of a peer A to a peer B is whether A has added B as friend or not.
+//
+//   * Security
+//
+//      Obviously the friend server knows who is possibly connected to whom. Since the connections to the
+//      friend server are anonymous, this information is difficult to protect, although the implementation
+//      currently makes it difficult to retrieve.
+//
+//      The friend server is only available to Tor nodes, since it allows RS nodes to connect to random peers.
+//      This allows trying the software without compromizing one's privacy.
 
 struct PeerInfo
 {

From 03a576589e701deb08957cfafd39c5e807c91ba8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 7 Nov 2022 21:10:55 +0100
Subject: [PATCH 119/503] allow user to supply his own Tor executable

---
 retroshare-gui/src/main.cpp                  |  6 ++++-
 retroshare-service/src/retroshare-service.cc | 23 +++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 82d78d2b2..2d3fabf89 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -239,7 +239,8 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 	        >> parameter('d',"debug-level"   ,conf.debugLevel     ,"level"     ,"Set debug level."                                            ,false)
 	        >> parameter('i',"ip-address"    ,conf.forcedInetAddress,"nnn.nnn.nnn.nnn", "Force IP address to use (if cannot be detected)."    ,false)
 	        >> parameter('p',"port"          ,conf.forcedPort     ,"port"      ,"Set listenning port to use."                                 ,false)
-	        >> parameter('o',"opmode"        ,conf.opModeStr      ,"opmode"    ,"Set Operating mode (Full, NoTurtle, Gaming, Minimal)."       ,false);
+            >> parameter('o',"opmode"        ,conf.opModeStr      ,"opmode"    ,"Set Operating mode (Full, NoTurtle, Gaming, Minimal)."       ,false)
+            >> parameter('t',"opmode"        ,conf.userSuppliedTorExecutable,"tor"    ,"supply full tor eecutable path."       ,false);
 #ifdef RS_JSONAPI
 	as      >> parameter('J', "jsonApiPort", conf.jsonApiPort, "jsonApiPort", "Enable JSON API on the specified port", false )
 	        >> parameter('P', "jsonApiBindAddress", conf.jsonApiBindAddress, "jsonApiBindAddress", "JSON API Bind Address.", false);
@@ -393,6 +394,9 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 
     if(is_auto_tor)
 	{
+        if(!conf.userSuppliedTorExecutable.empty())
+            RsTor::setTorExecutablePath(conf.userSuppliedTorExecutable);
+
 		// Now that we know the Tor service running, and we know the SSL id, we can make sure it provides a viable hidden service
 
         std::string tor_hidden_service_dir = RsAccounts::AccountDirectory() + "/hidden_service/" ;
diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index 2390739fd..040a2012d 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -126,19 +126,13 @@ int main(int argc, char* argv[])
 	              "output to stderr instead of log file." )
 	   >> option( 'u',"udp", conf.udpListenerOnly,
 	              "Only listen to UDP." )
-	   >> parameter( 'c',"base-dir", conf.optBaseDir, "directory",
-	                 "Set base directory.", false )
-	   >> parameter( 'l', "log-file", conf.logfname, "logfile",
-	                 "Set Log filename.", false )
-	   >> parameter( 'd', "debug-level", conf.debugLevel, "level",
-	                 "Set debug level.", false )
-	   >> parameter( 'i', "ip-address", conf.forcedInetAddress, "IP",
-	                 "Force IP address to use (if cannot be detected).", false )
-	   >> parameter( 'o', "opmode", conf.opModeStr, "opmode",
-	                 "Set Operating mode (Full, NoTurtle, Gaming, Minimal).",
-	                 false )
-	   >> parameter( 'p', "port", conf.forcedPort, "port",
-	                 "Set listenning port to use.", false );
+       >> parameter( 'c',"base-dir", conf.optBaseDir, "directory", "Set base directory.", false )
+       >> parameter( 'l', "log-file", conf.logfname, "logfile", "Set Log filename.", false )
+       >> parameter( 'd', "debug-level", conf.debugLevel, "level", "Set debug level.", false )
+       >> parameter( 'i', "ip-address", conf.forcedInetAddress, "IP", "Force IP address to use (if cannot be detected).", false )
+       >> parameter( 'o', "opmode", conf.opModeStr, "opmode", "Set Operating mode (Full, NoTurtle, Gaming, Minimal).", false )
+       >> parameter( 'p', "port", conf.forcedPort, "port", "Set listenning port to use.", false )
+       >> parameter( 't', "tor", conf.userSuppliedTorExecutable, "tor", "Set Tor executable full path.", false );
 
 #ifdef RS_SERVICE_TERMINAL_LOGIN
 	as >> parameter( 'U', "user-id", prefUserString, "ID",
@@ -176,6 +170,9 @@ int main(int argc, char* argv[])
 	as >> help( 'h', "help", "Display this Help" );
 	as.defaultErrorHandling(true, true);
 
+    if(!conf.userSuppliedTorExecutable.empty())
+        RsTor::setTorExecutablePath(conf.userSuppliedTorExecutable);
+
 #if (defined(RS_JSONAPI) && defined(RS_WEBUI)) && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
 	std::string webui_pass1;
 	if(askWebUiPassword)

From 4e0bd19182eddc9757c5e8d1940830b902667fc0 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 10 Nov 2022 19:48:45 +0100
Subject: [PATCH 120/503] fixed uninitialized memory read in
 ConnectFriendWizard

---
 retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 81287c6c4..4a7429f27 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -80,6 +80,7 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
 {
 	ui->setupUi(this);
 
+    error = 0;
 	mTitleFontSize = 0; // Standard
 	mTitleFontWeight = 0; // Standard
 	

From ba4982f2ca32877f3c3f8e19002e63d51ee8c827 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 15 Nov 2022 11:03:23 +0100
Subject: [PATCH 121/503] changed Mail interface to use the generic MsgAddress
 type instead of the GxsId/RsPeerId combination

---
 retroshare-gui/src/gui/feeds/ChatMsgItem.cpp  |   2 +-
 retroshare-gui/src/gui/feeds/MsgItem.cpp      |  25 +-
 .../src/gui/msgs/MessageComposer.cpp          | 251 ++++++++++--------
 retroshare-gui/src/gui/msgs/MessageComposer.h |   2 +
 retroshare-gui/src/gui/msgs/MessageModel.cpp  |  67 +++--
 retroshare-gui/src/gui/msgs/MessageModel.h    |  22 +-
 retroshare-gui/src/gui/msgs/MessageWidget.cpp | 125 ++++-----
 .../src/gui/msgs/MessagesDialog.cpp           |  18 +-
 8 files changed, 298 insertions(+), 214 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
index 7f37aef8b..c376ca9b8 100644
--- a/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
@@ -229,7 +229,7 @@ void ChatMsgItem::sendMessage()
     
     mi.title = tr("Quick Message").toUtf8().constData();
     mi.msg =   quickmsgText->toHtml().toUtf8().constData();
-    mi.rspeerid_msgto.insert(mPeerId);
+    mi.to.insert(MsgAddress(mPeerId,MsgAddress::MSG_ADDRESS_MODE_TO));
     
     rsMail->MessageSend(mi);
 
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp
index e0b3d2bf0..0789d98c9 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp
@@ -146,39 +146,39 @@ void MsgItem::updateItemStatic()
 	/* get peer Id  */
 
 	if (mi.msgflags & RS_MSG_DISTANT)
-		avatar->setGxsId(mi.rsgxsid_srcId) ;
+        avatar->setGxsId(mi.from.toGxsId()) ;
 	else
-		avatar->setId(ChatId(mi.rspeerid_srcId)) ;
+        avatar->setId(ChatId(mi.from.toRsPeerId())) ;
 
 	QString title;
     QString srcName;
 
-    if ((mi.msgflags & RS_MSG_SYSTEM) && mi.rspeerid_srcId == rsPeers->getOwnId())
+    if ((mi.msgflags & RS_MSG_SYSTEM) && mi.from.toRsPeerId() == rsPeers->getOwnId())
 		srcName = "RetroShare";
     else
     {
         if(mi.msgflags & RS_MSG_DISTANT)
         {
             RsIdentityDetails details ;
-            rsIdentity->getIdDetails(mi.rsgxsid_srcId, details) ;
+            rsIdentity->getIdDetails(mi.from.toGxsId(), details) ;
 
             srcName = QString::fromUtf8(details.mNickname.c_str());
         }
         else
-            srcName = QString::fromUtf8(rsPeers->getPeerName(mi.rspeerid_srcId).c_str());
+            srcName = QString::fromUtf8(rsPeers->getPeerName(mi.from.toRsPeerId()).c_str());
     }
 
 
 	if (!mIsHome)
 	{
-		if ((mi.msgflags & RS_MSG_USER_REQUEST) && (!mi.rsgxsid_srcId.isNull()))
+        if ((mi.msgflags & RS_MSG_USER_REQUEST) && mi.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)   // !mi.rsgxsid_srcId.isNull()))
 		{
 			title = QString::fromUtf8(mi.title.c_str()) + " " + tr("from") + " " + srcName;
 			replyButton->setText(tr("Reply to invite"));
 			subjectLabel->hide();
 			info_Frame_Invite->show();
 		}
-		else if ((mi.msgflags & RS_MSG_USER_REQUEST) && mi.rsgxsid_srcId.isNull())
+        else if ((mi.msgflags & RS_MSG_USER_REQUEST) && mi.from.type()!=MsgAddress::MSG_ADDRESS_TYPE_RSGXSID) // mi.rsgxsid_srcId.isNull())
 		{
 			title = QString::fromUtf8(mi.title.c_str()) + " " + " " + srcName;
 			subjectLabel->hide();
@@ -233,7 +233,11 @@ void MsgItem::updateItemStatic()
 	for(it = mi.files.begin(); it != mi.files.end(); ++it)
 	{
 		/* add file */
-        SubFileItem *fi = new SubFileItem(it->hash, it->fname, it->path, it->size, SFI_STATE_REMOTE, mi.rspeerid_srcId);
+        RsPeerId srcId ;
+        if(mi.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+            srcId = mi.from.toRsPeerId();
+
+        SubFileItem *fi = new SubFileItem(it->hash, it->fname, it->path, it->size, SFI_STATE_REMOTE, srcId);
 		mFileItems.push_back(fi);
 
 		QLayout *layout = expandFrame->layout();
@@ -395,9 +399,12 @@ void MsgItem::sendInvite()
 	if (!rsMail->getMessage(mMsgId, mi))
 		return;
 
+    if(mi.from.type()!=MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+        return;
+
     //if ((QMessageBox::question(this, tr("Send invite?"),tr("Do you really want send a invite with your Certificate?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
 	//{
-	MessageComposer::sendInvite(mi.rsgxsid_srcId,false);
+    MessageComposer::sendInvite(mi.from.toGxsId(),false);
 	//}
 
 }
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index f80434fd2..aede07658 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -122,6 +122,8 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     /* Invoke the Qt Designer generated object setup routine */
     ui.setupUi(this);
 
+    mAlreadySent = false;
+
     m_msgType = NORMAL;
     // needed to send system flags with reply
     msgFlags = 0;
@@ -149,7 +151,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     ui.hashBox->hide();
 
     // connect up the buttons.
-    connect( ui.actionSend, SIGNAL( triggered(bool)), this, SLOT( sendMessage() ) );
+    connect( ui.actionSend, SIGNAL( triggered(bool)), this, SLOT( sendMessage() ), Qt::UniqueConnection );
     //connect( ui.actionReply, SIGNAL( triggered (bool)), this, SLOT( replyMessage( ) ) );
     connect(ui.boldbtn, SIGNAL(clicked()), this, SLOT(textBold()));
     connect(ui.underlinebtn, SIGNAL(clicked()), this, SLOT(textUnderline()));
@@ -930,6 +932,7 @@ void MessageComposer::addFile(const FileInfo &fileInfo)
 void MessageComposer::titleChanged()
 {
     calculateTitle();
+    std::cerr << "Setting modified 004 = true" << std::endl;
     ui.msgText->document()->setModified(true);
 }
 
@@ -1083,18 +1086,45 @@ MessageComposer *MessageComposer::newMsg(const std::string &msgId /* = ""*/)
     //            msgComposer->addRecipient(MessageComposer::BCC, *groupIt, true) ;
     //        }
 
-        for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgto.begin();  it != msgInfo.rspeerid_msgto.end(); ++it )  msgComposer->addRecipient(MessageComposer::TO, *it) ;
-        for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgcc.begin();  it != msgInfo.rspeerid_msgcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::CC, *it) ;
-        for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgbcc.begin(); it != msgInfo.rspeerid_msgbcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::BCC, *it) ;
-        for (std::set<RsGxsId>::const_iterator it = msgInfo.rsgxsid_msgto.begin();   it != msgInfo.rsgxsid_msgto.end(); ++it )  msgComposer->addRecipient(MessageComposer::TO, *it) ;
-        for (std::set<RsGxsId>::const_iterator it = msgInfo.rsgxsid_msgcc.begin();   it != msgInfo.rsgxsid_msgcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::CC, *it) ;
-        for (std::set<RsGxsId>::const_iterator it = msgInfo.rsgxsid_msgbcc.begin();  it != msgInfo.rsgxsid_msgbcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::BCC, *it) ;
+        for(auto m:msgInfo.to)
+        switch(m.mode())
+        {
+        case MsgAddress::MSG_ADDRESS_MODE_TO:
+            if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+                msgComposer->addRecipient(MessageComposer::TO,m.toGxsId());
+            else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+                msgComposer->addRecipient(MessageComposer::TO,m.toRsPeerId());
+            break;
+
+        case MsgAddress::MSG_ADDRESS_MODE_CC:
+            if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+                msgComposer->addRecipient(MessageComposer::CC,m.toGxsId());
+            else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+                msgComposer->addRecipient(MessageComposer::CC,m.toRsPeerId());
+            break;
+
+        case MsgAddress::MSG_ADDRESS_MODE_BCC:
+            if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+                msgComposer->addRecipient(MessageComposer::BCC,m.toGxsId());
+            else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+                msgComposer->addRecipient(MessageComposer::BCC,m.toRsPeerId());
+            break;
+    default:break;
+        }
+
+        // for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgto.begin();  it != msgInfo.rspeerid_msgto.end(); ++it )  msgComposer->addRecipient(MessageComposer::TO, *it) ;
+        // for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgcc.begin();  it != msgInfo.rspeerid_msgcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::CC, *it) ;
+        // for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgbcc.begin(); it != msgInfo.rspeerid_msgbcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::BCC, *it) ;
+        // for (std::set<RsGxsId>::const_iterator it = msgInfo.rsgxsid_msgto.begin();   it != msgInfo.rsgxsid_msgto.end(); ++it )  msgComposer->addRecipient(MessageComposer::TO, *it) ;
+        // for (std::set<RsGxsId>::const_iterator it = msgInfo.rsgxsid_msgcc.begin();   it != msgInfo.rsgxsid_msgcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::CC, *it) ;
+        // for (std::set<RsGxsId>::const_iterator it = msgInfo.rsgxsid_msgbcc.begin();  it != msgInfo.rsgxsid_msgbcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::BCC, *it) ;
 
         MsgTagInfo tagInfo;
         rsMail->getMessageTag(msgId, tagInfo);
 
         msgComposer->m_tagIds = tagInfo.tagIds;
         msgComposer->showTagLabels();
+    std::cerr << "Setting modified 005 = false" << std::endl;
         msgComposer->ui.msgText->document()->setModified(false);
     }
 
@@ -1110,7 +1140,7 @@ QString MessageComposer::buildReplyHeader(const MessageInfo &msgInfo)
 	QString from;
 	if(msgInfo.msgflags & RS_MSG_DISTANT)
 	{
-		link = RetroShareLink::createMessage(msgInfo.rsgxsid_srcId, "");
+        link = RetroShareLink::createMessage(msgInfo.from.toGxsId(), "");
 		if (link.valid())
 		{
 			from += link.toHtml();
@@ -1118,57 +1148,39 @@ QString MessageComposer::buildReplyHeader(const MessageInfo &msgInfo)
 	}
 	else
 	{
-		link = RetroShareLink::createMessage(msgInfo.rspeerid_srcId, "");
+        link = RetroShareLink::createMessage(msgInfo.from.toRsPeerId(), "");
 		if (link.valid())
 		{
 			from += link.toHtml();
 		}
 	}
+    QString to,cc;
 
-    QString to;
-    for ( std::set<RsPeerId>::const_iterator  it = msgInfo.rspeerid_msgto.begin(); it != msgInfo.rspeerid_msgto.end(); ++it)
+    for(auto m:msgInfo.to)
     {
-        link = RetroShareLink::createMessage(*it, "");
+            RetroShareLink link;
+
+        if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+            link = RetroShareLink::createMessage(m.toGxsId(), "");
+        else
+            link = RetroShareLink::createMessage(m.toRsPeerId(), "");
+
         if (link.valid())
-        {
-            if (!to.isEmpty())
-                to += ", ";
+            if(m.mode()==MsgAddress::MSG_ADDRESS_MODE_TO)
+            {
+                if (!to.isEmpty())
+                    to += ", ";
 
-            to += link.toHtml();
-        }
-    }
-    for ( std::set<RsGxsId>::const_iterator  it = msgInfo.rsgxsid_msgto.begin(); it != msgInfo.rsgxsid_msgto.end(); ++it)
-    {
-        link = RetroShareLink::createMessage(*it, "");
-        if (link.valid())
-        {
-            if (!to.isEmpty())
-                to += ", ";
-
-            to += link.toHtml();
-        }
-    }
-
-    QString cc;
-    for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgcc.begin(); it != msgInfo.rspeerid_msgcc.end(); ++it) {
-        link = RetroShareLink::createMessage(*it, "");
-        if (link.valid()) {
-            if (!cc.isEmpty()) {
-                cc += ", ";
+                to += link.toHtml();
             }
-            cc += link.toHtml();
-        }
-    }
-    for (std::set<RsGxsId>::const_iterator it = msgInfo.rsgxsid_msgcc.begin(); it != msgInfo.rsgxsid_msgcc.end(); ++it) {
-        link = RetroShareLink::createMessage(*it, "");
-        if (link.valid()) {
-            if (!cc.isEmpty()) {
-                cc += ", ";
-            }
-            cc += link.toHtml();
-        }
-    }
+            else if(m.mode()==MsgAddress::MSG_ADDRESS_MODE_CC)
+            {
+                if (!cc.isEmpty())
+                    cc += ", ";
 
+                cc += link.toHtml();
+            }
+    }
 
     QString header = QString("<span>-----%1-----").arg(tr("Original Message"));
     header += QString("<br><font size='3'><strong>%1: </strong>%2</font><br>").arg(tr("From"), from);
@@ -1220,6 +1232,7 @@ void MessageComposer::setQuotedMsg(const QString &msg, const QString &header)
     ui.msgText->moveCursor(QTextCursor::Start);
 
     ui.msgText->setUndoRedoEnabled(true);
+    std::cerr << "Setting modified 006 = true" << std::endl;
     ui.msgText->document()->setModified(true);
 
     ui.msgText->setFocus( Qt::OtherFocusReason );
@@ -1241,14 +1254,18 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
     msgComposer->setTitleText(QString::fromUtf8(msgInfo.title.c_str()), REPLY);
     msgComposer->setQuotedMsg(QString::fromUtf8(msgInfo.msg.c_str()), buildReplyHeader(msgInfo));
 
-    if(!msgInfo.rspeerid_srcId.isNull()) msgComposer->addRecipient(MessageComposer::TO, msgInfo.rspeerid_srcId);
-    if(!msgInfo.rsgxsid_srcId.isNull()) msgComposer->addRecipient(MessageComposer::TO, msgInfo.rsgxsid_srcId);
+    if(msgInfo.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+        msgComposer->addRecipient(MessageComposer::TO, msgInfo.from.toGxsId());
+    else if(msgInfo.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+        msgComposer->addRecipient(MessageComposer::TO, msgInfo.from.toRsPeerId());
 
     // make sure the current ID is among the ones the msg was actually sent to.
-    for(auto it(msgInfo.rsgxsid_msgto.begin());it!=msgInfo.rsgxsid_msgto.end();++it)
-        if(rsIdentity->isOwnId(*it))
+#warning: We do not know here what is the atual destination of the message, since it may have been sent to two of our IDs at once.
+
+    for(auto m:msgInfo.to)
+        if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID && rsIdentity->isOwnId(m.toGxsId()))
         {
-            msgComposer->ui.respond_to_CB->setDefaultId(*it) ;
+            msgComposer->ui.respond_to_CB->setDefaultId(m.toGxsId()) ;
             break ;
         }
     // Note: another solution is to do
@@ -1259,21 +1276,27 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
     {
         RsPeerId ownId = rsPeers->getOwnId();
 
-        for (std::set<RsPeerId>::iterator tli = msgInfo.rspeerid_msgto.begin(); tli != msgInfo.rspeerid_msgto.end(); ++tli)
-            if (ownId != *tli)
-                msgComposer->addRecipient(MessageComposer::TO, *tli) ;
+        for(auto m:msgInfo.to)
+            if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+                msgComposer->addRecipient(MessageComposer::TO,m.toGxsId());
+            else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+                msgComposer->addRecipient(MessageComposer::TO,m.toRsPeerId());
 
-        for (std::set<RsPeerId>::iterator tli = msgInfo.rspeerid_msgcc.begin(); tli != msgInfo.rspeerid_msgcc.end(); ++tli)
-            if (ownId != *tli)
-                msgComposer->addRecipient(MessageComposer::TO, *tli) ;
+        // for (std::set<RsPeerId>::iterator tli = msgInfo.rspeerid_msgto.begin(); tli != msgInfo.rspeerid_msgto.end(); ++tli)
+        //     if (ownId != *tli)
+        //         msgComposer->addRecipient(MessageComposer::TO, *tli) ;
 
-        for (std::set<RsGxsId>::iterator tli = msgInfo.rsgxsid_msgto.begin(); tli != msgInfo.rsgxsid_msgto.end(); ++tli)
-            //if (ownId != *tli)
-                msgComposer->addRecipient(MessageComposer::TO, *tli) ;
+        // for (std::set<RsPeerId>::iterator tli = msgInfo.rspeerid_msgcc.begin(); tli != msgInfo.rspeerid_msgcc.end(); ++tli)
+        //     if (ownId != *tli)
+        //         msgComposer->addRecipient(MessageComposer::TO, *tli) ;
 
-        for (std::set<RsGxsId>::iterator tli = msgInfo.rsgxsid_msgcc.begin(); tli != msgInfo.rsgxsid_msgcc.end(); ++tli)
-            //if (ownId != *tli)
-                msgComposer->addRecipient(MessageComposer::TO, *tli) ;
+        // for (std::set<RsGxsId>::iterator tli = msgInfo.rsgxsid_msgto.begin(); tli != msgInfo.rsgxsid_msgto.end(); ++tli)
+        //     //if (ownId != *tli)
+        //         msgComposer->addRecipient(MessageComposer::TO, *tli) ;
+
+        // for (std::set<RsGxsId>::iterator tli = msgInfo.rsgxsid_msgcc.begin(); tli != msgInfo.rsgxsid_msgcc.end(); ++tli)
+        //     //if (ownId != *tli)
+        //         msgComposer->addRecipient(MessageComposer::TO, *tli) ;
     }
 
     // needed to send system flags with reply
@@ -1363,26 +1386,31 @@ void MessageComposer::setMsgText(const QString &msg, bool asHtml)
     c.movePosition(QTextCursor::End);
     ui.msgText->setTextCursor(c);
 
+    std::cerr << "Setting modified 007 = true" << std::endl;
     ui.msgText->document()->setModified(true);
 }
 
 void MessageComposer::sendMessage()
 {
-    if (sendMessage_internal(false)) {
+    /* check for existing title */
+
+    if (ui.titleEdit->text().isNull())
+        if (QMessageBox::warning(this, tr("RetroShare"), tr("Do you want to send the message without a subject ?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
+            ui.titleEdit->setFocus();
+            return ; // Don't send with an empty subject
+        }
+
+    if (sendMessage_internal(false))
         close();
-    }
 }
 
-bool MessageComposer::sendMessage_internal(bool bDraftbox)
+bool MessageComposer::buildMessage(MessageInfo& mi)
 {
-    /* construct a message */
-    MessageInfo mi;
+    // add a GXS signer/from in case the message is to be sent to a distant peer
 
-	 // add a GXS signer/from in case the message is to be sent to a distant peer
+    mi.from = MsgAddress(RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString()),MsgAddress::MSG_ADDRESS_MODE_TO) ;
 
-	 mi.rsgxsid_srcId = RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString()) ;
-
-	 //std::cerr << "MessageSend: setting 'from' field to GXS id = " << mi.rsgxsid_srcId << std::endl;
+    //std::cerr << "MessageSend: setting 'from' field to GXS id = " << mi.rsgxsid_srcId << std::endl;
 
     mi.title = misc::removeNewLine(ui.titleEdit->text()).toUtf8().constData();
     // needed to send system flags with reply
@@ -1392,14 +1420,6 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
     RsHtml::optimizeHtml(ui.msgText, text);
     mi.msg = text.toUtf8().constData();
 
-    /* check for existing title */
-    if (bDraftbox == false && mi.title.empty()) {
-        if (QMessageBox::warning(this, tr("RetroShare"), tr("Do you want to send the message without a subject ?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
-            ui.titleEdit->setFocus();
-            return false; // Don't send with an empty subject
-        }
-    }
-
     int filesCount = ui.msgFileList->topLevelItemCount();
     for (int i = 0; i < filesCount; ++i) {
         QTreeWidgetItem *item = ui.msgFileList->topLevelItem(i);
@@ -1456,12 +1476,9 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
 
                     switch (type)
                     {
-                    case TO: mi.rspeerid_msgto.insert(*sslIt);
-                        break;
-                    case CC: mi.rspeerid_msgcc.insert(*sslIt);
-                        break;
-                    case BCC:mi.rspeerid_msgbcc.insert(*sslIt);
-                        break;
+                    case TO:  mi.to.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
+                    case CC:  mi.to.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
+                    case BCC: mi.to.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
                     }
                 }
             }
@@ -1473,12 +1490,9 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
 
             switch (type)
             {
-            case TO: mi.rspeerid_msgto.insert(pid);
-            break ;
-            case CC: mi.rspeerid_msgcc.insert(pid);
-            break ;
-            case BCC:mi.rspeerid_msgbcc.insert(pid);
-            break ;
+                case TO:  mi.to.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
+                case CC:  mi.to.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
+                case BCC: mi.to.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
             }
         }
             break ;
@@ -1488,12 +1502,9 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
 
             switch (type)
             {
-            case TO: mi.rsgxsid_msgto.insert(gid) ;
-            break ;
-            case CC: mi.rsgxsid_msgcc.insert(gid) ;
-            break ;
-            case BCC:mi.rsgxsid_msgbcc.insert(gid) ;
-            break ;
+                case TO:  mi.to.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
+                case CC:  mi.to.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
+                case BCC: mi.to.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
             }
         }
             break ;
@@ -1503,6 +1514,26 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
             break ;
         }
     }
+    return true;
+}
+
+bool MessageComposer::sendMessage_internal(bool bDraftbox)
+{
+    if(mAlreadySent)
+    {
+        std::cerr << "Already_sent is true. Giving up." << std::endl;
+        return true;
+    }
+
+    /* construct a message */
+    MessageInfo mi;
+
+    if(!buildMessage(mi))
+        return false;
+
+    std::cerr << "Setting already_sent=true" << std::endl;
+
+    mAlreadySent = true;
 
     if (bDraftbox)
     {
@@ -1527,18 +1558,25 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
     else
     {
         /* check for the recipient */
-        if (mi.rspeerid_msgto.empty() && mi.rspeerid_msgcc.empty() && mi.rspeerid_msgbcc.empty()
-                        && mi.rsgxsid_msgto.empty() && mi.rsgxsid_msgcc.empty() && mi.rsgxsid_msgbcc.empty())
+        if (mi.to.empty())
         {
             QMessageBox::warning(this, tr("RetroShare"), tr("Please insert at least one recipient."), QMessageBox::Ok);
             return false; // Don't send with no recipient
         }
 
-     if(mi.rsgxsid_srcId.isNull() && !(mi.rsgxsid_msgto.empty() && mi.rsgxsid_msgcc.empty() && mi.rsgxsid_msgbcc.empty()))
-     {
+        bool at_least_one_gxsid = false;
+        for(auto m:mi.to)
+            if(m.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+            {
+                at_least_one_gxsid=true;
+                break;
+            }
+
+        if(at_least_one_gxsid && mi.from.type() != MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+        {
             QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers from the destination list."), QMessageBox::Ok);
             return false; // Don't send if cannot sign.
-     }
+        }
         if (rsMail->MessageSend(mi) == false) {
             return false;
         }
@@ -1576,6 +1614,7 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
             rsMail->setMessageTag(mi.msgId, *tag, false);
         }
     }
+    std::cerr << "Setting modified 001 = false" << std::endl;
     ui.msgText->document()->setModified(false);
 
     return true;
@@ -2394,6 +2433,7 @@ bool MessageComposer::fileSave()
     QTextStream ts(&file);
     ts.setCodec(QTextCodec::codecForName("UTF-8"));
     ts << ui.msgText->document()->toHtml("UTF-8");
+    std::cerr << "Setting modified 002 = false" << std::endl;
     ui.msgText->document()->setModified(false);
     return true;
 }
@@ -2448,6 +2488,7 @@ void MessageComposer::filePrintPdf()
 void MessageComposer::setCurrentFileName(const QString &fileName)
 {
     this->fileName = fileName;
+    std::cerr << "Setting modified 003 = false" << std::endl;
     ui.msgText->document()->setModified(false);
 
     setWindowModified(false);
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h
index 4db4f6ba9..dbc13d431 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.h
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.h
@@ -172,6 +172,7 @@ private slots:
 
 private:
     static QString buildReplyHeader(const MessageInfo &msgInfo);
+    bool buildMessage(MessageInfo& mi);
 
     void processSettings(bool bLoad);
 
@@ -264,6 +265,7 @@ private:
 	QLabel *lineLabel;
 
 	bool has_gxs;
+    bool mAlreadySent; // prevents a Qt bug that calls the same action twice.
 
     /** Qt Designer generated object */
     Ui::MessageComposer ui;
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 4ecdf67ad..143765fd1 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -167,7 +167,8 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation /*orientation*/
 		{
 		case COLUMN_THREAD_DATE:         return tr("Date");
 		case COLUMN_THREAD_AUTHOR:       return tr("From");
-		case COLUMN_THREAD_SUBJECT:      return tr("Subject");
+        case COLUMN_THREAD_TO:           return tr("To");
+        case COLUMN_THREAD_SUBJECT:      return tr("Subject");
 		case COLUMN_THREAD_TAGS:         return tr("Tags");
 		default:
 			return QVariant();
@@ -189,8 +190,9 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation /*orientation*/
         {
         case COLUMN_THREAD_ATTACHMENT: return tr("Click to sort by attachments");
         case COLUMN_THREAD_SUBJECT:    return tr("Click to sort by subject");
-        case COLUMN_THREAD_READ:       return tr("Click to sort by read");
-        case COLUMN_THREAD_AUTHOR:     return tr("Click to sort by from");
+        case COLUMN_THREAD_READ:       return tr("Click to sort by read status");
+        case COLUMN_THREAD_AUTHOR:     return tr("Click to sort by author");
+        case COLUMN_THREAD_TO:         return tr("Click to sort by destination");
         case COLUMN_THREAD_DATE:       return tr("Click to sort by date");
         case COLUMN_THREAD_TAGS:       return tr("Click to sort by tags");
         case COLUMN_THREAD_STAR:       return tr("Click to sort by star");
@@ -269,7 +271,7 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const
 	case MsgFlagsRole:       return fmpe.msgflags ;
 	case UnreadRole: 		 return fmpe.msgflags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER);
 	case MsgIdRole:          return QString::fromStdString(fmpe.msgId) ;
-	case SrcIdRole:          return QString::fromStdString(fmpe.srcId.toStdString()) ;
+    case SrcIdRole:          return QString::fromStdString(fmpe.from.toStdString()) ;
 	default:
 		return QVariant();
 	}
@@ -312,6 +314,11 @@ bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int /*col
 			if(s.isNull())
 				passes_strings = false;
 			break;
+        case FILTER_TYPE_TO:        s = sortRole(fmpe,COLUMN_THREAD_TO).toString();
+            if(s.isNull())
+                passes_strings = false;
+            break;
+
 		case FILTER_TYPE_DATE:   	s = displayRole(fmpe,COLUMN_THREAD_DATE).toString();
 			break;
 		case FILTER_TYPE_CONTENT:   {
@@ -390,15 +397,18 @@ void RsMessageModel::setFilter(FilterType filter_type, const QStringList& string
 
 QVariant RsMessageModel::toolTipRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const
 {
-	if(column == COLUMN_THREAD_AUTHOR)
+    if(column == COLUMN_THREAD_AUTHOR || column == COLUMN_THREAD_TO)
 	{
 		QString str,comment ;
 		QList<QIcon> icons;
 
-		if(!GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.srcId.toStdString()), true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR))
+        if(column == COLUMN_THREAD_AUTHOR && !GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.from.toStdString()), true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR))
 			return QVariant();
 
-		int S = QFontMetricsF(QApplication::font()).height();
+        if(column == COLUMN_THREAD_TO && !GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.to.begin()->toStdString()), true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR))
+            return QVariant();
+
+        int S = QFontMetricsF(QApplication::font()).height();
 		QImage pix( (*icons.begin()).pixmap(QSize(5*S,5*S)).toImage());
 
 		QString embeddedImage;
@@ -429,7 +439,8 @@ QVariant RsMessageModel::sizeHintRole(int col) const
 	case COLUMN_THREAD_SUBJECT:      return QVariant( QSize(factor * 170, factor*14 ));
 	case COLUMN_THREAD_DATE:         return QVariant( QSize(factor * 75 , factor*14 ));
 	case COLUMN_THREAD_AUTHOR:       return QVariant( QSize(factor * 75 , factor*14 ));
-	}
+    case COLUMN_THREAD_TO:           return QVariant( QSize(factor * 75 , factor*14 ));
+    }
 }
 
 QVariant RsMessageModel::authorRole(const Rs::Msgs::MsgInfoSummary& /*fmpe*/,int /*column*/) const
@@ -449,10 +460,18 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
 
 	case COLUMN_THREAD_SPAM:  return QVariant((fmpe.msgflags & RS_MSG_SPAM)? 1:0);
 
-	case COLUMN_THREAD_AUTHOR:{
+    case COLUMN_THREAD_TO: {
+            QString name;
+
+            if(GxsIdTreeItemDelegate::computeName(RsGxsId(fmpe.to.begin()->toStdString()),name))
+                return name;
+            return ""; //Not Found
+        }
+
+    case COLUMN_THREAD_AUTHOR:{
 			QString name;
 
-			if(GxsIdTreeItemDelegate::computeName(RsGxsId(fmpe.srcId.toStdString()),name))
+            if(GxsIdTreeItemDelegate::computeName(RsGxsId(fmpe.from.toStdString()),name))
 				return name;
 			return ""; //Not Found
 		}
@@ -503,9 +522,20 @@ QVariant RsMessageModel::displayRole(const Rs::Msgs::MsgInfoSummary& fmpe,int co
 			}
 			return text;
 		}
-		case COLUMN_THREAD_AUTHOR:{
+        case COLUMN_THREAD_TO: {
+            QString name;
+            RsGxsId id = RsGxsId(fmpe.to.begin()->toStdString());	// not sure of the type
+
+            if(id.isNull())
+                return QVariant(tr("[Notification]"));
+            if(GxsIdTreeItemDelegate::computeName(id,name))
+                return name;
+            return QVariant(tr("[Unknown]"));
+        }
+
+        case COLUMN_THREAD_AUTHOR:{
 			QString name;
-			RsGxsId id = RsGxsId(fmpe.srcId.toStdString());
+            RsGxsId id = RsGxsId(fmpe.from.toStdString());
 
 			if(id.isNull())
 				return QVariant(tr("[Notification]"));
@@ -525,8 +555,8 @@ QVariant RsMessageModel::userRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col)
 {
 	switch(col)
     {
-     	case COLUMN_THREAD_AUTHOR:   return QVariant(QString::fromStdString(fmpe.srcId.toStdString()));
-     	case COLUMN_THREAD_MSGID:    return QVariant(QString::fromStdString(fmpe.msgId));
+        case COLUMN_THREAD_AUTHOR:   return QVariant(QString::fromStdString(fmpe.from.toStdString()));
+        case COLUMN_THREAD_MSGID:    return QVariant(QString::fromStdString(fmpe.msgId));
     default:
         return QVariant();
     }
@@ -569,8 +599,10 @@ QVariant RsMessageModel::decorationRole(const Rs::Msgs::MsgInfoSummary& fmpe,int
 		case COLUMN_THREAD_SPAM:
 		return FilesDefs::getIconFromQtResourcePath((fmpe.msgflags & RS_MSG_SPAM) ? (IMAGE_SPAM_ON ): (IMAGE_SPAM_OFF));
 
-		case COLUMN_THREAD_AUTHOR://Return icon as place holder.
-		return FilesDefs::getIconFromGxsIdCache(RsGxsId(fmpe.srcId.toStdString()),QIcon(), exist);
+        case COLUMN_THREAD_TO://Return icon as place holder.
+            return FilesDefs::getIconFromGxsIdCache(RsGxsId(fmpe.to.begin()->toStdString()),QIcon(), exist);
+        case COLUMN_THREAD_AUTHOR://Return icon as place holder.
+            return FilesDefs::getIconFromGxsIdCache(RsGxsId(fmpe.from.toStdString()),QIcon(), exist);
 	}
 	return QVariant();
 }
@@ -641,6 +673,8 @@ void RsMessageModel::getMessageSummaries(BoxName box,std::list<Rs::Msgs::MsgInfo
 {
     rsMsgs->getMessageSummaries(msgs);
 
+    std::cerr << "Get msg summaries. Box=" << box << ":" << std::endl;
+
     // filter out messages that are not in the right box.
 
     for(auto it(msgs.begin());it!=msgs.end();)
@@ -658,6 +692,7 @@ void RsMessageModel::getMessageSummaries(BoxName box,std::list<Rs::Msgs::MsgInfo
             			++it;
                         continue;
 		}
+        std::cerr << "  msg id " << it->msgId << " flags=" << (it->msgflags & RS_MSG_BOXMASK) << " ok: " << ok << std::endl;
 
         if(ok)
             ++it;
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h
index 8021c3e24..16eaa27b9 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.h
+++ b/retroshare-gui/src/gui/msgs/MessageModel.h
@@ -58,12 +58,13 @@ public:
 		COLUMN_THREAD_SUBJECT      = 0x02,
 		COLUMN_THREAD_READ         = 0x03,
 		COLUMN_THREAD_AUTHOR       = 0x04,
-		COLUMN_THREAD_SPAM         = 0x05,
-		COLUMN_THREAD_DATE         = 0x06,
-		COLUMN_THREAD_TAGS         = 0x07,
-		COLUMN_THREAD_MSGID        = 0x08,
-		COLUMN_THREAD_NB_COLUMNS   = 0x09,
-		COLUMN_THREAD_CONTENT      = 0x09
+        COLUMN_THREAD_TO           = 0x05,
+        COLUMN_THREAD_SPAM         = 0x06,
+        COLUMN_THREAD_DATE         = 0x07,
+        COLUMN_THREAD_TAGS         = 0x08,
+        COLUMN_THREAD_MSGID        = 0x09,
+        COLUMN_THREAD_NB_COLUMNS   = 0x0a,
+        COLUMN_THREAD_CONTENT      = 0x0b
 	};
 
     enum QuickViewFilter {
@@ -84,10 +85,11 @@ public:
         FILTER_TYPE_NONE             = 0x00,
         FILTER_TYPE_SUBJECT          = 0x01,	// These numbers have been carefuly chosen to match the ones in rsmsgs.h
         FILTER_TYPE_FROM             = 0x02,
-        FILTER_TYPE_DATE             = 0x03,
-        FILTER_TYPE_CONTENT          = 0x04,
-        FILTER_TYPE_TAGS             = 0x05,
-        FILTER_TYPE_ATTACHMENTS      = 0x06,
+        FILTER_TYPE_TO               = 0x03,
+        FILTER_TYPE_DATE             = 0x04,
+        FILTER_TYPE_CONTENT          = 0x05,
+        FILTER_TYPE_TAGS             = 0x06,
+        FILTER_TYPE_ATTACHMENTS      = 0x07,
     };
 
 	enum Roles{ SortRole           = Qt::UserRole+1,
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index d05d17446..b4a205656 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -391,7 +391,8 @@ void MessageWidget::getcurrentrecommended()
 	}
 
     std::list<RsPeerId> srcIds;
-    srcIds.push_back(msgInfo.rspeerid_srcId);
+    if(msgInfo.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+        srcIds.push_back(msgInfo.from.toRsPeerId());
 
 	QModelIndexList list = ui.msgList->selectionModel()->selectedIndexes();
 
@@ -439,7 +440,10 @@ void MessageWidget::getallrecommended()
 	for(it = recList.begin(); it != recList.end(); ++it) {
 		std::cerr << "MessageWidget::getallrecommended() Calling File Request" << std::endl;
         std::list<RsPeerId> srcIds;
-        srcIds.push_back(msgInfo.rspeerid_srcId);
+
+        if(msgInfo.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+            srcIds.push_back(msgInfo.from.toRsPeerId());
+
 		rsFiles->FileRequest(it->fname, it->hash, it->size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds);
 	}
 }
@@ -565,17 +569,21 @@ void MessageWidget::fill(const std::string &msgId)
 		return;
 	}
 	
-	if ((msgInfo.msgflags & RS_MSG_USER_REQUEST) && msgInfo.rsgxsid_srcId.isNull()){
-		ui.info_Frame_Invite->show();
-		ui.sendInviteButton->hide();
-		ui.infoLabel_Invite->setText(tr("You got an invite to make friend! You may accept this request."));
-	} else if ((msgInfo.msgflags & RS_MSG_USER_REQUEST) && (!msgInfo.rsgxsid_srcId.isNull())){
-		ui.info_Frame_Invite->show();
-		ui.sendInviteButton->show();
-		ui.infoLabel_Invite->setText(tr("You got an invite to make friend! You may accept this request and send your own Certificate back"));
-	} else {
-		ui.info_Frame_Invite->hide();
-	}
+    if (msgInfo.msgflags & RS_MSG_USER_REQUEST)
+        if(msgInfo.from.type() == MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+        {
+            ui.info_Frame_Invite->show();
+            ui.sendInviteButton->hide();
+            ui.infoLabel_Invite->setText(tr("You got an invite to make friend! You may accept this request."));
+        }
+        else
+        {
+            ui.info_Frame_Invite->show();
+            ui.sendInviteButton->show();
+            ui.infoLabel_Invite->setText(tr("You got an invite to make friend! You may accept this request and send your own Certificate back"));
+        }
+    else
+        ui.info_Frame_Invite->hide();
 
 	const std::list<FileInfo> &recList = msgInfo.files;
 	std::list<FileInfo>::const_iterator it;
@@ -604,63 +612,44 @@ void MessageWidget::fill(const std::string &msgId)
 
 	/* iterate through the sources */
 	RetroShareLink link;
-	QString text;
+    QString to_text,cc_text,bcc_text;
+
+    for(auto m:msgInfo.to)
+    {
+        if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+            link = RetroShareLink::createMessage(m.toGxsId(), "");
+        else
+            link = RetroShareLink::createMessage(m.toRsPeerId(), "");
 
-	for(std::set<RsPeerId>::const_iterator pit = msgInfo.rspeerid_msgto.begin(); pit != msgInfo.rspeerid_msgto.end(); ++pit) {
-		link = RetroShareLink::createMessage(*pit, "");
 		if (link.valid())
-			text += link.toHtml() + "   ";
-	}
-	for(std::set<RsGxsId >::const_iterator pit = msgInfo.rsgxsid_msgto.begin(); pit != msgInfo.rsgxsid_msgto.end(); ++pit) {
-		link = RetroShareLink::createMessage(*pit, "");
-		if (link.valid())
-			text += link.toHtml() + "   ";
-	}
+            switch(m.mode())
+            {
+            case MsgAddress::MSG_ADDRESS_MODE_TO: to_text += link.toHtml() + "   "; break;
+            case MsgAddress::MSG_ADDRESS_MODE_CC: cc_text += link.toHtml() + "   "; break;
+            case MsgAddress::MSG_ADDRESS_MODE_BCC: bcc_text += link.toHtml() + "   "; break;
+            }
+    }
 
-	ui.trans_ToText->setText(text);
+    ui.trans_ToText->setText(to_text);
 
-	if (!msgInfo.rspeerid_msgcc.empty() || !msgInfo.rsgxsid_msgcc.empty())
+    if (!cc_text.isNull())
 	{
 		ui.ccLabel->setVisible(true);
 		ui.trans_CCText->setVisible(true);
 
-		text.clear();
-		for(std::set<RsPeerId>::const_iterator pit = msgInfo.rspeerid_msgcc.begin(); pit != msgInfo.rspeerid_msgcc.end(); ++pit) {
-			link = RetroShareLink::createMessage(*pit, "");
-			if (link.valid())
-				text += link.toHtml() + "   ";
-		}
-		for(std::set<RsGxsId>::const_iterator pit = msgInfo.rsgxsid_msgcc.begin(); pit != msgInfo.rsgxsid_msgcc.end(); ++pit) {
-			link = RetroShareLink::createMessage(*pit, "");
-			if (link.valid())
-				text += link.toHtml() + "   ";
-		}
-
-		ui.trans_CCText->setText(text);
+        ui.trans_CCText->setText(cc_text);
 	} else {
 		ui.ccLabel->setVisible(false);
 		ui.trans_CCText->setVisible(false);
 		ui.trans_CCText->clear();
 	}
 
-	if (!msgInfo.rspeerid_msgbcc.empty() || !msgInfo.rsgxsid_msgbcc.empty())
+    if (!bcc_text.isNull())
 	{
 		ui.bccLabel->setVisible(true);
 		ui.trans_BCCText->setVisible(true);
 
-		text.clear();
-		for(std::set<RsPeerId>::const_iterator pit = msgInfo.rspeerid_msgbcc.begin(); pit != msgInfo.rspeerid_msgbcc.end(); ++pit) {
-			link = RetroShareLink::createMessage(*pit, "");
-			if (link.valid())
-				text += link.toHtml() + "   ";
-		}
-		for(std::set<RsGxsId>::const_iterator pit = msgInfo.rsgxsid_msgbcc.begin(); pit != msgInfo.rsgxsid_msgbcc.end(); ++pit) {
-			link = RetroShareLink::createMessage(*pit, "");
-			if (link.valid())
-				text += link.toHtml() + "   ";
-		}
-
-		ui.trans_BCCText->setText(text);
+        ui.trans_BCCText->setText(bcc_text);
 	} else {
 		ui.bccLabel->setVisible(false);
 		ui.trans_BCCText->setVisible(false);
@@ -680,16 +669,16 @@ void MessageWidget::fill(const std::string &msgId)
 
 	if(msgInfo.msgflags & RS_MSG_DISTANT)	// distant message
 	{
-		tooltip_string = PeerDefs::rsidFromId(msgInfo.rsgxsid_srcId) ;
-		link = RetroShareLink::createMessage(msgInfo.rsgxsid_srcId, "");
+        tooltip_string = PeerDefs::rsidFromId(msgInfo.from.toGxsId()) ;
+        link = RetroShareLink::createMessage(msgInfo.from.toGxsId(), "");
 	}
 	else
 	{
-		tooltip_string = PeerDefs::rsidFromId(msgInfo.rspeerid_srcId) ;
-		link = RetroShareLink::createMessage(msgInfo.rspeerid_srcId, "");
+        tooltip_string = PeerDefs::rsidFromId(msgInfo.from.toRsPeerId()) ;
+        link = RetroShareLink::createMessage(msgInfo.from.toRsPeerId(), "");
 	}
 
-	if (((msgInfo.msgflags & RS_MSG_SYSTEM) && msgInfo.rspeerid_srcId == ownId) || msgInfo.rspeerid_srcId.isNull()) {
+    if (((msgInfo.msgflags & RS_MSG_SYSTEM) && msgInfo.from.toRsPeerId() == ownId) || msgInfo.from.type()!=MsgAddress::MSG_ADDRESS_TYPE_RSPEERID) {
 		ui.fromText->setText("[Notification]");
 		if (toolButtonReply) toolButtonReply->setEnabled(false);
 	} else {
@@ -706,7 +695,7 @@ void MessageWidget::fill(const std::string &msgId)
 	if (Settings->valueFromGroup(QString("Messages"), QString::fromUtf8("Emoticons"), true).toBool()) {
 		formatTextFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS ;
 	}
-	text = RsHtmlMsg(msgInfo.msgflags).formatText(ui.msgText->document(), QString::fromUtf8(msgInfo.msg.c_str()), formatTextFlag);
+    QString text = RsHtmlMsg(msgInfo.msgflags).formatText(ui.msgText->document(), QString::fromUtf8(msgInfo.msg.c_str()), formatTextFlag);
 	ui.msgText->resetImagesStatus(Settings->getMsgLoadEmbeddedImages() || (msgInfo.msgflags & RS_MSG_LOAD_EMBEDDED_IMAGES));
 	ui.msgText->setHtml(text);
 
@@ -883,19 +872,21 @@ void MessageWidget::loadImagesAlways()
 
 void MessageWidget::sendInvite()
 {
-	MessageInfo mi;
+    MessageInfo mi;
 
-	if (!rsMail) 
-		return;
+    if (!rsMail)
+        return;
 
-	if (!rsMail->getMessage(currMsgId, mi))
-		return;
+    if (!rsMail->getMessage(currMsgId, mi))
+        return;
 
-    //if ((QMessageBox::question(this, tr("Send invite?"),tr("Do you really want send a invite with your Certificate?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
-	//{
-      MessageComposer::sendInvite(mi.rsgxsid_srcId,false);
-	//}
+    if(!mi.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+        return;
 
+    if ((QMessageBox::question(this, tr("Send invite?"),tr("Do you really want send a invite with your Certificate?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Cancel))== QMessageBox::Yes)
+    {
+        MessageComposer::sendInvite(mi.from.toGxsId(),false);
+    }
 }
 
 void MessageWidget::setToolbarButtonStyle(Qt::ToolButtonStyle style)
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 480959bb8..f1e91267b 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -166,6 +166,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
     ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_SUBJECT,itemDelegate);
 
     ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_AUTHOR,new GxsIdTreeItemDelegate()) ;
+    ui.messageTreeWidget->setItemDelegateForColumn(RsMessageModel::COLUMN_THREAD_TO,new GxsIdTreeItemDelegate()) ;
 
     // workaround for Qt bug, should be solved in next Qt release 4.7.0
     // http://bugreports.qt.nokia.com/browse/QTBUG-8270
@@ -190,6 +191,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
     /* add filter actions */
     ui.filterLineEdit->addFilter(QIcon(), tr("Subject"),     RsMessageModel::COLUMN_THREAD_SUBJECT,   tr("Search Subject"));
     ui.filterLineEdit->addFilter(QIcon(), tr("From"),        RsMessageModel::COLUMN_THREAD_AUTHOR,    tr("Search From"));
+    ui.filterLineEdit->addFilter(QIcon(), tr("To"),          RsMessageModel::COLUMN_THREAD_TO,        tr("Search To"));
     ui.filterLineEdit->addFilter(QIcon(), tr("Date"),        RsMessageModel::COLUMN_THREAD_DATE,      tr("Search Date"));
     ui.filterLineEdit->addFilter(QIcon(), tr("Content"),     RsMessageModel::COLUMN_THREAD_CONTENT,   tr("Search Content"));
     ui.filterLineEdit->addFilter(QIcon(), tr("Tags"),        RsMessageModel::COLUMN_THREAD_TAGS,      tr("Search Tags"));
@@ -212,10 +214,12 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
     msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_SUBJECT,    fm.width("You have a message")*3.0);
     msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_AUTHOR,     fm.width("[Retroshare]")*1.1);
+    msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_TO,         fm.width("[Retroshare]")*1.1);
     msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE,       fm.width("01/01/1970")*1.1);
 
     QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT,    QHeaderView::Interactive);
     QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR,     QHeaderView::Interactive);
+    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_TO,         QHeaderView::Interactive);
     QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE,       QHeaderView::Interactive);
 
     QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR,       QHeaderView::Fixed);
@@ -749,12 +753,12 @@ void MessagesDialog::messageTreeWidgetCustomPopupMenu(QPoint /*point*/)
     // test if identity is known. If not, no need to call the people tab. Also some mails come from nodes and we wont show that node in the people tab either.
     // The problem here is that the field rsgxsid_srcId is always populated with either the GxsId or the node of the source, which is inconsistent.
 
-    if(nCount==1 && rsIdentity->getIdDetails(msgInfo.rsgxsid_srcId,details))
+    if(nCount==1 && msgInfo.from.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
 	{
-        std::cerr << "Src ID = " << msgInfo.rsgxsid_srcId << std::endl;
+        std::cerr << "Src ID = " << msgInfo.from.toGxsId() << std::endl;
 
-        contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_AUTHOR_INFO),tr("Show author in People"),this,SLOT(showAuthorInPeopleTab()));
-		contextMnu.addSeparator();
+        contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_AUTHOR_INFO),tr("Show in People"),this,SLOT(showAuthorInPeopleTab()));
+        contextMnu.addSeparator();
 	}
 
     contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_MESSAGE), tr("New Message"), this, SLOT(newmessage()));
@@ -774,7 +778,7 @@ void MessagesDialog::showAuthorInPeopleTab()
 	if (!rsMail->getMessage(mid, msgInfo))
 		return;
 
-	if(msgInfo.rsgxsid_srcId.isNull())
+    if(msgInfo.from.type() != MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
 		return ;
 
 	/* window will destroy itself! */
@@ -784,7 +788,7 @@ void MessagesDialog::showAuthorInPeopleTab()
 		return ;
 
 	MainWindow::showWindow(MainWindow::People);
-	idDialog->navigate(RsGxsId(msgInfo.rsgxsid_srcId)) ;
+    idDialog->navigate(RsGxsId(msgInfo.from.toGxsId())) ;
 }
 
 void MessagesDialog::folderlistWidgetCustomPopupMenu(QPoint /*point*/)
@@ -1201,6 +1205,7 @@ void MessagesDialog::filterChanged(const QString& text)
     {
     case RsMessageModel::COLUMN_THREAD_SUBJECT:      f = RsMessageModel::FILTER_TYPE_SUBJECT ; break;
     case RsMessageModel::COLUMN_THREAD_AUTHOR:       f = RsMessageModel::FILTER_TYPE_FROM ; break;
+    case RsMessageModel::COLUMN_THREAD_TO:           f = RsMessageModel::FILTER_TYPE_TO ; break;
     case RsMessageModel::COLUMN_THREAD_DATE:         f = RsMessageModel::FILTER_TYPE_DATE ; break;
     case RsMessageModel::COLUMN_THREAD_CONTENT:      f = RsMessageModel::FILTER_TYPE_CONTENT ; break;
     case RsMessageModel::COLUMN_THREAD_TAGS:         f = RsMessageModel::FILTER_TYPE_TAGS ; break;
@@ -1225,6 +1230,7 @@ void MessagesDialog::filterColumnChanged(int column)
     {
     case RsMessageModel::COLUMN_THREAD_SUBJECT:      f = RsMessageModel::FILTER_TYPE_SUBJECT ; break;
     case RsMessageModel::COLUMN_THREAD_AUTHOR:       f = RsMessageModel::FILTER_TYPE_FROM ; break;
+    case RsMessageModel::COLUMN_THREAD_TO:           f = RsMessageModel::FILTER_TYPE_TO ; break;
     case RsMessageModel::COLUMN_THREAD_DATE:         f = RsMessageModel::FILTER_TYPE_DATE ; break;
     case RsMessageModel::COLUMN_THREAD_CONTENT:      f = RsMessageModel::FILTER_TYPE_CONTENT ; break;
     case RsMessageModel::COLUMN_THREAD_TAGS:         f = RsMessageModel::FILTER_TYPE_TAGS ; break;

From 0b5cddb2990d471eb08147e424fd0adb8b985b61 Mon Sep 17 00:00:00 2001
From: RetroPooh <RetroPooh@users.noreply.github.com>
Date: Fri, 18 Nov 2022 23:03:20 +0300
Subject: [PATCH 122/503] tor status fix for unconfigured, add update on
 settings change; fix i2p out led status

---
 retroshare-gui/src/gui/MainWindow.cpp         |  4 ++
 retroshare-gui/src/gui/MainWindow.h           |  1 +
 .../src/gui/settings/ServerPage.cpp           | 41 ++++++++++++++-----
 .../src/gui/statusbar/torstatus.cpp           |  7 +++-
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 0af20e824..8695057a2 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -1628,6 +1628,10 @@ NATStatus *MainWindow::natstatusInstance()
 	return natstatus;
 }
 
+void MainWindow::torstatusReset()
+{
+	torstatus->reset();
+}
 DHTStatus *MainWindow::dhtstatusInstance()
 {
 	return dhtstatus;
diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h
index 23b70e66f..bac210f2c 100644
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@@ -187,6 +187,7 @@ public:
     RSComboBox *statusComboBoxInstance();
     PeerStatus *peerstatusInstance();
     NATStatus *natstatusInstance();
+    void torstatusReset();
     DHTStatus *dhtstatusInstance();
     HashingStatus *hashingstatusInstance();
     DiscStatus *discstatusInstance();
diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index 5089bd90c..d5ede348d 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -21,6 +21,7 @@
 #include "ServerPage.h"
 
 #include <gui/notifyqt.h>
+#include "gui/MainWindow.h"
 #include "rshare.h"
 #include "rsharesettings.h"
 #include "util/i2pcommon.h"
@@ -1357,6 +1358,7 @@ void ServerPage::saveAddressesHiddenNode()
 
 void ServerPage::updateOutProxyIndicator()
 {
+    MainWindow::getInstance()->torstatusReset();
     QTcpSocket socket ;
 
     // Tor
@@ -1373,22 +1375,39 @@ void ServerPage::updateOutProxyIndicator()
         ui.iconlabel_tor_outgoing->setToolTip(tr("Tor proxy is not enabled")) ;
     }
 
-	// I2P - SAM
-	// Note: there is only "the SAM port", there is no additional proxy port!
-	samStatus ss;
-	rsAutoProxyMonitor::taskSync(autoProxyType::I2PSAM3, autoProxyTask::status, &ss);
-	if(ss.state == samStatus::samState::online)
+	if (mHiddenType == RS_HIDDEN_TYPE_I2P && mSamSettings.enable)
 	{
-		socket.disconnectFromHost();
-		ui.iconlabel_i2p_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_OK)) ;
-		ui.iconlabel_i2p_outgoing->setToolTip(tr("Proxy seems to work.")) ;
+		// I2P - SAM
+		// Note: there is only "the SAM port", there is no additional proxy port!
+		samStatus ss;
+		rsAutoProxyMonitor::taskSync(autoProxyType::I2PSAM3, autoProxyTask::status, &ss);
+		if(ss.state == samStatus::samState::online)
+		{
+			socket.disconnectFromHost();
+			ui.iconlabel_i2p_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_OK)) ;
+			ui.iconlabel_i2p_outgoing->setToolTip(tr("Proxy seems to work.")) ;
+		}
+		else
+		{
+			ui.iconlabel_i2p_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
+			ui.iconlabel_i2p_outgoing->setToolTip(tr("I2P proxy is not enabled")) ;
+		}
 	}
 	else
 	{
-		ui.iconlabel_i2p_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
-		ui.iconlabel_i2p_outgoing->setToolTip(tr("I2P proxy is not enabled")) ;
+		socket.connectToHost(ui.hiddenpage_proxyAddress_i2p->text(),ui.hiddenpage_proxyPort_i2p->text().toInt());
+		if(socket.waitForConnected(500))
+		{
+			socket.disconnectFromHost();
+			ui.iconlabel_i2p_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_OK)) ;
+			ui.iconlabel_i2p_outgoing->setToolTip(tr("Proxy seems to work.")) ;
+		}
+		else
+		{
+			ui.iconlabel_i2p_outgoing->setPixmap(FilesDefs::getPixmapFromQtResourcePath(ICON_STATUS_UNKNOWN)) ;
+			ui.iconlabel_i2p_outgoing->setToolTip(tr("I2P proxy is not enabled")) ;
+		}
 	}
-
 	socket.connectToHost(ui.hiddenpage_proxyAddress_i2p_2->text(), 7656);
 	if(true == (mSamAccessible = socket.waitForConnected(1000)))
     {
diff --git a/retroshare-gui/src/gui/statusbar/torstatus.cpp b/retroshare-gui/src/gui/statusbar/torstatus.cpp
index fdde22337..d43de1df3 100644
--- a/retroshare-gui/src/gui/statusbar/torstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/torstatus.cpp
@@ -168,7 +168,7 @@ void TorStatus::getTorStatus()
 					torstatusLabel->setToolTip( text + tr("Tor proxy is not available"));
 				}
 			}
-			if(hiddentype == RS_HIDDEN_TYPE_I2P)
+			else if(hiddentype == RS_HIDDEN_TYPE_I2P)
 			{
 				statusTor->setText("<strong>" + tr("I2P") + ":</strong>");
 				rsPeers->getProxyServer(RS_HIDDEN_TYPE_I2P, proxyaddr, proxyport, status);
@@ -185,6 +185,11 @@ void TorStatus::getTorStatus()
 					torstatusLabel->setToolTip( text + tr("i2p proxy is not available"));
 				}
 			}
+			else
+			{
+				torstatusLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/tile_inactive_48.png").scaledToHeight(S,Qt::SmoothTransformation));
+				torstatusLabel->setToolTip(tr("No tor configuration"));
+			}
 			_updated = true;
 		}
 	}

From 3ac97b24a8c8d3d48f3ebb13d554811708a612f8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 21 Nov 2022 14:18:25 +0100
Subject: [PATCH 123/503] saving current work on big pass over Mail

---
 retroshare-gui/src/gui/feeds/ChatMsgItem.cpp  |   2 +-
 .../src/gui/msgs/MessageComposer.cpp          | 104 +++++++++---------
 retroshare-gui/src/gui/msgs/MessageModel.cpp  |   8 +-
 retroshare-gui/src/gui/msgs/MessageWidget.cpp |   2 +-
 4 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
index c376ca9b8..573c65c9d 100644
--- a/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
@@ -229,7 +229,7 @@ void ChatMsgItem::sendMessage()
     
     mi.title = tr("Quick Message").toUtf8().constData();
     mi.msg =   quickmsgText->toHtml().toUtf8().constData();
-    mi.to.insert(MsgAddress(mPeerId,MsgAddress::MSG_ADDRESS_MODE_TO));
+    mi.destinations.insert(MsgAddress(mPeerId,MsgAddress::MSG_ADDRESS_MODE_TO));
     
     rsMail->MessageSend(mi);
 
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index aede07658..2f707af82 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -1068,49 +1068,49 @@ MessageComposer *MessageComposer::newMsg(const std::string &msgId /* = ""*/)
         std::list<RsGroupInfo> groupInfoList;
         rsPeers->getGroupInfoList(groupInfoList);
 
-    //    std::list<std::string> groupIds;
-    //    std::list<std::string>::iterator groupIt;
+        //    std::list<std::string> groupIds;
+        //    std::list<std::string>::iterator groupIt;
 
-    //       calculateGroupsOfSslIds(groupInfoList, msgInfo.msgto, groupIds);
-    //       for (groupIt = groupIds.begin(); groupIt != groupIds.end(); ++groupIt ) {
-    //           msgComposer->addRecipient(MessageComposer::TO, *groupIt, true) ;
-    //       }
+        //       calculateGroupsOfSslIds(groupInfoList, msgInfo.msgto, groupIds);
+        //       for (groupIt = groupIds.begin(); groupIt != groupIds.end(); ++groupIt ) {
+        //           msgComposer->addRecipient(MessageComposer::TO, *groupIt, true) ;
+        //       }
 
-    //     calculateGroupsOfSslIds(groupInfoList, msgInfo.msgcc, groupIds);
-    //     for (groupIt = groupIds.begin(); groupIt != groupIds.end(); ++groupIt ) {
-    //         msgComposer->addRecipient(MessageComposer::CC, *groupIt, true) ;
-    //     }
+        //     calculateGroupsOfSslIds(groupInfoList, msgInfo.msgcc, groupIds);
+        //     for (groupIt = groupIds.begin(); groupIt != groupIds.end(); ++groupIt ) {
+        //         msgComposer->addRecipient(MessageComposer::CC, *groupIt, true) ;
+        //     }
 
-    //        calculateGroupsOfSslIds(groupInfoList, msgInfo.msgbcc, groupIds);
-    //        for (groupIt = groupIds.begin(); groupIt != groupIds.end(); ++groupIt ) {
-    //            msgComposer->addRecipient(MessageComposer::BCC, *groupIt, true) ;
-    //        }
+        //        calculateGroupsOfSslIds(groupInfoList, msgInfo.msgbcc, groupIds);
+        //        for (groupIt = groupIds.begin(); groupIt != groupIds.end(); ++groupIt ) {
+        //            msgComposer->addRecipient(MessageComposer::BCC, *groupIt, true) ;
+        //        }
 
-        for(auto m:msgInfo.to)
-        switch(m.mode())
-        {
-        case MsgAddress::MSG_ADDRESS_MODE_TO:
-            if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
-                msgComposer->addRecipient(MessageComposer::TO,m.toGxsId());
-            else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
-                msgComposer->addRecipient(MessageComposer::TO,m.toRsPeerId());
-            break;
+        for(auto m:msgInfo.destinations)
+            switch(m.mode())
+            {
+            case MsgAddress::MSG_ADDRESS_MODE_TO:
+                if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+                    msgComposer->addRecipient(MessageComposer::TO,m.toGxsId());
+                else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+                    msgComposer->addRecipient(MessageComposer::TO,m.toRsPeerId());
+                break;
 
-        case MsgAddress::MSG_ADDRESS_MODE_CC:
-            if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
-                msgComposer->addRecipient(MessageComposer::CC,m.toGxsId());
-            else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
-                msgComposer->addRecipient(MessageComposer::CC,m.toRsPeerId());
-            break;
+            case MsgAddress::MSG_ADDRESS_MODE_CC:
+                if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+                    msgComposer->addRecipient(MessageComposer::CC,m.toGxsId());
+                else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+                    msgComposer->addRecipient(MessageComposer::CC,m.toRsPeerId());
+                break;
 
-        case MsgAddress::MSG_ADDRESS_MODE_BCC:
-            if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
-                msgComposer->addRecipient(MessageComposer::BCC,m.toGxsId());
-            else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
-                msgComposer->addRecipient(MessageComposer::BCC,m.toRsPeerId());
-            break;
-    default:break;
-        }
+            case MsgAddress::MSG_ADDRESS_MODE_BCC:
+                if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+                    msgComposer->addRecipient(MessageComposer::BCC,m.toGxsId());
+                else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
+                    msgComposer->addRecipient(MessageComposer::BCC,m.toRsPeerId());
+                break;
+            default:break;
+            }
 
         // for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgto.begin();  it != msgInfo.rspeerid_msgto.end(); ++it )  msgComposer->addRecipient(MessageComposer::TO, *it) ;
         // for (std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgcc.begin();  it != msgInfo.rspeerid_msgcc.end(); ++it )  msgComposer->addRecipient(MessageComposer::CC, *it) ;
@@ -1124,7 +1124,7 @@ MessageComposer *MessageComposer::newMsg(const std::string &msgId /* = ""*/)
 
         msgComposer->m_tagIds = tagInfo.tagIds;
         msgComposer->showTagLabels();
-    std::cerr << "Setting modified 005 = false" << std::endl;
+        std::cerr << "Setting modified 005 = false" << std::endl;
         msgComposer->ui.msgText->document()->setModified(false);
     }
 
@@ -1156,7 +1156,7 @@ QString MessageComposer::buildReplyHeader(const MessageInfo &msgInfo)
 	}
     QString to,cc;
 
-    for(auto m:msgInfo.to)
+    for(auto m:msgInfo.destinations)
     {
             RetroShareLink link;
 
@@ -1262,7 +1262,7 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
     // make sure the current ID is among the ones the msg was actually sent to.
 #warning: We do not know here what is the atual destination of the message, since it may have been sent to two of our IDs at once.
 
-    for(auto m:msgInfo.to)
+    for(auto m:msgInfo.destinations)
         if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID && rsIdentity->isOwnId(m.toGxsId()))
         {
             msgComposer->ui.respond_to_CB->setDefaultId(m.toGxsId()) ;
@@ -1276,7 +1276,7 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
     {
         RsPeerId ownId = rsPeers->getOwnId();
 
-        for(auto m:msgInfo.to)
+        for(auto m:msgInfo.destinations)
             if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
                 msgComposer->addRecipient(MessageComposer::TO,m.toGxsId());
             else if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID)
@@ -1476,9 +1476,9 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
 
                     switch (type)
                     {
-                    case TO:  mi.to.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
-                    case CC:  mi.to.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
-                    case BCC: mi.to.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
+                    case TO:  mi.destinations.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
+                    case CC:  mi.destinations.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
+                    case BCC: mi.destinations.insert(MsgAddress(*sslIt,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
                     }
                 }
             }
@@ -1490,9 +1490,9 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
 
             switch (type)
             {
-                case TO:  mi.to.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
-                case CC:  mi.to.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
-                case BCC: mi.to.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
+                case TO:  mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
+                case CC:  mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
+                case BCC: mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
             }
         }
             break ;
@@ -1502,9 +1502,9 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
 
             switch (type)
             {
-                case TO:  mi.to.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
-                case CC:  mi.to.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
-                case BCC: mi.to.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
+                case TO:  mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
+                case CC:  mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
+                case BCC: mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
             }
         }
             break ;
@@ -1558,14 +1558,14 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
     else
     {
         /* check for the recipient */
-        if (mi.to.empty())
+        if (mi.destinations.empty())
         {
             QMessageBox::warning(this, tr("RetroShare"), tr("Please insert at least one recipient."), QMessageBox::Ok);
             return false; // Don't send with no recipient
         }
 
         bool at_least_one_gxsid = false;
-        for(auto m:mi.to)
+        for(auto m:mi.destinations)
             if(m.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
             {
                 at_least_one_gxsid=true;
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 143765fd1..d03ab1fec 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -405,7 +405,7 @@ QVariant RsMessageModel::toolTipRole(const Rs::Msgs::MsgInfoSummary& fmpe,int co
         if(column == COLUMN_THREAD_AUTHOR && !GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.from.toStdString()), true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR))
 			return QVariant();
 
-        if(column == COLUMN_THREAD_TO && !GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.to.begin()->toStdString()), true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR))
+        if(column == COLUMN_THREAD_TO && !GxsIdDetails::MakeIdDesc(RsGxsId(fmpe.to.toStdString()), true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR))
             return QVariant();
 
         int S = QFontMetricsF(QApplication::font()).height();
@@ -463,7 +463,7 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
     case COLUMN_THREAD_TO: {
             QString name;
 
-            if(GxsIdTreeItemDelegate::computeName(RsGxsId(fmpe.to.begin()->toStdString()),name))
+            if(GxsIdTreeItemDelegate::computeName(RsGxsId(fmpe.to.toStdString()),name))
                 return name;
             return ""; //Not Found
         }
@@ -524,7 +524,7 @@ QVariant RsMessageModel::displayRole(const Rs::Msgs::MsgInfoSummary& fmpe,int co
 		}
         case COLUMN_THREAD_TO: {
             QString name;
-            RsGxsId id = RsGxsId(fmpe.to.begin()->toStdString());	// not sure of the type
+            RsGxsId id = RsGxsId(fmpe.to.toStdString());	// not sure of the type
 
             if(id.isNull())
                 return QVariant(tr("[Notification]"));
@@ -600,7 +600,7 @@ QVariant RsMessageModel::decorationRole(const Rs::Msgs::MsgInfoSummary& fmpe,int
 		return FilesDefs::getIconFromQtResourcePath((fmpe.msgflags & RS_MSG_SPAM) ? (IMAGE_SPAM_ON ): (IMAGE_SPAM_OFF));
 
         case COLUMN_THREAD_TO://Return icon as place holder.
-            return FilesDefs::getIconFromGxsIdCache(RsGxsId(fmpe.to.begin()->toStdString()),QIcon(), exist);
+            return FilesDefs::getIconFromGxsIdCache(RsGxsId(fmpe.to.toStdString()),QIcon(), exist);
         case COLUMN_THREAD_AUTHOR://Return icon as place holder.
             return FilesDefs::getIconFromGxsIdCache(RsGxsId(fmpe.from.toStdString()),QIcon(), exist);
 	}
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index b4a205656..1335ceb50 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -614,7 +614,7 @@ void MessageWidget::fill(const std::string &msgId)
 	RetroShareLink link;
     QString to_text,cc_text,bcc_text;
 
-    for(auto m:msgInfo.to)
+    for(auto m:msgInfo.destinations)
     {
         if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
             link = RetroShareLink::createMessage(m.toGxsId(), "");

From 8bcb531cd3c8f867a9cc75e2ecc5f5a48d50650b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 22 Nov 2022 23:08:42 +0100
Subject: [PATCH 124/503] fixed a few glitches in Mail GUI

---
 .../src/gui/msgs/MessageComposer.cpp          | 55 +++----------------
 retroshare-gui/src/gui/msgs/MessageModel.cpp  | 38 +------------
 retroshare-gui/src/gui/msgs/MessageModel.h    | 14 +----
 .../src/gui/msgs/MessagesDialog.cpp           | 32 ++++++++---
 4 files changed, 35 insertions(+), 104 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 2f707af82..692b4b996 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -660,61 +660,20 @@ void MessageComposer::addConnectAttemptMsg(const RsPgpId &gpgId, const RsPeerId
     std::list<MsgInfoSummary> msgList;
     std::list<MsgInfoSummary>::const_iterator it;
 
-    rsMail->getMessageSummaries(msgList);
-    for(it = msgList.begin(); it != msgList.end(); ++it) {
-        if (it->msgflags & RS_MSG_TRASH) {
-            continue;
-        }
-        if ((it->msgflags & RS_MSG_BOXMASK) != RS_MSG_INBOX) {
-            continue;
-        }
-        if ((it->msgflags & RS_MSG_USER_REQUEST) == 0) {
-            continue;
-        }
-        if (it->title == title.toUtf8().constData()) {
+    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_INBOX,msgList);
+
+    // do not re-add an existing request.
+    // note: the test with name() is very unsecure. We should use the ID instead.
+
+    for(it = msgList.begin(); it != msgList.end(); ++it)
+        if((it->msgflags & RS_MSG_USER_REQUEST) && it->title == title.toUtf8().constData())
             return;
-        }
-    }
 
     /* create a message */
     QString msgText = tr("Hi %1,<br><br>%2 wants to be friends with you on RetroShare.<br><br>Respond now:<br>%3<br><br>Thanks,<br>The RetroShare Team").arg(QString::fromUtf8(rsPeers->getGPGName(rsPeers->getGPGOwnId()).c_str()), link.name(), link.toHtml());
     rsMail->SystemMessage(title.toUtf8().constData(), msgText.toUtf8().constData(), RS_MSG_USER_REQUEST);
 }
 
-#ifdef UNUSED_CODE
-void MessageComposer::sendChannelPublishKey(RsGxsChannelGroup &group)
-{
-//    QString channelName = QString::fromUtf8(group.mMeta.mGroupName.c_str());
-
-//    RetroShareLink link;
-//    if (!link.createGxsGroupLink(RetroShareLink::TYPE_CHANNEL, group.mMeta.mGroupId, channelName)) {
-//        return;
-//    }
-
-//    QString title = tr("Publish key for channel %1").arg(channelName);
-
-//    /* create a message */
-//    QString msgText = tr("... %1 ...<br>%2").arg(channelName, link.toHtml());
-//    rsMail->SystemMessage(title.toUtf8().constData(), msgText.toUtf8().constData(), RS_MSG_PUBLISH_KEY);
-}
-
-void MessageComposer::sendForumPublishKey(RsGxsForumGroup &group)
-{
-//    QString forumName = QString::fromUtf8(group.mMeta.mGroupName.c_str());
-
-//    RetroShareLink link;
-//    if (!link.createGxsGroupLink(RetroShareLink::TYPE_FORUM, group.mMeta.mGroupId, forumName)) {
-//        return;
-//    }
-
-//    QString title = tr("Publish key for forum %1").arg(forumName);
-
-//    /* create a message */
-//    QString msgText = tr("... %1 ...<br>%2").arg(forumName, link.toHtml());
-//    rsMail->SystemMessage(title.toUtf8().constData(), msgText.toUtf8().constData(), RS_MSG_PUBLISH_KEY);
-}
-#endif
-
 void MessageComposer::closeEvent (QCloseEvent * event)
 {
     bool bClose = true;
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index d03ab1fec..d63b093e0 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -53,7 +53,7 @@ const QString RsMessageModel::FilterString("filtered");
 RsMessageModel::RsMessageModel(QObject *parent)
     : QAbstractItemModel(parent)
 {
-    mCurrentBox = BOX_NONE;
+    mCurrentBox = Rs::Msgs::BoxName::BOX_NONE;
     mQuickViewFilter = QUICK_VIEW_ALL;
     mFilterType = FILTER_TYPE_NONE;
     mFilterStrings.clear();
@@ -647,7 +647,7 @@ void RsMessageModel::setMessages(const std::list<Rs::Msgs::MsgInfoSummary>& msgs
 	emit messagesLoaded();
 }
 
-void RsMessageModel::setCurrentBox(BoxName bn)
+void RsMessageModel::setCurrentBox(Rs::Msgs::BoxName bn)
 {
 	if(mCurrentBox != bn)
 	{
@@ -669,45 +669,13 @@ void RsMessageModel::setQuickViewFilter(QuickViewFilter fn)
 	}
 }
 
-void RsMessageModel::getMessageSummaries(BoxName box,std::list<Rs::Msgs::MsgInfoSummary>& msgs)
-{
-    rsMsgs->getMessageSummaries(msgs);
-
-    std::cerr << "Get msg summaries. Box=" << box << ":" << std::endl;
-
-    // filter out messages that are not in the right box.
-
-    for(auto it(msgs.begin());it!=msgs.end();)
-    {
-        bool ok = false;
-
-        switch(box)
-        {
-		case BOX_INBOX  : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_INBOX     && !(it->msgflags & RS_MSG_TRASH); break ;
-        case BOX_SENT   : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_SENTBOX   && !(it->msgflags & RS_MSG_TRASH); break ;
-        case BOX_OUTBOX : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_OUTBOX    && !(it->msgflags & RS_MSG_TRASH); break ;
-        case BOX_DRAFTS : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_DRAFTBOX  && !(it->msgflags & RS_MSG_TRASH); break ;
-        case BOX_TRASH  : ok = (it->msgflags & RS_MSG_TRASH) ; break ;
-        default:
-            			++it;
-                        continue;
-		}
-        std::cerr << "  msg id " << it->msgId << " flags=" << (it->msgflags & RS_MSG_BOXMASK) << " ok: " << ok << std::endl;
-
-        if(ok)
-            ++it;
-		else
-           it = msgs.erase(it) ;
-    }
-}
-
 void RsMessageModel::updateMessages()
 {
     emit messagesAboutToLoad();
 
     std::list<Rs::Msgs::MsgInfoSummary> msgs;
 
-    getMessageSummaries(mCurrentBox,msgs);
+    rsMsgs->getMessageSummaries(mCurrentBox,msgs);
 	setMessages(msgs);
 
     emit messagesLoaded();
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h
index 16eaa27b9..e3b7d5188 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.h
+++ b/retroshare-gui/src/gui/msgs/MessageModel.h
@@ -43,15 +43,6 @@ public:
 	explicit RsMessageModel(QObject *parent = NULL);
 	~RsMessageModel(){}
 
-    enum BoxName {
-        BOX_NONE   = 0x00,
-        BOX_INBOX  = 0x01,
-        BOX_OUTBOX = 0x02,
-        BOX_DRAFTS = 0x03,
-        BOX_SENT   = 0x04,
-        BOX_TRASH  = 0x05
-    };
-
 	enum Columns {
 		COLUMN_THREAD_STAR         = 0x00,
 		COLUMN_THREAD_ATTACHMENT   = 0x01,
@@ -105,11 +96,10 @@ public:
 	QModelIndex getIndexOfMessage(const std::string &mid) const;
 
     static const QString FilterString ;
-    static void getMessageSummaries(BoxName box, std::list<Rs::Msgs::MsgInfoSummary>& msgs);
 
     // This method will asynchroneously update the data
 
-    void setCurrentBox(BoxName bn) ;
+    void setCurrentBox(Rs::Msgs::BoxName bn) ;
     void setQuickViewFilter(QuickViewFilter fn) ;
 
     void setFilter(FilterType filter_type, const QStringList& strings) ;
@@ -189,7 +179,7 @@ private:
     QColor mTextColorNotSubscribed ;
     QColor mTextColorMissing       ;
 
-    BoxName mCurrentBox ;
+    Rs::Msgs::BoxName mCurrentBox ;
     QuickViewFilter mQuickViewFilter ;
     QStringList mFilterStrings;
     FilterType  mFilterType;
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index f1e91267b..16de2aea3 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -897,18 +897,18 @@ void MessagesDialog::changeBox(int box_row)
 		QString placeholderText = tr("No message available in your %1.").arg(item->text());
 		switch(box_row)
 		{
-			case ROW_INBOX: mMessageModel->setCurrentBox(RsMessageModel::BOX_INBOX );
+            case ROW_INBOX: mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_INBOX );
 			break;
-			case ROW_OUTBOX: mMessageModel->setCurrentBox(RsMessageModel::BOX_OUTBOX);
+            case ROW_OUTBOX: mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_OUTBOX);
 			break;
-			case ROW_DRAFTBOX: mMessageModel->setCurrentBox(RsMessageModel::BOX_DRAFTS);
+            case ROW_DRAFTBOX: mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_DRAFTS);
 			break;
-			case ROW_SENTBOX: mMessageModel->setCurrentBox(RsMessageModel::BOX_SENT  );
+            case ROW_SENTBOX: mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_SENT  );
 			break;
-			case ROW_TRASHBOX: mMessageModel->setCurrentBox(RsMessageModel::BOX_TRASH );
+            case ROW_TRASHBOX: mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_TRASH );
 			break;
 			default:
-				mMessageModel->setCurrentBox(RsMessageModel::BOX_NONE);
+                mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_NONE);
 		}
 
 		insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
@@ -916,7 +916,7 @@ void MessagesDialog::changeBox(int box_row)
 	}
 	else
 	{
-		mMessageModel->setCurrentBox(RsMessageModel::BOX_NONE);
+        mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_NONE);
 	}
 	inChange = false;
 
@@ -1263,8 +1263,22 @@ void MessagesDialog::updateMessageSummaryList()
 
     /* calculating the new messages */
 
+    Rs::Msgs::BoxName box;
+    int box_row = ui.listWidget->currentRow();
+
+    switch(box_row)
+    {
+    case ROW_INBOX: box = Rs::Msgs::BoxName::BOX_INBOX ; break;
+    case ROW_OUTBOX: box = Rs::Msgs::BoxName::BOX_OUTBOX; break;
+    case ROW_DRAFTBOX: box = Rs::Msgs::BoxName::BOX_DRAFTS; break;
+    case ROW_SENTBOX: box = Rs::Msgs::BoxName::BOX_SENT  ; break;
+    case ROW_TRASHBOX: box = Rs::Msgs::BoxName::BOX_TRASH ; break;
+    default:
+        box = Rs::Msgs::BoxName::BOX_NONE;
+    }
+
     std::list<MsgInfoSummary> msgList;
-    rsMail->getMessageSummaries(msgList);
+    rsMail->getMessageSummaries(box,msgList);
 
     QMap<int, int> tagCount;
 
@@ -1513,7 +1527,7 @@ void MessagesDialog::tagSet(int tagId, bool set)
 void MessagesDialog::emptyTrash()
 {
     std::list<Rs::Msgs::MsgInfoSummary> msgs ;
-    mMessageModel->getMessageSummaries(RsMessageModel::BOX_TRASH,msgs);
+    rsMsgs->getMessageSummaries(Rs::Msgs::BoxName::BOX_TRASH,msgs);
 
     for(auto it(msgs.begin());it!=msgs.end();++it)
 		rsMail->MessageDelete(it->msgId);

From 302e87e476601cd215a985e3608e99e6747b622b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 23 Nov 2022 21:18:11 +0100
Subject: [PATCH 125/503] fixing some UI errors in Mail

---
 retroshare-gui/src/gui/msgs/MessageModel.cpp | 130 ++++++++++++-------
 1 file changed, 80 insertions(+), 50 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index d63b093e0..0b8c27085 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -482,73 +482,103 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
 
 QVariant RsMessageModel::displayRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col) const
 {
-	switch(col)
-	{
-		case COLUMN_THREAD_SUBJECT:   return QVariant(QString::fromUtf8(fmpe.title.c_str()));
-		case COLUMN_THREAD_ATTACHMENT:return QVariant(QString::number(fmpe.count));
+    switch(col)
+    {
+    case COLUMN_THREAD_SUBJECT:   return QVariant(QString::fromUtf8(fmpe.title.c_str()));
+    case COLUMN_THREAD_ATTACHMENT:return QVariant(QString::number(fmpe.count));
 
-		case COLUMN_THREAD_STAR:
-		case COLUMN_THREAD_SPAM:
-		case COLUMN_THREAD_READ:return QVariant();
-		case COLUMN_THREAD_DATE:{
-			QDateTime qtime;
-			qtime.setTime_t(fmpe.ts);
+    case COLUMN_THREAD_STAR:
+    case COLUMN_THREAD_SPAM:
+    case COLUMN_THREAD_READ:return QVariant();
+    case COLUMN_THREAD_DATE:{
+        QDateTime qtime;
+        qtime.setTime_t(fmpe.ts);
 
-			return QVariant(DateTime::formatDateTime(qtime));
-		}
+        return QVariant(DateTime::formatDateTime(qtime));
+    }
 
-		case COLUMN_THREAD_TAGS:{
-			// Tags
-			Rs::Msgs::MsgTagInfo tagInfo;
-			rsMsgs->getMessageTag(fmpe.msgId, tagInfo);
+    case COLUMN_THREAD_TAGS:{
+        // Tags
+        Rs::Msgs::MsgTagInfo tagInfo;
+        rsMsgs->getMessageTag(fmpe.msgId, tagInfo);
 
-			Rs::Msgs::MsgTagType Tags;
-			rsMsgs->getMessageTagTypes(Tags);
+        Rs::Msgs::MsgTagType Tags;
+        rsMsgs->getMessageTagTypes(Tags);
 
-			QString text;
+        QString text;
 
-			// build tag names
-			for (auto tagit = tagInfo.tagIds.begin(); tagit != tagInfo.tagIds.end(); ++tagit)
-			{
-				if (!text.isNull())
-					text += ",";
+        // build tag names
+        for (auto tagit = tagInfo.tagIds.begin(); tagit != tagInfo.tagIds.end(); ++tagit)
+        {
+            if (!text.isNull())
+                text += ",";
 
-				auto Tag = Tags.types.find(*tagit);
+            auto Tag = Tags.types.find(*tagit);
 
-				if (Tag != Tags.types.end())
-					text += TagDefs::name(Tag->first, Tag->second.first);
-				else
-					RS_WARN("Unknown tag ", (int)Tag->first, " in message ", fmpe.msgId);
-			}
-			return text;
-		}
-        case COLUMN_THREAD_TO: {
-            QString name;
-            RsGxsId id = RsGxsId(fmpe.to.toStdString());	// not sure of the type
+            if (Tag != Tags.types.end())				if (Tag != Tags.types.end())
 
+                text += TagDefs::name(Tag->first, Tag->second.first);
+            else
+                RS_WARN("Unknown tag ", (int)Tag->first, " in message ", fmpe.msgId);
+        }
+        return text;
+    }
+    case COLUMN_THREAD_TO: {
+        QString name;
+
+        switch(mCurrentBox)
+        {
+        case Rs::Msgs::BoxName::BOX_DRAFTS:	// in this case, we display the full list of destinations
+        case Rs::Msgs::BoxName::BOX_TRASH:	// in this case, we display the full list of destinations
+        case Rs::Msgs::BoxName::BOX_SENT:	// in this case, we display the full list of destinations
+        {
+            for(auto d:fmpe.destinations)
+            {
+                QString tmp;
+                GxsIdTreeItemDelegate::computeName(RsGxsId(d.toStdString()),tmp);	// not nice, but works.
+                if(tmp.isNull())
+                    name += QString(tr("[Notification]") + ", ");
+                else
+                    name += tmp + ", " ;
+            }
+            name.chop(2);
+            return name;
+        }
+            break;
+        case Rs::Msgs::BoxName::BOX_NONE:	// in these cases, we display the actual destination
+        case Rs::Msgs::BoxName::BOX_INBOX:	// in these cases, we display the actual destination
+        case Rs::Msgs::BoxName::BOX_OUTBOX:
+        {
+            RsGxsId id = RsGxsId(fmpe.to.toStdString());	// use "to" field, which is populated in Outbox, .
             if(id.isNull())
                 return QVariant(tr("[Notification]"));
-            if(GxsIdTreeItemDelegate::computeName(id,name))
+            else
+            {
+                GxsIdTreeItemDelegate::computeName(id,name);
                 return name;
-            return QVariant(tr("[Unknown]"));
+            }
         }
+            break;
+        }
+    }
+        break;
 
-        case COLUMN_THREAD_AUTHOR:{
-			QString name;
-            RsGxsId id = RsGxsId(fmpe.from.toStdString());
+    case COLUMN_THREAD_AUTHOR:{
+        QString name;
+        RsGxsId id = RsGxsId(fmpe.from.toStdString());
 
-			if(id.isNull())
-				return QVariant(tr("[Notification]"));
-			if(GxsIdTreeItemDelegate::computeName(id,name))
-				return name;
-			return QVariant(tr("[Unknown]"));
-		}
+        if(id.isNull())
+            return QVariant(tr("[Notification]"));
+        if(GxsIdTreeItemDelegate::computeName(id,name))
+            return name;
+        return QVariant(tr("[Unknown]"));
+    }
 
-		default:
-		return QVariant("[ TODO ]");
-	}
+    default:
+        return QVariant("[ TODO ]");
+    }
 
-	return QVariant("[ERROR]");
+    return QVariant("[ERROR]");
 }
 
 QVariant RsMessageModel::userRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col) const

From 2d024c0d6f85976209e3d5ff67f32e4a86f3780b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 23 Nov 2022 21:48:09 +0100
Subject: [PATCH 126/503] made GxsIdChooser to auto update when identities are
 added/created/modified

---
 retroshare-gui/src/gui/gxs/GxsIdChooser.cpp   | 20 +++++++++++++++++++
 retroshare-gui/src/gui/gxs/GxsIdChooser.h     |  4 ++++
 retroshare-gui/src/gui/msgs/MessageModel.cpp  |  2 +-
 retroshare-gui/src/gui/msgs/MessageWidget.cpp |  3 ++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
index a3398e4cd..f40182563 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdChooser.cpp
@@ -25,6 +25,7 @@
 #include "gui/common/FilesDefs.h"
 #include "gui/Identity/IdEditDialog.h"
 #include "util/misc.h"
+#include "util/qtthreadsutils.h"
 
 #include <retroshare/rspeers.h>
 
@@ -76,6 +77,24 @@ GxsIdChooser::GxsIdChooser(QWidget *parent)
 	/* Connect signals */
 	connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(myCurrentIndexChanged(int)));
 	connect(this, SIGNAL(activated(int)), this, SLOT(indexActivated(int)));
+
+    // also capture identity creation/deletion events so as to update the UI accordingly
+
+    mEventHandlerId = 0;
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) {
+        RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }) ;}, mEventHandlerId, RsEventType::GXS_IDENTITY );
+}
+
+void GxsIdChooser::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
+{
+    if(event->mType != RsEventType::GXS_IDENTITY) return;
+
+    const RsGxsIdentityEvent *fe = dynamic_cast<const RsGxsIdentityEvent*>(event.get());
+    if(!fe)
+        return;
+
+    updateDisplay(true);
+    update(); // Qt flush
 }
 
 void GxsIdChooser::setFlags(uint32_t flags)
@@ -86,6 +105,7 @@ void GxsIdChooser::setFlags(uint32_t flags)
 
 GxsIdChooser::~GxsIdChooser()
 {
+    rsEvents->unregisterEventsHandler(mEventHandlerId);
 }
 
 void GxsIdChooser::fillDisplay(bool complete)
diff --git a/retroshare-gui/src/gui/gxs/GxsIdChooser.h b/retroshare-gui/src/gui/gxs/GxsIdChooser.h
index 205d0d13a..61a610763 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdChooser.h
+++ b/retroshare-gui/src/gui/gxs/GxsIdChooser.h
@@ -21,6 +21,7 @@
 #ifndef _GXS_ID_CHOOSER_H
 #define _GXS_ID_CHOOSER_H
 
+#include "retroshare/rsevents.h"
 #include "gui/common/RSComboBox.h"
 
 #include "retroshare/rsgxsifacetypes.h"
@@ -78,6 +79,7 @@ private slots:
 private:
     void loadPrivateIds();
     void setDefaultItem();
+    void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 
 	uint32_t mFlags;
 	RsGxsId mDefaultId;
@@ -86,6 +88,8 @@ private:
 
     std::set<RsGxsId> mConstraintIdsSet ; // leave empty if all allowed
 //    RsGxsUpdateBroadcastBase *mBase;
+
+    RsEventsHandlerId_t mEventHandlerId;
 };
 
 #endif
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 0b8c27085..544366937 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -585,7 +585,7 @@ QVariant RsMessageModel::userRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col)
 {
 	switch(col)
     {
-        case COLUMN_THREAD_AUTHOR:   return QVariant(QString::fromStdString(fmpe.from.toStdString()));
+        case COLUMN_THREAD_AUTHOR:   return displayRole(fmpe,col);
         case COLUMN_THREAD_MSGID:    return QVariant(QString::fromStdString(fmpe.msgId));
     default:
         return QVariant();
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index 1335ceb50..b733e373b 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -627,6 +627,7 @@ void MessageWidget::fill(const std::string &msgId)
             case MsgAddress::MSG_ADDRESS_MODE_TO: to_text += link.toHtml() + "   "; break;
             case MsgAddress::MSG_ADDRESS_MODE_CC: cc_text += link.toHtml() + "   "; break;
             case MsgAddress::MSG_ADDRESS_MODE_BCC: bcc_text += link.toHtml() + "   "; break;
+            default: break;
             }
     }
 
@@ -880,7 +881,7 @@ void MessageWidget::sendInvite()
     if (!rsMail->getMessage(currMsgId, mi))
         return;
 
-    if(!mi.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+    if(mi.from.type()!=MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
         return;
 
     if ((QMessageBox::question(this, tr("Send invite?"),tr("Do you really want send a invite with your Certificate?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Cancel))== QMessageBox::Yes)

From ea4df6306bb02909687acbc499252e05b18da5a0 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 25 Nov 2022 15:15:19 +0100
Subject: [PATCH 127/503] fixed multiple glitches in Mail UI

---
 .../src/gui/common/FriendSelectionWidget.cpp  | 36 ++++++++++++++++++-
 .../src/gui/common/FriendSelectionWidget.h    |  6 ++++
 retroshare-gui/src/gui/msgs/MessageModel.cpp  |  3 +-
 retroshare-gui/src/gui/msgs/MessageWidget.cpp |  7 ++--
 .../src/gui/msgs/MessagesDialog.cpp           | 17 +++++----
 5 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
index b5b3d8264..1b170b87c 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
@@ -127,11 +127,45 @@ FriendSelectionWidget::FriendSelectionWidget(QWidget *parent)
 
 	/* Refresh style to have the correct text color */
 	Rshare::refreshStyleSheet(this, false);
+
+    mEventHandlerId_identities = 0;
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) {
+        RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }) ;}, mEventHandlerId_identities, RsEventType::GXS_IDENTITY );
+    mEventHandlerId_peers = 0;
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) {
+        RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }) ;}, mEventHandlerId_peers, RsEventType::PEER_CONNECTION );
 }
 
+void FriendSelectionWidget::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
+{
+    const RsGxsIdentityEvent *fe = dynamic_cast<const RsGxsIdentityEvent*>(event.get());
+
+    if(fe)
+    {
+        updateDisplay(true);
+        update(); // Qt flush
+        return;
+    }
+    const RsConnectionEvent *fp = dynamic_cast<const RsConnectionEvent*>(event.get());
+
+    if(fp)
+        switch(fp->mConnectionInfoCode)
+        {
+        case RsConnectionEventCode::PEER_REMOVED:
+        case RsConnectionEventCode::PEER_ADDED:
+            updateDisplay(true);
+            update(); // Qt flush
+            break;
+        default: break ;
+        }
+}
+
+
 FriendSelectionWidget::~FriendSelectionWidget()
 {
-	delete ui;
+    rsEvents->unregisterEventsHandler(mEventHandlerId_peers);
+    rsEvents->unregisterEventsHandler(mEventHandlerId_identities);
+    delete ui;
 }
 
 void FriendSelectionWidget::changeEvent(QEvent *e)
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.h b/retroshare-gui/src/gui/common/FriendSelectionWidget.h
index 20c4a15e9..d0d295a3a 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.h
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.h
@@ -24,6 +24,7 @@
 #include <QWidget>
 #include <QDialog>
 
+#include "retroshare/rsevents.h"
 #include <gui/gxs/RsGxsUpdateBroadcastPage.h>
 
 namespace Ui {
@@ -151,6 +152,8 @@ private:
     void setSelectedIds_internal(IdType idType, const std::set<std::string> &ids, bool add);
 
 private:
+    void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
+
 	bool mStarted;
 	RSTreeWidgetItemCompareRole *mCompareRole;
 	Modus mListModus;
@@ -173,6 +176,9 @@ private:
 	QList<QAction*> mContextMenuActions;
 
     std::set<std::string> mPreSelectedIds; // because loading of GxsIds is asynchroneous we keep selected Ids from the client in a list here and use it to initialize after loading them.
+
+    RsEventsHandlerId_t mEventHandlerId_identities;
+    RsEventsHandlerId_t mEventHandlerId_peers;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(FriendSelectionWidget::ShowTypes)
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 544366937..a1addb2f0 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -585,8 +585,9 @@ QVariant RsMessageModel::userRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col)
 {
 	switch(col)
     {
-        case COLUMN_THREAD_AUTHOR:   return displayRole(fmpe,col);
+        case COLUMN_THREAD_AUTHOR:   return QVariant(QString::fromStdString(fmpe.from.toStdString()));
         case COLUMN_THREAD_MSGID:    return QVariant(QString::fromStdString(fmpe.msgId));
+        case COLUMN_THREAD_TO:       return QVariant(QString::fromStdString(fmpe.to.toStdString()));
     default:
         return QVariant();
     }
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index b733e373b..54266c3fa 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -679,10 +679,13 @@ void MessageWidget::fill(const std::string &msgId)
         link = RetroShareLink::createMessage(msgInfo.from.toRsPeerId(), "");
 	}
 
-    if (((msgInfo.msgflags & RS_MSG_SYSTEM) && msgInfo.from.toRsPeerId() == ownId) || msgInfo.from.type()!=MsgAddress::MSG_ADDRESS_TYPE_RSPEERID) {
+    if ((msgInfo.msgflags & RS_MSG_SYSTEM) && msgInfo.from.toRsPeerId() == ownId)
+    {
 		ui.fromText->setText("[Notification]");
 		if (toolButtonReply) toolButtonReply->setEnabled(false);
-	} else {
+    }
+    else
+    {
 		ui.fromText->setText(link.toHtml());
 		ui.fromText->setToolTip(tooltip_string) ;
 		if (toolButtonReply) toolButtonReply->setEnabled(true);
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 16de2aea3..2d7ca0371 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -379,12 +379,15 @@ void MessagesDialog::postModelUpdate()
         sel.select(i.sibling(i.row(),0),i.sibling(i.row(),RsMessageModel::COLUMN_THREAD_NB_COLUMNS-1));
     }
 
-    ui.messageTreeWidget->selectionModel()->select(sel,QItemSelectionModel::SelectCurrent);
+    // Restoring selection should not trigger anything, especially the re-display of the msg, which
+    // in turn will change the read status.
+
+    whileBlocking(ui.messageTreeWidget->selectionModel())->select(sel,QItemSelectionModel::SelectCurrent);
 
     if (!mTmpSavedCurrentId.isEmpty()) {
         QModelIndex index = mMessageProxyModel->mapFromSource(mMessageModel->getIndexOfMessage(mTmpSavedCurrentId.toStdString()));
         if (index.isValid()) {
-            ui.messageTreeWidget->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Select);
+            whileBlocking(ui.messageTreeWidget->selectionModel())->setCurrentIndex(index, QItemSelectionModel::Select);
         }
     }
 }
@@ -898,7 +901,7 @@ void MessagesDialog::changeBox(int box_row)
 		switch(box_row)
 		{
             case ROW_INBOX: mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_INBOX );
-			break;
+            break;
             case ROW_OUTBOX: mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_OUTBOX);
 			break;
             case ROW_DRAFTBOX: mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_DRAFTS);
@@ -913,7 +916,8 @@ void MessagesDialog::changeBox(int box_row)
 
 		insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
 		ui.messageTreeWidget->setPlaceholderText(placeholderText);
-	}
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_READ,box_row!=ROW_INBOX);
+    }
 	else
 	{
         mMessageModel->setCurrentBox(Rs::Msgs::BoxName::BOX_NONE);
@@ -993,21 +997,16 @@ void MessagesDialog::clicked(const QModelIndex& proxy_index)
 		case RsMessageModel::COLUMN_THREAD_READ:
 		{
 			mMessageModel->setMsgReadStatus(real_index, !isMessageRead(proxy_index));
-			//Already updated by currentChanged
-			//insertMsgTxtAndFiles(proxy_index);
-			updateMessageSummaryList();
 			return;
 		}
 		case RsMessageModel::COLUMN_THREAD_STAR:
 		{
 			mMessageModel->setMsgStar(real_index, !hasMessageStar(proxy_index));
-			updateMessageSummaryList();
 			return;
 		}
 		case RsMessageModel::COLUMN_THREAD_SPAM:
 		{
 			mMessageModel->setMsgJunk(real_index, !hasMessageSpam(proxy_index));
-			updateMessageSummaryList();
 			return;
 		}
 	}

From 6a2886da40bc9cdc4a2cd264e1fe816e5726a57c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 27 Nov 2022 18:36:42 +0100
Subject: [PATCH 128/503] fixed some UI bugs in Mail

---
 retroshare-gui/src/gui/msgs/MessageModel.cpp   |  2 +-
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index a1addb2f0..3696d6f33 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -660,7 +660,7 @@ void RsMessageModel::setMessages(const std::list<Rs::Msgs::MsgInfoSummary>& msgs
 	for(auto it(msgs.begin());it!=msgs.end();++it)
 	{
 		mMessagesMap[(*it).msgId] = mMessages.size();
-		mMessages.push_back(*it);
+        mMessages.push_back(*it);
 	}
 
 	// now update prow for all posts
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 2d7ca0371..b46dcd0f4 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -917,6 +917,8 @@ void MessagesDialog::changeBox(int box_row)
 		insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
 		ui.messageTreeWidget->setPlaceholderText(placeholderText);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_READ,box_row!=ROW_INBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_STAR,box_row==ROW_OUTBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_SPAM,box_row==ROW_OUTBOX);
     }
 	else
 	{
@@ -1152,13 +1154,11 @@ void MessagesDialog::removemessage()
 
     bool doDelete = false;
     int listrow = ui.listWidget->currentRow();
-    if (listrow == ROW_TRASHBOX) {
+    if (listrow == ROW_TRASHBOX || listrow == ROW_OUTBOX)
+        doDelete = true;
+
+    if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
         doDelete = true;
-    } else {
-        if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
-            doDelete = true;
-        }
-    }
 
     foreach (const QString& m, selectedMessages) {
         if (doDelete) {

From 7b0d501c1e3915680240de34d0f2be5feb7d8714 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 27 Nov 2022 20:37:05 +0100
Subject: [PATCH 129/503] fixed trick for own Ids in GxsIdTreeWidgetItem

---
 libretroshare                                    |  2 +-
 retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libretroshare b/libretroshare
index 8f3a30705..d2651109f 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 8f3a3070519322a66b0e83ecb2035e0ac7e67e58
+Subproject commit d2651109f8d71659197b2d5315e36cf7d47ba034
diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h
index 15bdfeb87..1f38ecf04 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h
+++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h
@@ -109,7 +109,9 @@ public:
         QList<QIcon> icons;
         QString comment;
 
-        if(rsPeers->isFriend(RsPeerId(id)))		// horrible trick because some widgets still use locations as IDs (e.g. messages)
+        if(id.isNull())
+            name = QObject::tr("[System]");
+        else if(RsPeerId(id)==rsPeers->getOwnId() || rsPeers->isFriend(RsPeerId(id)))		// horrible trick because some widgets still use locations as IDs (e.g. messages)
 			name = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ;
         else if(!GxsIdDetails::MakeIdDesc(id, false, name, icons, comment,GxsIdDetails::ICON_TYPE_NONE))
             return false;
@@ -123,8 +125,13 @@ public:
 		bool exist = false;
 
 
-		if(rsPeers->isFriend(RsPeerId(id)))		// horrible trick because some widgets still use locations as IDs (e.g. messages)
-		{
+        if(id.isNull())
+        {
+            name = QObject::tr("[System]");
+            icon = QIcon();
+        }
+        else if(RsPeerId(id)==rsPeers->getOwnId() || rsPeers->isFriend(RsPeerId(id)))		// horrible trick because some widgets still use locations as IDs (e.g. messages)
+        {
 			name = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ;
 			icon = FilesDefs::getIconFromQtResourcePath(":/icons/avatar_128.png");
 		}

From 0db41deb9f6e9ddc4ba081ed7ef36a04f6417652 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 28 Nov 2022 17:08:02 +0100
Subject: [PATCH 130/503] fixed bugs in Mail display

---
 .../src/gui/msgs/MessageComposer.cpp          |  7 ++--
 .../src/gui/msgs/MessagesDialog.cpp           | 36 +++++++++++--------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 692b4b996..97c28a9e5 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -1204,6 +1204,11 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
         return NULL;
     }
 
+    if(msgInfo.from.type()==MsgAddress::MSG_ADDRESS_TYPE_RSPEERID && msgInfo.from.toRsPeerId().isNull())
+    {
+        QMessageBox::warning(nullptr,tr("Will not reply"),tr("There is no point in replying to a notification message!"));
+        return nullptr;
+    }
     MessageComposer *msgComposer = MessageComposer::newMsg();
     msgComposer->m_msgParentId = msgId;
     msgComposer->m_msgType = REPLY;
@@ -1233,8 +1238,6 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
 
     if (all)
     {
-        RsPeerId ownId = rsPeers->getOwnId();
-
         for(auto m:msgInfo.destinations)
             if(m.type()==MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
                 msgComposer->addRecipient(MessageComposer::TO,m.toGxsId());
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index b46dcd0f4..fedf0e7b4 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -919,6 +919,7 @@ void MessagesDialog::changeBox(int box_row)
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_READ,box_row!=ROW_INBOX);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_STAR,box_row==ROW_OUTBOX);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_SPAM,box_row==ROW_OUTBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_TAGS,box_row==ROW_OUTBOX);
     }
 	else
 	{
@@ -1154,9 +1155,15 @@ void MessagesDialog::removemessage()
 
     bool doDelete = false;
     int listrow = ui.listWidget->currentRow();
-    if (listrow == ROW_TRASHBOX || listrow == ROW_OUTBOX)
+    if (listrow == ROW_TRASHBOX)
         doDelete = true;
 
+    if(listrow == ROW_OUTBOX)
+    {
+        QMessageBox::warning(nullptr,tr("Deletion impossible"),tr("Messages in this box are automatically deleted when received."));
+        return ;
+    }
+
     if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
         doDelete = true;
 
@@ -1267,17 +1274,21 @@ void MessagesDialog::updateMessageSummaryList()
 
     switch(box_row)
     {
-    case ROW_INBOX: box = Rs::Msgs::BoxName::BOX_INBOX ; break;
-    case ROW_OUTBOX: box = Rs::Msgs::BoxName::BOX_OUTBOX; break;
+    case ROW_INBOX:    box = Rs::Msgs::BoxName::BOX_INBOX ; break;
+    case ROW_OUTBOX:   box = Rs::Msgs::BoxName::BOX_OUTBOX; break;
     case ROW_DRAFTBOX: box = Rs::Msgs::BoxName::BOX_DRAFTS; break;
-    case ROW_SENTBOX: box = Rs::Msgs::BoxName::BOX_SENT  ; break;
+    case ROW_SENTBOX:  box = Rs::Msgs::BoxName::BOX_SENT  ; break;
     case ROW_TRASHBOX: box = Rs::Msgs::BoxName::BOX_TRASH ; break;
     default:
         box = Rs::Msgs::BoxName::BOX_NONE;
     }
 
-    std::list<MsgInfoSummary> msgList;
-    rsMail->getMessageSummaries(box,msgList);
+    std::list<MsgInfoSummary> msgList,tmplist;
+    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_INBOX ,tmplist); msgList.splice(msgList.end(),tmplist);
+    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_OUTBOX,tmplist); msgList.splice(msgList.end(),tmplist);
+    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_DRAFTS,tmplist); msgList.splice(msgList.end(),tmplist);
+    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_SENT  ,tmplist); msgList.splice(msgList.end(),tmplist);
+    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_TRASH ,tmplist); msgList.splice(msgList.end(),tmplist);
 
     QMap<int, int> tagCount;
 
@@ -1293,17 +1304,14 @@ void MessagesDialog::updateMessageSummaryList()
             tagCount [*tagId] = nCount;
         }
 
-        if (it->msgflags & RS_MSG_STAR) {
+        if (it->msgflags & RS_MSG_STAR) 
             ++starredCount;
-        }
 
-        if (it->msgflags & RS_MSG_SYSTEM) {
+        if (it->msgflags & RS_MSG_SYSTEM) 
             ++systemCount;
-        }
 
-        if (it->msgflags & RS_MSG_SPAM) {
+        if (it->msgflags & RS_MSG_SPAM) 
             ++spamCount;
-        }
 
         /* calculate box */
         if (it->msgflags & RS_MSG_TRASH) {
@@ -1321,7 +1329,7 @@ void MessagesDialog::updateMessageSummaryList()
         case RS_MSG_OUTBOX:
                 ++newOutboxCount;
                 break;
-        case RS_MSG_DRAFTBOX:
+        case RS_MSG_DRAFT:	// not RS_MSG_DRAFTBOX because drafts are not considered outgoing
                 ++newDraftCount;
                 break;
         case RS_MSG_SENTBOX:
@@ -1358,7 +1366,7 @@ void MessagesDialog::updateMessageSummaryList()
             break;
     }
 
-
+std::cerr << "NewInboxCount = " << newInboxCount << " NewDraftCount = " << newDraftCount << std::endl;
     QString textItem;
     /*updating the labels in leftcolumn*/
 

From 006f4c53be3d42ba0c9f872b9417f705f24ba14f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 30 Nov 2022 15:25:38 +0100
Subject: [PATCH 131/503] removed mMsgTagIds since tags are not in
 RsMailStorageItem struct

---
 .../src/gui/msgs/MessageComposer.cpp          | 47 +++++++++----------
 retroshare-gui/src/gui/msgs/MessageComposer.h |  2 +-
 retroshare-gui/src/gui/msgs/MessageModel.cpp  |  7 ++-
 retroshare-gui/src/gui/msgs/MessageWidget.cpp |  8 ++--
 retroshare-gui/src/gui/msgs/MessageWindow.cpp |  2 +-
 retroshare-gui/src/gui/msgs/TagsMenu.cpp      |  4 +-
 retroshare-gui/src/gui/msgs/TagsMenu.h        |  2 +-
 7 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 97c28a9e5..c90e6cba9 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -1081,7 +1081,7 @@ MessageComposer *MessageComposer::newMsg(const std::string &msgId /* = ""*/)
         MsgTagInfo tagInfo;
         rsMail->getMessageTag(msgId, tagInfo);
 
-        msgComposer->m_tagIds = tagInfo.tagIds;
+        msgComposer->m_tagIds = tagInfo;
         msgComposer->showTagLabels();
         std::cerr << "Setting modified 005 = false" << std::endl;
         msgComposer->ui.msgText->document()->setModified(false);
@@ -1267,7 +1267,7 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
 	MsgTagInfo tagInfo;
 	rsMail->getMessageTag(msgId, tagInfo);
 
-	msgComposer->m_tagIds = tagInfo.tagIds;
+    msgComposer->m_tagIds = tagInfo;
 	msgComposer->showTagLabels();
 
     msgComposer->calculateTitle();
@@ -1563,18 +1563,15 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
 
         /* insert new tags */
         std::list<uint32_t>::iterator tag;
-        for (tag = m_tagIds.begin(); tag != m_tagIds.end(); ++tag) {
-            if (std::find(tagInfo.tagIds.begin(), tagInfo.tagIds.end(), *tag) == tagInfo.tagIds.end()) {
-                rsMail->setMessageTag(mi.msgId, *tag, true);
-            } else {
-                tagInfo.tagIds.remove(*tag);
-            }
-        }
+        for (auto tag:m_tagIds)
+            if (tagInfo.find(tag) == tagInfo.end())
+                rsMail->setMessageTag(mi.msgId, tag, true);
+             else
+                tagInfo.erase(tag);
 
         /* remove deleted tags */
-        for (tag = tagInfo.tagIds.begin(); tag != tagInfo.tagIds.end(); ++tag) {
-            rsMail->setMessageTag(mi.msgId, *tag, false);
-        }
+        for (auto tag:tagInfo)
+            rsMail->setMessageTag(mi.msgId, tag, false);
     }
     std::cerr << "Setting modified 001 = false" << std::endl;
     ui.msgText->document()->setModified(false);
@@ -2801,17 +2798,17 @@ void MessageComposer::tagSet(int tagId, bool set)
 		return;
 	}
 
-	std::list<uint32_t>::iterator tag = std::find(m_tagIds.begin(), m_tagIds.end(), tagId);
-	if (tag == m_tagIds.end()) {
-		if (set) {
-			m_tagIds.push_back(tagId);
-			/* Keep the list sorted */
-			m_tagIds.sort();
-		}
-	} else {
-		if (set == false) {
-			m_tagIds.remove(tagId);
-		}
+    auto tag = m_tagIds.find(tagId);
+
+    if (tag == m_tagIds.end())
+    {
+        if (set)
+            m_tagIds.insert(tagId);
+    }
+    else
+    {
+        if (set == false)
+            m_tagIds.erase(tagId);
 	}
 
 	showTagLabels();
@@ -2838,8 +2835,8 @@ void MessageComposer::showTagLabels()
 		rsMail->getMessageTagTypes(tags);
 
 		std::map<uint32_t, std::pair<std::string, uint32_t> >::iterator tag;
-		for (std::list<uint32_t>::iterator tagId = m_tagIds.begin(); tagId != m_tagIds.end(); ++tagId) {
-			tag = tags.types.find(*tagId);
+        for (auto tagId:m_tagIds) {
+            tag = tags.types.find(tagId);
 			if (tag != tags.types.end()) {
 				QLabel *tagLabel = new QLabel(TagDefs::name(tag->first, tag->second.first), this);
 				tagLabel->setMaximumHeight(QFontMetrics(tagLabel->font()).height()*1.2);
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h
index dbc13d431..0df2dbd8e 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.h
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.h
@@ -251,7 +251,7 @@ private:
     std::string m_msgParentId; // parent message id
     std::string m_sDraftMsgId; // existing message id
     enumMessageType m_msgType;
-    std::list<uint32_t> m_tagIds;
+    std::set<uint32_t> m_tagIds;
     QList<QLabel*> tagLabels;
 
     // needed to send system flags with reply
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 3696d6f33..a0a33853b 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -508,15 +508,14 @@ QVariant RsMessageModel::displayRole(const Rs::Msgs::MsgInfoSummary& fmpe,int co
         QString text;
 
         // build tag names
-        for (auto tagit = tagInfo.tagIds.begin(); tagit != tagInfo.tagIds.end(); ++tagit)
+        for (auto tag:tagInfo)
         {
             if (!text.isNull())
                 text += ",";
 
-            auto Tag = Tags.types.find(*tagit);
-
-            if (Tag != Tags.types.end())				if (Tag != Tags.types.end())
+            auto Tag = Tags.types.find(tag);
 
+            if (Tag != Tags.types.end())
                 text += TagDefs::name(Tag->first, Tag->second.first);
             else
                 RS_WARN("Unknown tag ", (int)Tag->first, " in message ", fmpe.msgId);
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index 54266c3fa..9bf3dcc35 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -475,15 +475,17 @@ void MessageWidget::showTagLabels()
 	MsgTagInfo tagInfo;
 	rsMail->getMessageTag(currMsgId, tagInfo);
 
-	if (tagInfo.tagIds.empty() == false) {
+    if (!tagInfo.empty())
+    {
 		ui.tagsLabel->setVisible(true);
 
 		MsgTagType Tags;
 		rsMail->getMessageTagTypes(Tags);
 
 		std::map<uint32_t, std::pair<std::string, uint32_t> >::iterator Tag;
-		for (std::list<uint32_t>::iterator tagId = tagInfo.tagIds.begin(); tagId != tagInfo.tagIds.end(); ++tagId) {
-			Tag = Tags.types.find(*tagId);
+        for (auto tag:tagInfo)
+        {
+            Tag = Tags.types.find(tag);
 			if (Tag != Tags.types.end()) {
 				QLabel *tagLabel = new QLabel(TagDefs::name(Tag->first, Tag->second.first), this);
 				tagLabel->setMaximumHeight(16);
diff --git a/retroshare-gui/src/gui/msgs/MessageWindow.cpp b/retroshare-gui/src/gui/msgs/MessageWindow.cpp
index ad1067367..0c9abf2a2 100644
--- a/retroshare-gui/src/gui/msgs/MessageWindow.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWindow.cpp
@@ -150,7 +150,7 @@ void MessageWindow::tagAboutToShow()
 	MsgTagInfo tagInfo;
 	rsMail->getMessageTag(msgWidget->msgId(), tagInfo);
 
-	menu->activateActions(tagInfo.tagIds);
+    menu->activateActions(tagInfo);
 }
 
 void MessageWindow::tagRemoveAll()
diff --git a/retroshare-gui/src/gui/msgs/TagsMenu.cpp b/retroshare-gui/src/gui/msgs/TagsMenu.cpp
index 8ef4f7d93..881ec268d 100644
--- a/retroshare-gui/src/gui/msgs/TagsMenu.cpp
+++ b/retroshare-gui/src/gui/msgs/TagsMenu.cpp
@@ -170,7 +170,7 @@ void TagsMenu::fillTags()
 	addAction(action);
 }
 
-void TagsMenu::activateActions(std::list<uint32_t>& tagIds)
+void TagsMenu::activateActions(std::set<uint32_t>& tagIds)
 {
 	foreach(QObject *object, children()) {
 		QAction *action = qobject_cast<QAction*> (object);
@@ -186,7 +186,7 @@ void TagsMenu::activateActions(std::list<uint32_t>& tagIds)
 			continue;
 		}
 
-		std::list<uint32_t>::iterator tagId = std::find(tagIds.begin(), tagIds.end(), values [ACTION_TAGSINDEX_ID]);
+        auto tagId = std::find(tagIds.begin(), tagIds.end(), values [ACTION_TAGSINDEX_ID]);
 		action->setChecked(tagId != tagIds.end());
 	}
 }
diff --git a/retroshare-gui/src/gui/msgs/TagsMenu.h b/retroshare-gui/src/gui/msgs/TagsMenu.h
index a3f2cdd55..1cccb7e5f 100644
--- a/retroshare-gui/src/gui/msgs/TagsMenu.h
+++ b/retroshare-gui/src/gui/msgs/TagsMenu.h
@@ -34,7 +34,7 @@ public:
 	TagsMenu(const QString &title, QWidget *parent);
 	virtual ~TagsMenu();
 
-	void activateActions(std::list<uint32_t>& tagIds);
+    void activateActions(std::set<uint32_t> &tagIds);
 
 signals:
 	void tagSet(int tagId, bool set);

From 83e3dc708b7746f63ba3c264531845f92a0dc5c4 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Thu, 1 Dec 2022 13:36:36 -0300
Subject: [PATCH 132/503] Use non-EOL ubuntu base image for GitlabCI

---
 build_scripts/GitlabCI/base.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/GitlabCI/base.Dockerfile b/build_scripts/GitlabCI/base.Dockerfile
index 60d122a88..13097f58d 100644
--- a/build_scripts/GitlabCI/base.Dockerfile
+++ b/build_scripts/GitlabCI/base.Dockerfile
@@ -12,7 +12,7 @@
 ## To run the container
 # docker run -it -p 127.0.0.1:9092:9092 "${CI_REGISTRY_IMAGE}" retroshare-service --jsonApiPort 9092 --jsonApiBindAddress 0.0.0.0
 
-FROM ubuntu:21.10
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV APT_UNAT="--assume-yes --quiet"

From 0528bf4b50f0786d66c9076415a46149eb3b4f8e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 1 Dec 2022 21:02:10 +0100
Subject: [PATCH 133/503] fixed quick view filters, loading of drafts (from
 previous format), uniqueness of message Ids

---
 retroshare-gui/src/gui/msgs/MessageModel.cpp  |  6 +-
 .../src/gui/msgs/MessagesDialog.cpp           | 68 ++++++++++++-------
 retroshare-gui/src/gui/msgs/MessagesDialog.h  |  4 +-
 3 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index a0a33853b..4c7c42e52 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -694,8 +694,10 @@ void RsMessageModel::setQuickViewFilter(QuickViewFilter fn)
 		std::cerr << "Changing new quickview filter to " << fn << std::endl;
 #endif
 
-		mQuickViewFilter = fn ;
-		updateMessages();
+        mQuickViewFilter = fn ;
+
+        if(rowCount() > 0)
+            emit dataChanged(createIndex(0,0),createIndex(rowCount()-1,RsMessageModel::columnCount()-1));
 	}
 }
 
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index fedf0e7b4..cd09a5ff4 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -140,6 +140,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
     inChange = false;
     lockUpdate = 0;
     lastSelectedIndex = QModelIndex();
+    mLastCurrentQuickViewRow = -1;
 
     msgWidget = new MessageWidget(true, this);
 	ui.msgLayout->addWidget(msgWidget);
@@ -147,7 +148,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
     connectActions();
 
-    listMode = LIST_NOTHING;
+    //listMode = LIST_NOTHING;
 
     mMessageModel = new RsMessageModel(this);
     mMessageProxyModel = new MessageSortFilterProxyModel(this);
@@ -284,10 +285,11 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
     connect(ui.listWidget,           SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint)));
     connect(ui.listWidget,           SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int)));
-    connect(ui.quickViewWidget,      SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int)));
+    //connect(ui.quickViewWidget,      SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int)));
     connect(ui.tabWidget,            SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
     connect(ui.tabWidget,            SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int)));
     connect(ui.newmessageButton,     SIGNAL(clicked()), this, SLOT(newmessage()));
+    connect(ui.quickViewWidget,      SIGNAL(clicked(const QModelIndex&)), this, SLOT(resetQuickView(const QModelIndex&)));
 
     connect(ui.messageTreeWidget,    SIGNAL(clicked(const QModelIndex&)) , this, SLOT(clicked(const QModelIndex&)));
     connect(ui.messageTreeWidget,    SIGNAL(doubleClicked(const QModelIndex&)) , this, SLOT(doubleClicked(const QModelIndex&)));
@@ -504,7 +506,7 @@ void MessagesDialog::fillQuickView()
 	ui.quickViewWidget->clear();
 
 	// add static items
-	item = new QListWidgetItem(tr("Starred"), ui.quickViewWidget);
+    item = new QListWidgetItem(tr("Stared"), ui.quickViewWidget);
     item->setIcon(FilesDefs::getIconFromQtResourcePath(IMAGE_STAR_ON));
 	item->setData(ROLE_QUICKVIEW_TYPE, QUICKVIEW_TYPE_STATIC);
 	item->setData(ROLE_QUICKVIEW_ID, QUICKVIEW_STATIC_ID_STARRED);
@@ -893,9 +895,9 @@ void MessagesDialog::changeBox(int box_row)
 	if (item)
 	{
 		ui.quickViewWidget->setCurrentItem(NULL);
-		changeQuickView(-1);
 
-		listMode = LIST_BOX;
+        changeQuickView(-1);
+        //listMode = LIST_BOX;
 
 		QString placeholderText = tr("No message available in your %1.").arg(item->text());
 		switch(box_row)
@@ -930,21 +932,36 @@ void MessagesDialog::changeBox(int box_row)
     updateMessageSummaryList();
 }
 
+void MessagesDialog::resetQuickView(const QModelIndex& i)
+{
+    if(!i.isValid())
+        return;
+
+    int n = ui.quickViewWidget->currentRow();
+
+    if(mLastCurrentQuickViewRow == n)
+    {
+        changeQuickView(-1);
+        ui.quickViewWidget->setCurrentRow(-1);
+    }
+    else
+        changeQuickView(n);
+}
 void MessagesDialog::changeQuickView(int newrow)
 {
-
+    mLastCurrentQuickViewRow = newrow;
 	RsMessageModel::QuickViewFilter f = RsMessageModel::QUICK_VIEW_ALL ;
 	QListWidgetItem* item = ui.quickViewWidget->item(newrow);
 
 	if(item )
 	{
-		ui.listWidget->setCurrentItem(NULL);
-		changeBox(-1);
-
-		listMode = LIST_QUICKVIEW;
+        //ui.listWidget->setCurrentItem(NULL);
+        //changeBox(-1);
+        //listMode = LIST_QUICKVIEW;
 
 		QString placeholderText;
-		switch (item->data(ROLE_QUICKVIEW_TYPE).toInt()) {
+        switch (item->data(ROLE_QUICKVIEW_TYPE).toInt())
+        {
 			case QUICKVIEW_TYPE_TAG:
 			{
 				placeholderText = tr("No message using %1 tag available.").arg(item->data(ROLE_QUICKVIEW_TEXT).toString());
@@ -969,12 +986,12 @@ void MessagesDialog::changeQuickView(int newrow)
 			}
 		}
 
-		insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
+        //insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
 		ui.messageTreeWidget->setPlaceholderText(placeholderText);
 	}
 
 	mMessageModel->setQuickViewFilter(f);
-	mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString));	// this triggers the update of the proxy model
+    mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString));	// this triggers the update of the proxy model
 }
 
 // click in messageTreeWidget
@@ -1283,12 +1300,13 @@ void MessagesDialog::updateMessageSummaryList()
         box = Rs::Msgs::BoxName::BOX_NONE;
     }
 
-    std::list<MsgInfoSummary> msgList,tmplist;
-    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_INBOX ,tmplist); msgList.splice(msgList.end(),tmplist);
-    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_OUTBOX,tmplist); msgList.splice(msgList.end(),tmplist);
-    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_DRAFTS,tmplist); msgList.splice(msgList.end(),tmplist);
-    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_SENT  ,tmplist); msgList.splice(msgList.end(),tmplist);
-    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_TRASH ,tmplist); msgList.splice(msgList.end(),tmplist);
+    std::list<MsgInfoSummary> msgList;
+    rsMail->getMessageSummaries(box ,msgList);
+    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_INBOX ,tmplist); msgList.splice(msgList.end(),tmplist);
+    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_OUTBOX,tmplist); msgList.splice(msgList.end(),tmplist);
+    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_DRAFTS,tmplist); msgList.splice(msgList.end(),tmplist);
+    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_SENT  ,tmplist); msgList.splice(msgList.end(),tmplist);
+    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_TRASH ,tmplist); msgList.splice(msgList.end(),tmplist);
 
     QMap<int, int> tagCount;
 
@@ -1467,16 +1485,20 @@ std::cerr << "NewInboxCount = " << newInboxCount << " NewDraftCount = " << newDr
                 QString text = qv_item->data(ROLE_QUICKVIEW_TEXT).toString();
                 switch (qv_item->data(ROLE_QUICKVIEW_ID).toInt()) {
                 case QUICKVIEW_STATIC_ID_STARRED:
-                    text += " (" + QString::number(starredCount) + ")";
+                    if(starredCount>0)
+                        text += " (" + QString::number(starredCount) + ")";
                     break;
                 case QUICKVIEW_STATIC_ID_SYSTEM:
-                    text += " (" + QString::number(systemCount) + ")";
+                    if(systemCount > 0)
+                        text += " (" + QString::number(systemCount) + ")";
                     break;
                 case QUICKVIEW_STATIC_ID_SPAM:
-                    text += " (" + QString::number(spamCount) + ")";
+                    if(spamCount > 0)
+                        text += " (" + QString::number(spamCount) + ")";
                     break;
                 case QUICKVIEW_STATIC_ID_ATTACHMENT:
-                    text += " (" + QString::number(attachmentCount) + ")";
+                    if(attachmentCount > 0)
+                        text += " (" + QString::number(attachmentCount) + ")";
                     break;
                 }
 
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.h b/retroshare-gui/src/gui/msgs/MessagesDialog.h
index e2c3f4c6f..1d10137c2 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.h
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.h
@@ -79,6 +79,7 @@ private slots:
 
   void changeBox(int newrow);
   void changeQuickView(int newrow);
+  void resetQuickView(const QModelIndex& i);
   void updateCurrentMessage();
   void clicked(const QModelIndex&);
   void doubleClicked(const QModelIndex&);
@@ -138,9 +139,10 @@ private:
   bool inChange;
   int lockUpdate; // use with LockUpdate
 
-  enum { LIST_NOTHING, LIST_BOX, LIST_QUICKVIEW } listMode;
+  // enum { LIST_NOTHING, LIST_BOX, LIST_QUICKVIEW } listMode;
 
   std::string mCurrMsgId;
+  int mLastCurrentQuickViewRow;
 
   // timer and index for showing message
   QTimer *timer;

From 6327ccf6aeea837cd52c22221880c1d0e5797b5d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 3 Dec 2022 14:06:21 +0100
Subject: [PATCH 134/503] using explicit column resize since Qt4 is not
 supported anymore

---
 libretroshare                                  |  2 +-
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libretroshare b/libretroshare
index d2651109f..5d7c50e21 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit d2651109f8d71659197b2d5315e36cf7d47ba034
+Subproject commit 5d7c50e2161ca11661b7b61c5a2663364aab5b59
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index cd09a5ff4..adbbe1256 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -218,15 +218,15 @@ MessagesDialog::MessagesDialog(QWidget *parent)
     msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_TO,         fm.width("[Retroshare]")*1.1);
     msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE,       fm.width("01/01/1970")*1.1);
 
-    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT,    QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR,     QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_TO,         QHeaderView::Interactive);
-    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE,       QHeaderView::Interactive);
+    msgwheader->setSectionResizeMode(RsMessageModel::COLUMN_THREAD_SUBJECT,    QHeaderView::Interactive);
+    msgwheader->setSectionResizeMode(RsMessageModel::COLUMN_THREAD_AUTHOR,     QHeaderView::Interactive);
+    msgwheader->setSectionResizeMode(RsMessageModel::COLUMN_THREAD_TO,         QHeaderView::Interactive);
+    msgwheader->setSectionResizeMode(RsMessageModel::COLUMN_THREAD_DATE,       QHeaderView::Interactive);
 
-    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR,       QHeaderView::Fixed);
-    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Fixed);
-    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ,       QHeaderView::Fixed);
-    QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SPAM,       QHeaderView::Fixed);
+    msgwheader->setSectionResizeMode(RsMessageModel::COLUMN_THREAD_STAR,       QHeaderView::Fixed);
+    msgwheader->setSectionResizeMode(RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Fixed);
+    msgwheader->setSectionResizeMode(RsMessageModel::COLUMN_THREAD_READ,       QHeaderView::Fixed);
+    msgwheader->setSectionResizeMode(RsMessageModel::COLUMN_THREAD_SPAM,       QHeaderView::Fixed);
 
 	ui.messageTreeWidget->setSortingEnabled(true);
 

From 8185dba0d8b4c750748cb46dd0aa8c8a73e2e58a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 3 Dec 2022 15:59:05 +0100
Subject: [PATCH 135/503] fixed bug causing wrong "from" field in sent messages

---
 .../src/gui/msgs/MessageComposer.cpp          | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index c90e6cba9..65c026b72 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -1370,7 +1370,24 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
 {
     // add a GXS signer/from in case the message is to be sent to a distant peer
 
-    mi.from = MsgAddress(RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString()),MsgAddress::MSG_ADDRESS_MODE_TO) ;
+    bool at_least_one_gxsid = false;
+
+    for(auto m:mi.destinations)
+        if(m.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+        {
+            at_least_one_gxsid=true;
+            break;
+        }
+
+    if(!at_least_one_gxsid)
+        mi.from = Rs::Msgs::MsgAddress(rsPeers->getOwnId(),MsgAddress::MSG_ADDRESS_MODE_TO);
+    else if(mi.from.type() != MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+    {
+        QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers from the destination list."), QMessageBox::Ok);
+        return false; // Don't send if cannot sign.
+    }
+    else
+        mi.from = MsgAddress(RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString()),MsgAddress::MSG_ADDRESS_MODE_TO) ;
 
     //std::cerr << "MessageSend: setting 'from' field to GXS id = " << mi.rsgxsid_srcId << std::endl;
 
@@ -1452,9 +1469,9 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
 
             switch (type)
             {
-                case TO:  mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
-                case CC:  mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
-                case BCC: mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
+            case TO:  mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
+            case CC:  mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
+            case BCC: mi.destinations.insert(MsgAddress(pid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
             }
         }
             break ;
@@ -1464,9 +1481,9 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
 
             switch (type)
             {
-                case TO:  mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
-                case CC:  mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
-                case BCC: mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
+            case TO:  mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_TO)); break;
+            case CC:  mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_CC)); break;
+            case BCC: mi.destinations.insert(MsgAddress(gid,MsgAddress::MSG_ADDRESS_MODE_BCC)); break;
             }
         }
             break ;
@@ -1526,22 +1543,9 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
             return false; // Don't send with no recipient
         }
 
-        bool at_least_one_gxsid = false;
-        for(auto m:mi.destinations)
-            if(m.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
-            {
-                at_least_one_gxsid=true;
-                break;
-            }
 
-        if(at_least_one_gxsid && mi.from.type() != MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
-        {
-            QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers from the destination list."), QMessageBox::Ok);
-            return false; // Don't send if cannot sign.
-        }
-        if (rsMail->MessageSend(mi) == false) {
+        if (rsMail->MessageSend(mi) == false)
             return false;
-        }
 
         if (m_msgParentId.empty() == false) {
             switch (m_msgType) {

From a7570b70eb773e7771ee7670c641b33882a46980 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 3 Dec 2022 23:45:31 +0100
Subject: [PATCH 136/503] fixed proper setting of "from" field when
 heterogeneous destinations are used

---
 .../src/gui/msgs/MessageComposer.cpp          | 42 ++++++++++---------
 retroshare-gui/src/gui/msgs/MessageWidget.cpp |  2 +-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 65c026b72..4e0219b0c 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -1370,25 +1370,6 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
 {
     // add a GXS signer/from in case the message is to be sent to a distant peer
 
-    bool at_least_one_gxsid = false;
-
-    for(auto m:mi.destinations)
-        if(m.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
-        {
-            at_least_one_gxsid=true;
-            break;
-        }
-
-    if(!at_least_one_gxsid)
-        mi.from = Rs::Msgs::MsgAddress(rsPeers->getOwnId(),MsgAddress::MSG_ADDRESS_MODE_TO);
-    else if(mi.from.type() != MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
-    {
-        QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers from the destination list."), QMessageBox::Ok);
-        return false; // Don't send if cannot sign.
-    }
-    else
-        mi.from = MsgAddress(RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString()),MsgAddress::MSG_ADDRESS_MODE_TO) ;
-
     //std::cerr << "MessageSend: setting 'from' field to GXS id = " << mi.rsgxsid_srcId << std::endl;
 
     mi.title = misc::removeNewLine(ui.titleEdit->text()).toUtf8().constData();
@@ -1493,6 +1474,29 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
             break ;
         }
     }
+    bool at_least_one_gxsid = false;
+
+    for(auto m:mi.destinations)
+        if(m.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
+        {
+            at_least_one_gxsid=true;
+            break;
+        }
+
+    if(!at_least_one_gxsid)
+        mi.from = Rs::Msgs::MsgAddress(rsPeers->getOwnId(),MsgAddress::MSG_ADDRESS_MODE_TO);
+    else
+    {
+        auto gxs_id_from = RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString());
+
+        if(gxs_id_from.isNull())
+        {
+            QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers from the destination list."), QMessageBox::Ok);
+            return false; // Don't send if cannot sign.
+        }
+        mi.from = MsgAddress(RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString()),MsgAddress::MSG_ADDRESS_MODE_TO) ;
+    }
+
     return true;
 }
 
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index 9bf3dcc35..7467e2e84 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -670,7 +670,7 @@ void MessageWidget::fill(const std::string &msgId)
 //		link.createMessage(ownId, "");
 //	}
 
-	if(msgInfo.msgflags & RS_MSG_DISTANT)	// distant message
+    if(msgInfo.from.type()==Rs::Msgs::MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)	// distant message
 	{
         tooltip_string = PeerDefs::rsidFromId(msgInfo.from.toGxsId()) ;
         link = RetroShareLink::createMessage(msgInfo.from.toGxsId(), "");

From 7b78b87c65dc678e81f66ea37cfb72217c4894fb Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 4 Dec 2022 18:46:19 +0100
Subject: [PATCH 137/503] fixed coumn visibility depending on box

---
 retroshare-gui/src/gui/msgs/MessageModel.cpp   |  2 +-
 retroshare-gui/src/gui/msgs/MessageModel.h     |  6 +++---
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 11 ++++++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 4c7c42e52..4e1debaba 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -88,7 +88,7 @@ int RsMessageModel::rowCount(const QModelIndex& parent) const
 
 int RsMessageModel::columnCount(const QModelIndex &/*parent*/) const
 {
-	return COLUMN_THREAD_NB_COLUMNS ;
+    return COLUMN_THREAD_NB_COLUMNS;
 }
 
 bool RsMessageModel::getMessageData(const QModelIndex& i,Rs::Msgs::MessageInfo& fmpe) const
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h
index e3b7d5188..fb8c6daa5 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.h
+++ b/retroshare-gui/src/gui/msgs/MessageModel.h
@@ -54,9 +54,9 @@ public:
         COLUMN_THREAD_DATE         = 0x07,
         COLUMN_THREAD_TAGS         = 0x08,
         COLUMN_THREAD_MSGID        = 0x09,
-        COLUMN_THREAD_NB_COLUMNS   = 0x0a,
-        COLUMN_THREAD_CONTENT      = 0x0b
-	};
+        COLUMN_THREAD_CONTENT      = 0x0a,
+        COLUMN_THREAD_NB_COLUMNS   = 0x0b
+    };
 
     enum QuickViewFilter {
         QUICK_VIEW_ALL             = 0x00,
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index adbbe1256..4b790809d 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -254,9 +254,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
 	sortColumn(RsMessageModel::COLUMN_THREAD_DATE,Qt::DescendingOrder);
 
-    // load settings
-    processSettings(true);
-
     //ui.messageTreeWidget->installEventFilter(this);
 
 	// remove close button of the the first tab
@@ -299,6 +296,11 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
     connect(ui.messageTreeWidget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(currentChanged(const QModelIndex&,const QModelIndex&)));
 
+    // load settings
+    processSettings(true);
+
+    ui.listWidget->setCurrentRow(0); // always starts with inbox => allows to setup the proper number of columns
+
     mEventHandlerId=0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }); }, mEventHandlerId, RsEventType::MAIL_STATUS );
 
@@ -917,11 +919,14 @@ void MessagesDialog::changeBox(int box_row)
 		}
 
 		insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
+
 		ui.messageTreeWidget->setPlaceholderText(placeholderText);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_READ,box_row!=ROW_INBOX);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_STAR,box_row==ROW_OUTBOX);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_SPAM,box_row==ROW_OUTBOX);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_TAGS,box_row==ROW_OUTBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_MSGID,true);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_CONTENT,true);
     }
 	else
 	{

From 93746f507541e08d735d15341aa9da1e25ed618b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 4 Dec 2022 21:18:41 +0100
Subject: [PATCH 138/503] fixed removing/displaying message tags in tags menu

---
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 4b790809d..8f1f37bea 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -282,7 +282,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
     connect(ui.listWidget,           SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint)));
     connect(ui.listWidget,           SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int)));
-    //connect(ui.quickViewWidget,      SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int)));
     connect(ui.tabWidget,            SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
     connect(ui.tabWidget,            SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int)));
     connect(ui.newmessageButton,     SIGNAL(clicked()), this, SLOT(newmessage()));
@@ -1517,11 +1516,10 @@ std::cerr << "NewInboxCount = " << newInboxCount << " NewDraftCount = " << newDr
 
 void MessagesDialog::tagAboutToShow()
 {
-#ifdef TODO
 	TagsMenu *menu = dynamic_cast<TagsMenu*>(ui.tagButton->menu());
-	if (menu == NULL) {
+
+    if (menu == NULL)
 		return;
-	}
 
 	// activate actions from the first selected row
 	MsgTagInfo tagInfo;
@@ -1532,8 +1530,7 @@ void MessagesDialog::tagAboutToShow()
     if(!msgids.empty())
 		rsMail->getMessageTag(msgids.front().toStdString(), tagInfo);
 
-	menu->activateActions(tagInfo.tagIds);
-#endif
+    menu->activateActions(tagInfo);
 }
 
 void MessagesDialog::tagRemoveAll()
@@ -1547,9 +1544,8 @@ void MessagesDialog::tagRemoveAll()
 
 void MessagesDialog::tagSet(int tagId, bool set)
 {
-	if (tagId == 0) {
+    if (tagId == 0)
 		return;
-	}
 
     QList<QString> msgids;
     getSelectedMessages(msgids);

From ad584e0fff5e92cdcbdb39990483d1854ac6b844 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 6 Dec 2022 15:25:16 +0100
Subject: [PATCH 139/503] removed max size in friend selection widget of Msg
 composer

---
 retroshare-gui/src/gui/msgs/MessageComposer.ui | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui
index 46aa5b6e7..97890f79b 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.ui
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1000</width>
-    <height>750</height>
+    <width>1215</width>
+    <height>825</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -86,12 +86,6 @@
              <height>0</height>
             </size>
            </property>
-           <property name="maximumSize">
-            <size>
-             <width>300</width>
-             <height>16777215</height>
-            </size>
-           </property>
            <property name="sizeIncrement">
             <size>
              <width>220</width>
@@ -1310,8 +1304,8 @@ border-image: url(:/images/closepressed.png)
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1176</width>
-     <height>20</height>
+     <width>1215</width>
+     <height>25</height>
     </rect>
    </property>
   </widget>
@@ -1452,8 +1446,8 @@ border-image: url(:/images/closepressed.png)
   <tabstop>hashBox</tabstop>
  </tabstops>
  <resources>
-  <include location="../images.qrc"/>
   <include location="../icons.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>

From 1bcbbf1248eead0057020685d42e5aacfca5cc13 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 6 Dec 2022 15:47:02 +0100
Subject: [PATCH 140/503] fixed bold/boxsize in Mails

---
 .../src/gui/msgs/MessagesDialog.cpp           | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 8f1f37bea..a2a397282 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -1290,27 +1290,8 @@ void MessagesDialog::updateMessageSummaryList()
 
     /* calculating the new messages */
 
-    Rs::Msgs::BoxName box;
-    int box_row = ui.listWidget->currentRow();
-
-    switch(box_row)
-    {
-    case ROW_INBOX:    box = Rs::Msgs::BoxName::BOX_INBOX ; break;
-    case ROW_OUTBOX:   box = Rs::Msgs::BoxName::BOX_OUTBOX; break;
-    case ROW_DRAFTBOX: box = Rs::Msgs::BoxName::BOX_DRAFTS; break;
-    case ROW_SENTBOX:  box = Rs::Msgs::BoxName::BOX_SENT  ; break;
-    case ROW_TRASHBOX: box = Rs::Msgs::BoxName::BOX_TRASH ; break;
-    default:
-        box = Rs::Msgs::BoxName::BOX_NONE;
-    }
-
     std::list<MsgInfoSummary> msgList;
-    rsMail->getMessageSummaries(box ,msgList);
-    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_INBOX ,tmplist); msgList.splice(msgList.end(),tmplist);
-    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_OUTBOX,tmplist); msgList.splice(msgList.end(),tmplist);
-    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_DRAFTS,tmplist); msgList.splice(msgList.end(),tmplist);
-    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_SENT  ,tmplist); msgList.splice(msgList.end(),tmplist);
-    // rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_TRASH ,tmplist); msgList.splice(msgList.end(),tmplist);
+    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_ALL,msgList);
 
     QMap<int, int> tagCount;
 
@@ -1422,7 +1403,7 @@ std::cerr << "NewInboxCount = " << newInboxCount << " NewDraftCount = " << newDr
         textItem = tr("Outbox") + " (" + QString::number(newOutboxCount)+")";
         item->setText(textItem);
         QFont qf = item->font();
-        qf.setBold(true);
+        qf.setBold(false);
         item->setFont(qf);
     }
     else

From bc0bef07dec82f13a332dfea02a884b55715ecd9 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 6 Dec 2022 16:19:26 +0100
Subject: [PATCH 141/503] new attempt to fix limited sidebar width in mail
 composer

---
 retroshare-gui/src/gui/msgs/MessageComposer.ui | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui
index 97890f79b..8b2e3d601 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.ui
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui
@@ -31,12 +31,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>300</width>
-         <height>524287</height>
-        </size>
-       </property>
        <property name="sizeIncrement">
         <size>
          <width>220</width>

From 992d5c30d3ada3695b1ffbe1afd6bf76ab8c2a32 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 7 Dec 2022 18:30:03 +0100
Subject: [PATCH 142/503] fixed deletion of outgoing messages

---
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index a2a397282..42e45a96a 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -1176,17 +1176,18 @@ void MessagesDialog::removemessage()
 
     bool doDelete = false;
     int listrow = ui.listWidget->currentRow();
-    if (listrow == ROW_TRASHBOX)
+
+    if(listrow == ROW_TRASHBOX || (QApplication::keyboardModifiers() & Qt::ShiftModifier))
         doDelete = true;
 
     if(listrow == ROW_OUTBOX)
     {
-        QMessageBox::warning(nullptr,tr("Deletion impossible"),tr("Messages in this box are automatically deleted when received."));
-        return ;
-    }
+        if(QMessageBox::question(nullptr,tr("Deletion is not recommended"),tr("Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?"))
+                != QMessageBox::Yes)
+            return ;
 
-    if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
         doDelete = true;
+    }
 
     foreach (const QString& m, selectedMessages) {
         if (doDelete) {

From e2eb0d27a205b272cc4fe7b746f7359b00a0a2ac Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 12 Dec 2022 16:08:56 -0300
Subject: [PATCH 143/503] Update submodules

---
 libbitdht     | 2 +-
 libretroshare | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libbitdht b/libbitdht
index 659423769..6abbec950 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 659423769541169457c41f71c8a038e2d64ba079
+Subproject commit 6abbec95073f3c1eb5059cbf8441111ef4a317a7
diff --git a/libretroshare b/libretroshare
index 5d7c50e21..a9d4447c5 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 5d7c50e2161ca11661b7b61c5a2663364aab5b59
+Subproject commit a9d4447c5660337b4f7945d20e0f4ffd68d918e9

From 12ef7240e9a993acf2d5479ee352bcebc442e503 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 12 Dec 2022 18:06:54 -0300
Subject: [PATCH 144/503] Update bitdht submodule after bdboot.txt path fix

---
 libbitdht | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libbitdht b/libbitdht
index 6abbec950..2ddc86fb5 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 6abbec95073f3c1eb5059cbf8441111ef4a317a7
+Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4

From d3d672dc0d60b6085bdbe73316f99ccf512463fe Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 20 Dec 2022 21:51:21 +0100
Subject: [PATCH 145/503] Added feature to expand To field

* Added feature to expand To field
* Fixed TreeVersion
---
 retroshare-gui/src/gui/msgs/MessageWidget.cpp |  29 +-
 retroshare-gui/src/gui/msgs/MessageWidget.h   |   2 +-
 retroshare-gui/src/gui/msgs/MessageWidget.ui  | 319 ++++++++++--------
 .../src/gui/msgs/MessagesDialog.cpp           |   2 +-
 4 files changed, 201 insertions(+), 151 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index 7467e2e84..d74505e63 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -135,6 +135,7 @@ MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags f
 	isWindow = false;
 	currMsgFlags = 0;
 	expandFiles = false;
+	ui.expandButton->hide();
 
 	ui.actionTextBesideIcon->setData(Qt::ToolButtonTextBesideIcon);
 	ui.actionIconOnly->setData(Qt::ToolButtonIconOnly);
@@ -144,7 +145,8 @@ MessageWidget::MessageWidget(bool controlled, QWidget *parent, Qt::WindowFlags f
 	connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(getallrecommended()));
 	connect(ui.msgText, SIGNAL(anchorClicked(QUrl)), this, SLOT(anchorClicked(QUrl)));
 	connect(ui.sendInviteButton, SIGNAL(clicked()), this, SLOT(sendInvite()));
-	
+	connect(ui.expandButton, SIGNAL(clicked()), this, SLOT(expandTo()));
+
 	connect(ui.replyButton, SIGNAL(clicked()), this, SLOT(reply()));
 	connect(ui.replyallButton, SIGNAL(clicked()), this, SLOT(replyAll()));
 	connect(ui.forwardButton, SIGNAL(clicked()), this, SLOT(forward()));
@@ -551,6 +553,9 @@ void MessageWidget::fill(const std::string &msgId)
 		ui.deleteButton->setEnabled(false);
 		ui.moreButton->setEnabled(false);
 
+		ui.expandButton->hide();
+		ui.trans_ToText->setMaximumHeight(ui.trans_ToText->fontMetrics().lineSpacing()*1.5);
+
 		currMsgFlags = 0;
 
 		return;
@@ -635,6 +640,17 @@ void MessageWidget::fill(const std::string &msgId)
 
     ui.trans_ToText->setText(to_text);
 
+	int recipientsCount = ui.trans_ToText->toPlainText().split(QRegExp("(\\s|\\n|\\r)+"), QString::SkipEmptyParts).count();
+	ui.expandButton->setText( QString::number(recipientsCount)+ " " + tr("more"));
+
+	if (recipientsCount >=20) {
+		ui.expandButton->show();
+	} else {
+		ui.expandButton->hide();
+		ui.expandButton->setChecked(false);
+		ui.trans_ToText->setMaximumHeight(ui.trans_ToText->fontMetrics().lineSpacing()*1.5);
+	}
+
     if (!cc_text.isNull())
 	{
 		ui.ccLabel->setVisible(true);
@@ -937,3 +953,14 @@ void MessageWidget::checkLength()
 
 	ui.sizeLabel->setText(text);
 }
+
+void MessageWidget::expandTo()
+{
+	if (ui.expandButton->isChecked()) {
+		ui.trans_ToText->setMaximumHeight(ui.trans_ToText->fontMetrics().lineSpacing()*3.5);
+		ui.expandButton->setToolTip(tr("Show less"));
+	} else {
+		ui.trans_ToText->setMaximumHeight(ui.trans_ToText->fontMetrics().lineSpacing()*1.5);
+		ui.expandButton->setToolTip(tr("Show more"));
+	}
+}
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.h b/retroshare-gui/src/gui/msgs/MessageWidget.h
index 12438e55c..d6465e5cf 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.h
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.h
@@ -72,7 +72,7 @@ private slots:
 	void saveAs();
 	void refill();
 	void sendInvite();
-
+	void expandTo();
 
 	void msgfilelistWidgetCostumPopupMenu(QPoint);
 	void messagesTagsChanged();
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.ui b/retroshare-gui/src/gui/msgs/MessageWidget.ui
index 6f544a01b..de580d7e5 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.ui
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.ui
@@ -51,93 +51,6 @@
           <property name="verticalSpacing">
            <number>3</number>
           </property>
-          <item row="4" column="0">
-           <widget class="QLabel" name="bccLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>9</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Bcc:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="toLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>9</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>To:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="ccLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>9</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Cc:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="wordWrap">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="tagsLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>9</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Tags:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="4">
            <widget class="QLabel" name="dateText">
             <property name="sizePolicy">
@@ -290,6 +203,114 @@
             </item>
            </layout>
           </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="tagsLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>Tags:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="subjectLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>Subject:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="ccLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>Cc:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="bccLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>Bcc:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="toLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>To:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="1" colspan="3">
            <widget class="QLabel" name="subjectText">
             <property name="sizePolicy">
@@ -313,6 +334,25 @@
             </property>
            </widget>
           </item>
+          <item row="5" column="1" colspan="4">
+           <widget class="RSTextBrowser" name="trans_CCText">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>16</height>
+             </size>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="1">
            <widget class="QLabel" name="fromText">
             <property name="sizePolicy">
@@ -346,45 +386,7 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1" colspan="4">
-           <widget class="RSTextBrowser" name="trans_ToText">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>16</height>
-             </size>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1" colspan="4">
-           <widget class="RSTextBrowser" name="trans_CCText">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>16</height>
-             </size>
-            </property>
-            <property name="openExternalLinks">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1" colspan="4">
+          <item row="6" column="1" colspan="4">
            <widget class="RSTextBrowser" name="trans_BCCText">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
@@ -403,30 +405,9 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="1" colspan="4">
+          <item row="7" column="1" colspan="4">
            <layout class="QHBoxLayout" name="tagLayout"/>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="subjectLabel">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>9</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Subject:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="fromLabel">
             <property name="sizePolicy">
@@ -448,6 +429,48 @@
             </property>
            </widget>
           </item>
+          <item row="4" column="1" colspan="4">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <property name="spacing">
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="RSTextBrowser" name="trans_ToText">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="openExternalLinks">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="expandButton">
+              <property name="text">
+               <string/>
+              </property>
+              <property name="checkable">
+               <bool>true</bool>
+              </property>
+              <property name="popupMode">
+               <enum>QToolButton::InstantPopup</enum>
+              </property>
+              <property name="toolButtonStyle">
+               <enum>Qt::ToolButtonTextBesideIcon</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </item>
         <item>
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 42e45a96a..1fb55821f 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -420,7 +420,7 @@ UserNotify *MessagesDialog::createUserNotify(QObject *parent)
 
 void MessagesDialog::processSettings(bool load)
 {
-    int messageTreeVersion = 3; // version number for the settings to solve problems when modifying the column count
+    int messageTreeVersion = 4; // version number for the settings to solve problems when modifying the column count
 
     inProcessSettings = true;
 

From c0024e348733ea75673648b8abed566efdc0bbe9 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 24 Dec 2022 10:29:08 +0100
Subject: [PATCH 146/503] hide/disable unnecessary Tor widgets in auto-tor mode
 and show outgoing I2P widgets

---
 .../src/gui/settings/ServerPage.cpp           | 19 ++++++++++++++-----
 retroshare-gui/src/gui/settings/ServerPage.ui |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index 5089bd90c..4dd49ed80 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -102,11 +102,20 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
 	  {
 		  // Here we use absolute numbers instead of consts defined above, because the consts correspond to the tab number *after* this tab removal.
 
-		  ui.hiddenpage_proxyAddress_i2p->hide() ;
-		  ui.hiddenpage_proxyLabel_i2p->hide() ;
-		  ui.hiddenpage_proxyPort_i2p->hide() ;
-		  ui.label_i2p_outgoing->hide() ;
-		  ui.iconlabel_i2p_outgoing->hide() ;
+          ui.hiddenpage_proxyAddress_tor->setEnabled(false) ;
+          ui.hiddenpage_proxyPort_tor->setEnabled(false) ;
+          ui.hiddenpage_localAddress->setEnabled(false) ;
+          ui.hiddenpage_localPort->setEnabled(false) ;
+          ui.testIncoming_PB->hide() ;
+          ui.l_incomingTestResult->hide() ;
+          ui.iconlabel_service_incoming->hide() ;
+
+          // ui.hiddenpage_proxyAddress_i2p->hide() ;
+          // ui.hiddenpage_proxyLabel_i2p->hide() ;
+          // ui.hiddenpage_proxyPort_i2p->hide() ;
+          // ui.label_i2p_outgoing->hide() ;
+          // ui.iconlabel_i2p_outgoing->hide() ;
+
 		  ui.info_SocksProxy->hide() ;
 		  ui.hiddenpage_configuration->hide() ;
 		  ui.l_hiddenpage_configuration->hide() ;
diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index 60abc5fd8..b0dfaf26c 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -26,7 +26,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tabNetConf">
       <attribute name="title">
@@ -759,7 +759,7 @@ behind a firewall or a VPN.</string>
           </sizepolicy>
          </property>
          <property name="currentIndex">
-          <number>0</number>
+          <number>1</number>
          </property>
          <widget class="QWidget" name="hiddenServiceTabManual">
           <attribute name="title">

From 74dbef06beb36fe7069251467bbc543f89b12982 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 24 Dec 2022 10:29:50 +0100
Subject: [PATCH 147/503] fixed default page in preferences->network

---
 retroshare-gui/src/gui/settings/ServerPage.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index b0dfaf26c..60abc5fd8 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -26,7 +26,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabNetConf">
       <attribute name="title">
@@ -759,7 +759,7 @@ behind a firewall or a VPN.</string>
           </sizepolicy>
          </property>
          <property name="currentIndex">
-          <number>1</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="hiddenServiceTabManual">
           <attribute name="title">

From 0ce6b5f375ac59d03bc80dcbb7183e149c2507a8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 27 Dec 2022 23:01:26 +0100
Subject: [PATCH 148/503] attempt to fix the display of new msgs and icon in
 GXS toolbar items at start

---
 .../src/gui/Posted/PostedDialog.cpp           |  2 +-
 .../src/gui/gxs/GxsGroupFrameDialog.cpp       | 58 ++++++++++++++-----
 .../src/gui/gxs/GxsGroupFrameDialog.h         |  2 +-
 .../src/gui/gxschannels/GxsChannelDialog.cpp  |  2 +-
 .../src/gui/gxsforums/GxsForumsDialog.cpp     |  2 +-
 5 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedDialog.cpp b/retroshare-gui/src/gui/Posted/PostedDialog.cpp
index 6d41767d2..733878810 100644
--- a/retroshare-gui/src/gui/Posted/PostedDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedDialog.cpp
@@ -43,7 +43,7 @@ public:
 
 /** Constructor */
 PostedDialog::PostedDialog(QWidget *parent):
-    GxsGroupFrameDialog(rsPosted, parent), mEventHandlerId(0)
+    GxsGroupFrameDialog(rsPosted, settingsGroupName(),parent), mEventHandlerId(0)
 {
 	// Needs to be asynced because this function is likely to be called by another thread!
 	rsEvents->registerEventsHandler(
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 283d1f48f..61a394a21 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -70,8 +70,8 @@ static const uint32_t DELAY_BETWEEN_GROUP_STATISTICS_UPDATE = 120; // do not upd
  */
 
 /** Constructor */
-GxsGroupFrameDialog::GxsGroupFrameDialog(RsGxsIfaceHelper *ifaceImpl, QWidget *parent,bool allow_dist_sync)
-: MainPage(parent)
+GxsGroupFrameDialog::GxsGroupFrameDialog(RsGxsIfaceHelper *ifaceImpl,const QString& settings_name, QWidget *parent,bool allow_dist_sync)
+: MainPage(parent),mSettingsName(settings_name)
 {
 	/* Invoke the Qt Designer generated object setup routine */
 	ui = new Ui::GxsGroupFrameDialog();
@@ -166,7 +166,6 @@ void GxsGroupFrameDialog::initUi()
 	}
 
 	// load settings
-	mSettingsName = settingsGroupName();
 	processSettings(true);
 
 	if (groupFrameSettingsType() != GroupFrameSettings::Nothing) {
@@ -1178,20 +1177,49 @@ void GxsGroupFrameDialog::updateGroupStatisticsReal(const RsGxsGroupId &groupId)
 
 void GxsGroupFrameDialog::getServiceStatistics(GxsServiceStatistic& stats) const
 {
-	stats = GxsServiceStatistic(); // clears everything
+    if(!mCachedGroupStats.empty())
+    {
+        stats = GxsServiceStatistic(); // clears everything
 
-	for(auto& it:  mCachedGroupStats)
-	{
-		const GxsGroupStatistic& s(it.second);
+        for(auto& it:  mCachedGroupStats)
+        {
+            const GxsGroupStatistic& s(it.second);
 
-		stats.mNumMsgs             += s.mNumMsgs;
-		stats.mNumGrps             += 1;
-		stats.mSizeOfMsgs          += s.mTotalSizeOfMsgs;
-		stats.mNumThreadMsgsNew    += s.mNumThreadMsgsNew;
-		stats.mNumThreadMsgsUnread += s.mNumThreadMsgsUnread;
-		stats.mNumChildMsgsNew     += s.mNumChildMsgsNew ;
-		stats.mNumChildMsgsUnread  += s.mNumChildMsgsUnread ;
-	}
+            stats.mNumMsgs             += s.mNumMsgs;
+            stats.mNumGrps             += 1;
+            stats.mSizeOfMsgs          += s.mTotalSizeOfMsgs;
+            stats.mNumThreadMsgsNew    += s.mNumThreadMsgsNew;
+            stats.mNumThreadMsgsUnread += s.mNumThreadMsgsUnread;
+            stats.mNumChildMsgsNew     += s.mNumChildMsgsNew ;
+            stats.mNumChildMsgsUnread  += s.mNumChildMsgsUnread ;
+        }
+
+        // Also save the service statistics in conf file, so that we can display it right away at start.
+
+        Settings->beginGroup(mSettingsName);
+        Settings->setValue("NumMsgs",            stats.mNumMsgs            );
+        Settings->setValue("NumGrps",            stats.mNumGrps            );
+        Settings->setValue("SizeOfMessages",     stats.mSizeOfMsgs         );
+        Settings->setValue("NumThreadMsgsNew",   stats.mNumThreadMsgsNew   );
+        Settings->setValue("NumThreadMsgsUnread",stats.mNumThreadMsgsUnread);
+        Settings->setValue("NumChildMsgsNew",    stats.mNumChildMsgsNew    );
+        Settings->setValue("NumChildMsgsUnread", stats.mNumChildMsgsUnread );
+        Settings->endGroup();
+    }
+    else	// Get statistics from settings if no cache is already present: allows to display at start.
+    {
+        Settings->beginGroup(mSettingsName);
+
+        stats.mNumMsgs             = Settings->value("NumMsgs",QVariant(0)).toInt();
+        stats.mNumGrps             = Settings->value("NumGrps",QVariant(0)).toInt();
+        stats.mSizeOfMsgs          = Settings->value("SizeOfMessages",QVariant(0)).toInt();
+        stats.mNumThreadMsgsNew    = Settings->value("NumThreadMsgsNew",QVariant(0)).toInt();
+        stats.mNumThreadMsgsUnread = Settings->value("NumThreadMsgsUnread",QVariant(0)).toInt();
+        stats.mNumChildMsgsNew     = Settings->value("NumChildMsgsNew",QVariant(0)).toInt();
+        stats.mNumChildMsgsUnread  = Settings->value("NumChildMsgsUnread",QVariant(0)).toInt();
+
+        Settings->endGroup();
+    }
 }
 
 TurtleRequestId GxsGroupFrameDialog::distantSearch(const QString& search_string)   // this should be overloaded in the child class
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h
index 1cbd1fc8f..81bba553d 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h
@@ -71,7 +71,7 @@ public:
 	};
 
 public:
-	GxsGroupFrameDialog(RsGxsIfaceHelper *ifaceImpl, QWidget *parent = 0,bool allow_dist_sync=false);
+    GxsGroupFrameDialog(RsGxsIfaceHelper *ifaceImpl, const QString& settings_name,QWidget *parent = 0,bool allow_dist_sync=false);
 	virtual ~GxsGroupFrameDialog();
 
 	bool navigate(const RsGxsGroupId &groupId, const RsGxsMessageId& msgId);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
index 1abed7c64..6d28f97a8 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
@@ -49,7 +49,7 @@
 
 /** Constructor */
 GxsChannelDialog::GxsChannelDialog(QWidget *parent):
-    GxsGroupFrameDialog(rsGxsChannels, parent, true), mEventHandlerId(0)
+    GxsGroupFrameDialog(rsGxsChannels, settingsGroupName(),parent, true), mEventHandlerId(0)
 {
 	// Needs to be asynced because this function is called by another thread!
 	rsEvents->registerEventsHandler(
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
index 367935382..c7de87063 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
@@ -40,7 +40,7 @@ public:
 
 /** Constructor */
 GxsForumsDialog::GxsForumsDialog(QWidget *parent) :
-    GxsGroupFrameDialog(rsGxsForums, parent), mEventHandlerId(0)
+    GxsGroupFrameDialog(rsGxsForums, settingsGroupName(),parent), mEventHandlerId(0)
 {
 	mCountChildMsgs = true;
 

From 96a2f185714396b392bf66c2221c772b6cc4968a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 28 Dec 2022 21:02:05 +0100
Subject: [PATCH 149/503] fixed preserving order of links copied from search
 dialog results

---
 .../src/gui/FileTransfer/SearchDialog.cpp      | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index b284fce3d..d6446b823 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -1457,7 +1457,8 @@ void SearchDialog::copyResultLink()
     QList<QTreeWidgetItem*> itemsForCopy = ui.searchResultWidget->selectedItems();
     QTreeWidgetItem * item;
 
-    std::map<RsFileHash,RetroShareLink> url_map;
+    std::set<RsFileHash> already_seen_hashes;
+    QList<RetroShareLink> urls ;
 
     for (auto item:itemsForCopy)
     {
@@ -1466,7 +1467,7 @@ void SearchDialog::copyResultLink()
         QString fhash = item->text(SR_HASH_COL);
         RsFileHash hash(fhash.toStdString());
 
-        if(!hash.isNull())
+        if(!hash.isNull() && (already_seen_hashes.end() == already_seen_hashes.find(hash)))
         {
             std::cerr << "SearchDialog::copyResultLink() Calling set retroshare link";
             std::cerr << std::endl;
@@ -1477,16 +1478,13 @@ void SearchDialog::copyResultLink()
             RetroShareLink link = RetroShareLink::createFile(fname, fsize, fhash);
 
             if (link.valid())
-                url_map[hash] = link;
+            {
+                std::cerr << "new link added to clipboard: " << link.toString().toStdString() << std::endl ;
+                urls.push_back(link);
+                already_seen_hashes.insert(hash);
+            }
         }
     }
-    QList<RetroShareLink> urls ;
-
-    for(auto link:url_map)
-    {
-        std::cerr << "new link added to clipboard: " << link.second.toString().toStdString() << std::endl ;
-        urls.push_back(link.second);
-    }
 
     RSLinkClipboard::copyLinks(urls) ;
 }

From 1447306d65ad70429e6d096a39ca8f8450e0860f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 28 Dec 2022 21:15:27 +0100
Subject: [PATCH 150/503] not erasing clipboard when no links are selected

---
 retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index d6446b823..5f7889790 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -1486,7 +1486,8 @@ void SearchDialog::copyResultLink()
         }
     }
 
-    RSLinkClipboard::copyLinks(urls) ;
+    if(!urls.empty())
+        RSLinkClipboard::copyLinks(urls) ;
 }
 
 void SearchDialog::sendLinkTo( )

From cae7797b55a691ccb757474e5f272fbe510d1bda Mon Sep 17 00:00:00 2001
From: AskOldIch <AskOldIch@protonmail.com>
Date: Tue, 3 Jan 2023 16:47:15 +0000
Subject: [PATCH 151/503] Added "previewable" for .webm and .weba extension

- .webm -- basically is full video container (video+audio)

- .weba -- is only audio stream
---
 retroshare-gui/src/util/misc.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/retroshare-gui/src/util/misc.cpp b/retroshare-gui/src/util/misc.cpp
index c24ea2d11..2f6337d1b 100644
--- a/retroshare-gui/src/util/misc.cpp
+++ b/retroshare-gui/src/util/misc.cpp
@@ -108,6 +108,8 @@ bool misc::isPreviewable(QString extension)
     if(extension == "WAV") return true;
     if(extension == "WMA") return true;
     if(extension == "WMV") return true;
+    if(extension == "WEBM") return true;
+    if(extension == "WEBA") return true;
     return false;
 }
 

From c1b71053219e834f5b504dd85249f857736951da Mon Sep 17 00:00:00 2001
From: AskOldIch <AskOldIch@protonmail.com>
Date: Tue, 3 Jan 2023 16:54:03 +0000
Subject: [PATCH 152/503] Added extensions to SearchDialog

- .webm -- basically is full video container (video+audio)
- .weba -- is only audio stream
- .webp -- is a picture
---
 retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index b284fce3d..80087360a 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -286,7 +286,7 @@ void SearchDialog::initialiseFileTypeMappings()
 	/* edit these strings to change the range of extensions recognised by the search */
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_ANY, "");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_AUDIO,
-		"aac aif flac iff m3u m4a mid midi mp3 mpa ogg ra ram wav wma");
+		"aac aif flac iff m3u m4a mid midi mp3 mpa ogg ra ram wav wma weba");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_ARCHIVE,
 		"7z bz2 gz pkg rar sea sit sitx tar zip tgz");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_CDIMAGE,
@@ -295,11 +295,11 @@ void SearchDialog::initialiseFileTypeMappings()
 		"doc odt ott rtf pdf ps txt log msg wpd wps ods xls epub" );
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PICTURE,
 		"3dm 3dmf ai bmp drw dxf eps gif ico indd jpe jpeg jpg mng pcx pcc pct pgm "
-		"pix png psd psp qxd qxprgb sgi svg tga tif tiff xbm xcf");
+		"pix png psd psp qxd qxprgb sgi svg tga tif tiff xbm xcf webp");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PROGRAM,
 		"app bat cgi com bin exe js pif py pl sh vb ws bash");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_VIDEO,
-		"3gp asf asx avi mov mp4 mkv flv mpeg mpg qt rm swf vob wmv");
+		"3gp asf asx avi mov mp4 mkv flv mpeg mpg qt rm swf vob wmv webm");
 	SearchDialog::initialised = true;
 }
 

From 2cf95b410d5f9b1af79de3d465200ddafd44cabe Mon Sep 17 00:00:00 2001
From: AskOldIch <AskOldIch@protonmail.com>
Date: Tue, 3 Jan 2023 16:57:42 +0000
Subject: [PATCH 153/503] Added icons association with extensions

- .webm -- basically is full video container (video+audio)
- .weba -- is only audio stream
- .webp -- is a picture
---
 retroshare-gui/src/gui/common/FilesDefs.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FilesDefs.cpp b/retroshare-gui/src/gui/common/FilesDefs.cpp
index 0baaea837..0048d5685 100644
--- a/retroshare-gui/src/gui/common/FilesDefs.cpp
+++ b/retroshare-gui/src/gui/common/FilesDefs.cpp
@@ -33,13 +33,15 @@ static QString getInfoFromFilename(const QString& filename, bool anyForUnknown,
 {
 	QString ext = QFileInfo(filename).suffix().toLower();
 
-	if (ext == "jpg" || ext == "jpeg" || ext == "tif" || ext == "tiff" || ext == "png" || ext == "gif" || ext == "bmp" || ext == "ico" || ext == "svg") {
+	if (ext == "jpg" || ext == "jpeg" || ext == "tif" || ext == "tiff" || ext == "png" || ext == "gif" ||
+        ext == "bmp" || ext == "ico" || ext == "svg" || ext == "webp") {
 		return image ? ":/icons/filetype/picture.svg" : QApplication::translate("FilesDefs", "Picture");
 	} else if (ext == "avi" || ext == "mpg" || ext == "mpeg" || ext == "wmv" || ext == "divx" || ext == "ts" ||
 			   ext == "mkv" || ext == "mp4" || ext == "flv" || ext == "mov" || ext == "asf" || ext == "xvid" ||
-			   ext == "vob" || ext == "qt" || ext == "rm" || ext == "3gp" || ext == "ogm") {
+			   ext == "vob" || ext == "qt" || ext == "rm" || ext == "3gp" || ext == "ogm" || ext == "webm") {
 		return image ? ":/icons/filetype/video.svg" : QApplication::translate("FilesDefs", "Video");
-	} else if (ext == "ogg" || ext == "mp3" || ext == "mp1" || ext == "mp2" || ext == "wav" || ext == "wma" || ext == "m4a" || ext == "flac" ||ext == "xpm") {
+	} else if (ext == "ogg" || ext == "mp3" || ext == "mp1" || ext == "mp2" || ext == "wav" || ext == "wma" ||
+               ext == "m4a" || ext == "flac" || ext == "xpm" || ext == "weba") {
 		return image ? ":/icons/filetype/audio.svg" : QApplication::translate("FilesDefs", "Audio");
 	} else if (ext == "tar" || ext == "bz2" || ext == "zip" || ext == "gz" || ext == "7z" || ext == "msi" ||
 			   ext == "rar" || ext == "rpm" || ext == "ace" || ext == "jar" || ext == "tgz" || ext == "lha" ||

From fa071a1c50509450205ba15b0387fb0d141e5fcd Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 7 Jan 2023 15:08:10 +0100
Subject: [PATCH 154/503] improved expression widget so as to convert size
 Equal searches into a proper range

---
 .../src/gui/advsearch/expressionwidget.cpp    | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
index 5e5eee1ea..dc1738825 100644
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
@@ -122,9 +122,9 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
         highVal = exprParamElem->getIntHighValue();
         if (lowVal >highVal)
         {   
-            lowVal  = lowVal^highVal;	// csoler: wow, that is some style!
-            highVal = lowVal^highVal;
-            lowVal  = lowVal^highVal;
+            auto tmp=lowVal;
+            lowVal = highVal;
+            highVal = tmp;
         }
     }
 
@@ -174,11 +174,42 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
             else
             {
                 uint64_t s = exprParamElem->getIntValue() ;
+                auto cond = exprCondElem->getRelOperator();
+                bool MB = false;
 
                 if(s >= (uint64_t)(1024*1024*1024))
-                    expr = new RsRegularExpression::SizeExpressionMB(exprCondElem->getRelOperator(), (int)(s/(1024*1024))) ;
+                {
+                    MB=true;
+                    s >>= 20;
+                }
+
+                // Specific case for Equal operator, which we convert to a range, so as to avoid matching arbitrary digits
+
+                if(cond == RsRegularExpression::Equals)
+                {
+                    // Now compute a proper interval. For that we look for the largest non significant digit, and add/remove 50% of it.
+                    int i=0;
+                    while(!(s & (1<<i)) && i<32)
+                        i++;
+
+                    if(i==0)
+                        if(MB)
+                            expr = new RsRegularExpression::SizeExpressionMB(RsRegularExpression::Equals, (int)s) ;
+                        else
+                            expr = new RsRegularExpression::SizeExpression(RsRegularExpression::Equals, (int)s) ;
+                    else
+                        if(MB)
+                            expr = new RsRegularExpression::SizeExpressionMB(RsRegularExpression::InRange, (int)s - (1<<(i-1)), (int)s + (1<<(i-1)));
+                        else
+                            expr = new RsRegularExpression::SizeExpression(RsRegularExpression::InRange, (int)s - (1<<(i-1)), (int)s + (1<<(i-1)));
+                }
                 else
-                    expr = new RsRegularExpression::SizeExpression(exprCondElem->getRelOperator(), (int)s) ;
+                {
+                    if(MB)
+                        expr = new RsRegularExpression::SizeExpressionMB(cond, (int)s);
+                    else
+                        expr = new RsRegularExpression::SizeExpression(cond, (int)s) ;
+                }
             }
             break;
     };

From 54cffac521c1cbc58a0302002dd5793742bcfac0 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 8 Jan 2023 10:44:32 +0100
Subject: [PATCH 155/503] simplified logic of interval calculation for exact
 size search

---
 .../src/gui/advsearch/expressionwidget.cpp      | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
index dc1738825..7745c8a60 100644
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
@@ -187,21 +187,12 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
 
                 if(cond == RsRegularExpression::Equals)
                 {
-                    // Now compute a proper interval. For that we look for the largest non significant digit, and add/remove 50% of it.
-                    int i=0;
-                    while(!(s & (1<<i)) && i<32)
-                        i++;
+                    // Now compute a proper interval. There is no optimal solution, so we aim for the simplest: add/remove 20% of the initial value.
 
-                    if(i==0)
-                        if(MB)
-                            expr = new RsRegularExpression::SizeExpressionMB(RsRegularExpression::Equals, (int)s) ;
-                        else
-                            expr = new RsRegularExpression::SizeExpression(RsRegularExpression::Equals, (int)s) ;
+                    if(MB)
+                        expr = new RsRegularExpression::SizeExpressionMB(RsRegularExpression::InRange, (int)(s*0.8) , (int)(s*1.2));
                     else
-                        if(MB)
-                            expr = new RsRegularExpression::SizeExpressionMB(RsRegularExpression::InRange, (int)s - (1<<(i-1)), (int)s + (1<<(i-1)));
-                        else
-                            expr = new RsRegularExpression::SizeExpression(RsRegularExpression::InRange, (int)s - (1<<(i-1)), (int)s + (1<<(i-1)));
+                        expr = new RsRegularExpression::SizeExpression(RsRegularExpression::InRange, (int)(s*0.8) , (int)(s*1.2));
                 }
                 else
                 {

From 737a753c2ca27cb6c8b4746a0feee01e2207bf6e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 8 Jan 2023 18:41:17 +0100
Subject: [PATCH 156/503] fixed bug in range search

---
 retroshare-gui/src/gui/advsearch/guiexprelement.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/advsearch/guiexprelement.cpp b/retroshare-gui/src/gui/advsearch/guiexprelement.cpp
index 23317c168..5dd138186 100644
--- a/retroshare-gui/src/gui/advsearch/guiexprelement.cpp
+++ b/retroshare-gui/src/gui/advsearch/guiexprelement.cpp
@@ -155,18 +155,19 @@ void GuiExprElement::initialiseOptionsLists()
     
 /*  W A R N I N G !!!!
     the cb elements correspond to their inverse rel op counterparts in rsexpr.h due to the nature of 
-    the implementation.there 
+    the implementation.
     For example consider "size greater than 100kb" selected in the GUI.
     The rsexpr.cc impl returns true if the CONDITION specified is greater than the file size passed as argument 
     as rsexpr iterates through the files. So, the user wants files that are greater than 100kb but the impl returns
-    files where the condition is greater than the file size i.e. files whose size is less than or equal to the condition 
+    files where the condition is greater than the file size i.e. files whose size is less than to the condition
     Therefore we invert the mapping of rel conditions here to match the behaviour of the impl.
+    Also the Equal nature of comparisons should be kept, since = is symmetric.
 */    
-    GuiExprElement::relConditionIndexMap[GuiExprElement::LT_INDEX] = RsRegularExpression::GreaterEquals;
-    GuiExprElement::relConditionIndexMap[GuiExprElement::LTE_INDEX] = RsRegularExpression::Greater;
+    GuiExprElement::relConditionIndexMap[GuiExprElement::LT_INDEX] = RsRegularExpression::Greater;
+    GuiExprElement::relConditionIndexMap[GuiExprElement::LTE_INDEX] = RsRegularExpression::GreaterEquals;
     GuiExprElement::relConditionIndexMap[GuiExprElement::EQUAL_INDEX] = RsRegularExpression::Equals;
-    GuiExprElement::relConditionIndexMap[GuiExprElement::GTE_INDEX] = RsRegularExpression::Smaller;
-    GuiExprElement::relConditionIndexMap[GuiExprElement::GT_INDEX] = RsRegularExpression::SmallerEquals;
+    GuiExprElement::relConditionIndexMap[GuiExprElement::GTE_INDEX] = RsRegularExpression::SmallerEquals;
+    GuiExprElement::relConditionIndexMap[GuiExprElement::GT_INDEX] = RsRegularExpression::Smaller;
     GuiExprElement::relConditionIndexMap[GuiExprElement::RANGE_INDEX] = RsRegularExpression::InRange;
 
     // the string to index map

From 03e244a7af81c2a5d401a84838a97717be1c5249 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 15 Jan 2023 15:19:46 +0100
Subject: [PATCH 157/503] added handling of weak parameters certificate
 rejection case

---
 retroshare-gui/src/rshare.cpp | 60 +++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index 22195cc7d..8fb8fdc58 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -947,30 +947,42 @@ bool Rshare::loadCertificate(const RsPeerId &accountId, bool autoLogin)
 	}
 
 	std::string lockFile;
-	int retVal = RsInit::LockAndLoadCertificates(autoLogin, lockFile);
-	switch (retVal) {
-		case 0:	break;
-		case 1:	QMessageBox::warning(	0,
-										QObject::tr("Multiple instances"),
-										QObject::tr("Another RetroShare using the same profile is "
-										"already running on your system. Please close "
-										"that instance first\n Lock file:\n") +
-										QString::fromUtf8(lockFile.c_str()));
-				return false;
-		case 2:	QMessageBox::critical(	0,
-										QObject::tr("Multiple instances"),
-										QObject::tr("An unexpected error occurred when Retroshare "
-										"tried to acquire the single instance lock\n Lock file:\n") +
-										QString::fromUtf8(lockFile.c_str()));
-                return false;
-        case 3:
-//		case 3: QMessageBox::critical(	0,
-//										QObject::tr("Login Failure"),
-//										QObject::tr("Maybe password is wrong") );
-				return false;
-		default: std::cerr << "Rshare::loadCertificate() unexpected switch value " << retVal << std::endl;
-				return false;
-	}
+    RsInit::LoadCertificateStatus retVal = RsInit::LockAndLoadCertificates(autoLogin, lockFile);
+
+    switch (retVal)
+    {
+    case RsInit::OK:
+        break;
+    case RsInit::ERR_ALREADY_RUNNING:	QMessageBox::warning(	nullptr,
+                                                            QObject::tr("Multiple instances"),
+                                                            QObject::tr("Another RetroShare using the same profile is "
+                                                                        "already running on your system. Please close "
+                                                                        "that instance first\n Lock file:\n") +
+                                                            QString::fromUtf8(lockFile.c_str()));
+        return false;
+    case RsInit::ERR_CANT_ACQUIRE_LOCK:	QMessageBox::critical(	nullptr,
+                                                            QObject::tr("Multiple instances"),
+                                                            QObject::tr("An unexpected error occurred when Retroshare "
+                                                                        "tried to acquire the single instance lock\n Lock file:\n") +
+                                                            QString::fromUtf8(lockFile.c_str()));
+        return false;
+    case RsInit::ERR_CERT_CRYPTO_IS_TOO_WEAK: QMessageBox::critical(	nullptr,
+                                                            QObject::tr("Old certificate"),
+                                                            QObject::tr("This node uses old certificate settings that are considered too "
+                                                                        "weak by your current OpenSSL library version. You need to create a new node "
+                                                                        "possibly using the same profile."));
+        return false;
+    case RsInit::ERR_CANNOT_CONFIGURE_TOR: QMessageBox::critical(	nullptr,
+                                                            QObject::tr("Tor error"),
+                                                            QObject::tr("Cannot run/configure Tor. Make sure it is installed on your system."));
+        return false;
+        //		case 3: QMessageBox::critical(	0,
+        //										QObject::tr("Login Failure"),
+        //										QObject::tr("Maybe password is wrong") );
+        return false;
+    default: std::cerr << "Rshare::loadCertificate() unexpected switch value " << retVal << std::endl;
+        return false;
+    }
 
 	return true;
 }

From 0a8f4b1b6e771de88ff9f4259a59e66c851cdbbd Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 16 Jan 2023 19:53:20 +0100
Subject: [PATCH 158/503] switched all image outputs to jpeg format instead of
 png

---
 retroshare-gui/src/gui/Identity/IdEditDialog.cpp              | 4 ++--
 retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp        | 2 +-
 retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp               | 2 +-
 retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp      | 2 +-
 retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp           | 2 +-
 retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp            | 2 +-
 retroshare-gui/src/gui/chat/ChatWidget.cpp                    | 2 +-
 retroshare-gui/src/gui/common/AvatarDialog.cpp                | 2 +-
 retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp    | 4 ++--
 retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp  | 2 +-
 .../src/gui/gxschannels/GxsChannelPostThumbnail.cpp           | 2 +-
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp    | 2 +-
 retroshare-gui/src/util/imageutil.cpp                         | 2 +-
 retroshare-gui/src/util/misc.cpp                              | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index 4b5095fb3..ad46cc19b 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -577,7 +577,7 @@ void IdEditDialog::createId()
         QBuffer buffer(&ba);
 
         buffer.open(QIODevice::WriteOnly);
-        mAvatar.save(&buffer, "PNG"); // writes image into ba in PNG format
+        mAvatar.save(&buffer, "JPG"); // writes image into ba in PNG format
 
         params.mImage.copy((uint8_t *) ba.data(), ba.size());
     }
@@ -649,7 +649,7 @@ void IdEditDialog::updateId()
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-		mAvatar.save(&buffer, "PNG"); // writes image into ba in PNG format
+        mAvatar.save(&buffer, "JPG"); // writes image into ba in PNG format
 
 		mEditGroup.mImage.copy((uint8_t *) ba.data(), ba.size());
 	}
diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp
index 2900ad674..dd0c725b7 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp
@@ -115,7 +115,7 @@ void AlbumGroupDialog::prepareAlbumGroup(RsPhotoAlbum &group, const RsGroupMetaD
         QBuffer buffer(&ba);
 
         buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
 
         group.mThumbnail.copy((uint8_t *) ba.data(), ba.size());
     } else {
diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp
index a28b500e5..fea04adbc 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumItem.cpp
@@ -47,7 +47,7 @@ void AlbumItem::setUp()
     if(mAlbum.mThumbnail.mSize != 0)
     {
         QPixmap qtn;
-        qtn.loadFromData(mAlbum.mThumbnail.mData, mAlbum.mThumbnail.mSize, "PNG");
+        qtn.loadFromData(mAlbum.mThumbnail.mData, mAlbum.mThumbnail.mSize, "JPG");
         ui->label_Thumbnail->setPixmap(qtn);
     }
     else
diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
index da47d7596..8209b5d1b 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
@@ -330,7 +330,7 @@ void BoardPostDisplayWidget_compact::setup()
 #ifdef DEBUG_BOARDPOSTDISPLAYWIDGET
             std::cerr << "Got pixmap of size " << pixmap.width() << " x " << pixmap.height() << std::endl;
             std::cerr << "Saving to pix.png" << std::endl;
-            pixmap.save("pix.png","PNG");
+            pixmap.save("pix.png","JPG");
 #endif
 
             ui->pictureLabel->setPicture(pixmap);
diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
index 6414db7cd..b4791f5ca 100644
--- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
@@ -105,7 +105,7 @@ void PostedGroupDialog::preparePostedGroup(RsPostedGroup &group, const RsGroupMe
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-		pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
 
 		group.mGroupImage.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
index 1be0c9a2c..29cba1d5c 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
@@ -109,7 +109,7 @@ void WireGroupDialog::prepareWireGroup(RsWireGroup &group, const RsGroupMetaData
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-		pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
 
 		group.mHeadshot.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index ab198fa33..868b6f150 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -1094,7 +1094,7 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const RsGxsId gx
 			QImage image(icon.pixmap(height,height).toImage());
 			QByteArray byteArray;
 			QBuffer buffer(&byteArray);
-			image.save(&buffer, "PNG"); // writes the image in PNG format inside the buffer
+            image.save(&buffer, "JPG"); // writes the image in PNG format inside the buffer
 			QString iconBase64 = QString::fromLatin1(byteArray.toBase64().data());
 			strPreName = QString("<img src=\"data:image/png;base64,%1\" alt=\"[unsigned]\" />").arg(iconBase64);
 		}
diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp
index 632fa2948..4da8b3b76 100644
--- a/retroshare-gui/src/gui/common/AvatarDialog.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp
@@ -141,7 +141,7 @@ void AvatarDialog::getAvatar(QByteArray &avatar)
 	QBuffer buffer(&avatar);
 
 	buffer.open(QIODevice::WriteOnly);
-	pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
+    pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
 }
 
 void AvatarDialog::load()
diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
index e8f34d1eb..c834ae3da 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
@@ -611,7 +611,7 @@ bool CreateGxsChannelMsg::setThumbNail(const std::string& path, int frame){
 	QByteArray ba;
 	QBuffer buffer(&ba);
 	buffer.open(QIODevice::WriteOnly);
-	tNail.save(&buffer, "PNG");
+    tNail.save(&buffer, "JPG");
 	QPixmap img;
 	img.loadFromData(ba, "PNG");
 	img = img.scaled(thumbnail_label->width(), thumbnail_label->height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -814,7 +814,7 @@ void CreateGxsChannelMsg::sendMessage(const std::string &subject, const std::str
 			// send chan image
 
 			buffer.open(QIODevice::WriteOnly);
-            preview_W->getCroppedScaledPicture().save(&buffer, "PNG"); // writes image into ba in PNG format
+            preview_W->getCroppedScaledPicture().save(&buffer, "JPG"); // writes image into ba in PNG format
 			post.mThumbnail.copy((uint8_t *) ba.data(), ba.size());
 		}
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
index a98e9016a..e82795abf 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
@@ -120,7 +120,7 @@ void GxsChannelGroupDialog::prepareChannelGroup(RsGxsChannelGroup &group, const
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-		pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
 
 		group.mImage.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
index ee40e1465..16cf96195 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
@@ -350,7 +350,7 @@ void ZoomableLabel::updateView()
     std::cerr << "               Image size: " << mFullImage.width() << " x " << mFullImage.height() << ", window size: " << width() << " x " << height() << std::endl;
     std::cerr << "               cropped image: " << rect.left() << "," << rect.top() << "+" << rect.width() << "+" << rect.height() << std::endl;
     std::cerr << "               saving crop to pix2.png" << std::endl;
-    mFullImage.copy(rect).save("pix2.png","PNG");
+    mFullImage.copy(rect).save("pix2.png","JPG");
 #endif
     QLabel::setPixmap(mFullImage.copy(rect));
 }
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index fbf09350a..1d8de3f89 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -164,7 +164,7 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
 //        {
 //            QFile file("yourFile.png");
 //            file.open(QIODevice::WriteOnly);
-//            pixmap.save(&file, "PNG");
+//            pixmap.save(&file, "JPG");
 //            file.close();
 //        }
 
diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index 47029505e..92ce05f70 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -166,7 +166,7 @@ int ImageUtil::checkSize(QByteArray &bytearray, const QImage &img)
 
 	//std::cout << QString("Trying image: format PNG, size %1x%2, colors %3\n").arg(img.width()).arg(img.height()).arg(img.colorCount()).toStdString();
 	if (buffer.open(QIODevice::WriteOnly)) {
-		if (img.save(&buffer, "PNG", 0)) {
+        if (img.save(&buffer, "JPG", 0)) {
 			size = bytearray.length();
 		} else {
 			std::cerr << "ImageUtil: image can't be saved to buffer" << std::endl;
diff --git a/retroshare-gui/src/util/misc.cpp b/retroshare-gui/src/util/misc.cpp
index 2f6337d1b..dce286e60 100644
--- a/retroshare-gui/src/util/misc.cpp
+++ b/retroshare-gui/src/util/misc.cpp
@@ -291,7 +291,7 @@ bool misc::getOpenAvatarPicture(QWidget *parent, QByteArray &image_data)
 	// save image in QByteArray
 	QBuffer buffer(&image_data);
 	buffer.open(QIODevice::WriteOnly);
-	picture.save(&buffer, "PNG"); // writes image into ba in PNG format
+    picture.save(&buffer, "JPG"); // writes image into ba in JPG format
 
 	return true;
 }

From 31bdd6c226fcd18c3d7c4343a43cd24da2873da1 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 16 Jan 2023 20:16:44 +0100
Subject: [PATCH 159/503] keep PNG for avatars

---
 retroshare-gui/src/gui/Identity/IdEditDialog.cpp             | 4 ++--
 retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp          | 2 +-
 retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp           | 2 +-
 retroshare-gui/src/gui/chat/ChatWidget.cpp                   | 2 +-
 retroshare-gui/src/gui/common/AvatarDialog.cpp               | 2 +-
 retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index ad46cc19b..5b7991c6f 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -577,7 +577,7 @@ void IdEditDialog::createId()
         QBuffer buffer(&ba);
 
         buffer.open(QIODevice::WriteOnly);
-        mAvatar.save(&buffer, "JPG"); // writes image into ba in PNG format
+        mAvatar.save(&buffer, "PNG"); // writes image into ba in PNG format
 
         params.mImage.copy((uint8_t *) ba.data(), ba.size());
     }
@@ -649,7 +649,7 @@ void IdEditDialog::updateId()
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-        mAvatar.save(&buffer, "JPG"); // writes image into ba in PNG format
+        mAvatar.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 		mEditGroup.mImage.copy((uint8_t *) ba.data(), ba.size());
 	}
diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
index b4791f5ca..b4b544810 100644
--- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
@@ -105,7 +105,7 @@ void PostedGroupDialog::preparePostedGroup(RsPostedGroup &group, const RsGroupMe
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 		group.mGroupImage.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
index 29cba1d5c..139961640 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
@@ -109,7 +109,7 @@ void WireGroupDialog::prepareWireGroup(RsWireGroup &group, const RsGroupMetaData
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 		group.mHeadshot.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 868b6f150..880b5a640 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -1094,7 +1094,7 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const RsGxsId gx
 			QImage image(icon.pixmap(height,height).toImage());
 			QByteArray byteArray;
 			QBuffer buffer(&byteArray);
-            image.save(&buffer, "JPG"); // writes the image in PNG format inside the buffer
+            image.save(&buffer, "PNG"); // writes the image in PNG format inside the buffer
 			QString iconBase64 = QString::fromLatin1(byteArray.toBase64().data());
 			strPreName = QString("<img src=\"data:image/png;base64,%1\" alt=\"[unsigned]\" />").arg(iconBase64);
 		}
diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp
index 4da8b3b76..a657d2a1a 100644
--- a/retroshare-gui/src/gui/common/AvatarDialog.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp
@@ -141,7 +141,7 @@ void AvatarDialog::getAvatar(QByteArray &avatar)
 	QBuffer buffer(&avatar);
 
 	buffer.open(QIODevice::WriteOnly);
-    pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+    pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 }
 
 void AvatarDialog::load()
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
index e82795abf..8b9d8d881 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
@@ -120,7 +120,7 @@ void GxsChannelGroupDialog::prepareChannelGroup(RsGxsChannelGroup &group, const
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 		group.mImage.copy((uint8_t *) ba.data(), ba.size());
 	} else {

From 516e4f7c12bb6fcce088b1d4ef163e3cedd6c450 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 16 Jan 2023 21:11:18 +0100
Subject: [PATCH 160/503] added parameter to specify format to
 optimizeImageSize()

---
 .../src/gui/PhotoShare/AlbumGroupDialog.cpp    |  2 +-
 .../src/gui/Posted/PostedCreatePostDialog.cpp  |  2 +-
 .../src/gui/TheWire/WireGroupDialog.cpp        |  2 +-
 retroshare-gui/src/gui/chat/ChatWidget.cpp     |  2 +-
 .../src/gui/gxsforums/GxsForumModel.cpp        |  2 +-
 retroshare-gui/src/util/HandleRichText.cpp     |  4 ++--
 retroshare-gui/src/util/HandleRichText.h       |  2 +-
 retroshare-gui/src/util/imageutil.cpp          | 18 +++++++++---------
 retroshare-gui/src/util/imageutil.h            |  6 +++---
 retroshare-gui/src/util/misc.cpp               |  2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp
index dd0c725b7..2900ad674 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumGroupDialog.cpp
@@ -115,7 +115,7 @@ void AlbumGroupDialog::prepareAlbumGroup(RsPhotoAlbum &group, const RsGroupMetaD
         QBuffer buffer(&ba);
 
         buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 
         group.mThumbnail.copy((uint8_t *) ba.data(), ba.size());
     } else {
diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
index c1e0ce5ad..aace423f8 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
@@ -224,7 +224,7 @@ void PostedCreatePostDialog::addPicture()
 		}
 
 		QImage opt;
-		if(ImageUtil::optimizeSizeBytes(imagebytes, image, opt, 640*480, MAXMESSAGESIZE - 2000)) { //Leave space for other stuff
+        if(ImageUtil::optimizeSizeBytes(imagebytes, image, opt,"JPG", 640*480, MAXMESSAGESIZE - 2000)) { //Leave space for other stuff
 			ui->imageLabel->setPixmap(QPixmap::fromImage(opt));
 			ui->stackedWidgetPicture->setCurrentIndex(IMG_PICTURE);
 			ui->removeButton->show();
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
index 139961640..e13cd4f8f 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
@@ -126,7 +126,7 @@ void WireGroupDialog::prepareWireGroup(RsWireGroup &group, const RsGroupMetaData
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-		pixmap.save(&buffer, "JPG");
+        pixmap.save(&buffer, "PNG");
 
 		group.mMasthead.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 880b5a640..72e2db1d8 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -1677,7 +1677,7 @@ void ChatWidget::addExtraPicture()
 	if (misc::getOpenFileName(window(), RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", file)) {
 		QString encodedImage;
 		uint32_t maxMessageSize = this->maxMessageSize();
-		if (RsHtml::makeEmbeddedImage(file, encodedImage, 640*480, maxMessageSize - 200)) {		//-200 for the html stuff
+        if (RsHtml::makeEmbeddedImage(file, encodedImage, 640*480, maxMessageSize - 200)) {		//-200 for the html stuff
 			QTextDocumentFragment fragment = QTextDocumentFragment::fromHtml(encodedImage);
 			ui->chatTextEdit->textCursor().insertFragment(fragment);
 		}
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
index 07d44ca1b..77292dadf 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
@@ -566,7 +566,7 @@ QVariant RsGxsForumModel::toolTipRole(const ForumModelPostEntry& fmpe,int column
 		QImage pix( (*icons.begin()).pixmap(QSize(5*S,5*S)).toImage());
 
 		QString embeddedImage;
-		if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(5*S,5*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, -1))
+        if(RsHtml::makeEmbeddedImage(pix.scaled(QSize(5*S,5*S), Qt::KeepAspectRatio, Qt::SmoothTransformation), embeddedImage, -1))
 		{
 			embeddedImage.insert(embeddedImage.indexOf("src="), "style=\"float:left\" ");
 			comment = "<table><tr><td>" + embeddedImage + "</td><td>" + comment + "</td></table>";
diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp
index bba7c03af..6f6eec750 100644
--- a/retroshare-gui/src/util/HandleRichText.cpp
+++ b/retroshare-gui/src/util/HandleRichText.cpp
@@ -1216,7 +1216,7 @@ bool RsHtml::makeEmbeddedImage(const QString &fileName, QString &embeddedImage,
 		fprintf (stderr, "RsHtml::makeEmbeddedImage() - image \"%s\" can't be load\n", fileName.toLatin1().constData());
 		return false;
 	}
-	return RsHtml::makeEmbeddedImage(image, embeddedImage, maxPixels, maxBytes);
+    return RsHtml::makeEmbeddedImage(image, embeddedImage, maxPixels, maxBytes);
 }
 
 /** Converts image to embedded image HTML fragment **/
@@ -1224,7 +1224,7 @@ bool RsHtml::makeEmbeddedImage(const QImage &originalImage, QString &embeddedIma
 {
 	rstime::RsScopeTimer s("Embed image");
 	QImage opt;
-	return ImageUtil::optimizeSizeHtml(embeddedImage, originalImage, opt, maxPixels, maxBytes);
+    return ImageUtil::optimizeSizeHtml(embeddedImage, originalImage, opt, maxPixels, maxBytes);
 }
 
 QString RsHtml::plainText(const QString &text)
diff --git a/retroshare-gui/src/util/HandleRichText.h b/retroshare-gui/src/util/HandleRichText.h
index 9462ba865..3e98ea21c 100644
--- a/retroshare-gui/src/util/HandleRichText.h
+++ b/retroshare-gui/src/util/HandleRichText.h
@@ -70,7 +70,7 @@ public:
 	static QString toHtml(QString text, bool realHtml = true);
 
 	static bool    makeEmbeddedImage(const QString &fileName, QString &embeddedImage, const int maxPixels, const int maxBytes = -1);
-	static bool    makeEmbeddedImage(const QImage &originalImage, QString &embeddedImage, const int maxPixels, const int maxBytes = -1);
+    static bool    makeEmbeddedImage(const QImage &originalImage, QString &embeddedImage, const int maxPixels, const int maxBytes = -1);
 
 	static QString plainText(const QString &text);
 	static QString plainText(const std::string &text);
diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index 92ce05f70..ca87f534f 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -68,12 +68,12 @@ void ImageUtil::extractImage(QWidget *window, QTextCursor cursor, QString file)
 	}
 }
 
-bool ImageUtil::optimizeSizeBytes(QByteArray &bytearray, const QImage &original, QImage &optimized, int maxPixels, int maxBytes)
+bool ImageUtil::optimizeSizeBytes(QByteArray &bytearray, const QImage &original, QImage &optimized, const char *format, int maxPixels, int maxBytes)
 {
 	//nothing to do if it fits into the limits
 	optimized = original;
 	if ((maxPixels <= 0) || (optimized.width()*optimized.height() <= maxPixels)) {
-		int s = checkSize(bytearray, optimized);
+        int s = checkSize(bytearray, optimized,format);
 		if((maxBytes <= 0) || (s <= maxBytes)) {
 			return true;
 		}
@@ -92,7 +92,7 @@ bool ImageUtil::optimizeSizeBytes(QByteArray &bytearray, const QImage &original,
 
 	//if maxBytes not defined, do not reduce color space, just downscale
 	if(maxBytes <= 0) {
-		checkSize(bytearray, optimized = original.scaledToWidth(maxwidth, Qt::SmoothTransformation));
+        checkSize(bytearray, optimized = original.scaledToWidth(maxwidth, Qt::SmoothTransformation),format);
 		return true;
 	}
 
@@ -100,9 +100,9 @@ bool ImageUtil::optimizeSizeBytes(QByteArray &bytearray, const QImage &original,
 	quantization(original, ct);
 
 	//Use binary search to find a suitable image size + linear regression to guess the file size
-	double maxsize = (double)checkSize(bytearray, optimized = original.scaledToWidth(maxwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither));
+    double maxsize = (double)checkSize(bytearray, optimized = original.scaledToWidth(maxwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither),format);
 	if(maxsize <= maxBytes) return true;	//success
-	double minsize = (double)checkSize(bytearray, optimized = original.scaledToWidth(minwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither));
+    double minsize = (double)checkSize(bytearray, optimized = original.scaledToWidth(minwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither),format);
 	if(minsize > maxBytes) return false; //impossible
 
 //	std::cout << "maxS: " << maxsize << " minS: " << minsize << std::endl;
@@ -115,7 +115,7 @@ bool ImageUtil::optimizeSizeBytes(QByteArray &bytearray, const QImage &original,
 		double b = maxsize - m * ((double)maxwidth * (double)maxwidth / whratio);
 		double a = ((double)(maxBytes - region/2) - b) / m; //maxBytes - region/2 target the center of the accepted region
 		int nextwidth = (int)sqrt(a * whratio);
-		int nextsize = checkSize(bytearray, optimized = original.scaledToWidth(nextwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither));
+        int nextsize = checkSize(bytearray, optimized = original.scaledToWidth(nextwidth, Qt::SmoothTransformation).convertToFormat(QImage::Format_Indexed8, ct, Qt::ThresholdDither),format);
 		if(nextsize <= maxBytes) {
 			minsize = nextsize;
 			minwidth = nextwidth;
@@ -145,7 +145,7 @@ bool ImageUtil::optimizeSizeHtml(QString &html, const QImage& original, QImage &
 		if(maxBytes < 1) maxBytes = 1;
 	}
 
-	if(optimizeSizeBytes(bytearray, original, optimized, maxPixels, maxBytes))
+    if(optimizeSizeBytes(bytearray, original, optimized,"PNG",maxPixels, maxBytes))
 	{
 		QByteArray encodedByteArray = bytearray.toBase64();
 		html = "<img src=\"data:image/png;base64,";
@@ -156,7 +156,7 @@ bool ImageUtil::optimizeSizeHtml(QString &html, const QImage& original, QImage &
 	return false;
 }
 
-int ImageUtil::checkSize(QByteArray &bytearray, const QImage &img)
+int ImageUtil::checkSize(QByteArray &bytearray, const QImage &img,const char *format)
 {
 	rstime::RsScopeTimer st("Check size");
 
@@ -166,7 +166,7 @@ int ImageUtil::checkSize(QByteArray &bytearray, const QImage &img)
 
 	//std::cout << QString("Trying image: format PNG, size %1x%2, colors %3\n").arg(img.width()).arg(img.height()).arg(img.colorCount()).toStdString();
 	if (buffer.open(QIODevice::WriteOnly)) {
-        if (img.save(&buffer, "JPG", 0)) {
+        if (img.save(&buffer, format, 0)) {
 			size = bytearray.length();
 		} else {
 			std::cerr << "ImageUtil: image can't be saved to buffer" << std::endl;
diff --git a/retroshare-gui/src/util/imageutil.h b/retroshare-gui/src/util/imageutil.h
index 1a9658e13..5259452af 100644
--- a/retroshare-gui/src/util/imageutil.h
+++ b/retroshare-gui/src/util/imageutil.h
@@ -32,11 +32,11 @@ public:
 	ImageUtil();
 
 	static void extractImage(QWidget *window, QTextCursor cursor, QString file = "");
-	static bool optimizeSizeHtml(QString &html, const QImage& original, QImage &optimized, int maxPixels = -1, int maxBytes = -1);
-	static bool optimizeSizeBytes(QByteArray &bytearray, const QImage& original, QImage &optimized, int maxPixels = -1, int maxBytes = -1);
+    static bool optimizeSizeHtml(QString &html, const QImage& original, QImage &optimized, int maxPixels = -1, int maxBytes = -1);
+    static bool optimizeSizeBytes(QByteArray &bytearray, const QImage &original, QImage &optimized, const char *format, int maxPixels, int maxBytes);
 
 	private:
-		static int checkSize(QByteArray& embeddedImage, const QImage& img);
+        static int checkSize(QByteArray& embeddedImage, const QImage& img, const char *format);
 		static void quantization(const QImage& img, QVector<QRgb>& palette);
 		static void quantization(QList<QRgb>::iterator begin, QList<QRgb>::iterator end, int depth, QVector<QRgb>& palette);
 		static void avgbucket(QList<QRgb>::iterator begin, QList<QRgb>::iterator end, QVector<QRgb>& palette);
diff --git a/retroshare-gui/src/util/misc.cpp b/retroshare-gui/src/util/misc.cpp
index dce286e60..84c408de3 100644
--- a/retroshare-gui/src/util/misc.cpp
+++ b/retroshare-gui/src/util/misc.cpp
@@ -291,7 +291,7 @@ bool misc::getOpenAvatarPicture(QWidget *parent, QByteArray &image_data)
 	// save image in QByteArray
 	QBuffer buffer(&image_data);
 	buffer.open(QIODevice::WriteOnly);
-    picture.save(&buffer, "JPG"); // writes image into ba in JPG format
+    picture.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 	return true;
 }

From de1b8f08d20020aeefad72947a39607a42f50082 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 16 Jan 2023 21:24:16 +0100
Subject: [PATCH 161/503] added auto-chose of image format if there is no
 transparency

---
 retroshare-gui/src/util/imageutil.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index ca87f534f..7fcd1915e 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -145,7 +145,19 @@ bool ImageUtil::optimizeSizeHtml(QString &html, const QImage& original, QImage &
 		if(maxBytes < 1) maxBytes = 1;
 	}
 
-    if(optimizeSizeBytes(bytearray, original, optimized,"PNG",maxPixels, maxBytes))
+    // check for transparency
+    bool has_transparency = false;
+
+    if(original.hasAlphaChannel())
+        for(int i=0;i<original.width();++i)
+            for(int j=0;j<original.height();++j)
+                if(qAlpha(original.pixel(i,j)) < 255)
+                {
+                    has_transparency = true;
+                    break;
+                }
+
+    if(optimizeSizeBytes(bytearray, original, optimized,has_transparency?"PNG":"JPG",maxPixels, maxBytes))
 	{
 		QByteArray encodedByteArray = bytearray.toBase64();
 		html = "<img src=\"data:image/png;base64,";

From 7aacfb9aef15b748bf1c05eeecd5a1a601aedae5 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 16 Jan 2023 22:11:44 +0100
Subject: [PATCH 162/503] added auto-choose of image format when transparency
 is present

---
 .../src/gui/Identity/IdEditDialog.cpp         | 15 ++++++----
 .../src/gui/Posted/PostedGroupDialog.cpp      |  9 ++++--
 .../src/gui/common/AvatarDialog.cpp           |  6 ++--
 .../gui/gxschannels/GxsChannelGroupDialog.cpp |  9 ++++--
 retroshare-gui/src/util/imageutil.cpp         | 30 ++++++++++++-------
 retroshare-gui/src/util/imageutil.h           |  1 +
 6 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index 5b7991c6f..ac9965d2a 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -31,9 +31,10 @@
 #include "util/misc.h"
 #include "gui/notifyqt.h"
 
-#include <retroshare/rsidentity.h>
-#include <retroshare/rspeers.h>
+#include "retroshare/rsidentity.h"
+#include "retroshare/rspeers.h"
 #include "gui/common/FilesDefs.h"
+#include "util/imageutil.h"
 
 #include <iostream>
 
@@ -576,8 +577,10 @@ void IdEditDialog::createId()
         QByteArray ba;
         QBuffer buffer(&ba);
 
+        bool has_transparency = ImageUtil::hasAlphaContent(mAvatar.toImage());
+
         buffer.open(QIODevice::WriteOnly);
-        mAvatar.save(&buffer, "PNG"); // writes image into ba in PNG format
+        mAvatar.save(&buffer, has_transparency?"PNG":"JPG"); // writes image into ba in PNG format
 
         params.mImage.copy((uint8_t *) ba.data(), ba.size());
     }
@@ -648,8 +651,10 @@ void IdEditDialog::updateId()
 		QByteArray ba;
 		QBuffer buffer(&ba);
 
-		buffer.open(QIODevice::WriteOnly);
-        mAvatar.save(&buffer, "PNG"); // writes image into ba in PNG format
+        bool has_transparency = ImageUtil::hasAlphaContent(mAvatar.toImage());
+
+        buffer.open(QIODevice::WriteOnly);
+        mAvatar.save(&buffer, has_transparency?"PNG":"JPG"); // writes image into ba in PNG format
 
 		mEditGroup.mImage.copy((uint8_t *) ba.data(), ba.size());
 	}
diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
index b4b544810..f2b011adb 100644
--- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
@@ -22,8 +22,9 @@
 #include "PostedGroupDialog.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
+#include "util/imageutil.h"
 
-#include <retroshare/rswiki.h>
+#include "retroshare/rswiki.h"
 #include <iostream>
 
 const uint32_t PostedCreateEnabledFlags = ( 
@@ -104,8 +105,10 @@ void PostedGroupDialog::preparePostedGroup(RsPostedGroup &group, const RsGroupMe
 		QByteArray ba;
 		QBuffer buffer(&ba);
 
-		buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
+        bool has_transparency = ImageUtil::hasAlphaContent(pixmap.toImage());
+
+        buffer.open(QIODevice::WriteOnly);
+        pixmap.save(&buffer, has_transparency?"PNG":"JPG"); // writes image into ba in PNG format
 
 		group.mGroupImage.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp
index a657d2a1a..dd302b570 100644
--- a/retroshare-gui/src/gui/common/AvatarDialog.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp
@@ -40,6 +40,7 @@
 #include "util/misc.h"
 #include "gui/common/FilesDefs.h"
 #include "util/HandleRichText.h"
+#include "util/imageutil.h"
 #include "retroshare/rsinit.h"
 
 #define ICONNAME "groupicon.png"
@@ -138,10 +139,11 @@ void AvatarDialog::getAvatar(QByteArray &avatar)
 		return;
 	}
 
-	QBuffer buffer(&avatar);
+    bool has_transparency = ImageUtil::hasAlphaContent(pixmap.toImage());
+    QBuffer buffer(&avatar);
 
 	buffer.open(QIODevice::WriteOnly);
-    pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
+    pixmap.save(&buffer, has_transparency?"PNG":"JPG"); // writes image into ba in PNG format
 }
 
 void AvatarDialog::load()
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
index 8b9d8d881..0af2631c5 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
@@ -21,10 +21,11 @@
 #include <QBuffer>
 
 #include "gui/gxs/GxsIdDetails.h"
+#include "util/imageutil.h"
 #include "gui/common/FilesDefs.h"
 #include "GxsChannelGroupDialog.h"
 
-#include <retroshare/rsgxschannels.h>
+#include "retroshare/rsgxschannels.h"
 #include <iostream>
 
 // To start with we only have open forums - with distribution controls.
@@ -119,8 +120,10 @@ void GxsChannelGroupDialog::prepareChannelGroup(RsGxsChannelGroup &group, const
 		QByteArray ba;
 		QBuffer buffer(&ba);
 
-		buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
+        bool has_transparency = ImageUtil::hasAlphaContent(pixmap.toImage());
+
+        buffer.open(QIODevice::WriteOnly);
+        pixmap.save(&buffer, has_transparency?"PNG":"JPG"); // writes image into ba in PNG format
 
 		group.mImage.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index 7fcd1915e..7553f7c14 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -137,6 +137,25 @@ bool ImageUtil::optimizeSizeBytes(QByteArray &bytearray, const QImage &original,
 	//std::cout << html.toStdString() << std::endl;
 }
 
+bool ImageUtil::hasAlphaContent(const QImage& image)
+{
+    if(!image.hasAlphaChannel())
+    {
+        std::cerr << "Image of size " << image.width() << " x " << image.height() << ": No transparency content detected." << std::endl;
+        return false;
+    }
+
+    for(int i=0;i<image.width();++i)
+        for(int j=0;j<image.height();++j)
+            if(qAlpha(image.pixel(i,j)) < 255)
+            {
+                std::cerr << "Image of size " << image.width() << " x " << image.height() << ": Transparency content detected." << std::endl;
+                return true;
+            }
+
+    std::cerr << "Image of size " << image.width() << " x " << image.height() << ": No transparency content detected." << std::endl;
+    return false;
+}
 bool ImageUtil::optimizeSizeHtml(QString &html, const QImage& original, QImage &optimized, int maxPixels, int maxBytes)
 {
 	QByteArray bytearray;
@@ -146,16 +165,7 @@ bool ImageUtil::optimizeSizeHtml(QString &html, const QImage& original, QImage &
 	}
 
     // check for transparency
-    bool has_transparency = false;
-
-    if(original.hasAlphaChannel())
-        for(int i=0;i<original.width();++i)
-            for(int j=0;j<original.height();++j)
-                if(qAlpha(original.pixel(i,j)) < 255)
-                {
-                    has_transparency = true;
-                    break;
-                }
+    bool has_transparency = hasAlphaContent(original);
 
     if(optimizeSizeBytes(bytearray, original, optimized,has_transparency?"PNG":"JPG",maxPixels, maxBytes))
 	{
diff --git a/retroshare-gui/src/util/imageutil.h b/retroshare-gui/src/util/imageutil.h
index 5259452af..9e5bf37cb 100644
--- a/retroshare-gui/src/util/imageutil.h
+++ b/retroshare-gui/src/util/imageutil.h
@@ -34,6 +34,7 @@ public:
 	static void extractImage(QWidget *window, QTextCursor cursor, QString file = "");
     static bool optimizeSizeHtml(QString &html, const QImage& original, QImage &optimized, int maxPixels = -1, int maxBytes = -1);
     static bool optimizeSizeBytes(QByteArray &bytearray, const QImage &original, QImage &optimized, const char *format, int maxPixels, int maxBytes);
+    static bool hasAlphaContent(const QImage& image);
 
 	private:
         static int checkSize(QByteArray& embeddedImage, const QImage& img, const char *format);

From e60ee730b45f63b3b52e3e5066382227fa4a0e33 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 16 Jan 2023 22:23:58 +0100
Subject: [PATCH 163/503] fixed bug in quality of html-embedded images

---
 retroshare-gui/src/util/imageutil.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index 7553f7c14..d710a9ae3 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -188,7 +188,7 @@ int ImageUtil::checkSize(QByteArray &bytearray, const QImage &img,const char *fo
 
 	//std::cout << QString("Trying image: format PNG, size %1x%2, colors %3\n").arg(img.width()).arg(img.height()).arg(img.colorCount()).toStdString();
 	if (buffer.open(QIODevice::WriteOnly)) {
-        if (img.save(&buffer, format, 0)) {
+        if (img.save(&buffer, format, 85)) {
 			size = bytearray.length();
 		} else {
 			std::cerr << "ImageUtil: image can't be saved to buffer" << std::endl;

From 6a28727e761ee06d77eb88ca8287b3ed28da4158 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 17 Jan 2023 20:00:55 +0100
Subject: [PATCH 164/503] fixed date search

---
 .../src/gui/advsearch/expressionwidget.cpp    | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
index 7745c8a60..098c26ab6 100644
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
@@ -150,11 +150,24 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
                                       wordList);
             break;
         case DateSearch:
-            if (inRangedConfig) {    
-                expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(lowVal), checkedConversion(highVal));
-            } else {
+        switch(exprCondElem->getRelOperator())	// we need to convert expressions so that the delta is 1 day (i.e. 86400 secs)
+        {
+            case RsRegularExpression::Equals:
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::InRange, checkedConversion(exprParamElem->getIntValue()), checkedConversion(86400+exprParamElem->getIntValue()));
+                break;
+            case RsRegularExpression::InRange:
+                expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(lowVal), 86400+checkedConversion(highVal));
+                break;
+            case RsRegularExpression::Greater:			// fallthrough
+            case RsRegularExpression::SmallerEquals:
+                expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(exprParamElem->getIntValue()+86400));
+                break;
+            default:
+            case RsRegularExpression::GreaterEquals:	// fallthrough
+            case RsRegularExpression::Smaller:
                 expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(exprParamElem->getIntValue()));
-            }
+                break;
+        }
             break;
         case PopSearch:
             if (inRangedConfig) {    

From b87e450207762f417ae5f15b85cff87186f96057 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 17 Jan 2023 21:52:27 +0100
Subject: [PATCH 165/503] invert lower/greater conditions to be consistent with
 how comparisons are performed in rsexpr.h

---
 .../src/gui/advsearch/expressionwidget.cpp           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
index 098c26ab6..13bc70079 100644
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
@@ -158,14 +158,18 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
             case RsRegularExpression::InRange:
                 expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(lowVal), 86400+checkedConversion(highVal));
                 break;
-            case RsRegularExpression::Greater:			// fallthrough
+            case RsRegularExpression::Greater:
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::DateExpression(RsRegularExpression::SmallerEquals,checkedConversion(86400+exprParamElem->getIntValue())));
+                break;
             case RsRegularExpression::SmallerEquals:
-                expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(exprParamElem->getIntValue()+86400));
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::DateExpression(RsRegularExpression::Greater,checkedConversion(86400+exprParamElem->getIntValue())));
                 break;
             default:
-            case RsRegularExpression::GreaterEquals:	// fallthrough
+            case RsRegularExpression::GreaterEquals:
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::SmallerEquals, checkedConversion(exprParamElem->getIntValue()));
+                break;
             case RsRegularExpression::Smaller:
-                expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(exprParamElem->getIntValue()));
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::Greater, checkedConversion(exprParamElem->getIntValue()-1));
                 break;
         }
             break;

From ffe76f03a2c4942260c402450408481f48e11915 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 17 Jan 2023 22:33:07 +0100
Subject: [PATCH 166/503] fixed comparisions, accounting for multiple
 inversions in the code

---
 .../src/gui/advsearch/expressionwidget.cpp    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
index 13bc70079..c5cbd7964 100644
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
@@ -152,24 +152,29 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
         case DateSearch:
         switch(exprCondElem->getRelOperator())	// we need to convert expressions so that the delta is 1 day (i.e. 86400 secs)
         {
+             // The conditions below account for 3 things:
+             // - the swap between variables in rsexpr.cc
+             // - the swap of variables when calling getRelOperator()
+             // - the fact that the "...or Equal" for days adds 86400 seconds.
+
+            default:
             case RsRegularExpression::Equals:
                 expr = new RsRegularExpression::DateExpression(RsRegularExpression::InRange, checkedConversion(exprParamElem->getIntValue()), checkedConversion(86400+exprParamElem->getIntValue()));
                 break;
             case RsRegularExpression::InRange:
-                expr = new RsRegularExpression::DateExpression(exprCondElem->getRelOperator(), checkedConversion(lowVal), 86400+checkedConversion(highVal));
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::InRange, checkedConversion(lowVal), 86400+checkedConversion(highVal));
                 break;
-            case RsRegularExpression::Greater:
-                expr = new RsRegularExpression::DateExpression(RsRegularExpression::DateExpression(RsRegularExpression::SmallerEquals,checkedConversion(86400+exprParamElem->getIntValue())));
+            case RsRegularExpression::Greater:			// means we expect file.date() <   some day D. So file.date() < D, meaning Exp=Greater
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::Greater,checkedConversion(exprParamElem->getIntValue()));
                 break;
-            case RsRegularExpression::SmallerEquals:
-                expr = new RsRegularExpression::DateExpression(RsRegularExpression::DateExpression(RsRegularExpression::Greater,checkedConversion(86400+exprParamElem->getIntValue())));
+            case RsRegularExpression::SmallerEquals:	// means we expect file.date() >=  some day D. So file.date() >= D, meaning Exp=SmallerEquals
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::SmallerEquals,checkedConversion(exprParamElem->getIntValue()));
                 break;
-            default:
-            case RsRegularExpression::GreaterEquals:
-                expr = new RsRegularExpression::DateExpression(RsRegularExpression::SmallerEquals, checkedConversion(exprParamElem->getIntValue()));
+            case RsRegularExpression::Smaller:			// means we expect file.date() >  some day D. So file.date() >= D+86400, meaning Exp=SmallerEquals
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::SmallerEquals, checkedConversion(86400+exprParamElem->getIntValue()-1));
                 break;
-            case RsRegularExpression::Smaller:
-                expr = new RsRegularExpression::DateExpression(RsRegularExpression::Greater, checkedConversion(exprParamElem->getIntValue()-1));
+            case RsRegularExpression::GreaterEquals:	// means we expect file.date() <= some day D. So file.date() < D+86400, meaning Exp=Greater
+                expr = new RsRegularExpression::DateExpression(RsRegularExpression::Greater, checkedConversion(86400+exprParamElem->getIntValue()));
                 break;
         }
             break;

From d833ed185a3f917a8c42f343effd573311b610e0 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 17 Jan 2023 22:37:32 +0100
Subject: [PATCH 167/503] added comments

---
 retroshare-gui/src/gui/advsearch/expressionwidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
index c5cbd7964..f6b150065 100644
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
@@ -153,9 +153,9 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
         switch(exprCondElem->getRelOperator())	// we need to convert expressions so that the delta is 1 day (i.e. 86400 secs)
         {
              // The conditions below account for 3 things:
-             // - the swap between variables in rsexpr.cc
-             // - the swap of variables when calling getRelOperator()
-             // - the fact that the "...or Equal" for days adds 86400 seconds.
+             // - the swap between variables in rsexpr.h:214
+             // - the swap of variables when calling getRelOperator() (See guiexprelement.cpp:166)
+             // - the fact that some comparisions in the unit of days may add 86400 seconds.
 
             default:
             case RsRegularExpression::Equals:

From 38725628b0e28b022c92c4461188864f5fae0a6e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 23 Jan 2023 20:23:18 +0100
Subject: [PATCH 168/503] fixed advanced search not using browsable/distant/own
 files

---
 .../src/gui/FileTransfer/SearchDialog.cpp     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index c421e67e0..94e4229cc 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -805,28 +805,29 @@ void SearchDialog::advancedSearch(RsRegularExpression::Expression* expression)
 {
 	advSearchDialog->hide();
 
-	/* call to core */
-	std::list<DirDetails> results;
-
 	// send a turtle search request
     RsRegularExpression::LinearizedExpression e ;
 	expression->linearize(e) ;
 
-	TurtleRequestId req_id = rsFiles->turtleSearch(e) ;
+    TurtleRequestId req_id ;
 
-	// This will act before turtle results come to the interface, thanks to the signals scheduling policy.
-	initSearchResult(QString::fromStdString(e.GetStrings()),req_id, ui.FileTypeComboBox->currentIndex(), true) ;
+    if(ui._anonF2Fsearch_CB->isChecked())
+        req_id = rsFiles->turtleSearch(e) ;
+    else
+        req_id = RSRandom::random_u32() ; // generate a random 32 bits request id
 
-	rsFiles -> SearchBoolExp(expression, results, RS_FILE_HINTS_REMOTE);// | DIR_FLAGS_NETWORK_WIDE | DIR_FLAGS_BROWSABLE);
+    initSearchResult(QString::fromStdString(e.GetStrings()),req_id, ui.FileTypeComboBox->currentIndex(), true) ;
+
+    std::list<DirDetails> results;
+
+    FileSearchFlags flags(0);
+    if(ui._ownFiles_CB->isChecked())         flags |= RS_FILE_HINTS_LOCAL;
+    if(ui._friendListsearch_SB->isChecked()) flags |= RS_FILE_HINTS_REMOTE;
+
+    rsFiles -> SearchBoolExp(expression, results, flags);
 
 	/* abstraction to allow reusee of tree rendering code */
-	resultsToTree(advSearchDialog->getSearchAsString(),req_id, results);
-
-//	// debug stuff
-//	Expression *expression2 = LinearizedExpression::toExpr(e) ;
-//	results.clear() ;
-//	rsFiles -> SearchBoolExp(expression2, results, DIR_FLAGS_REMOTE | DIR_FLAGS_NETWORK_WIDE | DIR_FLAGS_BROWSABLE);
-//	resultsToTree((advSearchDialog->getSearchAsString()).toStdString(),req_id+1, results);
+    resultsToTree(advSearchDialog->getSearchAsString(),req_id, results);
 }
 
 void SearchDialog::searchKeywords()
@@ -1455,7 +1456,6 @@ void SearchDialog::copyResultLink()
 {
     /* should also be able to handle multi-selection */
     QList<QTreeWidgetItem*> itemsForCopy = ui.searchResultWidget->selectedItems();
-    QTreeWidgetItem * item;
 
     std::set<RsFileHash> already_seen_hashes;
     QList<RetroShareLink> urls ;

From 943a6cdd4dce56b7e9b86954611f0d262f574c3a Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 28 Jan 2023 13:43:23 +0100
Subject: [PATCH 169/503] Changed Moderators list to use with a Label, less
 space is used then before

Changed Moderators list to use with a QLabel, less space is used then before
---
 .../src/gui/feeds/GxsForumGroupItem.ui        | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
index 14cb13620..152d4951d 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
@@ -371,22 +371,32 @@
         </property>
         <layout class="QHBoxLayout" name="moderatorList_GB_HL">
          <property name="spacing">
-          <number>0</number>
+          <number>6</number>
          </property>
          <property name="leftMargin">
-          <number>0</number>
+          <number>9</number>
          </property>
          <property name="topMargin">
-          <number>0</number>
+          <number>9</number>
          </property>
          <property name="rightMargin">
-          <number>0</number>
+          <number>9</number>
          </property>
          <property name="bottomMargin">
-          <number>0</number>
+          <number>9</number>
          </property>
          <item>
-          <widget class="QTextEdit" name="moderatorList_TE"/>
+          <widget class="QLabel" name="moderatorList_TE">
+           <property name="text">
+            <string>TextLabel</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+           </property>
+          </widget>
          </item>
         </layout>
        </widget>

From 1915187374474aa836138b84a9ee7675aa20798c Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 28 Jan 2023 13:45:18 +0100
Subject: [PATCH 170/503] Stylesheet fix

---
 retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss | 2 +-
 retroshare-gui/src/gui/qss/stylesheet/default.qss        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
index a7f1e6c8c..923477e11 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
@@ -2661,7 +2661,7 @@ WireGroupItem QFrame#wire_frame:hover {
 	background-color: #7ecbfb;
 }
 WireGroupItem QFrame#wire_frame > QLabel {
-	color: black;
+	background: transparent;
 }
 
 PulseTopLevel QFrame#plainFrame,
diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss
index 607c371ff..d1730bfef 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/default.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss
@@ -311,7 +311,7 @@ BoardPostDisplayWidget_compact QToolButton#voteDownButton:disabled {
 
 ForumsDialog, GxsForumThreadWidget
 {
-	qproperty-textColorRead: black;
+	qproperty-textColorRead: darkgray;
 	qproperty-textColorUnread: black; 
 	qproperty-textColorUnreadChildren: darkgray;
 	qproperty-textColorNotSubscribed: black;

From c518fd0e42bb3c2d63e237ac6d52138648e7aab9 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 28 Jan 2023 13:48:26 +0100
Subject: [PATCH 171/503] Added to show on New Board/New Channel feed last
 updated time

Added to show on New Board/New Channel feed last updated time
---
 .../src/gui/feeds/GxsChannelGroupItem.cpp     |  6 +++++
 .../src/gui/feeds/GxsChannelGroupItem.ui      | 16 ++++++++++-
 .../src/gui/feeds/PostedGroupItem.cpp         |  5 ++++
 .../src/gui/feeds/PostedGroupItem.ui          | 27 +++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
index 41c61d896..e9c38a022 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
@@ -27,6 +27,7 @@
 #include "gui/common/FilesDefs.h"
 #include "gui/NewsFeed.h"
 #include "gui/RetroShareLink.h"
+#include "util/DateTime.h"
 
 /****
  * #define DEBUG_ITEM 1
@@ -166,6 +167,11 @@ void GxsChannelGroupItem::fill()
 										break ;
 	}
 
+	if(mGroup.mMeta.mLastPost==0)
+		ui->infoLastPost->setText(tr("Never"));
+	else
+		ui->infoLastPost->setText(DateTime::formatLongDateTime(mGroup.mMeta.mLastPost));
+
 	if (mIsHome)
 	{
 		/* disable buttons */
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
index 6c568993d..151e6920b 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>161</height>
+    <height>176</height>
    </rect>
   </property>
   <property name="font">
@@ -221,6 +221,20 @@
             </property>
            </spacer>
           </item>
+          <item>
+           <widget class="QLabel" name="infoLastPostLabel">
+            <property name="text">
+             <string>Last activity</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="infoLastPost">
+            <property name="text">
+             <string>TextLabel</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item row="1" column="1">
diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp b/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp
index 4ed8a95c4..f4abafb08 100644
--- a/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.cpp
@@ -26,6 +26,7 @@
 #include "gui/RetroShareLink.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
+#include "util/DateTime.h"
 
 /****
  * #define DEBUG_ITEM 1
@@ -160,6 +161,10 @@ void PostedGroupItem::fill()
         ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png"));
 	}
 
+    if(mGroup.mMeta.mLastPost==0)
+        ui->infoLastPost->setText(tr("Never"));
+    else
+        ui->infoLastPost->setText(DateTime::formatLongDateTime(mGroup.mMeta.mLastPost));
 
 	//TODO - nice icon for subscribed group
 //	if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) {
diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
index 636cc2c54..b525facb9 100644
--- a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
@@ -213,6 +213,33 @@
             </property>
            </spacer>
           </item>
+          <item>
+           <widget class="QLabel" name="infoLastPostLabel">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>Last activity</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="infoLastPost">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <italic>true</italic>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>TextLabel</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
         <item row="1" column="1">

From 641281048f90d543bcf740c77ca1b758815eb763 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 28 Jan 2023 16:29:36 +0100
Subject: [PATCH 172/503] added force recheck of possibly modified files when
 the button is used

---
 retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp | 2 +-
 retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui  | 5 ++++-
 retroshare-gui/src/gui/settings/TransferPage.ui           | 7 +++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 14ffca561..fb7f7b526 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -528,7 +528,7 @@ void LocalSharedFilesDialog::checkUpdate()
 
 void LocalSharedFilesDialog::forceCheck()
 {
-    rsFiles->ForceDirectoryCheck();
+    rsFiles->ForceDirectoryCheck(true);
     return;
 }
 
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
index dbcba0011..cd79340dd 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
@@ -285,6 +285,9 @@ border-image: url(:/images/closepressed.png)
       </item>
       <item>
        <widget class="QPushButton" name="checkButton">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
         <property name="text">
          <string>check files</string>
         </property>
@@ -396,8 +399,8 @@ border-image: url(:/images/closepressed.png)
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index e8cc22228..b1e7b7630 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>701</width>
-    <height>632</height>
+    <height>638</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
@@ -67,6 +67,9 @@
             </item>
             <item>
              <widget class="QSpinBox" name="autoCheckDirectoriesDelay_SB">
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="suffix">
                <string> minute(s)</string>
               </property>
@@ -289,7 +292,7 @@
           <string>&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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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;span style=&quot; font-family:'Sans'; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;

From 95e9d76af95ee6529e02f73160e053ea733b923b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 28 Jan 2023 16:47:36 +0100
Subject: [PATCH 173/503] fixed forum moderators not selected in edit dialog

---
 retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index 432684362..8b5923657 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -889,7 +889,7 @@ void GxsGroupDialog::setSelectedModerators(const std::set<RsGxsId>& ids)
 	ui.adminsList->show();
 	ui.filtercomboBox->show();
 
-	ui.adminsList->setSelectedIds<RsGxsId,FriendSelectionWidget::IDTYPE_GXS>(ids, false);
+    ui.adminsList->setSelectedIds<RsGxsId,FriendSelectionWidget::IDTYPE_GXS>(ids, true);
 
 	QString moderatorsListString ;
     RsIdentityDetails det;

From 7a490999521b67ac7b3cbeeed1ba191d23866f35 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 28 Jan 2023 21:10:45 +0100
Subject: [PATCH 174/503] added sorting of selected items on top in moderator
 selection list of forum edit dialog

---
 .../src/gui/common/FriendSelectionWidget.cpp  | 21 ++++++++++++++++---
 .../src/gui/common/FriendSelectionWidget.h    |  3 ++-
 .../src/gui/common/RSTreeWidgetItem.h         |  1 +
 .../src/gui/gxsforums/GxsForumGroupDialog.cpp |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
index 1b170b87c..2e91ded27 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
@@ -51,7 +51,8 @@
 #define ROLE_SORT_STANDARD_GROUP    Qt::UserRole + 2
 #define ROLE_SORT_NAME              Qt::UserRole + 3
 #define ROLE_SORT_STATE             Qt::UserRole + 4
-#define ROLE_FILTER_REASON          Qt::UserRole + 5
+#define ROLE_SORT_SELECTED          Qt::UserRole + 5
+#define ROLE_FILTER_REASON          Qt::UserRole + 6
 
 #define IMAGE_FRIENDINFO ":/images/peerdetails_16x16.png"
 
@@ -667,8 +668,13 @@ void FriendSelectionWidget::secured_fillList()
 				emit itemAdded(IDTYPE_GXS, QString::fromStdString(detail.mId.toStdString()), gxsItem);
 
 				if (std::find(gxsIdsSelected.begin(), gxsIdsSelected.end(), detail.mId) != gxsIdsSelected.end()) 
+                {
 					setSelected(mListModus, gxsItem, true);
-			}
+                    gxsItem->setData(COLUMN_NAME,ROLE_SORT_SELECTED,0);
+                }
+                else
+                    gxsItem->setData(COLUMN_NAME,ROLE_SORT_SELECTED,1);
+            }
 		}
 		if(mShowTypes & SHOW_CONTACTS)
 		{
@@ -1219,9 +1225,18 @@ std::string FriendSelectionWidget::idFromItem(QTreeWidgetItem *item)
 	return item->data(COLUMN_DATA, ROLE_ID).toString().toStdString();
 }
 
+void FriendSelectionWidget::sortByChecked(bool sort)
+{
+    mCompareRole->clear();
+    mCompareRole->setRole(COLUMN_NAME,ROLE_SORT_SELECTED);
+
+    ui->friendList->resort();
+}
+
 void FriendSelectionWidget::sortByState(bool sort)
 {
-	mCompareRole->setRole(COLUMN_NAME, ROLE_SORT_GROUP);
+    mCompareRole->clear();
+    mCompareRole->setRole(COLUMN_NAME, ROLE_SORT_GROUP);
 	mCompareRole->addRole(COLUMN_NAME, ROLE_SORT_STANDARD_GROUP);
 
 	if (sort) {
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.h b/retroshare-gui/src/gui/common/FriendSelectionWidget.h
index d0d295a3a..f10a748fc 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.h
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.h
@@ -132,7 +132,8 @@ signals:
 
 public slots:
 	void sortByState(bool sort);
-	void filterConnected(bool filter);
+    void sortByChecked(bool sort);
+    void filterConnected(bool filter);
 
 private slots:
 	void groupsChanged(int type);
diff --git a/retroshare-gui/src/gui/common/RSTreeWidgetItem.h b/retroshare-gui/src/gui/common/RSTreeWidgetItem.h
index 14a22b97c..8e90baee6 100644
--- a/retroshare-gui/src/gui/common/RSTreeWidgetItem.h
+++ b/retroshare-gui/src/gui/common/RSTreeWidgetItem.h
@@ -32,6 +32,7 @@ public:
 	RSTreeWidgetItemCompareRole();
 	explicit RSTreeWidgetItemCompareRole(QMap<int, QList<int>> map);
 
+    void clear() { QMap<int, QList<int> >::clear() ; }
 	void setRole(const int column, const int role);
 	void addRole(const int column, const int role);
 	void findRoles(const int column, QList<int> &roles) const;
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
index 8f9b9ed0d..16d0c307b 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
@@ -151,6 +151,7 @@ bool GxsForumGroupDialog::service_loadGroup(const RsGxsGenericGroupData *data, M
     // Local information. Description should be handled here.
 
     setSelectedModerators(pgroup->mAdminList.ids);
+    ui.adminsList->sortByChecked(true);
 
     mGroupData = *pgroup; // keeps the private information
 

From 30c2ff4b5e633426f075e22fd46091057ebe797e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 29 Jan 2023 14:13:13 +0100
Subject: [PATCH 175/503] fixed bug introduced by last commit

---
 retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index fb7f7b526..74a7d5744 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -528,8 +528,7 @@ void LocalSharedFilesDialog::checkUpdate()
 
 void LocalSharedFilesDialog::forceCheck()
 {
-    rsFiles->ForceDirectoryCheck(true);
-    return;
+    rsFiles->ForceDirectoryCheck();
 }
 
 void RemoteSharedFilesDialog::spawnCustomPopupMenu( QPoint point )

From a9c512c1f09b3b720fb1aa0d1c10e7ca48fa402c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 29 Jan 2023 20:53:25 +0100
Subject: [PATCH 176/503] re-created PR 2382 (#Phenom) to match new layout
 based on submodules

---
 retroshare-gui/src/gui/chat/ChatWidget.cpp | 44 ++++++++++++++++------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index ab198fa33..efe1af9a0 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -1535,23 +1535,43 @@ void ChatWidget::chooseFont()
 	//Use NULL as parent as with this QFontDialog don't take care of title nether options.
 	QFont font = misc::getFont(&ok, currentFont, nullptr, tr("Choose your font."));
 
-	QTextCursor cursor = ui->chatTextEdit->textCursor();
 	if (ok) {
+		QTextCursor cursor = ui->chatTextEdit->textCursor();
+
 		if (cursor.selection().isEmpty()){
 			currentFont = font;
 			setFont();
 		} else {
-			//Merge Format doesn't works for only selection so add a new block.
-			QString text = "<p style=\"";
-			text += " color: " + currentColor.name() + ";";
-			text += " font-family:" + font.family() + ";";
-			text += font.bold() ? " font-weight: bold;" : "";
-			text += font.italic() ? " font-style: italic;" : "";
-			text += " font-size:" + QString::number(font.pointSize()) + "pt;";
-			text += font.strikeOut() ? " text-decoration: line-through;" : "";
-			text += font.underline() ? " text-decoration: underline;" : "";
-			text += "\">" + cursor.selectedText().toHtmlEscaped() + "</p>";
- 			cursor.insertHtml(text);
+			// Merge Format doesn't works for only selection.
+			// and charFormat() get format for last char.
+			QTextCursor selCurs = cursor;
+			QTextCursor lastCurs = cursor;
+			int pos = cursor.selectionStart();
+			lastCurs.setPosition(pos);
+			do
+			{
+				// Get format block in selection iterating char one by one
+				selCurs.setPosition(++pos);
+				if (selCurs.charFormat() != lastCurs.charFormat())
+				{
+					// New char format, format last block.
+					QTextCharFormat charFormat = lastCurs.charFormat();
+					charFormat.setFont(font);
+					lastCurs.setCharFormat(charFormat);
+					// Last block formated, start it to current char.
+					lastCurs.setPosition(pos-1);
+				}
+				// Add current char.
+				lastCurs.setPosition(pos, QTextCursor::KeepAnchor);
+			} while (pos < cursor.selectionEnd());
+
+			// Now format last block
+			if (lastCurs.selectionStart() != lastCurs.selectionEnd())
+			{
+				QTextCharFormat charFormat = lastCurs.charFormat();
+				charFormat.setFont(font);
+				lastCurs.setCharFormat(charFormat);
+			}
 		}
 	}
 }

From 7c8e80e89bb37d3ec0e4dc29d2806a07724b893c Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 31 Jan 2023 21:40:15 +0100
Subject: [PATCH 177/503] Fixed update groupbox counting for members

---
 retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp | 11 +++++++++--
 retroshare-gui/src/gui/Circles/CreateCircleDialog.h   |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
index 3c323e286..92003e0a6 100644
--- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
@@ -357,8 +357,8 @@ void CreateCircleDialog::addMember(const QString& keyId, const QString& idtype,
 	member->setText(RSCIRCLEID_COL_IDTYPE, idtype);
 
 	tree->addTopLevelItem(member);
-	
-	ui.members_groupBox->setTitle( tr("Invited Members") + " (" + QString::number(ui.treeWidget_membership->topLevelItemCount()) + ")" );
+
+	updateMembership();
 }
 
 /** Maybe we can use RsGxsCircleGroup instead of RsGxsCircleDetails ??? (TODO)**/
@@ -413,6 +413,8 @@ void  CreateCircleDialog::removeMember()
 
 	// does this just work? (TODO)
 	delete(item);
+
+	updateMembership();
 }
 
 void CreateCircleDialog::createCircle()
@@ -952,3 +954,8 @@ void CreateCircleDialog::MembershipListCustomPopupMenu( QPoint )
 	contextMnu.exec(QCursor::pos());
 }
 
+void CreateCircleDialog::updateMembership()
+{
+	ui.members_groupBox->setTitle( tr("Invited Members") + " (" + QString::number(ui.treeWidget_membership->topLevelItemCount()) + ")" );
+}
+
diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.h b/retroshare-gui/src/gui/Circles/CreateCircleDialog.h
index fbbaacb2c..5e713b9c3 100644
--- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.h
+++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.h
@@ -56,6 +56,7 @@ private slots:
 	void filterChanged(const QString &text);
 	void createNewGxsId();
 	void idTypeChanged();
+	void updateMembership();
 	
 	/** Create the context popup menu and it's submenus */
 	void IdListCustomPopupMenu( QPoint point );

From ec97bb975ed131731e03b035c281abd2b0c7dd96 Mon Sep 17 00:00:00 2001
From: jolavillette <jolavillette@gmail.com>
Date: Wed, 1 Feb 2023 21:45:22 +0100
Subject: [PATCH 178/503] Allow .jpeg files as stickers

---
 retroshare-gui/src/gui/common/Emoticons.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/common/Emoticons.cpp b/retroshare-gui/src/gui/common/Emoticons.cpp
index 9da7530b1..2341039cd 100644
--- a/retroshare-gui/src/gui/common/Emoticons.cpp
+++ b/retroshare-gui/src/gui/common/Emoticons.cpp
@@ -51,7 +51,7 @@ static QHash<QString, QPixmap> iconcache;
 void Emoticons::load()
 {
 	loadSmiley();
-	filters << "*.png" << "*.jpg" << "*.gif" << "*.webp";
+	filters << "*.png" << "*.jpg" << "*.jpeg" << "*.gif" << "*.webp";
 	stickerFolders << (QString::fromStdString(RsAccounts::AccountDirectory()) + "/stickers");		//under account, unique for user
 	stickerFolders << (QString::fromStdString(RsAccounts::ConfigDirectory()) + "/stickers");		//under .retroshare, shared between users
 	stickerFolders << (QString::fromStdString(RsAccounts::systemDataDirectory()) + "/stickers");	//exe's folder, shipped with RS

From dcc4242ae68f5b1c2e37a2aa9630ea9b3669fcf7 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:53:18 +0100
Subject: [PATCH 179/503] Fixed picture show

---
 .../src/gui/TheWire/PulseMessage.cpp          | 64 ++++++++++++++++---
 retroshare-gui/src/gui/TheWire/PulseMessage.h |  5 +-
 2 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseMessage.cpp b/retroshare-gui/src/gui/TheWire/PulseMessage.cpp
index 8f4a91873..34724282f 100644
--- a/retroshare-gui/src/gui/TheWire/PulseMessage.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseMessage.cpp
@@ -29,10 +29,10 @@ PulseMessage::PulseMessage(QWidget *parent)
 {
 	setupUi(this);
 
-	connect(label_image1, SIGNAL(clicked()), this, SLOT(viewPicture()));
-	connect(label_image2, SIGNAL(clicked()), this, SLOT(viewPicture()));
-	connect(label_image3, SIGNAL(clicked()), this, SLOT(viewPicture()));
-	connect(label_image4, SIGNAL(clicked()), this, SLOT(viewPicture()));
+	connect(label_image1, SIGNAL(clicked()), this, SLOT(viewPictureOne()));
+	connect(label_image2, SIGNAL(clicked()), this, SLOT(viewPictureTwo()));
+	connect(label_image3, SIGNAL(clicked()), this, SLOT(viewPictureThree()));
+	connect(label_image4, SIGNAL(clicked()), this, SLOT(viewPictureFour()));
 }
 
 void PulseMessage::setup(RsWirePulseSPtr pulse)
@@ -148,7 +148,7 @@ void PulseMessage::setRefImageCount(uint32_t count)
 	}
 }
 
-void PulseMessage::viewPicture()
+void PulseMessage::viewPictureOne()
 {
 	PhotoView *photoView = new PhotoView(this);
 
@@ -158,21 +158,69 @@ void PulseMessage::viewPicture()
 		pixmap.loadFromData(mPulse->mImage1.mData, mPulse->mImage1.mSize);
 		photoView->setPixmap(pixmap);
 	}
-	
+
+	QString timestamp = misc::timeRelativeToNow(mPulse->mRefPublishTs);
+
+	photoView->setTitle(QString::fromStdString(mPulse->mPulseText));
+	photoView->setGroupNameString(QString::fromStdString(mPulse->mRefGroupName));
+	photoView->setTime(timestamp);
+	//photoView->setGroupId(mPulse->mRefGroupId);
+
+	photoView->show();
+
+	/* window will destroy itself! */
+}
+
+void PulseMessage::viewPictureTwo()
+{
+	PhotoView *photoView = new PhotoView(this);
+
 	if (!mPulse->mImage2.empty()) {
 		// install image.
 		QPixmap pixmap;
 		pixmap.loadFromData(mPulse->mImage2.mData, mPulse->mImage2.mSize);
 		photoView->setPixmap(pixmap);
 	}
-	
+
+	QString timestamp = misc::timeRelativeToNow(mPulse->mRefPublishTs);
+
+	photoView->setTitle(QString::fromStdString(mPulse->mPulseText));
+	photoView->setGroupNameString(QString::fromStdString(mPulse->mRefGroupName));
+	photoView->setTime(timestamp);
+	//photoView->setGroupId(mPulse->mRefGroupId);
+
+	photoView->show();
+
+	/* window will destroy itself! */
+}
+
+void PulseMessage::viewPictureThree()
+{
+	PhotoView *photoView = new PhotoView(this);
+
 	if (!mPulse->mImage3.empty()) {
 		// install image.
 		QPixmap pixmap;
 		pixmap.loadFromData(mPulse->mImage3.mData, mPulse->mImage3.mSize);
 		photoView->setPixmap(pixmap);
 	}
-	
+
+	QString timestamp = misc::timeRelativeToNow(mPulse->mRefPublishTs);
+
+	photoView->setTitle(QString::fromStdString(mPulse->mPulseText));
+	photoView->setGroupNameString(QString::fromStdString(mPulse->mRefGroupName));
+	photoView->setTime(timestamp);
+	//photoView->setGroupId(mPulse->mRefGroupId);
+
+	photoView->show();
+
+	/* window will destroy itself! */
+}
+
+void PulseMessage::viewPictureFour()
+{
+	PhotoView *photoView = new PhotoView(this);
+
 	if (!mPulse->mImage4.empty()) {
 		// install image.
 		QPixmap pixmap;
diff --git a/retroshare-gui/src/gui/TheWire/PulseMessage.h b/retroshare-gui/src/gui/TheWire/PulseMessage.h
index a2372ebbf..234f0da02 100644
--- a/retroshare-gui/src/gui/TheWire/PulseMessage.h
+++ b/retroshare-gui/src/gui/TheWire/PulseMessage.h
@@ -37,7 +37,10 @@ public:
 	void setRefImageCount(uint32_t count);
 
 private slots:
-	void viewPicture();
+	void viewPictureOne();
+	void viewPictureTwo();
+	void viewPictureThree();
+	void viewPictureFour();
 
 private:
 	RsWirePulseSPtr mPulse;

From c06da9975707646836e1387c0b37178ba97fdfb4 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 9 Feb 2023 23:27:43 +0100
Subject: [PATCH 180/503] attempt at not reloading full channel data at every
 change

---
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 180 ++--
 .../gui/gxschannels/GxsChannelPostsModel.h    |   4 +-
 .../GxsChannelPostsWidgetWithModel.cpp        | 805 +++++++++---------
 .../GxsChannelPostsWidgetWithModel.h          |   6 +-
 .../GxsChannelPostsWidgetWithModel.ui         |   4 +-
 5 files changed, 520 insertions(+), 479 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 06b671532..0ad05b4a1 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -118,85 +118,21 @@ void RsGxsChannelPostsModel::handleEvent_main_thread(std::shared_ptr<const RsEve
 	switch(e->mChannelEventCode)
 	{
 	case RsChannelEventCode::UPDATED_MESSAGE:
-	case RsChannelEventCode::READ_STATUS_CHANGED:
-	{
-		// Normally we should just emit dataChanged() on the index of the data that has changed:
-		// We need to update the data!
+    case RsChannelEventCode::READ_STATUS_CHANGED:
+    case RsChannelEventCode::NEW_COMMENT:
+    {
+        // Normally we should just emit dataChanged() on the index of the data that has changed:
+        // We need to update the data!
 
-        // make a copy of e, so as to avoid destruction of the shared pointer during async thread execution, since [e] doesn't actually tell
-        // the original shared_ptr that it is copied! So no counter is updated in event, which will be destroyed (as e will be) during or even before
-        // the execution of the lambda.
+        // In particular, mChannelMsgId may refer to a comment, but this will be handled correctly
+        // by update_single_post which will automatically retrive the correct parent msg.
 
-        RsGxsChannelEvent E(*e);
+        if(e->mChannelGroupId == mChannelGroup.mMeta.mGroupId)
+            update_single_post(e->mChannelGroupId,e->mChannelMsgId,e->mChannelThreadId);
+    };
+    break;
 
-        if(E.mChannelGroupId == mChannelGroup.mMeta.mGroupId)
-            RsThread::async([this, E]()
-			{
-                // 1 - get message data from p3GxsChannels. No need for pointers here, because we send only a single post to postToObject()
-                //     At this point we dont know what kind of msg id we have. It can be a vote, a comment or an actual message.
-
-				std::vector<RsGxsChannelPost> posts;
-				std::vector<RsGxsComment>     comments;
-				std::vector<RsGxsVote>        votes;
-                std::set<RsGxsMessageId>      msg_ids{ E.mChannelMsgId };
-
-                if(!rsGxsChannels->getChannelContent(E.mChannelGroupId,msg_ids, posts,comments,votes))
-				{
-                    std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve channel message data for channel/msg " << E.mChannelGroupId << "/" << E.mChannelMsgId << std::endl;
-					return;
-				}
-
-                // Check if what we have actually is a comment or a vote. If so we need to update the actual message they refer to
-
-                if(posts.empty())	// means we have a comment or a vote
-                {
-                    msg_ids.clear();
-
-                    for(auto c:comments) msg_ids.insert(c.mMeta.mThreadId);
-                    for(auto v:votes   ) msg_ids.insert(v.mMeta.mThreadId);
-
-                    comments.clear();
-                    votes.clear();
-
-                    if(!rsGxsChannels->getChannelContent(E.mChannelGroupId,msg_ids,posts,comments,votes))
-                    {
-                        std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve channel message data for channel/msg " << E.mChannelGroupId << "/" << E.mChannelMsgId << std::endl;
-                        return;
-                    }
-                }
-
-                // Need to call this in order to get the actuall comment count. The previous call only retrieves the message, since we supplied the message ID.
-                // another way to go would be to save the comment ids of the existing message and re-insert them before calling getChannelContent.
-
-                if(!rsGxsChannels->getChannelComments(E.mChannelGroupId,msg_ids,comments))
-                {
-                    std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve message comment data for channel/msg " << E.mChannelGroupId << "/" << E.mChannelMsgId << std::endl;
-                    return;
-                }
-
-                updateCommentCounts(posts,comments);
-
-                // 2 - update the model in the UI thread.
-
-                RsQThreadUtils::postToObject( [posts,this]()
-				{
-					for(uint32_t i=0;i<posts.size();++i)
-					{
-						// linear search. Not good at all, but normally this is for a single post.
-
-						for(uint32_t j=0;j<mPosts.size();++j)
-							if(mPosts[j].mMeta.mMsgId == posts[i].mMeta.mMsgId)
-                            {
-								mPosts[j] = posts[i];
-
-                                triggerViewUpdate();
-							}
-					}
-				},this);
-            });
-        }
-
-	default:
+    default:
 			break;
 	}
 }
@@ -564,6 +500,47 @@ bool operator<(const RsGxsChannelPost& p1,const RsGxsChannelPost& p2)
     return p1.mMeta.mPublishTs > p2.mMeta.mPublishTs;
 }
 
+void RsGxsChannelPostsModel::setSinglePost(const RsGxsChannelGroup& group, const RsGxsChannelPost& post)
+{
+    if(mChannelGroup.mMeta.mGroupId != group.mMeta.mGroupId)
+        return;
+
+    preMods();
+
+    // This is potentially quadratic, so it should not be called many times!
+
+    bool found=false;
+
+    for(auto& p:mPosts)
+        if(post.mMeta.mMsgId == p.mMeta.mMsgId || post.mMeta.mOrigMsgId == p.mMeta.mMsgId)
+        {
+            p = post;
+            found = true;
+        }
+    if(!found)
+        mPosts.push_back(post);
+
+    std::sort(mPosts.begin(),mPosts.end());
+
+    mFilteredPosts.clear();
+
+    for(uint32_t i=0;i<mPosts.size();++i)
+        mFilteredPosts.push_back(i);
+
+#ifdef DEBUG_CHANNEL_MODEL
+    // debug_dump();
+#endif
+
+    if (rowCount()>0)
+    {
+        beginInsertRows(QModelIndex(),0,rowCount()-1);
+        endInsertRows();
+    }
+
+    postMods();
+
+    emit channelPostsLoaded();
+}
 void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost>& posts)
 {
 	preMods();
@@ -593,6 +570,57 @@ void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vecto
 	emit channelPostsLoaded();
 }
 
+void RsGxsChannelPostsModel::update_single_post(const RsGxsGroupId& group_id,const RsGxsMessageId& msg_id,const RsGxsMessageId& thread_id)
+{
+    RsThread::async([this, group_id, msg_id,thread_id]()
+    {
+        // 1 - get message data from p3GxsChannels. No need for pointers here, because we send only a single post to postToObject()
+        //     At this point we dont know what kind of msg id we have. It can be a vote, a comment or an actual message.
+
+        std::vector<RsGxsChannelPost> posts;
+        std::vector<RsGxsComment>     comments;
+        std::vector<RsGxsVote>        votes;
+        std::set<RsGxsMessageId>      msg_ids({ (thread_id.isNull())?msg_id:thread_id } );		// we have a post message
+
+        if(!rsGxsChannels->getChannelContent(group_id,msg_ids, posts,comments,votes))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve channel message data for channel/msg " << group_id << "/" << msg_id << std::endl;
+            return;
+        }
+
+        // Need to call this in order to get the actual comment count. The previous call only retrieves the message, since we supplied the message ID.
+        // another way to go would be to save the comment ids of the existing message and re-insert them before calling getChannelContent.
+
+        if(!rsGxsChannels->getChannelComments(group_id,msg_ids,comments))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve message comment data for channel/msg " << group_id << "/" << msg_id << std::endl;
+            return;
+        }
+
+        // Normally, there's a single post in the "post" array. The function below takes a full array of posts however.
+
+        updateCommentCounts(posts,comments);
+
+        // 2 - update the model in the UI thread.
+
+        RsQThreadUtils::postToObject( [posts,this]()
+        {
+            for(uint32_t i=0;i<posts.size();++i)
+            {
+                // linear search. Not good at all, but normally this is for a single post.
+
+                for(uint32_t j=0;j<mPosts.size();++j)
+                    if(mPosts[j].mMeta.mMsgId == posts[i].mMeta.mMsgId)
+                    {
+                        mPosts[j] = posts[i];
+
+                        triggerViewUpdate();
+                    }
+            }
+        },this);
+    });
+}
+
 void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
 {
 	if(group_id.isNull())
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
index d8385d24b..2e2ecd7f6 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
@@ -214,6 +214,7 @@ private:
 	static void computeReputationLevel(uint32_t forum_sign_flags, RsGxsChannelPost& entry);
 
 	void update_posts(const RsGxsGroupId& group_id);
+    void update_single_post(const RsGxsGroupId& group_id, const RsGxsMessageId& msgId, const RsGxsMessageId &thread_id);
 
 #ifdef TODO
 	void setForumMessageSummary(const std::vector<RsGxsForumMsg>& messages);
@@ -231,7 +232,8 @@ private:
 	//void computeMessagesHierarchy(const RsGxsChannelGroup& forum_group, const std::vector<RsMsgMetaData> &msgs_array, std::vector<ChannelPostsModelPostEntry> &posts, std::map<RsGxsMessageId, std::vector<std::pair<time_t, RsGxsMessageId> > > &mPostVersions);
 	void createPostsArray(std::vector<RsGxsChannelPost> &posts);
 	void setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost> &posts);
-	void initEmptyHierarchy();
+    void setSinglePost(const RsGxsChannelGroup& group, const RsGxsChannelPost& post);
+    void initEmptyHierarchy();
 	void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 
     std::vector<int> mFilteredPosts;		// stores the list of displayes indices due to filtering.
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 1d8de3f89..b90f94d5e 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -99,9 +99,9 @@ int ChannelPostDelegate::cellSize(int col,const QFont& font,uint32_t parent_widt
 void ChannelPostDelegate::zoom(bool zoom_or_unzoom)
 {
     if(zoom_or_unzoom)
-		mZoom *= 1.02;
+        mZoom *= 1.02;
     else
-		mZoom /= 1.02;
+        mZoom /= 1.02;
 
     if(mZoom < 0.5)
         mZoom = 0.5;
@@ -280,52 +280,52 @@ void ChannelPostDelegate::setWidgetGrid(bool use_grid)
 
 QWidget *ChannelPostFilesDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/*option*/, const QModelIndex& index) const
 {
-	ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
+    ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
 
-	if(index.column() == RsGxsChannelPostFilesModel::COLUMN_FILES_FILE)
-	{
-		GxsChannelFilesStatusWidget* w = new GxsChannelFilesStatusWidget(file,parent);
-		connect(w,SIGNAL(onButtonClick()),this->parent(),SLOT(updateDAll_PB()));
-		return w;
-	}
-	else
-		return NULL;
+    if(index.column() == RsGxsChannelPostFilesModel::COLUMN_FILES_FILE)
+    {
+        GxsChannelFilesStatusWidget* w = new GxsChannelFilesStatusWidget(file,parent);
+        connect(w,SIGNAL(onButtonClick()),this->parent(),SLOT(updateDAll_PB()));
+        return w;
+    }
+    else
+        return NULL;
 }
 void ChannelPostFilesDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const
 {
-	editor->setGeometry(option.rect);
+    editor->setGeometry(option.rect);
 }
 
 void ChannelPostFilesDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
-	ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
+    ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
 
-	// prepare
-	painter->save();
-	painter->setClipRect(option.rect);
+    // prepare
+    painter->save();
+    painter->setClipRect(option.rect);
 
     painter->save();
 
     painter->fillRect( option.rect, option.backgroundBrush);
-	//optionFocusRect.backgroundColor = option.palette.color(colorgroup, (option.state & QStyle::State_Selected) ? QPalette::Highlight : QPalette::Background);
+    //optionFocusRect.backgroundColor = option.palette.color(colorgroup, (option.state & QStyle::State_Selected) ? QPalette::Highlight : QPalette::Background);
     painter->restore();
 
     switch(index.column())
     {
     case RsGxsChannelPostFilesModel::COLUMN_FILES_NAME: painter->drawText(option.rect,Qt::AlignLeft | Qt::AlignVCenter," " + QString::fromUtf8(file.mName.c_str()));
-        	break;
+            break;
     case RsGxsChannelPostFilesModel::COLUMN_FILES_SIZE: painter->drawText(option.rect,Qt::AlignRight | Qt::AlignVCenter,misc::friendlyUnit(qulonglong(file.mSize)));
-        	break;
+            break;
     case RsGxsChannelPostFilesModel::COLUMN_FILES_DATE: painter->drawText(option.rect,Qt::AlignLeft | Qt::AlignVCenter,QDateTime::fromMSecsSinceEpoch(file.mPublishTime*1000).toString("MM/dd/yyyy, hh:mm"));
-        	break;
+            break;
     case RsGxsChannelPostFilesModel::COLUMN_FILES_FILE: {
 
-		GxsChannelFilesStatusWidget w(file);
+        GxsChannelFilesStatusWidget w(file);
 
         w.setFixedWidth(option.rect.width());
-		w.setFixedHeight(option.rect.height());
+        w.setFixedHeight(option.rect.height());
 
-		QPixmap pixmap(w.size());
+        QPixmap pixmap(w.size());
 
                 // apparently we need to do the alternate colors manually
         //if(index.row() & 0x01)
@@ -341,13 +341,13 @@ void ChannelPostFilesDelegate::paint(QPainter * painter, const QStyleOptionViewI
 
     default:
             painter->drawText(option.rect,Qt::AlignLeft,QString("[No data]"));
-		break;
+        break;
     }
 }
 
 QSize ChannelPostFilesDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
-	ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
+    ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
 
     QFontMetricsF fm(option.font);
 
@@ -367,11 +367,11 @@ QSize ChannelPostFilesDelegate::sizeHint(const QStyleOptionViewItem& option, con
 
 /** Constructor */
 GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupId &channelId, QWidget *parent) :
-	GxsMessageFrameWidget(rsGxsChannels, parent),
-	ui(new Ui::GxsChannelPostsWidgetWithModel)
+    GxsMessageFrameWidget(rsGxsChannels, parent),
+    ui(new Ui::GxsChannelPostsWidgetWithModel)
 {
-	/* Invoke the Qt Designer generated object setup routine */
-	ui->setupUi(this);
+    /* Invoke the Qt Designer generated object setup routine */
+    ui->setupUi(this);
 
     ui->viewType_TB->setIcon(FilesDefs::getIconFromQtResourcePath(":icons/svg/gridlayout.svg"));
     ui->viewType_TB->setToolTip(tr("Click to switch to list view"));
@@ -427,75 +427,75 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
 
     ui->postDetails_TE->setPlaceholderText(tr("No text to display"));
 
-	// Set initial size of the splitter
-	ui->splitter->setStretchFactor(0, 1);
-	ui->splitter->setStretchFactor(1, 0);
+    // Set initial size of the splitter
+    ui->splitter->setStretchFactor(0, 1);
+    ui->splitter->setStretchFactor(1, 0);
 
-	QFontMetricsF fm(font());
+    QFontMetricsF fm(font());
 
-	if(mChannelPostsModel->getMode() == RsGxsChannelPostsModel::TREE_MODE_GRID)
-		for(int i=0;i<mChannelPostsModel->columnCount();++i)
-			ui->postsTree->setColumnWidth(i,mChannelPostsDelegate->cellSize(i,font(),ui->postsTree->width()));
+    if(mChannelPostsModel->getMode() == RsGxsChannelPostsModel::TREE_MODE_GRID)
+        for(int i=0;i<mChannelPostsModel->columnCount();++i)
+            ui->postsTree->setColumnWidth(i,mChannelPostsDelegate->cellSize(i,font(),ui->postsTree->width()));
 
-	/* Setup UI helper */
+    /* Setup UI helper */
 
-	/* Connect signals */
-	connect(ui->postButton, SIGNAL(clicked()), this, SLOT(createMsg()));
-	connect(ui->subscribeToolButton, SIGNAL(subscribe(bool)), this, SLOT(subscribeGroup(bool)));
-	connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
+    /* Connect signals */
+    connect(ui->postButton, SIGNAL(clicked()), this, SLOT(createMsg()));
+    connect(ui->subscribeToolButton, SIGNAL(subscribe(bool)), this, SLOT(subscribeGroup(bool)));
+    connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 
-	ui->postButton->setText(tr("Add new post"));
-	
-	/* add filter actions */
+    ui->postButton->setText(tr("Add new post"));
+
+    /* add filter actions */
     ui->filterLineEdit->setPlaceholderText(tr("Search..."));
-	connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
+    connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
 
     ui->postsTree->setPlaceholderText(tr("No posts available in this channel"));
     ui->postsTree->setMinimumWidth(COLUMN_SIZE_FONT_FACTOR_W*QFontMetricsF(font()).height()+1);
 
     connect(ui->postsTree,SIGNAL(sizeChanged(QSize)),this,SLOT(handlePostsTreeSizeChange(QSize)));
 
-	/* Set initial section sizes */
-	QHeaderView * channelpostfilesheader = ui->channelPostFiles_TV->header () ;
-	QHeaderView * channelfilesheader = ui->channelFiles_TV->header () ;
+    /* Set initial section sizes */
+    QHeaderView * channelpostfilesheader = ui->channelPostFiles_TV->header () ;
+    QHeaderView * channelfilesheader = ui->channelFiles_TV->header () ;
 
-	channelpostfilesheader->resizeSection (RsGxsChannelPostFilesModel::COLUMN_FILES_NAME, fm.width("RetroShare-v0.6.5-1487-g6714648e5-Windows-x64-portable-20200518-Qt-5.14.2.7z"));
-	channelfilesheader->resizeSection (RsGxsChannelPostFilesModel::COLUMN_FILES_NAME, fm.width("RetroShare-v0.6.5-1487-g6714648e5-Windows-x64-portable-20200518-Qt-5.14.2.7z"));
+    channelpostfilesheader->resizeSection (RsGxsChannelPostFilesModel::COLUMN_FILES_NAME, fm.width("RetroShare-v0.6.5-1487-g6714648e5-Windows-x64-portable-20200518-Qt-5.14.2.7z"));
+    channelfilesheader->resizeSection (RsGxsChannelPostFilesModel::COLUMN_FILES_NAME, fm.width("RetroShare-v0.6.5-1487-g6714648e5-Windows-x64-portable-20200518-Qt-5.14.2.7z"));
 
-	/* Initialize feed widget */
-	//ui->feedWidget->setSortRole(ROLE_PUBLISH, Qt::DescendingOrder);
-	//ui->feedWidget->setFilterCallback(filterItem);
+    /* Initialize feed widget */
+    //ui->feedWidget->setSortRole(ROLE_PUBLISH, Qt::DescendingOrder);
+    //ui->feedWidget->setFilterCallback(filterItem);
 
-	/* load settings */
-	processSettings(true);
+    /* load settings */
+    processSettings(true);
 
     ui->channelPostFiles_TV->setColumnHidden(RsGxsChannelPostFilesModel::COLUMN_FILES_DATE, true);	// no need to show this here.
 
-	/* Initialize subscribe button */
-	QIcon icon;
+    /* Initialize subscribe button */
+    QIcon icon;
     icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/redled.png"), QIcon::Normal, QIcon::On);
     icon.addPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/start.png"), QIcon::Normal, QIcon::Off);
 
 #ifdef TO_REMOVE
-	mAutoDownloadAction = new QAction(icon, "", this);
-	mAutoDownloadAction->setCheckable(true);
-	connect(mAutoDownloadAction, SIGNAL(triggered()), this, SLOT(toggleAutoDownload()));
+    mAutoDownloadAction = new QAction(icon, "", this);
+    mAutoDownloadAction->setCheckable(true);
+    connect(mAutoDownloadAction, SIGNAL(triggered()), this, SLOT(toggleAutoDownload()));
 
-	ui->subscribeToolButton->addSubscribedAction(mAutoDownloadAction);
+    ui->subscribeToolButton->addSubscribedAction(mAutoDownloadAction);
     setAutoDownload(false);
 #endif
 
     ui->commentsDialog->setGxsService(rsGxsChannels);
 
-	/* Initialize GUI */
-	settingsChanged();
+    /* Initialize GUI */
+    settingsChanged();
 
     setGroupId(channelId);
-	mChannelPostsModel->updateChannel(channelId);
+    mChannelPostsModel->updateChannel(channelId);
 
-	mEventHandlerId = 0;
-	// Needs to be asynced because this function is called by another thread!
-	rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
+    mEventHandlerId = 0;
+    // Needs to be asynced because this function is called by another thread!
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
     {
         RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
     }, mEventHandlerId, RsEventType::GXS_CHANNELS );
@@ -512,7 +512,7 @@ void GxsChannelPostsWidgetWithModel::updateZoomFactor(bool zoom_or_unzoom)
 
     int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),s.width()))));
 
-	mChannelPostsModel->setNumColumns(n_columns);	// forces the update
+    mChannelPostsModel->setNumColumns(n_columns);	// forces the update
 
     ui->postsTree->dataChanged(QModelIndex(),QModelIndex());
 }
@@ -555,10 +555,10 @@ void GxsChannelPostsWidgetWithModel::postContextMenu(const QPoint&)
     }
     menu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyMessageLink()));
 
-	if(IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags))
-		menu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/pencil-edit-button.png"), tr("Edit"), this, SLOT(editPost()));
+    if(IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags))
+        menu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/pencil-edit-button.png"), tr("Edit"), this, SLOT(editPost()));
 
-	menu.exec(QCursor::pos());
+    menu.exec(QCursor::pos());
 }
 
 void GxsChannelPostsWidgetWithModel::markMessageUnread()
@@ -628,29 +628,29 @@ void GxsChannelPostsWidgetWithModel::switchView()
 void GxsChannelPostsWidgetWithModel::copyMessageLink()
 {
     try
-	{
-		if (groupId().isNull())
-			throw std::runtime_error("No channel currently selected!");
+    {
+        if (groupId().isNull())
+            throw std::runtime_error("No channel currently selected!");
 
-		QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
+        QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
 
-		if(!index.isValid())
-			throw std::runtime_error("No post under mouse!");
+        if(!index.isValid())
+            throw std::runtime_error("No post under mouse!");
 
-		RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
+        RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
 
-		if(post.mMeta.mMsgId.isNull())
-			throw std::runtime_error("Post has empty MsgId!");
+        if(post.mMeta.mMsgId.isNull())
+            throw std::runtime_error("Post has empty MsgId!");
 
-		RetroShareLink link = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, groupId(), post.mMeta.mMsgId, QString::fromUtf8(post.mMeta.mMsgName.c_str()));
+        RetroShareLink link = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, groupId(), post.mMeta.mMsgId, QString::fromUtf8(post.mMeta.mMsgName.c_str()));
 
-		if (!link.valid())
-			throw std::runtime_error("Link is not valid");
+        if (!link.valid())
+            throw std::runtime_error("Link is not valid");
 
-		QList<RetroShareLink> urls;
-		urls.push_back(link);
-		RSLinkClipboard::copyLinks(urls);
-	}
+        QList<RetroShareLink> urls;
+        urls.push_back(link);
+        RSLinkClipboard::copyLinks(urls);
+    }
     catch(std::exception& e)
     {
         QMessageBox::critical(NULL,tr("Link creation error"),tr("Link could not be created: ")+e.what());
@@ -679,41 +679,41 @@ void GxsChannelPostsWidgetWithModel::download()
         rsFiles->FileRequest(file.mName, file.mHash, file.mSize, destination, RS_FILE_REQ_ANONYMOUS_ROUTING, sources);
     }
 
-	ui->postDAll_PB->hide();
+    ui->postDAll_PB->hide();
 }
 
 void GxsChannelPostsWidgetWithModel::updateDAll_PB()
 {
-	QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
-	RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
+    QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
+    RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
 
-	size_t newFileToDl = 0;
-	uint64_t newFileTotalSize = 0;
-	QString newFilesDetails;
+    size_t newFileToDl = 0;
+    uint64_t newFileTotalSize = 0;
+    QString newFilesDetails;
 
-	for(auto& file:post.mFiles)
-	{
-		FileInfo fileInfo;
-		if (!rsFiles->FileDetails(file.mHash, RS_FILE_HINTS_DOWNLOAD | RS_FILE_HINTS_SPEC_ONLY, fileInfo)) {
-			++newFileToDl;
-			newFileTotalSize += file.mSize;
-			newFilesDetails += QString::fromUtf8(file.mName.c_str()) + " " + misc::friendlyUnit(file.mSize) + "\n";
-		}
-	}
+    for(auto& file:post.mFiles)
+    {
+        FileInfo fileInfo;
+        if (!rsFiles->FileDetails(file.mHash, RS_FILE_HINTS_DOWNLOAD | RS_FILE_HINTS_SPEC_ONLY, fileInfo)) {
+            ++newFileToDl;
+            newFileTotalSize += file.mSize;
+            newFilesDetails += QString::fromUtf8(file.mName.c_str()) + " " + misc::friendlyUnit(file.mSize) + "\n";
+        }
+    }
 
-	ui->postDAll_PB->setHidden(newFileToDl == 0);
-	ui->postDAll_PB->setToolTip((newFileToDl == 1 ? tr("Download this file:") : tr("Download All these %1 files:").arg(newFileToDl) ) + "\n"
-	                            + newFilesDetails
-	                            + tr("Totaling: %1").arg(misc::friendlyUnit(newFileTotalSize)));
+    ui->postDAll_PB->setHidden(newFileToDl == 0);
+    ui->postDAll_PB->setToolTip((newFileToDl == 1 ? tr("Download this file:") : tr("Download All these %1 files:").arg(newFileToDl) ) + "\n"
+                                + newFilesDetails
+                                + tr("Totaling: %1").arg(misc::friendlyUnit(newFileTotalSize)));
 
 }
 
 void GxsChannelPostsWidgetWithModel::editPost()
 {
     QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
-	RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
+    RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
 
-	CreateGxsChannelMsg *msgDialog = new CreateGxsChannelMsg(post.mMeta.mGroupId,post.mMeta.mMsgId);
+    CreateGxsChannelMsg *msgDialog = new CreateGxsChannelMsg(post.mMeta.mGroupId,post.mMeta.mMsgId);
     msgDialog->show();
 }
 
@@ -742,69 +742,83 @@ void GxsChannelPostsWidgetWithModel::handlePostsTreeSizeChange(QSize s,bool forc
 
 void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
 {
-	const RsGxsChannelEvent *e = dynamic_cast<const RsGxsChannelEvent*>(event.get());
+    const RsGxsChannelEvent *e = dynamic_cast<const RsGxsChannelEvent*>(event.get());
 
-	if(!e)
-		return;
+    if(!e)
+        return;
 
-	switch(e->mChannelEventCode)
-	{
-		case RsChannelEventCode::NEW_CHANNEL:     // [[fallthrough]];
+    switch(e->mChannelEventCode)
+    {
+        case RsChannelEventCode::NEW_CHANNEL:     // [[fallthrough]];
         case RsChannelEventCode::DELETED_CHANNEL: // [[fallthrough]];
-        case RsChannelEventCode::NEW_COMMENT:     // [[fallthrough]];
-        case RsChannelEventCode::NEW_VOTE:        // [[fallthrough]];
         case RsChannelEventCode::UPDATED_CHANNEL: // [[fallthrough]];
-		case RsChannelEventCode::NEW_MESSAGE:     // [[fallthrough]];
-		case RsChannelEventCode::UPDATED_MESSAGE:
         case RsChannelEventCode::RECEIVED_PUBLISH_KEY:
         case RsChannelEventCode::SYNC_PARAMETERS_UPDATED:
         {
-			if(e->mChannelGroupId == groupId())
-				updateDisplay(true);
-    	}
+            if(e->mChannelGroupId == groupId())
+                updateDisplay(true,false);
+        }
+        break;
 
-		default:
-		break;
-	}
+        case RsChannelEventCode::NEW_COMMENT:     // [[fallthrough]];
+        case RsChannelEventCode::NEW_MESSAGE:     // [[fallthrough]];
+        {
+            if(e->mChannelGroupId == groupId())
+                updateDisplay(true,true);
+        }
+        break;
+
+        case RsChannelEventCode::NEW_VOTE:        // [[fallthrough]];
+
+            if(e->mChannelGroupId == groupId() && e->mChannelThreadId == ui->commentsDialog->messageId())
+                ui->commentsDialog->refresh();
+        break;
+
+        default:
+        break;
+
+        // case RsChannelEventCode::UPDATED_MESSAGE:     // handled in GxsChannelPostsModel
+        // case RsChannelEventCode::READ_STATUS_CHANGED: // handled in GxsChannelPostsModel
+    }
 }
 
 void GxsChannelPostsWidgetWithModel::showPostDetails()
 {
     QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
-	RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
+    RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
 #ifdef DEBUG_CHANNEL_POSTS_WIDGET
     std::cerr << "showPostDetails: current index is " << index.row() << "," << index.column() << std::endl;
 #endif
 
-	//QTextDocument doc;
-	//doc.setHtml(post.mMsg.c_str());
+    //QTextDocument doc;
+    //doc.setHtml(post.mMsg.c_str());
 
-	if(post.mMeta.mPublishTs == 0)
-	{
-		ui->postDetails_TE->clear();
-		ui->postLogo_LB->hide();
-		ui->postName_LB->hide();
-		ui->postTime_LB->hide();
-		mChannelPostFilesModel->clear();
-		ui->details_TW->setEnabled(false);
-		//mLastSelectedPosts[groupId()].clear();
+    if(post.mMeta.mPublishTs == 0)
+    {
+        ui->postDetails_TE->clear();
+        ui->postLogo_LB->hide();
+        ui->postName_LB->hide();
+        ui->postTime_LB->hide();
+        mChannelPostFilesModel->clear();
+        ui->details_TW->setEnabled(false);
+        //mLastSelectedPosts[groupId()].clear();
 
-		return;
-	}
-	ui->details_TW->setEnabled(true);
+        return;
+    }
+    ui->details_TW->setEnabled(true);
 
-	ui->postLogo_LB->show();
-	ui->postName_LB->show();
-	ui->postTime_LB->show();
+    ui->postLogo_LB->show();
+    ui->postName_LB->show();
+    ui->postTime_LB->show();
 
 #ifdef DEBUG_CHANNEL_POSTS_WIDGET
-	std::cerr << "showPostDetails: setting mLastSelectedPosts[groupId()] to current post Id " << post.mMeta.mMsgId << ". Previous value: " << mLastSelectedPosts[groupId()] << std::endl;
+    std::cerr << "showPostDetails: setting mLastSelectedPosts[groupId()] to current post Id " << post.mMeta.mMsgId << ". Previous value: " << mLastSelectedPosts[groupId()] << std::endl;
 #endif
-	mLastSelectedPosts[groupId()] = post.mMeta.mMsgId;
+    mLastSelectedPosts[groupId()] = post.mMeta.mMsgId;
 
-	std::list<ChannelPostFileInfo> files;
-	for(auto& file:post.mFiles)
-		files.push_back(ChannelPostFileInfo(file,post.mMeta.mPublishTs));
+    std::list<ChannelPostFileInfo> files;
+    for(auto& file:post.mFiles)
+        files.push_back(ChannelPostFileInfo(file,post.mMeta.mPublishTs));
 
     mChannelPostFilesModel->setFiles(files);
 
@@ -819,41 +833,41 @@ void GxsChannelPostsWidgetWithModel::showPostDetails()
 
     ui->postDetails_TE->setText(RsHtml().formatText(NULL, QString::fromUtf8(post.mMsg.c_str()), /* RSHTML_FORMATTEXT_EMBED_SMILEYS |*/ RSHTML_FORMATTEXT_EMBED_LINKS));
 
-	QPixmap postImage;
+    QPixmap postImage;
 
-	if (post.mThumbnail.mData != NULL)
-		GxsIdDetails::loadPixmapFromData(post.mThumbnail.mData, post.mThumbnail.mSize, postImage,GxsIdDetails::ORIGINAL);
-	else
-		postImage = FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
+    if (post.mThumbnail.mData != NULL)
+        GxsIdDetails::loadPixmapFromData(post.mThumbnail.mData, post.mThumbnail.mSize, postImage,GxsIdDetails::ORIGINAL);
+    else
+        postImage = FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
 
     int W = QFontMetricsF(font()).height() * 8;
 
     // Using fixed width so that the post will not displace the text when we browse.
 
-	ui->postLogo_LB->setPixmap(postImage);
-	ui->postLogo_LB->setFixedSize(W,postImage.height()/(float)postImage.width()*W);
+    ui->postLogo_LB->setPixmap(postImage);
+    ui->postLogo_LB->setFixedSize(W,postImage.height()/(float)postImage.width()*W);
 
-	ui->postName_LB->setText(QString::fromUtf8(post.mMeta.mMsgName.c_str()));
+    ui->postName_LB->setText(QString::fromUtf8(post.mMeta.mMsgName.c_str()));
 
-	ui->postTime_LB->setText(QDateTime::fromMSecsSinceEpoch(post.mMeta.mPublishTs*1000).toString("MM/dd/yyyy, hh:mm"));
-	ui->postTime_LB->setFixedWidth(W);
+    ui->postTime_LB->setText(QDateTime::fromMSecsSinceEpoch(post.mMeta.mPublishTs*1000).toString("MM/dd/yyyy, hh:mm"));
+    ui->postTime_LB->setFixedWidth(W);
 
     //ui->channelPostFiles_TV->resizeColumnToContents(RsGxsChannelPostFilesModel::COLUMN_FILES_FILE);
     //ui->channelPostFiles_TV->resizeColumnToContents(RsGxsChannelPostFilesModel::COLUMN_FILES_SIZE);
     ui->channelPostFiles_TV->setAutoSelect(true);
 
- 	// Now also set the post as read
+    // Now also set the post as read
 
-	if(IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus))
-	{
-		RsGxsGrpMsgIdPair postId;
-		postId.second = post.mMeta.mMsgId;
-		postId.first  = post.mMeta.mGroupId;
+    if(IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus))
+    {
+        RsGxsGrpMsgIdPair postId;
+        postId.second = post.mMeta.mMsgId;
+        postId.first  = post.mMeta.mGroupId;
 
         RsThread::async([postId]() { rsGxsChannels->setMessageReadStatus(postId, true) ; } );
-	}
+    }
 
-	updateDAll_PB();
+    updateDAll_PB();
 }
 
 void GxsChannelPostsWidgetWithModel::updateCommentsCount(int n)
@@ -863,30 +877,30 @@ void GxsChannelPostsWidgetWithModel::updateCommentsCount(int n)
     else
         ui->details_TW->setTabText(2,tr("Comments"));
 }
-void GxsChannelPostsWidgetWithModel::updateGroupData()
+void GxsChannelPostsWidgetWithModel::updateData(bool update_group_data, bool update_posts)
 {
-	if(groupId().isNull())
+    if(groupId().isNull())
     {
         // clear post, files and comment widgets
 
         showPostDetails();
-		return;
+        return;
     }
 
-	RsThread::async([this]()
-	{
-		RsGxsChannelGroup group;
-		std::vector<RsGxsChannelGroup> groups;
+    RsThread::async([this,update_group_data,update_posts]()
+    {
+        std::vector<RsGxsChannelGroup> groups;
+        RsGxsChannelGroup group;
 
-		if(rsGxsChannels->getChannelsInfo(std::list<RsGxsGroupId>{ groupId() }, groups) && groups.size()==1)
+        if(rsGxsChannels->getChannelsInfo(std::list<RsGxsGroupId>{ groupId() }, groups) && groups.size()==1)
             group = groups[0];
         else if(!rsGxsChannels->getDistantSearchResultGroupData(groupId(),group))
-		{
-			std::cerr << __PRETTY_FUNCTION__ << " failed to get group data for channel: " << groupId() << std::endl;
-			return;
-		}
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to get group data for channel: " << groupId() << std::endl;
+            return;
+        }
 
-		RsQThreadUtils::postToObject( [this,group]()
+        RsQThreadUtils::postToObject( [this,update_group_data,update_posts,group]()
         {
             if(mGroup.mMeta.mGroupId != group.mMeta.mGroupId) // this prevents any attempt to display the wrong index. Navigate() if needed will use mNavigatePendingMsgId
             {
@@ -898,52 +912,58 @@ void GxsChannelPostsWidgetWithModel::updateGroupData()
                 updateCommentsCount(0);
             }
 
-            mGroup = group;
+            if(update_group_data)
+            {
+                mGroup = group;
+                insertChannelDetails(mGroup);
+            }
 
-            ui->postsTree->setPlaceholderText(tr("Loading..."));
+            if(update_posts)
+            {
+                ui->postsTree->setPlaceholderText(tr("Loading..."));
 
-            mChannelPostsModel->updateChannel(groupId());
-            whileBlocking(ui->filterLineEdit)->clear();
-            whileBlocking(ui->showUnread_TB)->setChecked(false);
+                mChannelPostsModel->updateChannel(groupId());
 
-            insertChannelDetails(mGroup);
+                whileBlocking(ui->filterLineEdit)->clear();
+                whileBlocking(ui->showUnread_TB)->setChecked(false);
+            }
 
             emit groupDataLoaded();
             emit groupChanged(this);		// signals the parent widget to e.g. update the group tab name
         } );
-	});
+    });
 }
 
 void GxsChannelPostsWidgetWithModel::postChannelPostLoad()
 {
-	std::cerr << "Post channel load..." << std::endl;
+    std::cerr << "Post channel load..." << std::endl;
 
-	if (!mNavigatePendingMsgId.isNull())
-		navigate(mNavigatePendingMsgId);
+    if (!mNavigatePendingMsgId.isNull())
+        navigate(mNavigatePendingMsgId);
 
-	else if( (mLastSelectedPosts.count(groupId()) > 0)
+    else if( (mLastSelectedPosts.count(groupId()) > 0)
              && !mLastSelectedPosts[groupId()].isNull())
-	{
-		QModelIndex index = mChannelPostsModel->getIndexOfMessage(mLastSelectedPosts[groupId()]);
+    {
+        QModelIndex index = mChannelPostsModel->getIndexOfMessage(mLastSelectedPosts[groupId()]);
 
-		std::cerr << "Setting current index to " << index.row() << ","<< index.column() << " for current post "
-		          << mLastSelectedPosts[groupId()].toStdString() << std::endl;
+        std::cerr << "Setting current index to " << index.row() << ","<< index.column() << " for current post "
+                  << mLastSelectedPosts[groupId()].toStdString() << std::endl;
 
-		ui->postsTree->selectionModel()->setCurrentIndex(index,QItemSelectionModel::ClearAndSelect);
-		ui->postsTree->scrollTo(index);//May change if model reloaded
-		ui->postsTree->setFocus();
-	}
-	else
-		std::cerr << "No pre-selected channel post." << std::endl;
+        ui->postsTree->selectionModel()->setCurrentIndex(index,QItemSelectionModel::ClearAndSelect);
+        ui->postsTree->scrollTo(index);//May change if model reloaded
+        ui->postsTree->setFocus();
+    }
+    else
+        std::cerr << "No pre-selected channel post." << std::endl;
 
-	std::list<ChannelPostFileInfo> files;
+    std::list<ChannelPostFileInfo> files;
 
     mChannelPostsModel->getFilesList(files);
     mChannelFilesModel->setFiles(files);
 
-	ui->channelFiles_TV->setAutoSelect(true);
-	ui->channelFiles_TV->sortByColumn(ui->channelFiles_TV->header()->sortIndicatorSection()
-	                                  ,ui->channelFiles_TV->header()->sortIndicatorOrder());
+    ui->channelFiles_TV->setAutoSelect(true);
+    ui->channelFiles_TV->sortByColumn(ui->channelFiles_TV->header()->sortIndicatorSection()
+                                      ,ui->channelFiles_TV->header()->sortIndicatorOrder());
 
     // if there's no posts, this is what's going to be displayed.
     ui->postsTree->setPlaceholderText(tr("No posts available in this channel."));
@@ -971,84 +991,75 @@ void GxsChannelPostsWidgetWithModel::postChannelPostLoad()
     handlePostsTreeSizeChange(ui->postsTree->size(),true); // force the update
 }
 
-void GxsChannelPostsWidgetWithModel::updateDisplay(bool complete)
+void GxsChannelPostsWidgetWithModel::updateDisplay(bool update_group_data,bool update_posts)
 {
-	// First, clear all widget
-	blank();
+    // First, clear all widget
+    blank();
 #ifdef DEBUG_CHANNEL
     std::cerr << "udateDisplay: groupId()=" << groupId()<< std::endl;
 #endif
-	if(groupId().isNull())
+    if(groupId().isNull())
     {
 #ifdef DEBUG_CHANNEL
         std::cerr << "  group_id=0. Return!"<< std::endl;
 #endif
-		return;
+        return;
     }
 
-	if(mGroup.mMeta.mGroupId.isNull() && !groupId().isNull())
+    if(mGroup.mMeta.mGroupId != groupId())
     {
 #ifdef DEBUG_FORUMS
         std::cerr << "  inconsistent group data. Reloading!"<< std::endl;
 #endif
-		complete = true;
+        update_group_data = true;
+        update_posts = true;
     }
-	if(complete) 	// need to update the group data, reload the messages etc.
-	{
-#warning csoler 2020-06-02 : todo
-		//saveExpandedItems(mSavedExpandedMessages);
 
-        //if(mGroupId != mChannelPostsModel->currentGroupId())
-        //    mThreadId.clear();
-
-		updateGroupData();
-
-		return;
-	}
+    updateData(update_group_data,update_posts);
 }
 GxsChannelPostsWidgetWithModel::~GxsChannelPostsWidgetWithModel()
 {
-	rsEvents->unregisterEventsHandler(mEventHandlerId);
-	// save settings
-	processSettings(false);
+    rsEvents->unregisterEventsHandler(mEventHandlerId);
+    // save settings
+    processSettings(false);
 
     //delete(mAutoDownloadAction);
     delete mFilesDelegate;
-	delete ui;
+    delete ui;
 }
 
 void GxsChannelPostsWidgetWithModel::processSettings(bool load)
 {
-	QHeaderView *channelpostfilesheader = ui->channelPostFiles_TV->header () ;
-	QHeaderView *channelfilesheader = ui->channelFiles_TV->header () ;
-	
-	Settings->beginGroup(QString("ChannelPostsWidget"));
+    QHeaderView *channelpostfilesheader = ui->channelPostFiles_TV->header () ;
+    QHeaderView *channelfilesheader = ui->channelFiles_TV->header () ;
 
-	if (load) {
+    Settings->beginGroup(QString("ChannelPostsWidget"));
 
-		// state of files tree
-		channelpostfilesheader->restoreState(Settings->value("PostFilesTree").toByteArray());
-		channelfilesheader->restoreState(Settings->value("FilesTree").toByteArray());
+    if (load) {
 
-		// state of splitter
-		ui->splitter->restoreState(Settings->value("SplitterChannelPosts").toByteArray());
-	} else {
-		// state of files tree
-		Settings->setValue("PostFilesTree", channelpostfilesheader->saveState());
-		Settings->setValue("FilesTree", channelfilesheader->saveState());
+        // state of files tree
+        channelpostfilesheader->restoreState(Settings->value("PostFilesTree").toByteArray());
+        channelfilesheader->restoreState(Settings->value("FilesTree").toByteArray());
 
-		// state of splitter
-		Settings->setValue("SplitterChannelPosts", ui->splitter->saveState());
-	}
+        // state of splitter
+        ui->splitter->restoreState(Settings->value("SplitterChannelPosts").toByteArray());
+    } else {
+        // state of files tree
+        Settings->setValue("PostFilesTree", channelpostfilesheader->saveState());
+        Settings->setValue("FilesTree", channelfilesheader->saveState());
 
-	Settings->endGroup();
+        // state of splitter
+        Settings->setValue("SplitterChannelPosts", ui->splitter->saveState());
+    }
+
+    Settings->endGroup();
 }
 
 void GxsChannelPostsWidgetWithModel::settingsChanged()
 {
-	mUseThread = Settings->getChannelLoadThread();
+    mUseThread = Settings->getChannelLoadThread();
 
-	//mStateHelper->setWidgetVisible(ui->progressBar, mUseThread);
+    //mStateHelper->setWidgetVisible(ui->progressBar, mUseThread);
 }
 
 QString GxsChannelPostsWidgetWithModel::groupName(bool)
@@ -1068,15 +1079,15 @@ void GxsChannelPostsWidgetWithModel::groupNameChanged(const QString &/*name*/)
 
 QIcon GxsChannelPostsWidgetWithModel::groupIcon()
 {
-	/* CHANNEL IMAGE */
-	QPixmap chanImage;
-	if (mGroup.mImage.mData != NULL) {
-		GxsIdDetails::loadPixmapFromData(mGroup.mImage.mData, mGroup.mImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
-	} else {
-		chanImage = FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
-	}
+    /* CHANNEL IMAGE */
+    QPixmap chanImage;
+    if (mGroup.mImage.mData != NULL) {
+        GxsIdDetails::loadPixmapFromData(mGroup.mImage.mData, mGroup.mImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
+    } else {
+        chanImage = FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
+    }
 
-	return QIcon(chanImage);
+    return QIcon(chanImage);
 }
 
 /*************************************************************************************/
@@ -1086,50 +1097,50 @@ QIcon GxsChannelPostsWidgetWithModel::groupIcon()
 // Callback from Widget->FeedHolder->ServiceDialog->CommentContainer->CommentDialog,
 void GxsChannelPostsWidgetWithModel::openComments(uint32_t /*type*/, const RsGxsGroupId &groupId, const QVector<RsGxsMessageId>& msg_versions,const RsGxsMessageId &msgId, const QString &title)
 {
-	emit loadComment(groupId, msg_versions,msgId, title);
+    emit loadComment(groupId, msg_versions,msgId, title);
 }
 
 void GxsChannelPostsWidgetWithModel::createMsg()
 {
-	if (groupId().isNull()) {
-		return;
-	}
+    if (groupId().isNull()) {
+        return;
+    }
 
-	if (!IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {
-		return;
-	}
+    if (!IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags)) {
+        return;
+    }
 
-	CreateGxsChannelMsg *msgDialog = new CreateGxsChannelMsg(groupId());
-	msgDialog->show();
+    CreateGxsChannelMsg *msgDialog = new CreateGxsChannelMsg(groupId());
+    msgDialog->show();
 
-	/* window will destroy itself! */
+    /* window will destroy itself! */
 }
 
 void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGroup &group)
 {
     // save selection if needed
 
-	/* IMAGE */
-	QPixmap chanImage;
-	if (group.mImage.mData != NULL) {
-		GxsIdDetails::loadPixmapFromData(group.mImage.mData, group.mImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
-	} else {
+    /* IMAGE */
+    QPixmap chanImage;
+    if (group.mImage.mData != NULL) {
+        GxsIdDetails::loadPixmapFromData(group.mImage.mData, group.mImage.mSize, chanImage,GxsIdDetails::ORIGINAL);
+    } else {
         chanImage = FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
-	}
+    }
     if(group.mMeta.mGroupName.empty())
-		ui->channelName_LB->setText(tr("[No name]"));
+        ui->channelName_LB->setText(tr("[No name]"));
     else
-		ui->channelName_LB->setText(QString::fromUtf8(group.mMeta.mGroupName.c_str()));
+        ui->channelName_LB->setText(QString::fromUtf8(group.mMeta.mGroupName.c_str()));
 
-	ui->logoLabel->setPixmap(chanImage);
+    ui->logoLabel->setPixmap(chanImage);
     ui->logoLabel->setFixedSize(QSize(ui->logoLabel->height()*chanImage.width()/(float)chanImage.height(),ui->logoLabel->height())); // make the logo have the same aspect ratio than the original image
 
-	ui->postButton->setEnabled(bool(group.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH));
+    ui->postButton->setEnabled(bool(group.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH));
 
 #ifdef TO_REMOVE
-	bool autoDownload ;
-	rsGxsChannels->getChannelAutoDownload(group.mMeta.mGroupId,autoDownload);
-	setAutoDownload(autoDownload);
+    bool autoDownload ;
+    rsGxsChannels->getChannelAutoDownload(group.mMeta.mGroupId,autoDownload);
+    setAutoDownload(autoDownload);
 #endif
 
     setSubscribeButtonText(group.mMeta.mGroupId,group.mMeta.mSubscribeFlags, group.mMeta.mPop);
@@ -1154,12 +1165,12 @@ void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGrou
     }
 
 
-	ui->infoPosts->setText(QString::number(group.mMeta.mVisibleMsgCount));
+    ui->infoPosts->setText(QString::number(group.mMeta.mVisibleMsgCount));
 
-	if(group.mMeta.mLastPost==0)
-		ui->infoLastPost->setText(tr("Never"));
-	else
-		ui->infoLastPost->setText(DateTime::formatLongDateTime(group.mMeta.mLastPost));
+    if(group.mMeta.mLastPost==0)
+        ui->infoLastPost->setText(tr("Never"));
+    else
+        ui->infoLastPost->setText(DateTime::formatLongDateTime(group.mMeta.mLastPost));
 
     uint32_t current_sync_time  = GxsGroupFrameDialog::checkDelay(rsGxsChannels->getSyncPeriod(group.mMeta.mGroupId))/86400 ;
 
@@ -1185,65 +1196,65 @@ void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGrou
     ui->infoSyncTimeLabel->setText(sync_string);
 
 
-	QString formatDescription = QString::fromUtf8(group.mDescription.c_str());
+    QString formatDescription = QString::fromUtf8(group.mDescription.c_str());
 
-	unsigned int formatFlag = RSHTML_FORMATTEXT_EMBED_LINKS;
+    unsigned int formatFlag = RSHTML_FORMATTEXT_EMBED_LINKS;
 
-	// embed smileys ?
-	if (Settings->valueFromGroup(QString("ChannelPostsWidget"), QString::fromUtf8("Emoteicons_ChannelDecription"), true).toBool()) {
-		formatFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS;
-	}
+    // embed smileys ?
+    if (Settings->valueFromGroup(QString("ChannelPostsWidget"), QString::fromUtf8("Emoteicons_ChannelDecription"), true).toBool()) {
+        formatFlag |= RSHTML_FORMATTEXT_EMBED_SMILEYS;
+    }
 
-	formatDescription = RsHtml().formatText(NULL, formatDescription, formatFlag);
+    formatDescription = RsHtml().formatText(NULL, formatDescription, formatFlag);
 
-	ui->infoDescription->setText(formatDescription);
+    ui->infoDescription->setText(formatDescription);
 
-	ui->infoAdministrator->setId(group.mMeta.mAuthorId) ;
+    ui->infoAdministrator->setId(group.mMeta.mAuthorId) ;
 
-	if(!group.mMeta.mAuthorId.isNull())
-	{
-		RetroShareLink link = RetroShareLink::createMessage(group.mMeta.mAuthorId, "");
-		ui->infoAdministrator->setText(link.toHtml());
-	}
-	else
-		ui->infoAdministrator->setText("[No contact author]");
+    if(!group.mMeta.mAuthorId.isNull())
+    {
+        RetroShareLink link = RetroShareLink::createMessage(group.mMeta.mAuthorId, "");
+        ui->infoAdministrator->setText(link.toHtml());
+    }
+    else
+        ui->infoAdministrator->setText("[No contact author]");
 
-	ui->infoCreated->setText(DateTime::formatLongDateTime(group.mMeta.mPublishTs));
+    ui->infoCreated->setText(DateTime::formatLongDateTime(group.mMeta.mPublishTs));
 
-	QString distrib_string ( "[unknown]" );
+    QString distrib_string ( "[unknown]" );
 
-	switch((RsGxsCircleType)group.mMeta.mCircleType)
-	{
-	case RsGxsCircleType::PUBLIC: distrib_string = tr("Public") ;
-		break ;
-	case RsGxsCircleType::EXTERNAL:
-	{
-		RsGxsCircleDetails det ;
+    switch((RsGxsCircleType)group.mMeta.mCircleType)
+    {
+    case RsGxsCircleType::PUBLIC: distrib_string = tr("Public") ;
+        break ;
+    case RsGxsCircleType::EXTERNAL:
+    {
+        RsGxsCircleDetails det ;
 
-		// !! What we need here is some sort of CircleLabel, which loads the circle and updates the label when done.
+        // !! What we need here is some sort of CircleLabel, which loads the circle and updates the label when done.
 
-		if(rsGxsCircles->getCircleDetails(group.mMeta.mCircleId,det))
-			distrib_string = tr("Restricted to members of circle \"")+QString::fromUtf8(det.mCircleName.c_str()) +"\"";
-		else
-			distrib_string = tr("Restricted to members of circle ")+QString::fromStdString(group.mMeta.mCircleId.toStdString()) ;
-	}
-		break ;
-	case RsGxsCircleType::YOUR_EYES_ONLY: distrib_string = tr("Your eyes only");
-		break ;
-	case RsGxsCircleType::LOCAL: distrib_string = tr("You and your friend nodes");
-		break ;
-	default:
-		std::cerr << "(EE) badly initialised group distribution ID = " << group.mMeta.mCircleType << std::endl;
-	}
+        if(rsGxsCircles->getCircleDetails(group.mMeta.mCircleId,det))
+            distrib_string = tr("Restricted to members of circle \"")+QString::fromUtf8(det.mCircleName.c_str()) +"\"";
+        else
+            distrib_string = tr("Restricted to members of circle ")+QString::fromStdString(group.mMeta.mCircleId.toStdString()) ;
+    }
+        break ;
+    case RsGxsCircleType::YOUR_EYES_ONLY: distrib_string = tr("Your eyes only");
+        break ;
+    case RsGxsCircleType::LOCAL: distrib_string = tr("You and your friend nodes");
+        break ;
+    default:
+        std::cerr << "(EE) badly initialised group distribution ID = " << group.mMeta.mCircleType << std::endl;
+    }
 
-	ui->infoDistribution->setText(distrib_string);
+    ui->infoDistribution->setText(distrib_string);
 #ifdef TODO
-	ui->infoWidget->show();
-	ui->feedWidget->hide();
-	ui->fileWidget->hide();
+    ui->infoWidget->show();
+    ui->feedWidget->hide();
+    ui->fileWidget->hide();
 
-	//ui->feedToolButton->setEnabled(false);
-	//ui->fileToolButton->setEnabled(false);
+    //ui->feedToolButton->setEnabled(false);
+    //ui->fileToolButton->setEnabled(false);
 #endif
 
     setSubscribeButtonText(group.mMeta.mGroupId,group.mMeta.mSubscribeFlags, group.mMeta.mPop);
@@ -1322,70 +1333,70 @@ void GxsChannelPostsWidgetWithModel::switchOnlyUnread(bool)
 }
 void GxsChannelPostsWidgetWithModel::filterChanged(QString s)
 {
-	QStringList ql = s.split(' ',QString::SkipEmptyParts);
-	uint32_t count;
-	mChannelPostsModel->setFilter(ql,ui->showUnread_TB->isChecked(),count);
-	mChannelFilesModel->setFilter(ql,count);
+    QStringList ql = s.split(' ',QString::SkipEmptyParts);
+    uint32_t count;
+    mChannelPostsModel->setFilter(ql,ui->showUnread_TB->isChecked(),count);
+    mChannelFilesModel->setFilter(ql,count);
 }
 
 void GxsChannelPostsWidgetWithModel::blank()
 {
-	ui->postButton->setEnabled(false);
-	ui->subscribeToolButton->setEnabled(false);
+    ui->postButton->setEnabled(false);
+    ui->subscribeToolButton->setEnabled(false);
 
-	ui->channelName_LB->setText(tr("No Channel Selected"));
-	ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/channels.png"));
-	ui->infoPosts->setText("");
-	ui->infoLastPost->setText("");
-	ui->infoAdministrator->setText("");
-	ui->infoDistribution->setText("");
-	ui->infoCreated->setText("");
-	ui->infoDescription->setText("");
+    ui->channelName_LB->setText(tr("No Channel Selected"));
+    ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/channels.png"));
+    ui->infoPosts->setText("");
+    ui->infoLastPost->setText("");
+    ui->infoAdministrator->setText("");
+    ui->infoDistribution->setText("");
+    ui->infoCreated->setText("");
+    ui->infoDescription->setText("");
 
-	mChannelPostsModel->clear();
-	mChannelPostFilesModel->clear();
-	ui->postDetails_TE->clear();
-	ui->postLogo_LB->hide();
-	ui->postName_LB->hide();
-	ui->postTime_LB->hide();
-	ui->postDAll_PB->hide();
-	groupNameChanged(QString());
+    mChannelPostsModel->clear();
+    mChannelPostFilesModel->clear();
+    ui->postDetails_TE->clear();
+    ui->postLogo_LB->hide();
+    ui->postName_LB->hide();
+    ui->postTime_LB->hide();
+    ui->postDAll_PB->hide();
+    groupNameChanged(QString());
 
 }
 
 bool GxsChannelPostsWidgetWithModel::navigate(const RsGxsMessageId& msgId)
 {
-	QModelIndex index = mChannelPostsModel->getIndexOfMessage(msgId);
+    QModelIndex index = mChannelPostsModel->getIndexOfMessage(msgId);
 
-	if(!index.isValid())
-	{
-		std::cerr << "(EE) Cannot navigate to msg " << msgId << " in channel " << mGroup.mMeta.mGroupId << ": index unknown. Setting mNavigatePendingMsgId." << std::endl;
+    if(!index.isValid())
+    {
+        std::cerr << "(EE) Cannot navigate to msg " << msgId << " in channel " << mGroup.mMeta.mGroupId << ": index unknown. Setting mNavigatePendingMsgId." << std::endl;
 
-		mNavigatePendingMsgId = msgId;    // not found. That means the forum may not be loaded yet. So we keep that post in mind, for after loading.
-		return true;                      // we have to return true here, otherwise the caller will intepret the async loading as an error.
-	}
+        mNavigatePendingMsgId = msgId;    // not found. That means the forum may not be loaded yet. So we keep that post in mind, for after loading.
+        return true;                      // we have to return true here, otherwise the caller will intepret the async loading as an error.
+    }
 
-	ui->postsTree->selectionModel()->setCurrentIndex(index,QItemSelectionModel::ClearAndSelect);
-	ui->postsTree->scrollTo(index);//May change if model reloaded
-	ui->postsTree->setFocus();
+    ui->postsTree->selectionModel()->setCurrentIndex(index,QItemSelectionModel::ClearAndSelect);
+    ui->postsTree->scrollTo(index);//May change if model reloaded
+    ui->postsTree->setFocus();
 
-	ui->channel_TW->setCurrentIndex(CHANNEL_TABS_POSTS);
-	ui->details_TW->setCurrentIndex(CHANNEL_TABS_DETAILS);
+    ui->channel_TW->setCurrentIndex(CHANNEL_TABS_POSTS);
+    ui->details_TW->setCurrentIndex(CHANNEL_TABS_DETAILS);
 
-	mNavigatePendingMsgId.clear();
+    mNavigatePendingMsgId.clear();
 
-	return true;
+    return true;
 }
 
 void GxsChannelPostsWidgetWithModel::subscribeGroup(bool subscribe)
 {
-	RsGxsGroupId grpId(groupId());
-	if (grpId.isNull()) return;
+    RsGxsGroupId grpId(groupId());
+    if (grpId.isNull()) return;
 
-	RsThread::async([=]()
-	{
-		rsGxsChannels->subscribeToChannel(grpId, subscribe);
-	} );
+    RsThread::async([=]()
+    {
+        rsGxsChannels->subscribeToChannel(grpId, subscribe);
+    } );
 }
 
 #ifdef TO_REMOVE
@@ -1397,50 +1408,50 @@ void GxsChannelPostsWidgetWithModel::setAutoDownload(bool autoDl)
 
 void GxsChannelPostsWidgetWithModel::toggleAutoDownload()
 {
-	RsGxsGroupId grpId = groupId();
-	if (grpId.isNull()) {
-		return;
-	}
+    RsGxsGroupId grpId = groupId();
+    if (grpId.isNull()) {
+        return;
+    }
 
-	bool autoDownload;
-	if(!rsGxsChannels->getChannelAutoDownload(grpId, autoDownload))
-	{
-		std::cerr << __PRETTY_FUNCTION__ << " failed to get autodownload value "
-		          << "for channel: " << grpId.toStdString() << std::endl;
-		return;
-	}
+    bool autoDownload;
+    if(!rsGxsChannels->getChannelAutoDownload(grpId, autoDownload))
+    {
+        std::cerr << __PRETTY_FUNCTION__ << " failed to get autodownload value "
+                  << "for channel: " << grpId.toStdString() << std::endl;
+        return;
+    }
 
-	RsThread::async([this, grpId, autoDownload]()
-	{
-		if(!rsGxsChannels->setChannelAutoDownload(grpId, !autoDownload))
-		{
-			std::cerr << __PRETTY_FUNCTION__ << " failed to set autodownload "
-			          << "for channel: " << grpId.toStdString() << std::endl;
-			return;
-		}
-	});
+    RsThread::async([this, grpId, autoDownload]()
+    {
+        if(!rsGxsChannels->setChannelAutoDownload(grpId, !autoDownload))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to set autodownload "
+                      << "for channel: " << grpId.toStdString() << std::endl;
+            return;
+        }
+    });
 }
 #endif
 
 class GxsChannelPostsReadData
 {
 public:
-	explicit GxsChannelPostsReadData(bool read)
-	{
-		mRead = read;
-	}
+    explicit GxsChannelPostsReadData(bool read)
+    {
+        mRead = read;
+    }
 
 public:
-	bool mRead;
+    bool mRead;
 };
 
 void GxsChannelPostsWidgetWithModel::setAllMessagesReadDo(bool read)
 {
-	if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags))
-		return;
+    if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags))
+        return;
 
-	//QModelIndex src_index;
+    //QModelIndex src_index;
 
-	mChannelPostsModel->setAllMsgReadStatus(read);
+    mChannelPostsModel->setAllMsgReadStatus(read);
 }
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index d37b83f22..56e46f49d 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -104,11 +104,11 @@ public:
 
 	/* GxsMessageFrameWidget */
     virtual QIcon groupIcon() override;
-    virtual void groupIdChanged() override { updateDisplay(true); }
+    virtual void groupIdChanged() override { updateDisplay(true,true); }
     virtual QString groupName(bool) override;
     virtual bool navigate(const RsGxsMessageId&) override;
 
-	void updateDisplay(bool complete);
+    void updateDisplay(bool update_group_data, bool update_posts);
 
 #ifdef TODO
 	/* FeedHolder */
@@ -141,7 +141,7 @@ protected:
 
 private slots:
 	void showPostDetails();
-	void updateGroupData();
+    void updateData(bool update_group_data,bool update_posts);
 	void download();
 	void updateDAll_PB();
 	void createMsg();
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
index cc98c8e56..c4005cfc6 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@@ -194,7 +194,7 @@
    <item>
     <widget class="QTabWidget" name="channel_TW">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
@@ -402,7 +402,7 @@
           <string notr="true">&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:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">

From 43fd84e777f294b86829ad1fcec925f8bc8966c8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 9 Feb 2023 23:32:19 +0100
Subject: [PATCH 181/503] attempt at not reloading full channel data at every
 change

---
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index b90f94d5e..1fa83926a 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -760,15 +760,15 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         }
         break;
 
-        case RsChannelEventCode::NEW_COMMENT:     // [[fallthrough]];
-        case RsChannelEventCode::NEW_MESSAGE:     // [[fallthrough]];
+        case RsChannelEventCode::NEW_MESSAGE:
         {
             if(e->mChannelGroupId == groupId())
                 updateDisplay(true,true);
         }
         break;
 
-        case RsChannelEventCode::NEW_VOTE:        // [[fallthrough]];
+        case RsChannelEventCode::NEW_COMMENT:     // [[fallthrough]];
+        case RsChannelEventCode::NEW_VOTE:
 
             if(e->mChannelGroupId == groupId() && e->mChannelThreadId == ui->commentsDialog->messageId())
                 ui->commentsDialog->refresh();

From f6c584183b25648e207cae21ed7b4458168aa77f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 17 Feb 2023 23:56:35 +0100
Subject: [PATCH 182/503] fixed crash when canceling DL from channel files list

---
 .../GxsChannelFilesStatusWidget.cpp           | 33 ++++++++++++-------
 .../gxschannels/GxsChannelFilesStatusWidget.h |  5 ++-
 .../GxsChannelPostsWidgetWithModel.cpp        |  6 ++--
 .../GxsChannelPostsWidgetWithModel.h          |  2 +-
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
index 365dab3f3..aae58540b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
@@ -33,8 +33,8 @@
 
 #include "retroshare/rsfiles.h"
 
-GxsChannelFilesStatusWidget::GxsChannelFilesStatusWidget(const RsGxsFile &file, QWidget *parent) :
-    QWidget(parent), mFile(file), ui(new Ui::GxsChannelFilesStatusWidget)
+GxsChannelFilesStatusWidget::GxsChannelFilesStatusWidget(const RsGxsFile &file, QWidget *parent,bool used_as_editor) :
+    QWidget(parent), mFile(file), mUsedAsEditor(used_as_editor),ui(new Ui::GxsChannelFilesStatusWidget)
 {
 	ui->setupUi(this);
 
@@ -46,7 +46,7 @@ GxsChannelFilesStatusWidget::GxsChannelFilesStatusWidget(const RsGxsFile &file,
 	connect(ui->downloadPushButton, SIGNAL(clicked()), this, SLOT(download()));
 	connect(ui->resumeToolButton, SIGNAL(clicked()), this, SLOT(resume()));
 	connect(ui->pauseToolButton, SIGNAL(clicked()), this, SLOT(pause()));
-	connect(ui->cancelToolButton, SIGNAL(clicked()), this, SLOT(cancel()));
+    connect(ui->cancelToolButton, SIGNAL(clicked()), this, SLOT(cancel()));
 	connect(ui->openFilePushButton, SIGNAL(clicked()), this, SLOT(openFile()));
 
 	ui->downloadPushButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/download.png"));
@@ -306,14 +306,15 @@ void GxsChannelFilesStatusWidget::resume()
 
 void GxsChannelFilesStatusWidget::cancel()
 {
-	if ((QMessageBox::question(this, "", tr("Are you sure that you want to cancel and delete the file?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) == QMessageBox::No) {
-		return;
-	}
+    if(!mUsedAsEditor)
+        if ((QMessageBox::question(this, "", tr("Are you sure that you want to cancel and delete the file?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) == QMessageBox::No) {
+            return;
+        }
 
 	rsFiles->FileCancel(mFile.mHash);
 
 	emit onButtonClick();// Signals the parent widget to e.g. update the downloadable file count
-	check();
+    check();
 }
 
 void GxsChannelFilesStatusWidget::openFolder()
@@ -327,8 +328,12 @@ void GxsChannelFilesStatusWidget::openFolder()
 	QDir dir = QFileInfo(QString::fromUtf8(fileInfo.path.c_str())).absoluteDir();
 	if (dir.exists()) {
 		if (!RsUrlHandler::openUrl(QUrl::fromLocalFile(dir.absolutePath()))) {
-			QMessageBox::warning(this, "", QString("%1 %2").arg(tr("Can't open folder"), dir.absolutePath()));
-		}
+            if(!mUsedAsEditor)
+                QMessageBox::warning(this, "", QString("%1 %2").arg(tr("Can't open folder"), dir.absolutePath()));
+            else
+                RsErr() << "Can't open folder " << dir.absolutePath().toStdString() ;
+
+        }
 	}
 }
 
@@ -347,8 +352,12 @@ void GxsChannelFilesStatusWidget::openFile()
 			std::cerr << "GxsChannelFilesStatusWidget(): can't open file " << fileInfo.path << std::endl;
 		}
 	}else{
-		QMessageBox::information(this, tr("Play File"),
-				tr("File %1 does not exist at location.").arg(fileInfo.path.c_str()));
-		return;
+        if(!mUsedAsEditor)
+            QMessageBox::information(this, tr("Play File"),
+                    tr("File %1 does not exist at location.").arg(fileInfo.path.c_str()));
+        else
+            RsErr() << "File " << fileInfo.path << " does not exist at location." ;
+
+        return;
 	}
 }
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h
index 8f2f7f8e4..7ae09ce6b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h
@@ -34,9 +34,10 @@ class GxsChannelFilesStatusWidget : public QWidget
 	Q_OBJECT
 
 public:
-	explicit GxsChannelFilesStatusWidget(const RsGxsFile &file, QWidget *parent = 0);
+    explicit GxsChannelFilesStatusWidget(const RsGxsFile &file, QWidget *parent = 0,bool used_as_editor=false);
 	~GxsChannelFilesStatusWidget();
 
+    bool usedAsEditor() const { return mUsedAsEditor; }
 signals:
 
 	void onButtonClick();
@@ -73,6 +74,8 @@ private:
 	uint64_t mSize;
 	uint64_t mDivisor;
 
+    bool mUsedAsEditor;
+
 	Ui::GxsChannelFilesStatusWidget *ui;
 };
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 1d8de3f89..b394ba93b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -284,8 +284,10 @@ QWidget *ChannelPostFilesDelegate::createEditor(QWidget *parent, const QStyleOpt
 
 	if(index.column() == RsGxsChannelPostFilesModel::COLUMN_FILES_FILE)
 	{
-		GxsChannelFilesStatusWidget* w = new GxsChannelFilesStatusWidget(file,parent);
-		connect(w,SIGNAL(onButtonClick()),this->parent(),SLOT(updateDAll_PB()));
+        GxsChannelFilesStatusWidget* w = new GxsChannelFilesStatusWidget(file,parent,true);
+        w->setFocusPolicy(Qt::StrongFocus);
+        connect(w,SIGNAL(onButtonClick()),this->parent(),SLOT(updateDAll_PB()));
+
 		return w;
 	}
 	else
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index d37b83f22..208c18ef1 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -47,7 +47,7 @@ class ChannelPostFilesDelegate: public QStyledItemDelegate
 	Q_OBJECT
 
 	public:
-		ChannelPostFilesDelegate(QObject *parent=0) : QStyledItemDelegate(parent){}
+        ChannelPostFilesDelegate(QObject *parent=0) : QStyledItemDelegate(parent){}
         virtual ~ChannelPostFilesDelegate(){}
 
 		void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const override;

From 5069a1a10e4175c90eee3cb5f3443a29ddf04808 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 18 Feb 2023 17:01:29 +0100
Subject: [PATCH 183/503] fixed filtering of files in channels

---
 .../src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp       | 4 ++++
 .../src/gui/gxschannels/GxsChannelPostFilesModel.cpp          | 4 +---
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
index aae58540b..66eb0f793 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
@@ -306,6 +306,10 @@ void GxsChannelFilesStatusWidget::resume()
 
 void GxsChannelFilesStatusWidget::cancel()
 {
+    // When QMessgeBox asks for cancel confirmtion, this makes the widget lose focus => since it is an editor widget,
+    // it gets destroyed by the parent list widget => subsequent code after the QMessageBox runs over a deleted object => crash
+    // In summary: no QMessageBox here when the Status widget is used as an editor.
+
     if(!mUsedAsEditor)
         if ((QMessageBox::question(this, "", tr("Are you sure that you want to cancel and delete the file?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No)) == QMessageBox::No) {
             return;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index be2f288ac..a0db07085 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -295,7 +295,7 @@ void RsGxsChannelPostFilesModel::setFilter(const QStringList& strings, uint32_t&
 {
 	preMods();
 
-	initEmptyHierarchy();
+    mFilteredFiles.clear();
 
 	if(strings.empty())
 	{
@@ -317,8 +317,6 @@ void RsGxsChannelPostFilesModel::setFilter(const QStringList& strings, uint32_t&
 	}
 	count = mFilteredFiles.size();
 
-	std::cerr << "After filtering: " << count << " posts remain." << std::endl;
-
 	if (rowCount()>0)
 	{
 		beginInsertRows(QModelIndex(),0,rowCount()-1);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
index cc98c8e56..8de933c1c 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@@ -194,7 +194,7 @@
    <item>
     <widget class="QTabWidget" name="channel_TW">
      <property name="currentIndex">
-      <number>1</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
@@ -402,7 +402,7 @@
           <string notr="true">&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:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">

From 456d742cd12f69f12776251b2fdfaefa28724f58 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 18 Feb 2023 20:31:25 +0100
Subject: [PATCH 184/503] only show unread and grid view buttons when posts tab
 is selected

---
 .../GxsChannelPostsWidgetWithModel.cpp         | 18 ++++++++++++++++++
 .../GxsChannelPostsWidgetWithModel.h           |  1 +
 .../GxsChannelPostsWidgetWithModel.ui          |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index b394ba93b..c5b0e010c 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -418,6 +418,8 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
     connect(ui->postsTree->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)),this,SLOT(showPostDetails()));
     connect(ui->postsTree,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(postContextMenu(const QPoint&)));
 
+    connect(ui->channel_TW,SIGNAL(currentChanged(int)),this,SLOT(currentTabChanged(int)));
+
     connect(mChannelPostsModel,SIGNAL(channelPostsLoaded()),this,SLOT(postChannelPostLoad()));
 
     ui->postName_LB->hide();
@@ -503,6 +505,22 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
     }, mEventHandlerId, RsEventType::GXS_CHANNELS );
 }
 
+void GxsChannelPostsWidgetWithModel::currentTabChanged(int t)
+{
+    switch(t)
+    {
+    case CHANNEL_TABS_DETAILS:
+    case CHANNEL_TABS_FILES:
+        ui->showUnread_TB->setHidden(true);
+        ui->viewType_TB->setHidden(true);
+        break;
+
+    case CHANNEL_TABS_POSTS:
+        ui->showUnread_TB->setHidden(false);
+        ui->viewType_TB->setHidden(false);
+        break;
+    }
+}
 void GxsChannelPostsWidgetWithModel::updateZoomFactor(bool zoom_or_unzoom)
 {
     mChannelPostsDelegate->zoom(zoom_or_unzoom);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index 208c18ef1..8cacbebe4 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -160,6 +160,7 @@ private slots:
     void markMessageUnread();
 
 public slots:
+    void currentTabChanged(int t);
  	void sortColumnFiles(int col,Qt::SortOrder so);
  	void sortColumnPostFiles(int col,Qt::SortOrder so);
     void updateCommentsCount(int n);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
index 8de933c1c..c4005cfc6 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@@ -194,7 +194,7 @@
    <item>
     <widget class="QTabWidget" name="channel_TW">
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">

From 9d575ddca14cae07ab9658e542119725df317109 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 2 Mar 2023 09:46:16 +0100
Subject: [PATCH 185/503] implemented new algorithm for sorting channel posts

---
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 97 ++++++++++++++++++-
 .../gui/gxschannels/GxsChannelPostsModel.h    |  5 +-
 2 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 06b671532..750db7519 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -571,7 +571,7 @@ void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vecto
 	initEmptyHierarchy();
 	mChannelGroup = group;
 
-	createPostsArray(posts);
+    createPostsArray(posts);
 
 	std::sort(mPosts.begin(),mPosts.end());
 
@@ -658,7 +658,7 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
     });
 }
 
-void RsGxsChannelPostsModel::createPostsArray(std::vector<RsGxsChannelPost>& posts)
+void RsGxsChannelPostsModel::old_createPostsArray(std::vector<RsGxsChannelPost>& posts)
 {
     // collect new versions of posts if any
 
@@ -776,6 +776,99 @@ void RsGxsChannelPostsModel::createPostsArray(std::vector<RsGxsChannelPost>& pos
     }
 }
 
+void RsGxsChannelPostsModel::createPostsArray(std::vector<RsGxsChannelPost>& posts)
+{
+    // The hierarchy of posts may contain edited posts. In the new model (03/2023), mOrigMsgId points to the original
+    // top-level post in the hierarchy of edited posts. However, in the old model, mOrigMsgId points to the edited post.
+    // Therefore the algorithm below is made to cope with both models at once.
+    //
+    // In the future, using the new model, it will be possible to delete old versions from the db, and detect new versions
+    // because they all share the same mOrigMsgId.
+    //
+    // We proceed as follows:
+    //
+    //	1 - create a search map to convert post IDs into their index in the posts tab
+    //  2 - recursively climb up the post mOrigMsgId until no parent is found. At top level, create the original post, and add all previous elements as newer versions.
+    //	3 - go through the list of original posts, select among them the most recent version, and set all others as older versions.
+    //
+    // The algorithm handles the case where some parent has been deleted.
+
+#ifdef DEBUG_CHANNEL_MODEL
+    std::cerr << "Inserting channel posts" << std::endl;
+#endif
+
+    //	1 - create a search map to convert post IDs into their index in the posts tab
+
+    std::map<RsGxsMessageId,uint32_t> search_map ;
+
+    for (uint32_t i=0;i<posts.size();++i)
+        search_map[posts[i].mMeta.mMsgId] = i ;
+
+    //  2 - recursively climb up the post mOrigMsgId until no parent is found. At top level, create the original post, and add all previous elements as newer versions.
+
+    std::map<RsGxsMessageId,uint32_t> original_versions ;
+
+    for (uint32_t i=0;i<posts.size();++i)
+    {
+        uint32_t current_index = i;
+        rstime_t newest_time = posts[i].mMeta.mPublishTs;
+        rstime_t newest_index = i;
+
+        while(true)
+        {
+            const auto& m(posts[current_index].mMeta);
+
+            if(m.mPublishTs > newest_time)
+            {
+                newest_index = current_index;
+                newest_time = m.mPublishTs;
+            }
+
+            RsGxsMessageId top_level_id;
+            std::map<RsGxsMessageId,uint32_t>::const_iterator it;
+
+            if(m.mOrigMsgId.isNull() || m.mOrigMsgId==m.mMsgId)	// we have a top-level post.
+                top_level_id = m.mMsgId;
+            else if( (it = search_map.find(m.mOrigMsgId)) == search_map.end())	// we don't have the post. Never mind, we store the
+                top_level_id = m.mOrigMsgId;
+            else
+            {
+                current_index = it->second;
+                continue;
+            }
+
+            auto vit = original_versions.find(top_level_id);
+
+            if(vit != original_versions.end())
+            {
+                if(posts[vit->second].mMeta.mPublishTs < newest_time)
+                    vit->second = newest_index;
+            }
+            else
+                original_versions[top_level_id] = newest_index;
+
+            break;
+        }
+    }
+
+#ifdef DEBUG_CHANNEL_MODEL
+    std::cerr << "Now adding " << posts.size() << " posts into array structure..." << std::endl;
+#endif
+
+    mPosts.clear();
+
+    // make sure the posts are delivered in the same order they appears in the posts[] tab.
+
+    std::vector<uint32_t> ids;
+
+    for(auto id:original_versions)
+        ids.push_back(id.second);
+
+    std::sort(ids.begin(),ids.end());
+
+    for(uint32_t i=0;i<ids.size();++i)
+        mPosts.push_back(posts[ids[i]]);
+}
 void RsGxsChannelPostsModel::setAllMsgReadStatus(bool read_status)
 {
     // No need to call preMods()/postMods() here because we're not changing the model
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
index d8385d24b..642bfaa5a 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
@@ -229,8 +229,9 @@ private:
 	//static void convertMsgToPostEntry(const RsGxsChannelGroup &mChannelGroup, const RsMsgMetaData &msg, bool useChildTS, ChannelModelPostEntry& fentry);
 
 	//void computeMessagesHierarchy(const RsGxsChannelGroup& forum_group, const std::vector<RsMsgMetaData> &msgs_array, std::vector<ChannelPostsModelPostEntry> &posts, std::map<RsGxsMessageId, std::vector<std::pair<time_t, RsGxsMessageId> > > &mPostVersions);
-	void createPostsArray(std::vector<RsGxsChannelPost> &posts);
-	void setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost> &posts);
+	void old_createPostsArray(std::vector<RsGxsChannelPost> &posts);
+    void createPostsArray(std::vector<RsGxsChannelPost>& posts);
+    void setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost> &posts);
 	void initEmptyHierarchy();
 	void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 

From 97265dddab46f94746bc8680a56101997933e0e3 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 2 Mar 2023 22:55:58 +0100
Subject: [PATCH 186/503] updated algorithm for sorting channel posts with
 debug info and collection of all post versions

---
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 99 ++++++++++++++-----
 1 file changed, 75 insertions(+), 24 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 750db7519..25fdd6d0f 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -35,7 +35,7 @@
 #include "GxsChannelPostsModel.h"
 #include "GxsChannelPostFilesModel.h"
 
-//#define DEBUG_CHANNEL_MODEL
+#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 
@@ -704,9 +704,6 @@ void RsGxsChannelPostsModel::old_createPostsArray(std::vector<RsGxsChannelPost>&
 
             uint32_t current_index = new_versions[i] ;
             uint32_t source_index  = new_versions[i] ;
-#ifdef DEBUG_CHANNEL_MODEL
-            RsGxsMessageId source_msg_id = posts[source_index].mMeta.mMsgId ;
-#endif
 
             // What we do is everytime we find a replacement post, we climb up the replacement graph until we find the original post
             // (or the most recent version of it). When we reach this post, we replace it with the data of the source post.
@@ -799,30 +796,51 @@ void RsGxsChannelPostsModel::createPostsArray(std::vector<RsGxsChannelPost>& pos
 
     //	1 - create a search map to convert post IDs into their index in the posts tab
 
+#ifdef DEBUG_CHANNEL_MODEL
+    std::cerr << "  Given list: " << std::endl;
+#endif
     std::map<RsGxsMessageId,uint32_t> search_map ;
 
     for (uint32_t i=0;i<posts.size();++i)
+    {
+#ifdef DEBUG_CHANNEL_MODEL
+        std::cerr << "    " << i << ": " << posts[i].mMeta.mMsgId << " orig=" << posts[i].mMeta.mOrigMsgId << " publish TS =" << posts[i].mMeta.mPublishTs << std::endl;
+#endif
         search_map[posts[i].mMeta.mMsgId] = i ;
+    }
 
     //  2 - recursively climb up the post mOrigMsgId until no parent is found. At top level, create the original post, and add all previous elements as newer versions.
 
-    std::map<RsGxsMessageId,uint32_t> original_versions ;
+#ifdef DEBUG_CHANNEL_MODEL
+    std::cerr << "  Searching for top-level posts..." << std::endl;
+#endif
+    std::map<RsGxsMessageId,std::pair<uint32_t,std::set<RsGxsMessageId> > > original_versions ;
 
     for (uint32_t i=0;i<posts.size();++i)
     {
-        uint32_t current_index = i;
-        rstime_t newest_time = posts[i].mMeta.mPublishTs;
-        rstime_t newest_index = i;
+#ifdef DEBUG_CHANNEL_MODEL
+        std::cerr << "    Post " << i;
+#endif
 
-        while(true)
+        // We use a recursive function here, so as to collect versions when climbing up to the top level post, and
+        // set the top level as the orig for all visited posts on the way back.
+
+        std::function<RsGxsMessageId (uint32_t,std::set<RsGxsMessageId>& versions,rstime_t newest_time,uint32_t newest_index,int depth)> recurs_find_top_level
+                = [&posts,&search_map,&recurs_find_top_level,&original_versions](uint32_t index,
+                                                                                std::set<RsGxsMessageId>& collected_versions,
+                                                                                rstime_t newest_time,
+                                                                                uint32_t newest_index,
+                                                                                int depth)
+                -> RsGxsMessageId
         {
-            const auto& m(posts[current_index].mMeta);
+            const auto& m(posts[index].mMeta);
 
             if(m.mPublishTs > newest_time)
             {
-                newest_index = current_index;
+                newest_index = index;
                 newest_time = m.mPublishTs;
             }
+            collected_versions.insert(m.mMsgId);
 
             RsGxsMessageId top_level_id;
             std::map<RsGxsMessageId,uint32_t>::const_iterator it;
@@ -830,44 +848,77 @@ void RsGxsChannelPostsModel::createPostsArray(std::vector<RsGxsChannelPost>& pos
             if(m.mOrigMsgId.isNull() || m.mOrigMsgId==m.mMsgId)	// we have a top-level post.
                 top_level_id = m.mMsgId;
             else if( (it = search_map.find(m.mOrigMsgId)) == search_map.end())	// we don't have the post. Never mind, we store the
+            {
                 top_level_id = m.mOrigMsgId;
+                collected_versions.insert(m.mOrigMsgId);	// this one will never be added to the set by the previous call
+            }
             else
             {
-                current_index = it->second;
-                continue;
+                top_level_id = recurs_find_top_level(it->second,collected_versions,newest_time,newest_index,depth+1);
+                posts[index].mMeta.mOrigMsgId = top_level_id;	// this fastens calculation because it will skip already seen posts.
+
+                return top_level_id;
             }
 
+#ifdef DEBUG_CHANNEL_MODEL
+            std::cerr << std::string(2*depth,' ') << "  top level = " << top_level_id ;
+#endif
             auto vit = original_versions.find(top_level_id);
 
             if(vit != original_versions.end())
             {
-                if(posts[vit->second].mMeta.mPublishTs < newest_time)
-                    vit->second = newest_index;
-            }
-            else
-                original_versions[top_level_id] = newest_index;
-
-            break;
-        }
-    }
+                if(posts[vit->second.first].mMeta.mPublishTs < newest_time)
+                    vit->second.first = newest_index;
 
 #ifdef DEBUG_CHANNEL_MODEL
-    std::cerr << "Now adding " << posts.size() << " posts into array structure..." << std::endl;
+                std::cerr << "  already existing. " << std::endl;
 #endif
+            }
+            else
+            {
+                original_versions[top_level_id].first = newest_index;
+#ifdef DEBUG_CHANNEL_MODEL
+                std::cerr << "  new. " << std::endl;
+#endif
+            }
+            original_versions[top_level_id].second.insert(collected_versions.begin(),collected_versions.end());
+
+            return top_level_id;
+        };
+
+        auto versions_set = std::set<RsGxsMessageId>();
+        recurs_find_top_level(i,versions_set,posts[i].mMeta.mPublishTs,i,0);
+    }
 
     mPosts.clear();
 
+#ifdef DEBUG_CHANNEL_MODEL
+    std::cerr << "  Total top_level posts: " << original_versions.size() << std::endl;
+
+    for(auto it:original_versions)
+    {
+        std::cerr << "    Post " << it.first << ". Total versions = " << it.second.second.size() << " latest: " << posts[it.second.first].mMeta.mMsgId << std::endl;
+
+        for(auto m:it.second.second)
+            if(m != it.first)
+                std::cerr << "      other (newer version): " << m << std::endl;
+    }
+#endif
     // make sure the posts are delivered in the same order they appears in the posts[] tab.
 
     std::vector<uint32_t> ids;
 
     for(auto id:original_versions)
-        ids.push_back(id.second);
+        ids.push_back(id.second.first);
 
     std::sort(ids.begin(),ids.end());
 
     for(uint32_t i=0;i<ids.size();++i)
+    {
         mPosts.push_back(posts[ids[i]]);
+        mPosts.back().mOlderVersions = original_versions[posts[ids[i]].mMeta.mMsgId].second;
+    }
+
 }
 void RsGxsChannelPostsModel::setAllMsgReadStatus(bool read_status)
 {

From 36de6d34b53a67ff49202f8329dc691c17d67406 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 3 Mar 2023 00:08:33 +0100
Subject: [PATCH 187/503] switch from createPost() to createPostV2() in
 channels

---
 .../gui/gxschannels/CreateGxsChannelMsg.cpp   | 45 +++----------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
index c834ae3da..05ce9bda6 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
@@ -794,56 +794,25 @@ void CreateGxsChannelMsg::sendMessage(const std::string &subject, const std::str
 	/* rsGxsChannels */
 	if (rsGxsChannels)
 	{
-		RsGxsChannelPost post;
-
-		post.mMeta.mGroupId = mChannelId;
-		post.mMeta.mParentId.clear() ;
-		post.mMeta.mThreadId.clear() ;
-		post.mMeta.mMsgId.clear() ;
-
-		post.mMeta.mOrigMsgId = mOrigPostId;
-		post.mMeta.mMsgName = subject;
-		post.mMsg = msg;
-		post.mFiles = files;
-
 		QByteArray ba;
 		QBuffer buffer(&ba);
 
+        RsGxsImage image;
+
 		if(!picture.isNull())
 		{
 			// send chan image
 
 			buffer.open(QIODevice::WriteOnly);
             preview_W->getCroppedScaledPicture().save(&buffer, "JPG"); // writes image into ba in PNG format
-			post.mThumbnail.copy((uint8_t *) ba.data(), ba.size());
+            image.copy((uint8_t *) ba.data(), ba.size());
 		}
 
+        std::string error_string;
+        RsGxsMessageId post_id;
 
-#ifdef ENABLE_GENERATE
-		int generateCount = 0;
-		if (generateCheckBox->isChecked()) {
-			generateCount = generateSpinBox->value();
-			if (QMessageBox::question(this, tr("Generate mass data"), tr("Do you really want to generate %1 messages ?").arg(generateCount), QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
-				return;
-			}
-		}
-#endif
-
-		uint32_t token;
-#ifdef ENABLE_GENERATE
-		if (generateCount) {
-			for (int count = 0; count < generateCount; ++count) {
-				RsGxsChannelPost generatePost = post;
-				generatePost.mMeta.mMsgName = QString("%1 %2").arg(QString::fromUtf8(post.mMeta.mMsgName.c_str())).arg(count + 1, 3, 10, QChar('0')).toUtf8().constData();
-
-				rsGxsChannels->createPost(token, generatePost);
-			}
-		} else {
-#endif
-			rsGxsChannels->createPost(token, post);
-#ifdef ENABLE_GENERATE
-		}
-#endif
+        if(!rsGxsChannels->createPostV2(mChannelId,subject,msg,files,image,mOrigPostId,post_id,error_string))
+            QMessageBox::critical(nullptr,tr("Cannot publish post"),QString::fromStdString(error_string));
 	}
 
 	accept();

From 04d10d7fd3451dd9a3e18a275b4fd90659c67275 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 7 Mar 2023 09:28:16 +0100
Subject: [PATCH 188/503] quick bug fix for crash in server page

---
 retroshare-gui/src/gui/MainWindow.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 8695057a2..a59d76dfb 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -1630,7 +1630,8 @@ NATStatus *MainWindow::natstatusInstance()
 
 void MainWindow::torstatusReset()
 {
-	torstatus->reset();
+	if(torstatus != nullptr)
+		torstatus->reset();
 }
 DHTStatus *MainWindow::dhtstatusInstance()
 {

From 9eb2096a713861bc660df565a0342b289105a678 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 8 Mar 2023 20:44:47 +0100
Subject: [PATCH 189/503] fixed filtering of messages in Mail

---
 retroshare-gui/src/gui/msgs/MessageModel.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 4e1debaba..a19087dc0 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -387,12 +387,11 @@ void RsMessageModel::setFilter(FilterType filter_type, const QStringList& string
 	std::cerr << std::endl;
 #endif
 
-	preMods();
-
 	mFilterType = filter_type;
 	mFilterStrings = strings;
 
-	postMods();
+        if(rowCount() > 0)
+            emit dataChanged(createIndex(0,0),createIndex(rowCount()-1,RsMessageModel::columnCount()-1));
 }
 
 QVariant RsMessageModel::toolTipRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const

From 3b9886a747a29a7cb56f5583e4de9b61ab261538 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 12 Mar 2023 17:43:09 +0100
Subject: [PATCH 190/503] fixed channel mode debug output

---
 retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 25fdd6d0f..045a7a8d9 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -35,7 +35,7 @@
 #include "GxsChannelPostsModel.h"
 #include "GxsChannelPostFilesModel.h"
 
-#define DEBUG_CHANNEL_MODEL
+//#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 

From 7314de8a80f0d615fc9168134220aac70abcee2b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 12 Mar 2023 21:00:33 +0100
Subject: [PATCH 191/503] added RSNewWebUI as a submodule so as to help
 packaging

---
 .gitmodules      | 3 +++
 RetroShare.pro   | 7 +++++++
 retroshare-webui | 1 +
 3 files changed, 11 insertions(+)
 create mode 160000 retroshare-webui

diff --git a/.gitmodules b/.gitmodules
index 9ac26001d..c9696bc60 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,3 +32,6 @@
 	path = libretroshare
 	url = ../libretroshare
 	branch = master
+[submodule "retroshare-webui"]
+	path = retroshare-webui
+	url = git@github.com:Retroshare/RSNewWebUI
diff --git a/RetroShare.pro b/RetroShare.pro
index 58ae659ab..944e8204e 100644
--- a/RetroShare.pro
+++ b/RetroShare.pro
@@ -68,6 +68,13 @@ retroshare_plugins {
     plugins.target = plugins
 }
 
+rs_webui {
+    SUBDIRS += retroshare-webui
+    retroshare-webui.file = retroshare-webui/webui.pro
+    retroshare-webui.target = rs_webui
+    retroshare-webui.depends = retroshare_gui
+}
+
 wikipoos {
     SUBDIRS += pegmarkdown
     pegmarkdown.file = supportlibs/pegmarkdown/pegmarkdown.pro
diff --git a/retroshare-webui b/retroshare-webui
new file mode 160000
index 000000000..a593b9c80
--- /dev/null
+++ b/retroshare-webui
@@ -0,0 +1 @@
+Subproject commit a593b9c808f90cce7d47a5de86c207ef8675945f

From 548ef009608acc746b7aa4e514defed8d177520a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 21 Mar 2023 21:08:30 +0100
Subject: [PATCH 192/503] enabled channel post model debug

---
 retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 045a7a8d9..25fdd6d0f 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -35,7 +35,7 @@
 #include "GxsChannelPostsModel.h"
 #include "GxsChannelPostFilesModel.h"
 
-//#define DEBUG_CHANNEL_MODEL
+#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 

From a37ee4673fc4a124317acd1c265b42021658c094 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 22 Mar 2023 09:07:27 +0100
Subject: [PATCH 193/503] half-implemented the system to perform lighter
 updates of channels

---
 .../gxschannels/GxsChannelPostFilesModel.cpp  |   6 +-
 .../gxschannels/GxsChannelPostFilesModel.h    |   3 +
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 105 +++++++++---------
 .../gui/gxschannels/GxsChannelPostsModel.h    |   6 +-
 .../GxsChannelPostsWidgetWithModel.cpp        |  15 ++-
 5 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index a0db07085..78748bcbe 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -426,7 +426,6 @@ QVariant RsGxsChannelPostFilesModel::userRole(const ChannelPostFileInfo& fmpe,in
 
 void RsGxsChannelPostFilesModel::clear()
 {
-
 	initEmptyHierarchy();
 
 	emit channelLoaded();
@@ -463,3 +462,8 @@ void RsGxsChannelPostFilesModel::setFiles(const std::list<ChannelPostFileInfo> &
 
 	postMods();
 }
+
+void RsGxsChannelPostFilesModel::update_files(const std::set<RsGxsFile>& added_files,const std::set<RsGxsFile>& removed_files)
+{
+#error TODO
+}
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.h
index 1aaa60fcb..8fbd6bbb1 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.h
@@ -83,6 +83,9 @@ public:
 	void setFiles(const std::list<ChannelPostFileInfo>& files);
     void setFilter(const QStringList &strings, uint32_t &count) ;
 
+    // This method adds/removes the given lists of files. Useful when a single post is updated
+    void update_files(const std::set<RsGxsFile>& added_files,const std::set<RsGxsFile>& removed_files);
+
 #ifdef TODO
 	QModelIndex getIndexOfFile(const RsFileHash& hash) const;
     void setSortMode(SortMode mode) ;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 0ad05b4a1..425f39a1b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -35,7 +35,7 @@
 #include "GxsChannelPostsModel.h"
 #include "GxsChannelPostFilesModel.h"
 
-//#define DEBUG_CHANNEL_MODEL
+#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 
@@ -47,14 +47,6 @@ RsGxsChannelPostsModel::RsGxsChannelPostsModel(QObject *parent)
     : QAbstractItemModel(parent), mTreeMode(RsGxsChannelPostsModel::TREE_MODE_GRID), mColumns(6)
 {
 	initEmptyHierarchy();
-
-	mEventHandlerId = 0;
-	// Needs to be asynced because this function is called by another thread!
-
-	rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
-    {
-        RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
-    }, mEventHandlerId, RsEventType::GXS_CHANNELS );
 }
 
 RsGxsChannelPostsModel::~RsGxsChannelPostsModel()
@@ -108,35 +100,6 @@ void updateCommentCounts( std::vector<RsGxsChannelPost>& posts, std::vector<RsGx
 }
 
 
-void RsGxsChannelPostsModel::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
-{
-	const RsGxsChannelEvent *e = dynamic_cast<const RsGxsChannelEvent*>(event.get());
-
-	if(!e)
-		return;
-
-	switch(e->mChannelEventCode)
-	{
-	case RsChannelEventCode::UPDATED_MESSAGE:
-    case RsChannelEventCode::READ_STATUS_CHANGED:
-    case RsChannelEventCode::NEW_COMMENT:
-    {
-        // Normally we should just emit dataChanged() on the index of the data that has changed:
-        // We need to update the data!
-
-        // In particular, mChannelMsgId may refer to a comment, but this will be handled correctly
-        // by update_single_post which will automatically retrive the correct parent msg.
-
-        if(e->mChannelGroupId == mChannelGroup.mMeta.mGroupId)
-            update_single_post(e->mChannelGroupId,e->mChannelMsgId,e->mChannelThreadId);
-    };
-    break;
-
-    default:
-			break;
-	}
-}
-
 void RsGxsChannelPostsModel::initEmptyHierarchy()
 {
 	beginResetModel();
@@ -570,9 +533,12 @@ void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vecto
 	emit channelPostsLoaded();
 }
 
-void RsGxsChannelPostsModel::update_single_post(const RsGxsGroupId& group_id,const RsGxsMessageId& msg_id,const RsGxsMessageId& thread_id)
+void RsGxsChannelPostsModel::update_single_post(const RsGxsMessageId& msg_id,std::set<RsGxsFile>& added_files,std::set<RsGxsFile>& removed_files)
 {
-    RsThread::async([this, group_id, msg_id,thread_id]()
+#ifdef DEBUG_CHANNEL_MODEL
+    RsDbg() << "updating single post for group id=" << currentGroupId() << " and msg id=" << msg_id ;
+#endif
+    RsThread::async([this,&added_files,&removed_files, msg_id]()
     {
         // 1 - get message data from p3GxsChannels. No need for pointers here, because we send only a single post to postToObject()
         //     At this point we dont know what kind of msg id we have. It can be a vote, a comment or an actual message.
@@ -580,20 +546,19 @@ void RsGxsChannelPostsModel::update_single_post(const RsGxsGroupId& group_id,con
         std::vector<RsGxsChannelPost> posts;
         std::vector<RsGxsComment>     comments;
         std::vector<RsGxsVote>        votes;
-        std::set<RsGxsMessageId>      msg_ids({ (thread_id.isNull())?msg_id:thread_id } );		// we have a post message
 
-        if(!rsGxsChannels->getChannelContent(group_id,msg_ids, posts,comments,votes))
+        if(!rsGxsChannels->getChannelContent(currentGroupId(), { msg_id }, posts,comments,votes) || posts.size() != 1)
         {
-            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve channel message data for channel/msg " << group_id << "/" << msg_id << std::endl;
+            RsErr() << " failed to retrieve channel message data for channel/msg " << currentGroupId() << "/" << msg_id ;
             return;
         }
 
         // Need to call this in order to get the actual comment count. The previous call only retrieves the message, since we supplied the message ID.
         // another way to go would be to save the comment ids of the existing message and re-insert them before calling getChannelContent.
 
-        if(!rsGxsChannels->getChannelComments(group_id,msg_ids,comments))
+        if(!rsGxsChannels->getChannelComments(currentGroupId(),{ msg_id },comments))
         {
-            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve message comment data for channel/msg " << group_id << "/" << msg_id << std::endl;
+            RsErr() << " failed to retrieve message comment data for channel/msg " << currentGroupId() << "/" << msg_id ;
             return;
         }
 
@@ -603,20 +568,58 @@ void RsGxsChannelPostsModel::update_single_post(const RsGxsGroupId& group_id,con
 
         // 2 - update the model in the UI thread.
 
-        RsQThreadUtils::postToObject( [posts,this]()
+        added_files.clear();
+        removed_files.clear();
+
+        RsQThreadUtils::postToObject( [&posts,&added_files,&removed_files,this]()
         {
             for(uint32_t i=0;i<posts.size();++i)
             {
+                bool found = false;
+
                 // linear search. Not good at all, but normally this is for a single post.
 
-                for(uint32_t j=0;j<mPosts.size();++j)
-                    if(mPosts[j].mMeta.mMsgId == posts[i].mMeta.mMsgId)
-                    {
-                        mPosts[j] = posts[i];
+                const auto& new_post_meta(posts[i].mMeta);
 
-                        triggerViewUpdate();
+                for(uint32_t j=0;j<mPosts.size();++j)
+                    if(new_post_meta.mMsgId == mPosts[j].mMeta.mMsgId)	// same post updated
+                    {
+                          added_files.insert(posts[i].mFiles.begin(),posts[i].mFiles.end());
+                        removed_files.insert(mPosts[j].mFiles.begin(),mPosts[j].mFiles.end());
+
+                        mPosts[j] = posts[i];
+#ifdef DEBUG_CHANNEL_MODEL
+                        RsDbg() << "  post is an updated existing post." ;
+#endif
+                        found=true;
+                        break;
                     }
+                    else if( (new_post_meta.mOrigMsgId == mPosts[j].mMeta.mOrigMsgId || new_post_meta.mOrigMsgId == mPosts[j].mMeta.mMsgId)
+                              && mPosts[j].mMeta.mPublishTs < new_post_meta.mPublishTs)	// new post version
+                    {
+                          added_files.insert(posts[i].mFiles.begin(),posts[i].mFiles.end());
+                        removed_files.insert(mPosts[j].mFiles.begin(),mPosts[j].mFiles.end());
+
+                        posts[i].mOlderVersions.insert(new_post_meta.mMsgId);
+                        mPosts[j] = posts[i];
+#ifdef DEBUG_CHANNEL_MODEL
+                        RsDbg() << "  post is an new version of an existing post." ;
+#endif
+                        found=true;
+                        break;
+                    }
+
+                if(!found)
+                {
+#ifdef DEBUG_CHANNEL_MODEL
+                    RsDbg() << "  post is an new post.";
+#endif
+                    added_files.insert(posts[i].mFiles.begin(),posts[i].mFiles.end());
+                    mPosts.push_back(posts[i]);
+                }
             }
+            triggerViewUpdate();
+
         },this);
     });
 }
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
index 2e2ecd7f6..e5756b781 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
@@ -214,7 +214,10 @@ private:
 	static void computeReputationLevel(uint32_t forum_sign_flags, RsGxsChannelPost& entry);
 
 	void update_posts(const RsGxsGroupId& group_id);
-    void update_single_post(const RsGxsGroupId& group_id, const RsGxsMessageId& msgId, const RsGxsMessageId &thread_id);
+public:
+    void update_single_post(const RsGxsMessageId& msgId, std::set<RsGxsFile> &added_files, std::set<RsGxsFile> &removed_files);
+
+private:
 
 #ifdef TODO
 	void setForumMessageSummary(const std::vector<RsGxsForumMsg>& messages);
@@ -234,7 +237,6 @@ private:
 	void setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost> &posts);
     void setSinglePost(const RsGxsChannelGroup& group, const RsGxsChannelPost& post);
     void initEmptyHierarchy();
-	void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 
     std::vector<int> mFilteredPosts;		// stores the list of displayes indices due to filtering.
     std::vector<RsGxsChannelPost> mPosts ;  // store the list of posts updated from rsForums.
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 74bd7361f..e4123dfc5 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -783,7 +783,14 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         case RsChannelEventCode::NEW_MESSAGE:
         {
             if(e->mChannelGroupId == groupId())
-                updateDisplay(true,true);
+            {
+                std::set<RsGxsFile> added_files,removed_files;
+
+                mChannelPostsModel->update_single_post(e->mChannelMsgId,added_files,removed_files);
+                mChannelFilesModel->update_files(added_files,removed_files);
+
+                updateDisplay(true,false);
+            }
         }
         break;
 
@@ -794,11 +801,13 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
                 ui->commentsDialog->refresh();
         break;
 
+        case RsChannelEventCode::READ_STATUS_CHANGED:
+            mChannelPostsModel->triggerViewUpdate();
+        break;
+
         default:
         break;
 
-        // case RsChannelEventCode::UPDATED_MESSAGE:     // handled in GxsChannelPostsModel
-        // case RsChannelEventCode::READ_STATUS_CHANGED: // handled in GxsChannelPostsModel
     }
 }
 

From aba0ffa581e025a6c2b1e89fd75d91cc2c81078b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 23 Mar 2023 17:04:22 +0100
Subject: [PATCH 194/503] finished the system to perform lighter updates of
 channels

---
 .../gxschannels/GxsChannelPostFilesModel.cpp  |  46 ++++-
 .../gxschannels/GxsChannelPostFilesModel.h    |  86 ++++-----
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 169 ++++++------------
 .../gui/gxschannels/GxsChannelPostsModel.h    |   7 +-
 .../GxsChannelPostsWidgetWithModel.cpp        |  53 +++++-
 5 files changed, 193 insertions(+), 168 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index 78748bcbe..2d0b10106 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -463,7 +463,49 @@ void RsGxsChannelPostFilesModel::setFiles(const std::list<ChannelPostFileInfo> &
 	postMods();
 }
 
-void RsGxsChannelPostFilesModel::update_files(const std::set<RsGxsFile>& added_files,const std::set<RsGxsFile>& removed_files)
+void RsGxsChannelPostFilesModel::update_files(std::set<ChannelPostFileInfo>& added_files,std::set<ChannelPostFileInfo>& removed_files)
 {
-#error TODO
+    // 1 - remove common files from both lists
+
+    std::cerr << "RsGxsChannelPostsFilesModel:: updating files." << std::endl;
+
+    for(auto afit=added_files.begin();afit!=added_files.end();)
+    {
+        auto rfit = removed_files.find(*afit);
+
+        if(rfit != removed_files.end())
+        {
+            std::cerr << "  Eliminating common file " << rfit->mName << std::endl;
+            removed_files.erase(rfit);
+            auto tmp = afit;
+            ++tmp;
+            added_files.erase(afit);
+            afit = tmp;
+        }
+        else
+            ++afit;
+    }
+
+    // 2 - add whatever file remains,
+
+    for(const auto& f:removed_files)
+    {
+        std::cerr << "  Removing deleted file " << f.mName << std::endl;
+
+        for(uint32_t i=0;i<mFiles.size();++i)
+            if(mFiles[i].mHash == f.mHash)
+            {
+                mFiles[i] = mFiles.back();
+                mFiles.pop_back();
+                break;
+            }
+    }
+    // 3 - add other files. We do not check that they are duplicates, because the list of files includes duplicates.
+
+    for(const auto& f:added_files )
+    {
+        mFilteredFiles.push_back(mFiles.size());
+        mFiles.push_back(f);
+    }
 }
+
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.h
index 8fbd6bbb1..2a4a44a8f 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.h
@@ -41,34 +41,34 @@ class QTimer;
 struct ChannelPostFileInfo: public RsGxsFile
 {
     ChannelPostFileInfo(const RsGxsFile& gxs_file,rstime_t t)
-    	: RsGxsFile(gxs_file),mPublishTime(t)
+        : RsGxsFile(gxs_file),mPublishTime(t)
     {}
 
     ChannelPostFileInfo() : mPublishTime(0) {}
 
-    rstime_t mPublishTime;
+    rstime_t mPublishTime;	// related post publish time
 };
 
 // This class is the item model used by Qt to display the information
 
 class RsGxsChannelPostFilesModel : public QAbstractItemModel
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	explicit RsGxsChannelPostFilesModel(QObject *parent = NULL);
-	~RsGxsChannelPostFilesModel(){}
+    explicit RsGxsChannelPostFilesModel(QObject *parent = NULL);
+    ~RsGxsChannelPostFilesModel(){}
 
-	enum Columns {
-		COLUMN_FILES_NAME        = 0x00,
-		COLUMN_FILES_SIZE        = 0x01,
-		COLUMN_FILES_FILE        = 0x02,
-		COLUMN_FILES_DATE        = 0x03,
-		COLUMN_FILES_NB_COLUMNS  = 0x04
-	};
+    enum Columns {
+        COLUMN_FILES_NAME        = 0x00,
+        COLUMN_FILES_SIZE        = 0x01,
+        COLUMN_FILES_FILE        = 0x02,
+        COLUMN_FILES_DATE        = 0x03,
+        COLUMN_FILES_NB_COLUMNS  = 0x04
+    };
 
-	enum Roles{ SortRole           = Qt::UserRole+1,
-              	FilterRole         = Qt::UserRole+2,
+    enum Roles{ SortRole           = Qt::UserRole+1,
+                FilterRole         = Qt::UserRole+2,
               };
 
 #ifdef TODO
@@ -77,25 +77,25 @@ public:
     };
 #endif
 
-	QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}
+    QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}
 
     // This method will asynchroneously update the data
-	void setFiles(const std::list<ChannelPostFileInfo>& files);
+    void setFiles(const std::list<ChannelPostFileInfo>& files);
     void setFilter(const QStringList &strings, uint32_t &count) ;
 
     // This method adds/removes the given lists of files. Useful when a single post is updated
-    void update_files(const std::set<RsGxsFile>& added_files,const std::set<RsGxsFile>& removed_files);
+    void update_files(std::set<ChannelPostFileInfo> &added_files, std::set<ChannelPostFileInfo> &removed_files);
 
 #ifdef TODO
-	QModelIndex getIndexOfFile(const RsFileHash& hash) const;
+    QModelIndex getIndexOfFile(const RsFileHash& hash) const;
     void setSortMode(SortMode mode) ;
 
-	void setTextColorRead          (QColor color) { mTextColorRead           = color;}
-	void setTextColorUnread        (QColor color) { mTextColorUnread         = color;}
-	void setTextColorUnreadChildren(QColor color) { mTextColorUnreadChildren = color;}
-	void setTextColorNotSubscribed (QColor color) { mTextColorNotSubscribed  = color;}
-	void setTextColorMissing       (QColor color) { mTextColorMissing        = color;}
-	void setAuthorOpinion(const QModelIndex& indx,RsOpinion op);
+    void setTextColorRead          (QColor color) { mTextColorRead           = color;}
+    void setTextColorUnread        (QColor color) { mTextColorUnread         = color;}
+    void setTextColorUnreadChildren(QColor color) { mTextColorUnreadChildren = color;}
+    void setTextColorNotSubscribed (QColor color) { mTextColorNotSubscribed  = color;}
+    void setTextColorMissing       (QColor color) { mTextColorMissing        = color;}
+    void setAuthorOpinion(const QModelIndex& indx,RsOpinion op);
 #endif
 
     // Helper functions
@@ -115,25 +115,25 @@ public:
     Qt::ItemFlags flags(const QModelIndex& index) const  override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-	QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
     // Custom item roles
 
     QVariant sizeHintRole  (int col) const;
-	QVariant displayRole   (const ChannelPostFileInfo& fmpe, int col) const;
-	QVariant toolTipRole   (const ChannelPostFileInfo& fmpe, int col) const;
-	QVariant userRole      (const ChannelPostFileInfo& fmpe, int col) const;
-	QVariant sortRole      (const ChannelPostFileInfo& fmpe, int col) const;
-	QVariant filterRole    (const ChannelPostFileInfo& fmpe, int col) const;
+    QVariant displayRole   (const ChannelPostFileInfo& fmpe, int col) const;
+    QVariant toolTipRole   (const ChannelPostFileInfo& fmpe, int col) const;
+    QVariant userRole      (const ChannelPostFileInfo& fmpe, int col) const;
+    QVariant sortRole      (const ChannelPostFileInfo& fmpe, int col) const;
+    QVariant filterRole    (const ChannelPostFileInfo& fmpe, int col) const;
 #ifdef TODO
-	QVariant decorationRole(const ForumModelPostEntry& fmpe, int col) const;
-	QVariant pinnedRole    (const ForumModelPostEntry& fmpe, int col) const;
-	QVariant missingRole   (const ForumModelPostEntry& fmpe, int col) const;
-	QVariant statusRole    (const ForumModelPostEntry& fmpe, int col) const;
-	QVariant authorRole    (const ForumModelPostEntry& fmpe, int col) const;
-	QVariant fontRole      (const ForumModelPostEntry& fmpe, int col) const;
-	QVariant textColorRole (const ForumModelPostEntry& fmpe, int col) const;
-	QVariant backgroundRole(const ForumModelPostEntry& fmpe, int col) const;
+    QVariant decorationRole(const ForumModelPostEntry& fmpe, int col) const;
+    QVariant pinnedRole    (const ForumModelPostEntry& fmpe, int col) const;
+    QVariant missingRole   (const ForumModelPostEntry& fmpe, int col) const;
+    QVariant statusRole    (const ForumModelPostEntry& fmpe, int col) const;
+    QVariant authorRole    (const ForumModelPostEntry& fmpe, int col) const;
+    QVariant fontRole      (const ForumModelPostEntry& fmpe, int col) const;
+    QVariant textColorRole (const ForumModelPostEntry& fmpe, int col) const;
+    QVariant backgroundRole(const ForumModelPostEntry& fmpe, int col) const;
 #endif
 
     /*!
@@ -154,20 +154,20 @@ private:
     bool mFilteringEnabled;
     SortMode mSortMode;
 #endif
-	void preMods() ;
-	void postMods() ;
+    void preMods() ;
+    void postMods() ;
 
     quintptr getParentRow(quintptr ref,int& row) const;
     quintptr getChildRef(quintptr ref, int index) const;
     int   getChildrenCount(quintptr ref) const;
 
     static bool convertTabEntryToRefPointer(uint32_t entry, quintptr& ref);
-	static bool convertRefPointerToTabEntry(quintptr ref,uint32_t& entry);
+    static bool convertRefPointerToTabEntry(quintptr ref,uint32_t& entry);
 
 #ifdef TODO
-	static void generateMissingItem(const RsGxsMessageId &msgId,ChannelPostsModelPostEntry& entry);
+    static void generateMissingItem(const RsGxsMessageId &msgId,ChannelPostsModelPostEntry& entry);
 #endif
-	void initEmptyHierarchy();
+    void initEmptyHierarchy();
 
     std::vector<int> mFilteredFiles ;  // store the list of files for the post
     std::vector<ChannelPostFileInfo> mFiles ;  // store the list of files for the post
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 425f39a1b..4f3223186 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -64,7 +64,7 @@ void RsGxsChannelPostsModel::setMode(TreeMode mode)
     triggerViewUpdate();
 }
 
-void updateCommentCounts( std::vector<RsGxsChannelPost>& posts, std::vector<RsGxsComment>& comments)
+void RsGxsChannelPostsModel::computeCommentCounts( std::vector<RsGxsChannelPost>& posts, std::vector<RsGxsComment>& comments)
 {
     // Store posts IDs in a std::map to avoid a quadratic cost
 
@@ -463,47 +463,73 @@ bool operator<(const RsGxsChannelPost& p1,const RsGxsChannelPost& p2)
     return p1.mMeta.mPublishTs > p2.mMeta.mPublishTs;
 }
 
-void RsGxsChannelPostsModel::setSinglePost(const RsGxsChannelGroup& group, const RsGxsChannelPost& post)
+void RsGxsChannelPostsModel::updateSinglePost(const RsGxsChannelPost& post,std::set<RsGxsFile>& added_files,std::set<RsGxsFile>& removed_files)
 {
-    if(mChannelGroup.mMeta.mGroupId != group.mMeta.mGroupId)
-        return;
+#ifdef DEBUG_CHANNEL_MODEL
+    RsDbg() << "updating single post for group id=" << currentGroupId() << " and msg id=" << post.mMeta.mMsgId ;
+#endif
+    added_files.clear();
+    removed_files.clear();
 
-    preMods();
+    emit layoutAboutToBeChanged();
 
-    // This is potentially quadratic, so it should not be called many times!
+    // linear search. Not good at all, but normally this is just for a single post.
 
-    bool found=false;
+    bool found = false;
+    const auto& new_post_meta(post.mMeta);
 
-    for(auto& p:mPosts)
-        if(post.mMeta.mMsgId == p.mMeta.mMsgId || post.mMeta.mOrigMsgId == p.mMeta.mMsgId)
+    for(uint32_t j=0;j<mPosts.size();++j)
+        if(new_post_meta.mMsgId == mPosts[j].mMeta.mMsgId)	// same post updated
         {
-            p = post;
-            found = true;
+            added_files.insert(post.mFiles.begin(),post.mFiles.end());
+            removed_files.insert(mPosts[j].mFiles.begin(),mPosts[j].mFiles.end());
+
+            mPosts[j] = post;
+#ifdef DEBUG_CHANNEL_MODEL
+            RsDbg() << "  post is an updated existing post." ;
+#endif
+            found=true;
+            break;
         }
+        else if( (new_post_meta.mOrigMsgId == mPosts[j].mMeta.mOrigMsgId || new_post_meta.mOrigMsgId == mPosts[j].mMeta.mMsgId)
+                 && mPosts[j].mMeta.mPublishTs < new_post_meta.mPublishTs)	// new post version
+        {
+            added_files.insert(post.mFiles.begin(),post.mFiles.end());
+            removed_files.insert(mPosts[j].mFiles.begin(),mPosts[j].mFiles.end());
+
+            auto old_post_id = mPosts[j].mMeta.mMsgId;
+            mPosts[j] = post;
+            mPosts[j].mOlderVersions.insert(old_post_id);
+#ifdef DEBUG_CHANNEL_MODEL
+            RsDbg() << "  post is an new version of an existing post." ;
+#endif
+            found=true;
+            break;
+        }
+
     if(!found)
+    {
+#ifdef DEBUG_CHANNEL_MODEL
+        RsDbg() << "  post is an new post.";
+#endif
+        added_files.insert(post.mFiles.begin(),post.mFiles.end());
         mPosts.push_back(post);
 
-    std::sort(mPosts.begin(),mPosts.end());
+        std::sort(mPosts.begin(),mPosts.end());
 
-    mFilteredPosts.clear();
-
-    for(uint32_t i=0;i<mPosts.size();++i)
-        mFilteredPosts.push_back(i);
-
-#ifdef DEBUG_CHANNEL_MODEL
-    // debug_dump();
-#endif
-
-    if (rowCount()>0)
-    {
-        beginInsertRows(QModelIndex(),0,rowCount()-1);
-        endInsertRows();
+        // We don't do that, because otherwise the filtered posts will be changed dynamically when browsing, which is bad.
+        //
+        //   mFilteredPosts.clear();
+        //   for(uint32_t i=0;i<mPosts.size();++i)
+        //     mFilteredPosts.push_back(i);
     }
 
-    postMods();
+    triggerViewUpdate();
 
+    emit layoutChanged();
     emit channelPostsLoaded();
 }
+
 void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost>& posts)
 {
 	preMods();
@@ -533,96 +559,7 @@ void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vecto
 	emit channelPostsLoaded();
 }
 
-void RsGxsChannelPostsModel::update_single_post(const RsGxsMessageId& msg_id,std::set<RsGxsFile>& added_files,std::set<RsGxsFile>& removed_files)
-{
-#ifdef DEBUG_CHANNEL_MODEL
-    RsDbg() << "updating single post for group id=" << currentGroupId() << " and msg id=" << msg_id ;
-#endif
-    RsThread::async([this,&added_files,&removed_files, msg_id]()
-    {
-        // 1 - get message data from p3GxsChannels. No need for pointers here, because we send only a single post to postToObject()
-        //     At this point we dont know what kind of msg id we have. It can be a vote, a comment or an actual message.
 
-        std::vector<RsGxsChannelPost> posts;
-        std::vector<RsGxsComment>     comments;
-        std::vector<RsGxsVote>        votes;
-
-        if(!rsGxsChannels->getChannelContent(currentGroupId(), { msg_id }, posts,comments,votes) || posts.size() != 1)
-        {
-            RsErr() << " failed to retrieve channel message data for channel/msg " << currentGroupId() << "/" << msg_id ;
-            return;
-        }
-
-        // Need to call this in order to get the actual comment count. The previous call only retrieves the message, since we supplied the message ID.
-        // another way to go would be to save the comment ids of the existing message and re-insert them before calling getChannelContent.
-
-        if(!rsGxsChannels->getChannelComments(currentGroupId(),{ msg_id },comments))
-        {
-            RsErr() << " failed to retrieve message comment data for channel/msg " << currentGroupId() << "/" << msg_id ;
-            return;
-        }
-
-        // Normally, there's a single post in the "post" array. The function below takes a full array of posts however.
-
-        updateCommentCounts(posts,comments);
-
-        // 2 - update the model in the UI thread.
-
-        added_files.clear();
-        removed_files.clear();
-
-        RsQThreadUtils::postToObject( [&posts,&added_files,&removed_files,this]()
-        {
-            for(uint32_t i=0;i<posts.size();++i)
-            {
-                bool found = false;
-
-                // linear search. Not good at all, but normally this is for a single post.
-
-                const auto& new_post_meta(posts[i].mMeta);
-
-                for(uint32_t j=0;j<mPosts.size();++j)
-                    if(new_post_meta.mMsgId == mPosts[j].mMeta.mMsgId)	// same post updated
-                    {
-                          added_files.insert(posts[i].mFiles.begin(),posts[i].mFiles.end());
-                        removed_files.insert(mPosts[j].mFiles.begin(),mPosts[j].mFiles.end());
-
-                        mPosts[j] = posts[i];
-#ifdef DEBUG_CHANNEL_MODEL
-                        RsDbg() << "  post is an updated existing post." ;
-#endif
-                        found=true;
-                        break;
-                    }
-                    else if( (new_post_meta.mOrigMsgId == mPosts[j].mMeta.mOrigMsgId || new_post_meta.mOrigMsgId == mPosts[j].mMeta.mMsgId)
-                              && mPosts[j].mMeta.mPublishTs < new_post_meta.mPublishTs)	// new post version
-                    {
-                          added_files.insert(posts[i].mFiles.begin(),posts[i].mFiles.end());
-                        removed_files.insert(mPosts[j].mFiles.begin(),mPosts[j].mFiles.end());
-
-                        posts[i].mOlderVersions.insert(new_post_meta.mMsgId);
-                        mPosts[j] = posts[i];
-#ifdef DEBUG_CHANNEL_MODEL
-                        RsDbg() << "  post is an new version of an existing post." ;
-#endif
-                        found=true;
-                        break;
-                    }
-
-                if(!found)
-                {
-#ifdef DEBUG_CHANNEL_MODEL
-                    RsDbg() << "  post is an new post.";
-#endif
-                    added_files.insert(posts[i].mFiles.begin(),posts[i].mFiles.end());
-                    mPosts.push_back(posts[i]);
-                }
-            }
-            triggerViewUpdate();
-
-        },this);
-    });
-}
 
 void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
 {
@@ -666,7 +603,7 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
         // This shouldn't be needed normally. We need it until a background process computes the number of comments per
         // post and stores it in the service string. Since we request all data, this process isn't costing much anyway.
 
-        updateCommentCounts(*posts,*comments);
+        computeCommentCounts(*posts,*comments);
 
         // 2 - update the model in the UI thread.
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
index e5756b781..a84a4df60 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
@@ -101,6 +101,7 @@ public:
                    SORT_MODE_CHILDREN_PUBLISH_TS  = 0x01,
     };
 #endif
+    static void computeCommentCounts( std::vector<RsGxsChannelPost>& posts, std::vector<RsGxsComment>& comments);
 
 	QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}
 	QModelIndex getIndexOfMessage(const RsGxsMessageId& mid) const;
@@ -214,8 +215,6 @@ private:
 	static void computeReputationLevel(uint32_t forum_sign_flags, RsGxsChannelPost& entry);
 
 	void update_posts(const RsGxsGroupId& group_id);
-public:
-    void update_single_post(const RsGxsMessageId& msgId, std::set<RsGxsFile> &added_files, std::set<RsGxsFile> &removed_files);
 
 private:
 
@@ -235,7 +234,9 @@ private:
 	//void computeMessagesHierarchy(const RsGxsChannelGroup& forum_group, const std::vector<RsMsgMetaData> &msgs_array, std::vector<ChannelPostsModelPostEntry> &posts, std::map<RsGxsMessageId, std::vector<std::pair<time_t, RsGxsMessageId> > > &mPostVersions);
 	void createPostsArray(std::vector<RsGxsChannelPost> &posts);
 	void setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost> &posts);
-    void setSinglePost(const RsGxsChannelGroup& group, const RsGxsChannelPost& post);
+public:
+    void updateSinglePost(const RsGxsChannelPost& post, std::set<RsGxsFile>& added_files, std::set<RsGxsFile>& removed_files);
+private:
     void initEmptyHierarchy();
 
     std::vector<int> mFilteredPosts;		// stores the list of displayes indices due to filtering.
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index e4123dfc5..023732ed7 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -784,12 +784,57 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         {
             if(e->mChannelGroupId == groupId())
             {
-                std::set<RsGxsFile> added_files,removed_files;
 
-                mChannelPostsModel->update_single_post(e->mChannelMsgId,added_files,removed_files);
-                mChannelFilesModel->update_files(added_files,removed_files);
+                RsThread::async([this,e]()
+                {
+                    // 1 - get message data from p3GxsChannels. No need for pointers here, because we send only a single post to postToObject()
+                    //     At this point we dont know what kind of msg id we have. It can be a vote, a comment or an actual message.
 
-                updateDisplay(true,false);
+                    std::vector<RsGxsChannelPost> posts;
+                    std::vector<RsGxsComment>     comments;
+                    std::vector<RsGxsVote>        votes;
+
+                    const auto& msg_id(e->mChannelMsgId);
+                    const auto& grp_id(e->mChannelGroupId);
+
+                    if(!rsGxsChannels->getChannelContent(grp_id, { msg_id }, posts,comments,votes) || posts.size() != 1)
+                    {
+                        RsErr() << " failed to retrieve channel message data for channel/msg " << grp_id << "/" << msg_id;
+                        return;
+                    }
+
+                    // Need to call this in order to get the actual comment count. The previous call only retrieves the message, since we supplied the message ID.
+                    // another way to go would be to save the comment ids of the existing message and re-insert them before calling getChannelContent.
+
+                    if(!rsGxsChannels->getChannelComments(grp_id,{ msg_id },comments))
+                    {
+                        RsErr() << " failed to retrieve message comment data for channel/msg " << grp_id << "/" << msg_id ;
+                        return;
+                    }
+
+                    // Normally, there's a single post in the "post" array. The function below takes a full array of posts however.
+
+                    RsGxsChannelPostsModel::computeCommentCounts(posts,comments);
+
+                    // 2 - update the model in the UI thread.
+
+                    RsQThreadUtils::postToObject( [&post=posts[0],this]()
+                    {
+                        std::set<RsGxsFile> added_files,removed_files;
+
+                        mChannelPostsModel->updateSinglePost(post,added_files,removed_files);
+
+                        std::set<ChannelPostFileInfo> added_filesi,removed_filesi;
+
+                        for(auto f:added_files) added_filesi.insert(ChannelPostFileInfo(f,post.mMeta.mPublishTs));
+                        for(auto f:removed_files) removed_filesi.insert(ChannelPostFileInfo(f,post.mMeta.mPublishTs));
+
+                        mChannelFilesModel->update_files(added_filesi,removed_filesi);
+
+                        updateDisplay(true,false);
+
+                    },this);
+                });
             }
         }
         break;

From 141ee0b7e04826f5b07f1dc9c8d8699782b22582 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 23 Mar 2023 21:13:38 +0100
Subject: [PATCH 195/503] fixed bug in updating filtered posts

---
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 53 +++++++++++--------
 .../gui/gxschannels/GxsChannelPostsModel.h    |  5 ++
 .../GxsChannelPostsWidgetWithModel.cpp        |  9 ++--
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 4f3223186..508db7046 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -140,7 +140,31 @@ void RsGxsChannelPostsModel::getFilesList(std::list<ChannelPostFileInfo>& files)
         files.push_back(it.second);
 }
 
+bool RsGxsChannelPostsModel::postPassesFilter(const RsGxsChannelPost& post,const QStringList& strings,bool only_unread) const
+{
+    bool passes_strings = true;
+
+    for(auto& s:strings)
+        passes_strings = passes_strings && QString::fromStdString(post.mMeta.mMsgName).contains(s,Qt::CaseInsensitive);
+
+    if(strings.empty())
+        passes_strings = true;
+
+    if(passes_strings && (!only_unread || (IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus))))
+        return true;
+
+    return false;
+}
+
 void RsGxsChannelPostsModel::setFilter(const QStringList& strings,bool only_unread, uint32_t& count)
+{
+    mFilteredStrings = strings;
+    mFilterUnread = only_unread;
+
+    updateFilter(count);
+}
+
+void RsGxsChannelPostsModel::updateFilter(uint32_t& count)
 {
 	preMods();
 
@@ -151,18 +175,8 @@ void RsGxsChannelPostsModel::setFilter(const QStringList& strings,bool only_unre
 	endResetModel();
 
     for(size_t i=0;i<mPosts.size();++i)
-    {
-        bool passes_strings = true;
-
-        for(auto& s:strings)
-            passes_strings = passes_strings && QString::fromStdString(mPosts[i].mMeta.mMsgName).contains(s,Qt::CaseInsensitive);
-
-        if(strings.empty())
-            passes_strings = true;
-
-        if(passes_strings && (!only_unread || (IS_MSG_UNREAD(mPosts[i].mMeta.mMsgStatus) || IS_MSG_NEW(mPosts[i].mMeta.mMsgStatus))))
-            mFilteredPosts.push_back(i);
-    }
+        if(postPassesFilter(mPosts[i],mFilteredStrings,mFilterUnread))
+                mFilteredPosts.push_back(i);
 
     count = mFilteredPosts.size();
 
@@ -514,20 +528,13 @@ void RsGxsChannelPostsModel::updateSinglePost(const RsGxsChannelPost& post,std::
 #endif
         added_files.insert(post.mFiles.begin(),post.mFiles.end());
         mPosts.push_back(post);
-
-        std::sort(mPosts.begin(),mPosts.end());
-
-        // We don't do that, because otherwise the filtered posts will be changed dynamically when browsing, which is bad.
-        //
-        //   mFilteredPosts.clear();
-        //   for(uint32_t i=0;i<mPosts.size();++i)
-        //     mFilteredPosts.push_back(i);
     }
+    std::sort(mPosts.begin(),mPosts.end());
+
+    uint32_t count;
+    updateFilter(count);
 
     triggerViewUpdate();
-
-    emit layoutChanged();
-    emit channelPostsLoaded();
 }
 
 void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost>& posts)
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
index a84a4df60..4fe35e589 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
@@ -141,6 +141,8 @@ public:
     void setAllMsgReadStatus(bool read_status);
 
     void setFilter(const QStringList &strings, bool only_unread,uint32_t &count) ;
+    bool postPassesFilter(const RsGxsChannelPost &post, const QStringList &strings, bool only_unread) const;
+    void updateFilter(uint32_t& count);
 
 #ifdef TODO
 	void setAuthorOpinion(const QModelIndex& indx,RsOpinion op);
@@ -239,6 +241,9 @@ public:
 private:
     void initEmptyHierarchy();
 
+    QStringList mFilteredStrings;
+    bool mFilterUnread;
+
     std::vector<int> mFilteredPosts;		// stores the list of displayes indices due to filtering.
     std::vector<RsGxsChannelPost> mPosts ;  // store the list of posts updated from rsForums.
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 023732ed7..b1715d9d8 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -784,6 +784,7 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         {
             if(e->mChannelGroupId == groupId())
             {
+                RsDbg() << "Received new message in current channel, msgId=" << e->mChannelMsgId ;
 
                 RsThread::async([this,e]()
                 {
@@ -803,6 +804,7 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
                         return;
                     }
 
+#ifdef TO_REMOVE
                     // Need to call this in order to get the actual comment count. The previous call only retrieves the message, since we supplied the message ID.
                     // another way to go would be to save the comment ids of the existing message and re-insert them before calling getChannelContent.
 
@@ -815,6 +817,7 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
                     // Normally, there's a single post in the "post" array. The function below takes a full array of posts however.
 
                     RsGxsChannelPostsModel::computeCommentCounts(posts,comments);
+#endif
 
                     // 2 - update the model in the UI thread.
 
@@ -831,8 +834,6 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
 
                         mChannelFilesModel->update_files(added_filesi,removed_filesi);
 
-                        updateDisplay(true,false);
-
                     },this);
                 });
             }
@@ -994,6 +995,8 @@ void GxsChannelPostsWidgetWithModel::updateData(bool update_group_data, bool upd
 
             if(update_posts)
             {
+                blank();
+
                 ui->postsTree->setPlaceholderText(tr("Loading..."));
 
                 mChannelPostsModel->updateChannel(groupId());
@@ -1068,7 +1071,7 @@ void GxsChannelPostsWidgetWithModel::postChannelPostLoad()
 void GxsChannelPostsWidgetWithModel::updateDisplay(bool update_group_data,bool update_posts)
 {
     // First, clear all widget
-    blank();
+
 #ifdef DEBUG_CHANNEL
     std::cerr << "udateDisplay: groupId()=" << groupId()<< std::endl;
 #endif

From dec1d3068b75b376d9c520aa58eb3b2b3fd4db2b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 23 Mar 2023 22:07:28 +0100
Subject: [PATCH 196/503] fixed 2 bugs in post display

---
 libbitdht                                                | 2 +-
 libretroshare                                            | 2 +-
 .../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp   | 9 ++-------
 retroshare-webui                                         | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/libbitdht b/libbitdht
index 2ddc86fb5..659423769 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
+Subproject commit 659423769541169457c41f71c8a038e2d64ba079
diff --git a/libretroshare b/libretroshare
index a9d4447c5..74cd958cf 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit a9d4447c5660337b4f7945d20e0f4ffd68d918e9
+Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index b1715d9d8..ed721a66a 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -780,6 +780,7 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         }
         break;
 
+        case RsChannelEventCode::READ_STATUS_CHANGED:
         case RsChannelEventCode::NEW_MESSAGE:
         {
             if(e->mChannelGroupId == groupId())
@@ -821,7 +822,7 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
 
                     // 2 - update the model in the UI thread.
 
-                    RsQThreadUtils::postToObject( [&post=posts[0],this]()
+                    RsQThreadUtils::postToObject( [post=posts[0],this]()
                     {
                         std::set<RsGxsFile> added_files,removed_files;
 
@@ -847,10 +848,6 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
                 ui->commentsDialog->refresh();
         break;
 
-        case RsChannelEventCode::READ_STATUS_CHANGED:
-            mChannelPostsModel->triggerViewUpdate();
-        break;
-
         default:
         break;
 
@@ -995,8 +992,6 @@ void GxsChannelPostsWidgetWithModel::updateData(bool update_group_data, bool upd
 
             if(update_posts)
             {
-                blank();
-
                 ui->postsTree->setPlaceholderText(tr("Loading..."));
 
                 mChannelPostsModel->updateChannel(groupId());
diff --git a/retroshare-webui b/retroshare-webui
index a593b9c80..5cc37b3e5 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit a593b9c808f90cce7d47a5de86c207ef8675945f
+Subproject commit 5cc37b3e5ad6b64b247e9d2066a9b6c8acae67ce

From e4910cf8fdd9ee43f78a1cb97b91bbf6fea83cea Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 24 Mar 2023 13:48:48 +0100
Subject: [PATCH 197/503] fixed update of comment/unread comment count when a
 new version of a msg arrives

---
 .../src/gui/gxschannels/GxsChannelPostsModel.cpp    | 13 +++++++++++++
 .../gxschannels/GxsChannelPostsWidgetWithModel.cpp  |  2 --
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 508db7046..865cd776b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -498,7 +498,14 @@ void RsGxsChannelPostsModel::updateSinglePost(const RsGxsChannelPost& post,std::
             added_files.insert(post.mFiles.begin(),post.mFiles.end());
             removed_files.insert(mPosts[j].mFiles.begin(),mPosts[j].mFiles.end());
 
+            auto save_ucc = mPosts[j].mUnreadCommentCount;
+            auto save_cc  = mPosts[j].mCommentCount;
+
             mPosts[j] = post;
+
+            mPosts[j].mUnreadCommentCount = save_ucc;
+            mPosts[j].mCommentCount = save_cc;
+
 #ifdef DEBUG_CHANNEL_MODEL
             RsDbg() << "  post is an updated existing post." ;
 #endif
@@ -512,7 +519,13 @@ void RsGxsChannelPostsModel::updateSinglePost(const RsGxsChannelPost& post,std::
             removed_files.insert(mPosts[j].mFiles.begin(),mPosts[j].mFiles.end());
 
             auto old_post_id = mPosts[j].mMeta.mMsgId;
+            auto save_ucc = mPosts[j].mUnreadCommentCount;
+            auto save_cc  = mPosts[j].mCommentCount;
+
             mPosts[j] = post;
+
+            mPosts[j].mCommentCount += save_cc;
+            mPosts[j].mUnreadCommentCount += save_ucc;
             mPosts[j].mOlderVersions.insert(old_post_id);
 #ifdef DEBUG_CHANNEL_MODEL
             RsDbg() << "  post is an new version of an existing post." ;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index ed721a66a..e63b96633 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -805,7 +805,6 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
                         return;
                     }
 
-#ifdef TO_REMOVE
                     // Need to call this in order to get the actual comment count. The previous call only retrieves the message, since we supplied the message ID.
                     // another way to go would be to save the comment ids of the existing message and re-insert them before calling getChannelContent.
 
@@ -818,7 +817,6 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
                     // Normally, there's a single post in the "post" array. The function below takes a full array of posts however.
 
                     RsGxsChannelPostsModel::computeCommentCounts(posts,comments);
-#endif
 
                     // 2 - update the model in the UI thread.
 

From 43d8432dcc800f0d7735046f883ca8cad53a5c19 Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Sun, 26 Mar 2023 02:12:49 +0530
Subject: [PATCH 198/503] This commit fixed the Download_Complete sound not
 working when a download is completed.

---
 retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index ba5fc017d..ee4afff2c 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -19,8 +19,8 @@
  *******************************************************************************/
 
 #include "TransfersDialog.h"
-
 #include "gui/notifyqt.h"
+#include "gui/SoundManager.h"
 #include "gui/RetroShareLink.h"
 #include "gui/common/FilesDefs.h"
 #include "gui/common/RsCollection.h"
@@ -1113,6 +1113,7 @@ void TransfersDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> eve
  	switch (fe->mFileTransferEventCode)
     {
 	case RsFileTransferEventCode::DOWNLOAD_COMPLETE:
+		SoundManager::play(SOUND_DOWNLOAD_COMPLETE);
 	case RsFileTransferEventCode::COMPLETED_FILES_REMOVED:
 
         getUserNotify()->updateIcon();

From e8354aa3d3f1c35ffcc591a0ff952e1ee074fadb Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Sun, 26 Mar 2023 02:18:03 +0530
Subject: [PATCH 199/503] Just added a empty line in the header file section.

---
 retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index ee4afff2c..2b342515f 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -19,6 +19,7 @@
  *******************************************************************************/
 
 #include "TransfersDialog.h"
+
 #include "gui/notifyqt.h"
 #include "gui/SoundManager.h"
 #include "gui/RetroShareLink.h"

From 3316d7563027b747cdf02f2d3e189bf06407a0c9 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 26 Mar 2023 16:29:00 +0200
Subject: [PATCH 200/503] fixed bug accessing a potentially deleted object of
 the parent thread

---
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index e63b96633..c8a0fd117 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -787,7 +787,7 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
             {
                 RsDbg() << "Received new message in current channel, msgId=" << e->mChannelMsgId ;
 
-                RsThread::async([this,e]()
+                RsThread::async([this,E=*e]()	// dereferencing to make a copy that will survive while e is deleted by the parent thread.
                 {
                     // 1 - get message data from p3GxsChannels. No need for pointers here, because we send only a single post to postToObject()
                     //     At this point we dont know what kind of msg id we have. It can be a vote, a comment or an actual message.
@@ -796,8 +796,8 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
                     std::vector<RsGxsComment>     comments;
                     std::vector<RsGxsVote>        votes;
 
-                    const auto& msg_id(e->mChannelMsgId);
-                    const auto& grp_id(e->mChannelGroupId);
+                    const auto& msg_id(E.mChannelMsgId);
+                    const auto& grp_id(E.mChannelGroupId);
 
                     if(!rsGxsChannels->getChannelContent(grp_id, { msg_id }, posts,comments,votes) || posts.size() != 1)
                     {

From 191d7ac96e2d894781483e21a3f677f419a119a8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 26 Mar 2023 16:29:12 +0200
Subject: [PATCH 201/503] improved debug output

---
 .../gxschannels/GxsChannelPostFilesModel.cpp  | 35 ++++++++++++-------
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 11 +++---
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index 2d0b10106..ee1bc5fe2 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -33,11 +33,11 @@
 
 #include "GxsChannelPostFilesModel.h"
 
-//#define DEBUG_CHANNEL_MODEL
+#define DEBUG_CHANNEL_FILES_MODEL
 
 Q_DECLARE_METATYPE(ChannelPostFileInfo)
 
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_FILES_MODEL
 static std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere
 #endif
 
@@ -161,8 +161,8 @@ QModelIndex RsGxsChannelPostFilesModel::index(int row, int column, const QModelI
 
     quintptr ref = getChildRef(parent.internalId(),row);
 
-#ifdef DEBUG_CHANNEL_MODEL
-	std::cerr << "index-3(" << row << "," << column << " parent=" << parent << ") : " << createIndex(row,column,ref) << std::endl;
+#ifdef DEBUG_CHANNEL_FILES_MODEL
+    RsDbg() << "index-3(" << row << "," << column << " parent=" << parent << ") : " << createIndex(row,column,ref) ;
 #endif
 	return createIndex(row,column,ref) ;
 }
@@ -242,7 +242,7 @@ QVariant RsGxsChannelPostFilesModel::headerData(int section, Qt::Orientation /*o
 
 QVariant RsGxsChannelPostFilesModel::data(const QModelIndex &index, int role) const
 {
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_FILES_MODEL
     std::cerr << "calling data(" << index << ") role=" << role << std::endl;
 #endif
 
@@ -259,13 +259,13 @@ QVariant RsGxsChannelPostFilesModel::data(const QModelIndex &index, int role) co
 	quintptr ref = (index.isValid())?index.internalId():0 ;
 	uint32_t entry = 0;
 
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_FILES_MODEL
 	std::cerr << "data(" << index << ")" ;
 #endif
 
 	if(!ref)
 	{
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_FILES_MODEL
 		std::cerr << " [empty]" << std::endl;
 #endif
 		return QVariant() ;
@@ -273,7 +273,7 @@ QVariant RsGxsChannelPostFilesModel::data(const QModelIndex &index, int role) co
 
 	if(!convertRefPointerToTabEntry(ref,entry) || entry >= mFilteredFiles.size())
 	{
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_FILES_MODEL
 		std::cerr << "Bad pointer: " << (void*)ref << std::endl;
 #endif
 		return QVariant() ;
@@ -443,7 +443,7 @@ void RsGxsChannelPostFilesModel::setFiles(const std::list<ChannelPostFileInfo> &
 	for(uint32_t i=0;i<mFiles.size();++i)
 		mFilteredFiles.push_back(i);
 
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_FILES_MODEL
 	// debug_dump();
 #endif
 
@@ -467,7 +467,9 @@ void RsGxsChannelPostFilesModel::update_files(std::set<ChannelPostFileInfo>& add
 {
     // 1 - remove common files from both lists
 
-    std::cerr << "RsGxsChannelPostsFilesModel:: updating files." << std::endl;
+#ifdef DEBUG_CHANNEL_FILES_MODEL
+    RsDbg() << "RsGxsChannelPostsFilesModel:: updating files." ;
+#endif
 
     for(auto afit=added_files.begin();afit!=added_files.end();)
     {
@@ -475,7 +477,9 @@ void RsGxsChannelPostFilesModel::update_files(std::set<ChannelPostFileInfo>& add
 
         if(rfit != removed_files.end())
         {
-            std::cerr << "  Eliminating common file " << rfit->mName << std::endl;
+#ifdef DEBUG_CHANNEL_FILES_MODEL
+            RsDbg() << "  Eliminating common file " << rfit->mName ;
+#endif
             removed_files.erase(rfit);
             auto tmp = afit;
             ++tmp;
@@ -486,11 +490,15 @@ void RsGxsChannelPostFilesModel::update_files(std::set<ChannelPostFileInfo>& add
             ++afit;
     }
 
+    RsDbg() << "  Remains: " << added_files.size() << " added files and " << removed_files.size() << " removed files" ;
+
     // 2 - add whatever file remains,
 
     for(const auto& f:removed_files)
     {
-        std::cerr << "  Removing deleted file " << f.mName << std::endl;
+#ifdef DEBUG_CHANNEL_FILES_MODEL
+        RsDbg() << "  Removing deleted file " << f.mName ;
+#endif
 
         for(uint32_t i=0;i<mFiles.size();++i)
             if(mFiles[i].mHash == f.mHash)
@@ -504,6 +512,9 @@ void RsGxsChannelPostFilesModel::update_files(std::set<ChannelPostFileInfo>& add
 
     for(const auto& f:added_files )
     {
+#ifdef DEBUG_CHANNEL_FILES_MODEL
+        RsDbg() << "  Adding new file " << f.mName ;
+#endif
         mFilteredFiles.push_back(mFiles.size());
         mFiles.push_back(f);
     }
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 865cd776b..0fe8265f6 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -35,6 +35,7 @@
 #include "GxsChannelPostsModel.h"
 #include "GxsChannelPostFilesModel.h"
 
+//#define DEBUG_CHANNEL_MODEL_DATA
 #define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
@@ -283,7 +284,7 @@ QModelIndex RsGxsChannelPostsModel::index(int row, int column, const QModelIndex
 
     quintptr ref = getChildRef(parent.internalId(),(mTreeMode == TREE_MODE_GRID)?(column + row*mColumns):row);
 
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_MODEL_DATA
 	std::cerr << "index-3(" << row << "," << column << " parent=" << parent << ") : " << createIndex(row,column,ref) << std::endl;
 #endif
 	return createIndex(row,column,ref) ;
@@ -373,7 +374,7 @@ int RsGxsChannelPostsModel::getChildrenCount(quintptr ref) const
 
 QVariant RsGxsChannelPostsModel::data(const QModelIndex &index, int role) const
 {
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_MODEL_DATA
     std::cerr << "calling data(" << index << ") role=" << role << std::endl;
 #endif
 
@@ -390,13 +391,13 @@ QVariant RsGxsChannelPostsModel::data(const QModelIndex &index, int role) const
 	quintptr ref = (index.isValid())?index.internalId():0 ;
 	uint32_t entry = 0;
 
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_MODEL_DATA
 	std::cerr << "data(" << index << ")" ;
 #endif
 
 	if(!ref)
 	{
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_MODEL_DATA
 		std::cerr << " [empty]" << std::endl;
 #endif
 		return QVariant() ;
@@ -404,7 +405,7 @@ QVariant RsGxsChannelPostsModel::data(const QModelIndex &index, int role) const
 
 	if(!convertRefPointerToTabEntry(ref,entry) || entry >= mFilteredPosts.size())
 	{
-#ifdef DEBUG_CHANNEL_MODEL
+#ifdef DEBUG_CHANNEL_MODEL_DATA
 		std::cerr << "Bad pointer: " << (void*)ref << std::endl;
 #endif
 		return QVariant() ;

From 5f54db577c59778816a5dc2eea9706d86069266e Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 26 Mar 2023 20:00:13 +0200
Subject: [PATCH 202/503] Fixed Toasters

Fixed Online, Download Complete, Mail & FR Toaster
---
 .../src/gui/FileTransfer/TransfersDialog.cpp  |  6 ++
 retroshare-gui/src/gui/NewsFeed.cpp           |  6 ++
 .../src/gui/msgs/MessageUserNotify.cpp        | 11 +++
 retroshare-gui/src/gui/notifyqt.cpp           | 79 +++++++++++++++++++
 retroshare-gui/src/gui/notifyqt.h             |  1 +
 .../src/gui/toaster/MessageToaster.cpp        | 24 +++++-
 6 files changed, 125 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 2b342515f..bb516d5c1 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -1111,10 +1111,16 @@ void TransfersDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> eve
 	if(!fe)
         return;
 
+	FileInfo nfo ;
+	if(!rsFiles->FileDetails(fe->mHash, RS_FILE_HINTS_DOWNLOAD, nfo)) 
+		return ;
+
  	switch (fe->mFileTransferEventCode)
     {
 	case RsFileTransferEventCode::DOWNLOAD_COMPLETE:
 		SoundManager::play(SOUND_DOWNLOAD_COMPLETE);
+		if (Settings->getNotifyFlags() & RS_POPUP_DOWNLOAD)
+			NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),"");
 	case RsFileTransferEventCode::COMPLETED_FILES_REMOVED:
 
         getUserNotify()->updateIcon();
diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp
index 252560d43..36f547738 100644
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@@ -441,6 +441,8 @@ void NewsFeed::handleConnectionEvent(std::shared_ptr<const RsEvent> event)
 	{
 	case RsConnectionEventCode::PEER_CONNECTED:
 		addFeedItemIfUnique(new PeerItem(this, NEWSFEED_PEERLIST, e.mSslId, PEER_TYPE_CONNECT, false), true);
+		if (Settings->getNotifyFlags() & RS_POPUP_CONNECT)
+			NotifyQt::getInstance()->addToaster(RS_POPUP_CONNECT, e.mSslId.toStdString().c_str(), "", "");
 		break;
 	case RsConnectionEventCode::PEER_DISCONNECTED: // not handled yet
 		break;
@@ -476,6 +478,7 @@ void NewsFeed::handleSecurityEvent(std::shared_ptr<const RsEvent> event)
 		addFeedItemIfUnique(new PeerItem(this, NEWSFEED_PEERLIST, e.mSslId, PEER_TYPE_HELLO, false), true );
 		return;
 	}
+	
 
     uint32_t FeedItemType=0;
 
@@ -504,6 +507,9 @@ void NewsFeed::handleSecurityEvent(std::shared_ptr<const RsEvent> event)
 
 	if (Settings->getMessageFlags() & RS_MESSAGE_CONNECT_ATTEMPT)
 		MessageComposer::addConnectAttemptMsg(e.mPgpId, e.mSslId, QString::fromStdString(det.name + "(" + det.location + ")"));
+	
+	if (Settings->getNotifyFlags() & RS_POPUP_CONNECT_ATTEMPT)
+		NotifyQt::getInstance()->addToaster(RS_POPUP_CONNECT_ATTEMPT, e.mPgpId.toStdString().c_str(), det.location, e.mSslId.toStdString().c_str());
 }
 
 void NewsFeed::testFeeds(uint /*notifyFlags*/)
diff --git a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
index fddf2c8d5..60e6ec197 100644
--- a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
@@ -23,6 +23,7 @@
 #include "gui/notifyqt.h"
 #include "gui/MainWindow.h"
 #include "util/qtthreadsutils.h"
+#include "gui/settings/rsharesettings.h"
 
 #include "gui/msgs/MessageInterface.h"
 
@@ -91,8 +92,18 @@ void MessageUserNotify::handleEvent_main_thread(std::shared_ptr<const RsEvent> e
 		return;
 	}
 
+	std::set<RsMailMessageId>::const_iterator it;
+
 	switch (fe->mMailStatusEventCode) {
 	case RsMailStatusEventCode::NEW_MESSAGE:
+		if (Settings->getNotifyFlags() & RS_POPUP_MSG)
+			for (it = fe->mChangedMsgIds.begin(); it != fe->mChangedMsgIds.end(); ++it) {
+				MessageInfo msgInfo;
+				if (rsMail->getMessage(*it, msgInfo)) {
+						NotifyQt::getInstance()->addToaster(RS_POPUP_MSG, msgInfo.msgId.c_str(), msgInfo.title.c_str(), msgInfo.msg.c_str() );
+				}
+			}
+		break;
 	case RsMailStatusEventCode::MESSAGE_CHANGED:
 	case RsMailStatusEventCode::MESSAGE_REMOVED:
 		updateIcon();
diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp
index 7d2e9a207..59d102170 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -1162,3 +1162,82 @@ void NotifyQt::runningTick()
 	}
 }
 
+void NotifyQt::addToaster(uint notifyFlags, const std::string& id, const std::string& title, const std::string& msg)
+{
+	uint pos = 0;
+
+	while (notifyFlags) {
+		uint type = notifyFlags & (1 << pos);
+		notifyFlags &= ~(1 << pos);
+		++pos;
+
+		ToasterItem *toaster = NULL;
+
+		switch(type)
+		{
+			case RS_POPUP_ENCRYPTED_MSG:
+				SoundManager::play(SOUND_MESSAGE_ARRIVED);
+
+				toaster = new ToasterItem(new MessageToaster(std::string(), tr("Unknown title"), QString("[%1]").arg(tr("Encrypted message"))));
+				break;
+			case RS_POPUP_MSG:
+				SoundManager::play(SOUND_MESSAGE_ARRIVED);
+
+				toaster = new ToasterItem(new MessageToaster(id, QString::fromUtf8(title.c_str()), QString::fromUtf8(msg.c_str())));
+				break;
+			case RS_POPUP_CONNECT:
+				SoundManager::play(SOUND_USER_ONLINE);
+
+				toaster = new ToasterItem(new OnlineToaster(RsPeerId(id)));
+				break;
+			case RS_POPUP_DOWNLOAD:
+				SoundManager::play(SOUND_DOWNLOAD_COMPLETE);
+
+				toaster = new ToasterItem(new DownloadToaster(RsFileHash(id), QString::fromUtf8(title.c_str())));
+				break;
+			case RS_POPUP_CHAT:
+				toaster = new ToasterItem(new ChatToaster(RsPeerId(id), QString::fromUtf8(msg.c_str())));
+				break;
+			case RS_POPUP_GROUPCHAT:
+#ifdef RS_DIRECT_CHAT
+				toaster = new ToasterItem(new GroupChatToaster(RsPeerId(id), QString::fromUtf8(msg.c_str())));
+#endif // RS_DIRECT_CHAT
+				break;
+			case RS_POPUP_CHATLOBBY:
+				{
+					ChatId chat_id(id);
+
+					ChatDialog *chatDialog = ChatDialog::getChat(chat_id);
+					ChatWidget *chatWidget;
+					if (chatDialog && (chatWidget = chatDialog->getChatWidget()) && chatWidget->isActive()) {
+						// do not show when active
+						break;
+					}
+
+					ChatLobbyDialog *chatLobbyDialog = dynamic_cast<ChatLobbyDialog*>(chatDialog);
+
+					RsGxsId sender(title);
+					if (!chatLobbyDialog || chatLobbyDialog->isParticipantMuted(sender))
+						break; // participant is muted
+
+					toaster = new ToasterItem(new ChatLobbyToaster(chat_id.toLobbyId(), sender, QString::fromUtf8(msg.c_str())));
+					}
+				break;
+			case RS_POPUP_CONNECT_ATTEMPT:
+					// id = gpgid
+					// title = ssl name
+					// msg = peer id
+					toaster = new ToasterItem(new FriendRequestToaster(RsPgpId(id), QString::fromUtf8(title.c_str()), RsPeerId(msg)));
+				break;
+		}
+
+		if (toaster) {
+			/* init attributes */
+			toaster->widget->setWindowFlags(Qt::ToolTip | Qt::WindowStaysOnTopHint);
+
+			/* add toaster to waiting list */
+			//QMutexLocker lock(&waitingToasterMutex);
+			waitingToasterList.push_back(toaster);
+		}
+	}
+}
diff --git a/retroshare-gui/src/gui/notifyqt.h b/retroshare-gui/src/gui/notifyqt.h
index f4fc063c7..d2b15fa09 100644
--- a/retroshare-gui/src/gui/notifyqt.h
+++ b/retroshare-gui/src/gui/notifyqt.h
@@ -95,6 +95,7 @@ class NotifyQt: public QObject, public NotifyClient
 		void testToaster(ToasterNotify *toasterNotify, /*RshareSettings::enumToasterPosition*/ int position, QPoint margin);
 		void testToaster(QString tag, ToasterNotify *toasterNotify, /*RshareSettings::enumToasterPosition*/ int position, QPoint margin);
 
+		void addToaster(uint notifyFlags, const std::string& id, const std::string& title, const std::string& msg);
 		void notifySettingsChanged();
 
 	signals:
diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.cpp b/retroshare-gui/src/gui/toaster/MessageToaster.cpp
index 93772ca68..1f4894ba3 100644
--- a/retroshare-gui/src/gui/toaster/MessageToaster.cpp
+++ b/retroshare-gui/src/gui/toaster/MessageToaster.cpp
@@ -21,7 +21,11 @@
 #include "MessageToaster.h"
 #include "../MainWindow.h"
 
+#include <retroshare/rsmsgs.h>
 #include <retroshare/rspeers.h>
+#include <retroshare/rsidentity.h>
+
+#include "gui/msgs/MessageInterface.h"
 
 MessageToaster::MessageToaster(const std::string &peerId, const QString &title, const QString &message) : QWidget(NULL)
 {
@@ -39,8 +43,24 @@ MessageToaster::MessageToaster(const std::string &peerId, const QString &title,
 	ui.textLabel->setText(message);
 	ui.textLabel->setToolTip(message);
 
-	std::string name = (!RsPeerId(peerId).isNull())? (rsPeers->getPeerName(RsPeerId(peerId))): (rsPeers->getGPGName(RsPgpId(peerId))) ;
-	ui.toasterLabel->setText(ui.toasterLabel->text() + " " + QString::fromUtf8(name.c_str()));
+	MessageInfo mi;
+
+	if (!rsMail->getMessage(peerId, mi))
+		return;
+
+	QString srcName;
+
+	if(mi.msgflags & RS_MSG_DISTANT)
+	{
+		RsIdentityDetails details ;
+		rsIdentity->getIdDetails(mi.from.toGxsId(), details) ;
+
+		srcName = QString::fromUtf8(details.mNickname.c_str());
+	}
+	else
+		srcName = QString::fromUtf8(rsPeers->getPeerName(mi.from.toRsPeerId()).c_str());
+
+	ui.toasterLabel->setText(ui.toasterLabel->text() + " " + srcName);
 }
 
 void MessageToaster::openmessageClicked()

From e63ff4d7db27b9d6fa125c18f3eac9e82ab45a3b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 26 Mar 2023 22:49:08 +0200
Subject: [PATCH 203/503] made setAllMsgAsRead faster in channels, avoiding to
 reload all posts

---
 .../gxschannels/GxsChannelPostFilesModel.cpp  |  2 +-
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 23 +++++++++++++--
 .../GxsChannelPostsWidgetWithModel.cpp        | 29 +++++++++++++------
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index ee1bc5fe2..856ef32e1 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -33,7 +33,7 @@
 
 #include "GxsChannelPostFilesModel.h"
 
-#define DEBUG_CHANNEL_FILES_MODEL
+//#define DEBUG_CHANNEL_FILES_MODEL
 
 Q_DECLARE_METATYPE(ChannelPostFileInfo)
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 0fe8265f6..b7f9f53d1 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -39,7 +39,6 @@
 #define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
-
 Q_DECLARE_METATYPE(RsGxsChannelPost)
 
 std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere
@@ -206,7 +205,7 @@ int RsGxsChannelPostsModel::rowCount(const QModelIndex& parent) const
             return mFilteredPosts.size();
     }
 
-    RsErr() << __PRETTY_FUNCTION__ << " rowCount cannot figure out the porper number of rows." << std::endl;
+    RsErr() << __PRETTY_FUNCTION__ << " rowCount cannot figure out the proper number of rows." ;
     return 0;
 }
 
@@ -790,6 +789,16 @@ void RsGxsChannelPostsModel::setAllMsgReadStatus(bool read_status)
             if(!rsGxsChannels->setMessageReadStatus(p,read_status))
                 RsErr() << "setAllMsgReadStatus: failed to change status of msg " << p.first << " in group " << p.second << " to status " << read_status << std::endl;
         });
+
+    // 3 - update the local model data, since we don't catch the READ_STATUS_CHANGED event later, to avoid re-loading the msg.
+
+    for(uint32_t i=0;i<mPosts.size();++i)
+        if(read_status)
+            mPosts[i].mMeta.mMsgStatus &= ~GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
+        else
+            mPosts[i].mMeta.mMsgStatus |= GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
+
+    emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,mColumns-1,(void*)NULL));
 }
 
 void RsGxsChannelPostsModel::setMsgReadStatus(const QModelIndex& i,bool read_status)
@@ -806,6 +815,16 @@ void RsGxsChannelPostsModel::setMsgReadStatus(const QModelIndex& i,bool read_sta
 		return ;
 
     rsGxsChannels->setMessageReadStatus(RsGxsGrpMsgIdPair(mPosts[mFilteredPosts[entry]].mMeta.mGroupId,mPosts[mFilteredPosts[entry]].mMeta.mMsgId),read_status);
+
+    // Quick update to the msg itself. Normally setMsgReadStatus will launch an event,
+    // that we can catch to update the msg, but all the information is already here.
+
+    if(read_status)
+        mPosts[mFilteredPosts[entry]].mMeta.mMsgStatus &= ~GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
+    else
+        mPosts[mFilteredPosts[entry]].mMeta.mMsgStatus |= GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
+
+    emit dataChanged(i,i);
 }
 
 QModelIndex RsGxsChannelPostsModel::getIndexOfMessage(const RsGxsMessageId& mid) const
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index c8a0fd117..9198ed73a 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -119,6 +119,7 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
     painter->save();
     painter->setClipRect(option.rect);
 
+    std::cerr << "option.rect=" << option.rect.width() << " x " << option.rect.height() << std::endl;
     RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
 
     // if(index.row() & 0x01)
@@ -262,6 +263,9 @@ QSize ChannelPostDelegate::sizeHint(const QStyleOptionViewItem& option, const QM
 
     float cell_width  = mZoom*COLUMN_SIZE_FONT_FACTOR_W*fm.height();
     float cell_height = mZoom*COLUMN_SIZE_FONT_FACTOR_W*fm.height()*aspect_ratio;
+#ifdef DEBUG_CHANNEL_POSTS_WIDGET
+    RsDbg() << "SizeHint: mUseGrid=" << mUseGrid << " cell_width=" << cell_width << " cell_height=" << cell_height << " mZoom=" << mZoom ;
+#endif
 
     if(mUseGrid || index.column()==0)
         return QSize(cell_width,cell_height);
@@ -743,7 +747,7 @@ void GxsChannelPostsWidgetWithModel::handlePostsTreeSizeChange(QSize s,bool forc
         return;
 
     int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),ui->postsTree->width()))));
-    std::cerr << "nb columns: " << n_columns << " current count=" << mChannelPostsModel->columnCount() << std::endl;
+    RsDbg() << "nb columns: " << n_columns << " current count=" << mChannelPostsModel->columnCount() ;
 
     // save current post. The setNumColumns() indeed loses selection
 
@@ -780,7 +784,9 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         }
         break;
 
-        case RsChannelEventCode::READ_STATUS_CHANGED:
+        case RsChannelEventCode::READ_STATUS_CHANGED: // This is already handled by setMsgReadStatus() that has been called and issued this event.
+        break;
+
         case RsChannelEventCode::NEW_MESSAGE:
         {
             if(e->mChannelGroupId == groupId())
@@ -857,7 +863,7 @@ void GxsChannelPostsWidgetWithModel::showPostDetails()
     QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
     RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
 #ifdef DEBUG_CHANNEL_POSTS_WIDGET
-    std::cerr << "showPostDetails: current index is " << index.row() << "," << index.column() << std::endl;
+    RsDbg() << "showPostDetails: current index is " << index.row() << "," << index.column() ;
 #endif
 
     //QTextDocument doc;
@@ -882,7 +888,7 @@ void GxsChannelPostsWidgetWithModel::showPostDetails()
     ui->postTime_LB->show();
 
 #ifdef DEBUG_CHANNEL_POSTS_WIDGET
-    std::cerr << "showPostDetails: setting mLastSelectedPosts[groupId()] to current post Id " << post.mMeta.mMsgId << ". Previous value: " << mLastSelectedPosts[groupId()] << std::endl;
+    RsDbg() << "showPostDetails: setting mLastSelectedPosts[groupId()] to current post Id " << post.mMeta.mMsgId << ". Previous value: " << mLastSelectedPosts[groupId()] ;
 #endif
     mLastSelectedPosts[groupId()] = post.mMeta.mMsgId;
 
@@ -898,7 +904,7 @@ void GxsChannelPostsWidgetWithModel::showPostDetails()
     ui->commentsDialog->commentLoad(post.mMeta.mGroupId, all_msgs_versions, post.mMeta.mMsgId,true);
 
 #ifdef DEBUG_CHANNEL_POSTS_WIDGET
-    std::cerr << "Showing details about selected index : "<< index.row() << "," << index.column() << std::endl;
+    RsDbg() << "Showing details about selected index : "<< index.row() << "," << index.column() ;
 #endif
 
     ui->postDetails_TE->setText(RsHtml().formatText(NULL, QString::fromUtf8(post.mMsg.c_str()), /* RSHTML_FORMATTEXT_EMBED_SMILEYS |*/ RSHTML_FORMATTEXT_EMBED_LINKS));
@@ -930,11 +936,16 @@ void GxsChannelPostsWidgetWithModel::showPostDetails()
 
     if(IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus))
     {
-        RsGxsGrpMsgIdPair postId;
-        postId.second = post.mMeta.mMsgId;
-        postId.first  = post.mMeta.mGroupId;
+        mChannelPostsModel->setMsgReadStatus(index,true);
 
-        RsThread::async([postId]() { rsGxsChannels->setMessageReadStatus(postId, true) ; } );
+        //RsGxsGrpMsgIdPair postId;
+        //postId.second = post.mMeta.mMsgId;
+        //postId.first  = post.mMeta.mGroupId;
+
+        //RsThread::async([postId]()
+        //{
+            //rsGxsChannels->setMessageReadStatus(postId, true) ;
+        //} );
     }
 
     updateDAll_PB();

From 09e66cbde4bb864ce4a6fcc31e914a963db9b1d4 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 26 Mar 2023 23:03:09 +0200
Subject: [PATCH 204/503] code cleaning/disabled debug output

---
 .../src/gui/gxschannels/GxsChannelPostsModel.cpp |  2 +-
 .../GxsChannelPostsWidgetWithModel.cpp           | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index b7f9f53d1..7d34bb007 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -36,7 +36,7 @@
 #include "GxsChannelPostFilesModel.h"
 
 //#define DEBUG_CHANNEL_MODEL_DATA
-#define DEBUG_CHANNEL_MODEL
+//#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 Q_DECLARE_METATYPE(RsGxsChannelPost)
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 9198ed73a..268296220 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -119,14 +119,9 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
     painter->save();
     painter->setClipRect(option.rect);
 
-    std::cerr << "option.rect=" << option.rect.width() << " x " << option.rect.height() << std::endl;
     RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
 
-    // if(index.row() & 0x01)
-    //     painter->fillRect( option.rect, option.palette.alternateBase().color());
-    // else
-        painter->fillRect( option.rect, option.palette.base().color());
-
+    painter->fillRect( option.rect, option.palette.base().color());
     painter->restore();
 
     if(mUseGrid || index.column()==0)
@@ -145,14 +140,7 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
         if((option.state & QStyle::State_Selected) && post.mMeta.mPublishTs > 0) // check if post is selected and is not empty (end of last row)
             pixmap.fill(SelectedColor);	// I dont know how to grab the backgroud color for selected objects automatically.
         else
-        {
-                // we need to do the alternate color manually
-
-            //if(index.row() & 0x01)
-            //    pixmap.fill(option.palette.alternateBase().color());
-            //else
-                pixmap.fill(option.palette.base().color());
-        }
+            pixmap.fill(option.palette.base().color());
 
         w.render(&pixmap,QPoint(),QRegion(),QWidget::DrawChildren );// draw the widgets, not the background
 

From 48c959c8583155ca941f01376559f3f56c0dc56f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 27 Mar 2023 21:27:07 +0200
Subject: [PATCH 205/503] fixed bug in setting msg as read

---
 retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 7d34bb007..6063d4d64 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -794,9 +794,9 @@ void RsGxsChannelPostsModel::setAllMsgReadStatus(bool read_status)
 
     for(uint32_t i=0;i<mPosts.size();++i)
         if(read_status)
-            mPosts[i].mMeta.mMsgStatus &= ~GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
+            mPosts[i].mMeta.mMsgStatus &= ~(GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD | GXS_SERV::GXS_MSG_STATUS_GUI_NEW);
         else
-            mPosts[i].mMeta.mMsgStatus |= GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
+            mPosts[i].mMeta.mMsgStatus |= GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD ;
 
     emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,mColumns-1,(void*)NULL));
 }
@@ -820,7 +820,7 @@ void RsGxsChannelPostsModel::setMsgReadStatus(const QModelIndex& i,bool read_sta
     // that we can catch to update the msg, but all the information is already here.
 
     if(read_status)
-        mPosts[mFilteredPosts[entry]].mMeta.mMsgStatus &= ~GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
+        mPosts[mFilteredPosts[entry]].mMeta.mMsgStatus &= ~(GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD | GXS_SERV::GXS_MSG_STATUS_GUI_NEW);
     else
         mPosts[mFilteredPosts[entry]].mMeta.mMsgStatus |= GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
 

From cc93a6da1a61a02ff3df49856ffa827736c02e6e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 29 Mar 2023 20:46:41 +0200
Subject: [PATCH 206/503] using orange color for unread comment bubble in
 channel post widget, and fixed the color update when new comment arrives

---
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 12 ++++
 .../gui/gxschannels/GxsChannelPostsModel.h    |  1 +
 .../GxsChannelPostsWidgetWithModel.cpp        | 65 +++++++++++--------
 3 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 6063d4d64..7d22208d5 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -801,6 +801,16 @@ void RsGxsChannelPostsModel::setAllMsgReadStatus(bool read_status)
     emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,mColumns-1,(void*)NULL));
 }
 
+void RsGxsChannelPostsModel::updatePostWithNewComment(const RsGxsMessageId& msg_id)
+{
+    for(uint32_t i=0;i<mPosts.size();++i)
+        if(mPosts[i].mMeta.mMsgId == msg_id)
+        {
+            ++mPosts[i].mUnreadCommentCount;
+            emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,mColumns-1,(void*)NULL));	// update everything because we don't know the index.
+            break;
+        }
+}
 void RsGxsChannelPostsModel::setMsgReadStatus(const QModelIndex& i,bool read_status)
 {
 	if(!i.isValid())
@@ -824,6 +834,8 @@ void RsGxsChannelPostsModel::setMsgReadStatus(const QModelIndex& i,bool read_sta
     else
         mPosts[mFilteredPosts[entry]].mMeta.mMsgStatus |= GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD;
 
+    mPosts[mFilteredPosts[entry]].mUnreadCommentCount = 0;
+
     emit dataChanged(i,i);
 }
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
index 4fe35e589..3ec9f4d8b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
@@ -139,6 +139,7 @@ public:
 
     void setMsgReadStatus(const QModelIndex &i, bool read_status);
     void setAllMsgReadStatus(bool read_status);
+    void updatePostWithNewComment(const RsGxsMessageId& msg_id);
 
     void setFilter(const QStringList &strings, bool only_unread,uint32_t &count) ;
     bool postPassesFilter(const RsGxsChannelPost &post, const QStringList &strings, bool only_unread) const;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 268296220..b99f71faf 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -73,12 +73,13 @@ QColor SelectedColor = QRgb(0xff308dc7);
 #define COLUMN_SIZE_FONT_FACTOR_W  6
 #define COLUMN_SIZE_FONT_FACTOR_H  10
 
-#define STAR_OVERLAY_IMAGE ":icons/star_overlay_128.png"
-#define COMMENT_OVERLAY_IMAGE ":images/white-bubble-64.png"
-#define IMAGE_COPYLINK     ":icons/png/copy.png"
-#define IMAGE_GRID_VIEW    ":icons/png/menu.png"
-#define IMAGE_DOWNLOAD     ":icons/png/download.png"
-#define IMAGE_UNREAD       ":icons/png/message.png"
+#define STAR_OVERLAY_IMAGE           ":icons/star_overlay_128.png"
+#define COMMENT_OVERLAY_IMAGE        ":images/white-bubble-64.png"
+#define UNREAD_COMMENT_OVERLAY_IMAGE ":images/orange-bubble-64.png"
+#define IMAGE_COPYLINK               ":icons/png/copy.png"
+#define IMAGE_GRID_VIEW              ":icons/png/menu.png"
+#define IMAGE_DOWNLOAD               ":icons/png/download.png"
+#define IMAGE_UNREAD                 ":icons/png/message.png"
 
 Q_DECLARE_METATYPE(ChannelPostFileInfo)
 
@@ -157,33 +158,39 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
 //            file.close();
 //        }
 
-        if(mUseGrid || index.column()==0)
+        if(mZoom != 1.0)
+            pixmap = pixmap.scaled(mZoom*pixmap.size(),Qt::KeepAspectRatio,Qt::SmoothTransformation);
+
+        if(IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus))
         {
-            if(mZoom != 1.0)
-                pixmap = pixmap.scaled(mZoom*pixmap.size(),Qt::KeepAspectRatio,Qt::SmoothTransformation);
+            QPainter p(&pixmap);
+            QFontMetricsF fm(option.font);
 
-            if(IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus))
-            {
-                QPainter p(&pixmap);
-                QFontMetricsF fm(option.font);
+            p.drawPixmap(mZoom*QPoint(0.1*fm.height(),-3.4*fm.height()),FilesDefs::getPixmapFromQtResourcePath(STAR_OVERLAY_IMAGE).scaled(mZoom*6*fm.height(),mZoom*6*fm.height(),Qt::KeepAspectRatio,Qt::SmoothTransformation));
+        }
 
-                p.drawPixmap(mZoom*QPoint(0.1*fm.height(),-3.4*fm.height()),FilesDefs::getPixmapFromQtResourcePath(STAR_OVERLAY_IMAGE).scaled(mZoom*6*fm.height(),mZoom*6*fm.height(),Qt::KeepAspectRatio,Qt::SmoothTransformation));
-            }
+        if(post.mUnreadCommentCount > 0)
+        {
+            QPainter p(&pixmap);
+            QFontMetricsF fm(option.font);
 
-            if(post.mUnreadCommentCount)
-            {
-                QPainter p(&pixmap);
-                QFontMetricsF fm(option.font);
-
-                p.drawPixmap(QPoint(pixmap.width(),0.0)+mZoom*QPoint(-2.9*fm.height(),0.4*fm.height()),
-                             FilesDefs::getPixmapFromQtResourcePath(COMMENT_OVERLAY_IMAGE).scaled(mZoom*3*fm.height(),mZoom*3*fm.height(),
-                                                                                                  Qt::KeepAspectRatio,Qt::SmoothTransformation));
-            }
+            p.drawPixmap(QPoint(pixmap.width(),0.0)+mZoom*QPoint(-2.9*fm.height(),0.4*fm.height()),
+                         FilesDefs::getPixmapFromQtResourcePath(UNREAD_COMMENT_OVERLAY_IMAGE).scaled(mZoom*3*fm.height(),mZoom*3*fm.height(),
+                                                                                              Qt::KeepAspectRatio,Qt::SmoothTransformation));
+        }
+        else if(post.mCommentCount > 0)
+        {
+            QPainter p(&pixmap);
+            QFontMetricsF fm(option.font);
 
+            p.drawPixmap(QPoint(pixmap.width(),0.0)+mZoom*QPoint(-2.9*fm.height(),0.4*fm.height()),
+                         FilesDefs::getPixmapFromQtResourcePath(COMMENT_OVERLAY_IMAGE).scaled(mZoom*3*fm.height(),mZoom*3*fm.height(),
+                                                                                              Qt::KeepAspectRatio,Qt::SmoothTransformation));
         }
 
         painter->drawPixmap(option.rect.topLeft(),
-                            pixmap.scaled(option.rect.width(),option.rect.width()*pixmap.height()/(float)pixmap.width(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
+                            pixmap.scaled(option.rect.width(),option.rect.width()*pixmap.height()/(float)pixmap.width(),
+                                          Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
     }
     else
     {
@@ -833,7 +840,11 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         }
         break;
 
-        case RsChannelEventCode::NEW_COMMENT:     // [[fallthrough]];
+        case RsChannelEventCode::NEW_COMMENT:
+
+            if(e->mChannelGroupId == groupId() && e->mChannelThreadId != ui->commentsDialog->messageId())
+                mChannelPostsModel->updatePostWithNewComment(e->mChannelThreadId); [[fallthrough]];
+
         case RsChannelEventCode::NEW_VOTE:
 
             if(e->mChannelGroupId == groupId() && e->mChannelThreadId == ui->commentsDialog->messageId())
@@ -922,7 +933,7 @@ void GxsChannelPostsWidgetWithModel::showPostDetails()
 
     // Now also set the post as read
 
-    if(IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus))
+    if(IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus) || post.mUnreadCommentCount > 0)
     {
         mChannelPostsModel->setMsgReadStatus(index,true);
 

From 4f1bdbca7090ce51845dc2a035d902aa8f83ff9a Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Sun, 2 Apr 2023 15:22:36 +0530
Subject: [PATCH 207/503] commiting changes

---
 libbitdht     | 2 +-
 libretroshare | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libbitdht b/libbitdht
index 659423769..2ddc86fb5 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 659423769541169457c41f71c8a038e2d64ba079
+Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
diff --git a/libretroshare b/libretroshare
index 74cd958cf..036107c6a 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
+Subproject commit 036107c6ace161832100776077a11a3d1657d291

From b124222d8779a569e6b9c440bae0db56f68a0250 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sat, 18 Mar 2023 16:56:16 +0100
Subject: [PATCH 208/503] Windows build environment: - Fixed download of Tor
 binaries - Fixed download of doxygen - Updated MSYS2 installer - Changed
 build of WebUI

---
 build_scripts/Windows-msys2/build/build.bat   |  5 ---
 build_scripts/Windows-msys2/build/env.bat     |  2 +-
 build_scripts/Windows-msys2/build/pack.bat    |  6 +--
 build_scripts/Windows-msys2/tools/webui.bat   | 22 ----------
 build_scripts/Windows/build.bat               |  2 +-
 build_scripts/Windows/build/build.bat         | 42 -------------------
 build_scripts/Windows/build/env.bat           |  4 +-
 build_scripts/Windows/build/pack.bat          |  3 +-
 .../Windows/env/tools/prepare-msys2.bat       |  2 +-
 .../Windows/env/tools/prepare-tools.bat       |  8 ++--
 10 files changed, 14 insertions(+), 82 deletions(-)
 delete mode 100644 build_scripts/Windows-msys2/tools/webui.bat

diff --git a/build_scripts/Windows-msys2/build/build.bat b/build_scripts/Windows-msys2/build/build.bat
index 972379aad..4fdaff09f 100644
--- a/build_scripts/Windows-msys2/build/build.bat
+++ b/build_scripts/Windows-msys2/build/build.bat
@@ -97,11 +97,6 @@ title Build - %SourceName%-%RsBuildConfig% [make]
 %EnvMSYS2Cmd% "make -j %CoreCount%"
 if errorlevel 1 goto error
 
-:: Webui
-if "%ParamWebui%"=="1" (
-	call "%~dp0..\tools\webui.bat"
-)
-
 :error
 popd
 
diff --git a/build_scripts/Windows-msys2/build/env.bat b/build_scripts/Windows-msys2/build/env.bat
index c8cb71ff4..ccba33db3 100644
--- a/build_scripts/Windows-msys2/build/env.bat
+++ b/build_scripts/Windows-msys2/build/env.bat
@@ -18,7 +18,7 @@ set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsToolchain%-%RsCompiler%-%RsBuildCo
 set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsToolchain%-%RsCompiler%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
-set RsWebuiPath=%RootPath%\%SourceName%-webui
+set RsWebuiBuildPath=%RsBuildPath%\retroshare-webui\webui
 
 if not exist "%~dp0env-mod.bat" goto no_mod
 call "%~dp0env-mod.bat"
diff --git a/build_scripts/Windows-msys2/build/pack.bat b/build_scripts/Windows-msys2/build/pack.bat
index ceefd0144..313da7479 100644
--- a/build_scripts/Windows-msys2/build/pack.bat
+++ b/build_scripts/Windows-msys2/build/pack.bat
@@ -187,12 +187,12 @@ echo copy buildinfo.txt
 copy "%RsBuildPath%\buildinfo.txt" "%RsDeployPath%" %Quite%
 
 if "%ParamWebui%"=="1" (
-	if exist "%RsWebuiPath%\webui" (
+	if exist "%RsWebuiBuildPath%" (
 		echo copy webui
 		mkdir "%RsDeployPath%\webui"
-		xcopy /S "%RsWebuiPath%\webui" "%RsDeployPath%\webui" %Quite%
+		xcopy /S "%RsWebuiBuildPath%" "%RsDeployPath%\webui" %Quite%
 	) else (
-		%cecho% error "Webui is enabled, but no webui data found at %RsWebuiPath%\webui"
+		%cecho% error "Webui is enabled, but no webui data found at %RsWebuiBuildPath%"
 		goto error
 	)
 )
diff --git a/build_scripts/Windows-msys2/tools/webui.bat b/build_scripts/Windows-msys2/tools/webui.bat
deleted file mode 100644
index b7af01e53..000000000
--- a/build_scripts/Windows-msys2/tools/webui.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-setlocal
-
-echo.
-echo === webui
-echo.
-title Build webui
-
-if not exist "%RsWebuiPath%" (
-	echo Checking out webui source into %RsWebuiPath%
-	if not "%ParamNoupdate%"=="1" (
-		%EnvMSYS2Cmd% "pacman --noconfirm --needed -S git"
-	)
-	git clone https://github.com/RetroShare/RSNewWebUI.git "%RsWebuiPath%"
-) else (
-	echo Webui source found at %RsWebuiPath%		
-)
-
-pushd "%RsWebuiPath%\webui-src\make-src"
-%EnvMSYS2Cmd% "sh build.sh"
-popd
-
-endlocal
\ No newline at end of file
diff --git a/build_scripts/Windows/build.bat b/build_scripts/Windows/build.bat
index 4cec821b8..90bf2ae1c 100644
--- a/build_scripts/Windows/build.bat
+++ b/build_scripts/Windows/build.bat
@@ -17,7 +17,7 @@ call "%~dp0build\build.bat" release autologin webui plugins nativedialogs servic
 if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Pack %SourceName%"
-call "%~dp0build\pack.bat" release plugins service
+call "%~dp0build\pack.bat" release webui plugins service
 if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Build installer"
diff --git a/build_scripts/Windows/build/build.bat b/build_scripts/Windows/build/build.bat
index 9755fdadf..487647568 100644
--- a/build_scripts/Windows/build/build.bat
+++ b/build_scripts/Windows/build/build.bat
@@ -71,14 +71,6 @@ title Build - %SourceName%-%RsBuildConfig% [make]
 mingw32-make -j %CoreCount%
 if errorlevel 1 goto error
 
-:: Webui
-if "%ParamWebui%"=="1" (
-	call :build-webui
-	if errorlevel 1 goto error
-) else (
-	if exist "%RsWebuiBuildPath%" call "%ToolsPath%\remove-dir.bat" "%RsWebuiBuildPath%"
-)
-
 echo.
 echo === Changelog
 echo.
@@ -98,37 +90,3 @@ exit /B %ERRORLEVEL%
 echo Failed to initialize environment.
 endlocal
 exit /B 1
-
-:build-webui
-echo.
-echo === webui
-echo.
-title Build webui
-
-if not exist "%RsWebuiPath%" (
-	echo Checking out webui source into %RsWebuiPath%
-	git clone https://github.com/RetroShare/RSNewWebUI.git "%RsWebuiPath%"
-	if errorlevel 1 exit /B 1
-) else (
-	echo Webui source found at %RsWebuiPath%
-	pushd "%RsWebuiPath%"
-	git pull
-	popd
-	if errorlevel 1 exit /B 1
-)
-
-pushd "%RsWebuiPath%\webui-src\make-src"
-call build.bat
-popd
-if errorlevel 1 exit /B 1
-
-if not exist "%RsWebuiPath%\webui" (
-	%cecho% error "Webui is enabled, but no webui data found at %RsWebuiPath%\webui"
-	exit /B 1
-)
-
-if exist "%RsWebuiBuildPath%" call "%ToolsPath%\remove-dir.bat" "%RsWebuiBuildPath%"
-move "%RsWebuiPath%\webui" "%RsWebuiBuildPath%"
-if errorlevel 1 exit /B 1
-
-exit /B 0
diff --git a/build_scripts/Windows/build/env.bat b/build_scripts/Windows/build/env.bat
index b605cf502..98f70c87f 100644
--- a/build_scripts/Windows/build/env.bat
+++ b/build_scripts/Windows/build/env.bat
@@ -105,8 +105,7 @@ set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%GCCArchitecture%-%RsBuildConfig%
 set RsDeployPath=%DeployPath%\Qt-%QtVersion%-%GCCArchitecture%%RsType%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
-set RsWebuiPath=%RootPath%\%SourceName%-webui
-set RsWebuiBuildPath=%BuildPath%\Qt-%QtVersion%-%GCCArchitecture%-%RsBuildConfig%\webui
+set RsWebuiBuildPath=%RsBuildPath%\retroshare-webui\webui
 
 if not exist "%~dp0env-mod.bat" goto no_mod
 call "%~dp0env-mod.bat"
@@ -138,6 +137,7 @@ if "%Module%"=="build" (
 )
 if "%Module%"=="pack" (
 	echo Optional parameter
+	echo webui                 Pack webui
 	echo service               Pack service
 	echo friendserver          Pack Friend Server ^(needs Tor^)
 	echo tor                   Pack Tor version
diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat
index 0dbf6e82d..1c844efa0 100644
--- a/build_scripts/Windows/build/pack.bat
+++ b/build_scripts/Windows/build/pack.bat
@@ -181,10 +181,11 @@ copy "%SourcePath%\libbitdht\src\bitdht\bdboot.txt" "%RsDeployPath%" %Quite%
 echo copy changelog.txt
 copy "%RsBuildPath%\changelog.txt" "%RsDeployPath%" %Quite%
 
-if exist "%RsWebuiBuildPath%" (
+if defined ParamWebui (
 	echo copy webui
 	mkdir "%RsDeployPath%\webui"
 	xcopy /S "%RsWebuiBuildPath%" "%RsDeployPath%\webui" %Quite%
+	if errorlevel 1 %cecho% error "WebUi not found"& goto error
 )
 
 if "%ParamTor%"=="1" (
diff --git a/build_scripts/Windows/env/tools/prepare-msys2.bat b/build_scripts/Windows/env/tools/prepare-msys2.bat
index 79ddb32c3..e4a4da8d5 100644
--- a/build_scripts/Windows/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows/env/tools/prepare-msys2.bat
@@ -16,7 +16,7 @@ if "%~1"=="clean" (
 	goto exit
 )
 
-set MSYS2Version=20220503
+set MSYS2Version=20230318
 
 set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
 set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
diff --git a/build_scripts/Windows/env/tools/prepare-tools.bat b/build_scripts/Windows/env/tools/prepare-tools.bat
index 94f213460..c2c1e1bdd 100644
--- a/build_scripts/Windows/env/tools/prepare-tools.bat
+++ b/build_scripts/Windows/env/tools/prepare-tools.bat
@@ -16,8 +16,8 @@ set NSISInstallPath=%EnvToolsPath%\NSIS
 set MinGitInstall=MinGit-2.28.0-32-bit.zip
 set MinGitUrl=https://github.com/git-for-windows/git/releases/download/v2.28.0.windows.1/%MinGitInstall%
 set MinGitInstallPath=%EnvToolsPath%\MinGit
-set DoxygenInstall=doxygen-1.9.4.windows.x64.bin.zip
-set DoxygenUrl=https://www.doxygen.nl/files/%DoxygenInstall%
+set DoxygenInstall=doxygen-1.9.6.windows.x64.bin.zip
+set DoxygenUrl=https://github.com/doxygen/doxygen/releases/download/Release_1_9_6/%DoxygenInstall%
 set DoxygenInstallPath=%EnvToolsPath%\doxygen
 set CMakeVersion=cmake-3.19.0-win32-x86
 set CMakeInstall=%CMakeVersion%.zip
@@ -176,7 +176,7 @@ mkdir "%EnvTempPath%"
 call "%ToolsPath%\download-file.bat" "%TorDownloadIndexUrl%" "%EnvTempPath%\index.html"
 if not exist "%EnvTempPath%\index.html" %cecho% error "Cannot download Tor installation" & goto error
 
-for /F "tokens=1,2 delims= " %%A in ('%EnvSedExe% -r -n -e"s/.*href=\"^(.*^)^(tor-win32.*\.zip^)\".*/\2 \1\2/p" "%EnvTempPath%\index.html"') do set TorInstall=%%A& set TorDownloadUrl=%TorProjectUrl%%%B
+for /F "tokens=1,2 delims= " %%A in ('%EnvSedExe% -r -n -e"s/.*href=\"^(.*^)^(tor-.*windows-i686\.tar\.gz^)\".*/\2 \1\2/p" "%EnvTempPath%\index.html"') do set TorInstall=%%A& set TorDownloadUrl=%%B
 call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 if "%TorInstall%"=="" %cecho% error "Cannot download Tor installation" & goto error
 if "%TorDownloadUrl%"=="" %cecho% error "Cannot download Tor installation" & goto error
@@ -189,7 +189,7 @@ if not exist "%EnvTorPath%\Tor\tor.exe" (
 	if not exist "%EnvDownloadPath%\%TorInstall%" %cecho% error "Cannot download Tor installation" & goto error
 
 	%cecho% info "Unpack Tor"
-	"%EnvSevenZipExe%" x -o"%EnvTorPath%" "%EnvDownloadPath%\%TorInstall%"
+	"%EnvSevenZipExe%" x -so "%EnvDownloadPath%\%TorInstall%" | "%EnvSevenZipExe%" x -si -ttar -o"%EnvTorPath%" 
 )
 
 :exit

From 783a0a586f891450337e929d0a6925a8ffb41019 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 3 Apr 2023 22:06:42 +0200
Subject: [PATCH 209/503] fixed bug preventing completed files removal to clear
 the files counter

---
 .../src/gui/FileTransfer/TransferUserNotify.cpp    |  2 --
 .../src/gui/FileTransfer/TransfersDialog.cpp       | 14 +++++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/TransferUserNotify.cpp b/retroshare-gui/src/gui/FileTransfer/TransferUserNotify.cpp
index b424d922b..fa0c33046 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransferUserNotify.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransferUserNotify.cpp
@@ -27,8 +27,6 @@ TransferUserNotify::TransferUserNotify(QObject *parent) :
 	UserNotify(parent)
 {
 	newTransferCount = 0;
-
-//	connect(NotifyQt::getInstance(), SIGNAL(downloadCompleteCountChanged(int)), this, SLOT(downloadCountChanged(int)));
 }
 
 bool TransferUserNotify::hasSetting(QString *name, QString *group)
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index bb516d5c1..f5659756b 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -1111,16 +1111,20 @@ void TransfersDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> eve
 	if(!fe)
         return;
 
-	FileInfo nfo ;
-	if(!rsFiles->FileDetails(fe->mHash, RS_FILE_HINTS_DOWNLOAD, nfo)) 
-		return ;
-
  	switch (fe->mFileTransferEventCode)
     {
 	case RsFileTransferEventCode::DOWNLOAD_COMPLETE:
+    {
+        FileInfo nfo ;
+        if(!rsFiles->FileDetails(fe->mHash, RS_FILE_HINTS_DOWNLOAD, nfo))
+            break;
+
 		SoundManager::play(SOUND_DOWNLOAD_COMPLETE);
 		if (Settings->getNotifyFlags() & RS_POPUP_DOWNLOAD)
-			NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),"");
+            NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),"");
+    }
+        [[fallthrough]];
+
 	case RsFileTransferEventCode::COMPLETED_FILES_REMOVED:
 
         getUserNotify()->updateIcon();

From 22a9cf4236503a0d090b6e3191af9fe844377f49 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 7 Apr 2023 16:23:46 +0200
Subject: [PATCH 210/503] moved popup settings for toasters

---
 .../src/gui/FileTransfer/TransfersDialog.cpp  |  3 +-
 retroshare-gui/src/gui/NewsFeed.cpp           |  6 +-
 .../src/gui/msgs/MessageUserNotify.cpp        | 11 ++--
 retroshare-gui/src/gui/notifyqt.cpp           | 57 ++++++++++++++++---
 4 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index f5659756b..d0b4d5fc7 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -1120,8 +1120,7 @@ void TransfersDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> eve
             break;
 
 		SoundManager::play(SOUND_DOWNLOAD_COMPLETE);
-		if (Settings->getNotifyFlags() & RS_POPUP_DOWNLOAD)
-            NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),"");
+		NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),"");
     }
         [[fallthrough]];
 
diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp
index 36f547738..c73f834fb 100644
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@@ -441,8 +441,7 @@ void NewsFeed::handleConnectionEvent(std::shared_ptr<const RsEvent> event)
 	{
 	case RsConnectionEventCode::PEER_CONNECTED:
 		addFeedItemIfUnique(new PeerItem(this, NEWSFEED_PEERLIST, e.mSslId, PEER_TYPE_CONNECT, false), true);
-		if (Settings->getNotifyFlags() & RS_POPUP_CONNECT)
-			NotifyQt::getInstance()->addToaster(RS_POPUP_CONNECT, e.mSslId.toStdString().c_str(), "", "");
+		NotifyQt::getInstance()->addToaster(RS_POPUP_CONNECT, e.mSslId.toStdString().c_str(), "", "");
 		break;
 	case RsConnectionEventCode::PEER_DISCONNECTED: // not handled yet
 		break;
@@ -508,8 +507,7 @@ void NewsFeed::handleSecurityEvent(std::shared_ptr<const RsEvent> event)
 	if (Settings->getMessageFlags() & RS_MESSAGE_CONNECT_ATTEMPT)
 		MessageComposer::addConnectAttemptMsg(e.mPgpId, e.mSslId, QString::fromStdString(det.name + "(" + det.location + ")"));
 	
-	if (Settings->getNotifyFlags() & RS_POPUP_CONNECT_ATTEMPT)
-		NotifyQt::getInstance()->addToaster(RS_POPUP_CONNECT_ATTEMPT, e.mPgpId.toStdString().c_str(), det.location, e.mSslId.toStdString().c_str());
+	NotifyQt::getInstance()->addToaster(RS_POPUP_CONNECT_ATTEMPT, e.mPgpId.toStdString().c_str(), det.location, e.mSslId.toStdString().c_str());
 }
 
 void NewsFeed::testFeeds(uint /*notifyFlags*/)
diff --git a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
index 60e6ec197..5414802e0 100644
--- a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
@@ -96,13 +96,12 @@ void MessageUserNotify::handleEvent_main_thread(std::shared_ptr<const RsEvent> e
 
 	switch (fe->mMailStatusEventCode) {
 	case RsMailStatusEventCode::NEW_MESSAGE:
-		if (Settings->getNotifyFlags() & RS_POPUP_MSG)
-			for (it = fe->mChangedMsgIds.begin(); it != fe->mChangedMsgIds.end(); ++it) {
-				MessageInfo msgInfo;
-				if (rsMail->getMessage(*it, msgInfo)) {
-						NotifyQt::getInstance()->addToaster(RS_POPUP_MSG, msgInfo.msgId.c_str(), msgInfo.title.c_str(), msgInfo.msg.c_str() );
-				}
+		for (it = fe->mChangedMsgIds.begin(); it != fe->mChangedMsgIds.end(); ++it) {
+			MessageInfo msgInfo;
+			if (rsMail->getMessage(*it, msgInfo)) {
+					NotifyQt::getInstance()->addToaster(RS_POPUP_MSG, msgInfo.msgId.c_str(), msgInfo.title.c_str(), msgInfo.msg.c_str() );
 			}
+		}
 		break;
 	case RsMailStatusEventCode::MESSAGE_CHANGED:
 	case RsMailStatusEventCode::MESSAGE_REMOVED:
diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp
index 59d102170..9012e77bd 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -1173,37 +1173,73 @@ void NotifyQt::addToaster(uint notifyFlags, const std::string& id, const std::st
 
 		ToasterItem *toaster = NULL;
 
+		uint popupflags = Settings->getNotifyFlags();
+
 		switch(type)
 		{
 			case RS_POPUP_ENCRYPTED_MSG:
 				SoundManager::play(SOUND_MESSAGE_ARRIVED);
 
-				toaster = new ToasterItem(new MessageToaster(std::string(), tr("Unknown title"), QString("[%1]").arg(tr("Encrypted message"))));
+				if ((popupflags & RS_POPUP_MSG) && !_disableAllToaster)
+				{
+					toaster = new ToasterItem(new MessageToaster(std::string(), tr("Unknown title"), QString("[%1]").arg(tr("Encrypted message"))));
+				}
 				break;
 			case RS_POPUP_MSG:
 				SoundManager::play(SOUND_MESSAGE_ARRIVED);
 
-				toaster = new ToasterItem(new MessageToaster(id, QString::fromUtf8(title.c_str()), QString::fromUtf8(msg.c_str())));
+				if ((popupflags & RS_POPUP_MSG) && !_disableAllToaster)
+				{
+					toaster = new ToasterItem(new MessageToaster(id, QString::fromUtf8(title.c_str()), QString::fromUtf8(msg.c_str())));
+				}
 				break;
 			case RS_POPUP_CONNECT:
 				SoundManager::play(SOUND_USER_ONLINE);
 
-				toaster = new ToasterItem(new OnlineToaster(RsPeerId(id)));
+				if ((popupflags & RS_POPUP_CONNECT) && !_disableAllToaster)
+				{
+					toaster = new ToasterItem(new OnlineToaster(RsPeerId(id)));
+				}
 				break;
 			case RS_POPUP_DOWNLOAD:
 				SoundManager::play(SOUND_DOWNLOAD_COMPLETE);
 
-				toaster = new ToasterItem(new DownloadToaster(RsFileHash(id), QString::fromUtf8(title.c_str())));
+				if ((popupflags & RS_POPUP_DOWNLOAD) && !_disableAllToaster)
+				{
+					toaster = new ToasterItem(new DownloadToaster(RsFileHash(id), QString::fromUtf8(title.c_str())));
+				}
 				break;
 			case RS_POPUP_CHAT:
-				toaster = new ToasterItem(new ChatToaster(RsPeerId(id), QString::fromUtf8(msg.c_str())));
-				break;
+				if ((popupflags & RS_POPUP_CHAT) && !_disableAllToaster)
+				{
+					// TODO: fix for distant chat, look up if dstant chat uses RS_POPUP_CHAT
+					ChatDialog *chatDialog = ChatDialog::getChat(ChatId(RsPeerId(id)));
+					ChatWidget *chatWidget;
+					if (chatDialog && (chatWidget = chatDialog->getChatWidget()) && chatWidget->isActive()) {
+						// do not show when active
+						break;
+					}
+					toaster = new ToasterItem(new ChatToaster(RsPeerId(id), QString::fromUtf8(msg.c_str())));
+				}
 			case RS_POPUP_GROUPCHAT:
 #ifdef RS_DIRECT_CHAT
-				toaster = new ToasterItem(new GroupChatToaster(RsPeerId(id), QString::fromUtf8(msg.c_str())));
+				if ((popupflags & RS_POPUP_GROUPCHAT) && !_disableAllToaster)
+				{
+					MainWindow *mainWindow = MainWindow::getInstance();
+					if (mainWindow && mainWindow->isActiveWindow() && !mainWindow->isMinimized()) {
+						if (MainWindow::getActivatePage() == MainWindow::Friends) {
+							if (FriendsDialog::isGroupChatActive()) {
+								// do not show when active
+								break;
+							}
+						}
+					}
+					toaster = new ToasterItem(new GroupChatToaster(RsPeerId(id), QString::fromUtf8(msg.c_str())));
+				}
 #endif // RS_DIRECT_CHAT
 				break;
 			case RS_POPUP_CHATLOBBY:
+				if ((popupflags & RS_POPUP_CHATLOBBY) && !_disableAllToaster)
 				{
 					ChatId chat_id(id);
 
@@ -1221,13 +1257,16 @@ void NotifyQt::addToaster(uint notifyFlags, const std::string& id, const std::st
 						break; // participant is muted
 
 					toaster = new ToasterItem(new ChatLobbyToaster(chat_id.toLobbyId(), sender, QString::fromUtf8(msg.c_str())));
-					}
+				}
 				break;
 			case RS_POPUP_CONNECT_ATTEMPT:
+				if ((popupflags & RS_POPUP_CONNECT_ATTEMPT) && !_disableAllToaster)
+				{
 					// id = gpgid
 					// title = ssl name
 					// msg = peer id
 					toaster = new ToasterItem(new FriendRequestToaster(RsPgpId(id), QString::fromUtf8(title.c_str()), RsPeerId(msg)));
+				}
 				break;
 		}
 
@@ -1240,4 +1279,6 @@ void NotifyQt::addToaster(uint notifyFlags, const std::string& id, const std::st
 			waitingToasterList.push_back(toaster);
 		}
 	}
+	/* Now start the waiting toasters */
+	startWaitingToasters();
 }

From 05c3f1f6e9b3a5eb9cbf5eabc739ab9c3023cf2c Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Fri, 7 Apr 2023 19:12:55 +0200
Subject: [PATCH 211/503] Changed path of webui submodule to relative path

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index c9696bc60..3c767cf19 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,4 +34,4 @@
 	branch = master
 [submodule "retroshare-webui"]
 	path = retroshare-webui
-	url = git@github.com:Retroshare/RSNewWebUI
+	url = ../RSNewWebUI

From 7299ace57ab15e1e0ceb839c67bba9479dd9e800 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 8 Apr 2023 18:04:22 +0200
Subject: [PATCH 212/503] re-enabled channel debug output

---
 retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 11a29903a..3136004a2 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -36,7 +36,7 @@
 #include "GxsChannelPostFilesModel.h"
 
 //#define DEBUG_CHANNEL_MODEL_DATA
-//#define DEBUG_CHANNEL_MODEL
+#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 Q_DECLARE_METATYPE(RsGxsChannelPost)

From 7dabc1ff9b896943cc8df76aa5e99abdb5368a40 Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Sun, 9 Apr 2023 18:10:16 +0530
Subject: [PATCH 213/503] Adeed a new spin box in the gui to track the variable
 which stores the maximum size limit allowed for autodownload in channels.
 This spin box was linked to the variable from the p3gxschannel.h file. This
 spin box has 8GB as it's default value.

---
 .../src/gui/settings/ChannelPage.cpp          | 22 +++++-
 retroshare-gui/src/gui/settings/ChannelPage.h |  9 ++-
 .../src/gui/settings/ChannelPage.ui           | 70 +++++++++++++------
 3 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ChannelPage.cpp b/retroshare-gui/src/gui/settings/ChannelPage.cpp
index ef2fa6307..28f4d4f66 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChannelPage.cpp
@@ -22,6 +22,8 @@
 #include "rsharesettings.h"
 #include "util/misc.h"
 #include "gui/notifyqt.h"
+#include "../../libretroshare/src/retroshare/rsgxschannels.h"
+#include "../../libretroshare/src/services/p3gxschannels.h"
 
 ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
     : ConfigPage(parent, flags)
@@ -33,7 +35,10 @@ ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
 	ui.groupFrameSettingsWidget->setOpenAllInNewTabText(tr("Open each channel in a new tab"));
     ui.groupFrameSettingsWidget->setType(GroupFrameSettings::Channel) ;
 
-	connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
+    connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
+
+    // Connecting the spin box with the maximum auto download size in channels
+    connect(ui.autoDownloadSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateMaxAutoDownloadSizeLimit(int)));
 
 }
 
@@ -49,6 +54,13 @@ void ChannelPage::load()
 	Settings->beginGroup(QString("ChannelPostsWidget"));
     whileBlocking(ui.emoteicon_checkBox)->setChecked(Settings->value("Emoteicons_ChannelDecription", true).toBool());
     Settings->endGroup();
+
+    // Getting  the maximum auto download size from the configuration
+    uint64_t maxAutoDownloadSize;
+    rsGxsChannels->getMaxAutoDownloadSizeLimit(maxAutoDownloadSize);
+    int temp=(maxAutoDownloadSize/(Size_Of_1_GB));
+    whileBlocking(ui.autoDownloadSpinBox)->setValue(temp);
+
 }
 
 void ChannelPage::updateEmotes()
@@ -57,3 +69,11 @@ void ChannelPage::updateEmotes()
     Settings->setValue("Emoteicons_ChannelDecription", ui.emoteicon_checkBox->isChecked());
     Settings->endGroup();
 }
+
+// Function to update the maximum size allowed for auto download in channels
+void ChannelPage::updateMaxAutoDownloadSizeLimit(int value)
+{
+    uint64_t temp=(static_cast<uint64_t>(value)*Size_Of_1_GB);
+    rsGxsChannels->setMaxAutoDownloadSizeLimit(temp);
+}
+
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.h b/retroshare-gui/src/gui/settings/ChannelPage.h
index 93f32cabc..3b5b43a77 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.h
+++ b/retroshare-gui/src/gui/settings/ChannelPage.h
@@ -25,6 +25,8 @@
 #include "ui_ChannelPage.h"
 #include "gui/common/FilesDefs.h"
 
+#define Size_Of_1_GB	                            (1024 * 1024 * 1024)	// It is the size of 1 GB in bytes.
+
 class ChannelPage : public ConfigPage
 {
 	Q_OBJECT
@@ -34,7 +36,7 @@ public:
 	~ChannelPage();
 
 	/** Loads the settings for this page */
-	virtual void load();
+    virtual void load();
 
     virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/channels.svg") ; }
 	virtual QString pageName() const { return tr("Channels") ; }
@@ -42,7 +44,10 @@ public:
 
 private slots:
 	void updateEmotes();
-  
+
+ // Function to update the maximum size allowed for auto download in channels
+    void updateMaxAutoDownloadSizeLimit(int value);
+
 private:
 	Ui::ChannelPage ui;
 };
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.ui b/retroshare-gui/src/gui/settings/ChannelPage.ui
index 5e75e442e..38b3426e9 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.ui
+++ b/retroshare-gui/src/gui/settings/ChannelPage.ui
@@ -6,22 +6,23 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>423</width>
+    <width>526</width>
     <height>334</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="tabsGroupBox">
-     <property name="title">
-      <string>Tabs</string>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="3" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
-      </item>
-     </layout>
-    </widget>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="generalGroupBox">
@@ -39,18 +40,43 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="tabsGroupBox">
+     <property name="title">
+      <string>Tabs</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+    <widget class="QGroupBox" name="downloadsGroupBox">
+     <property name="title">
+      <string>Downloads</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
+       <widget class="QSpinBox" name="autoDownloadSpinBox">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>200</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Maximum Auto Download Size (in GBs)</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>

From e89ad86da05b5636303e24bd9d3f3944e592bd2c Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Sun, 9 Apr 2023 18:34:08 +0530
Subject: [PATCH 214/503] Revert "Adeed a new spin box in the gui to track the
 variable which stores the maximum size limit allowed for autodownload in
 channels."

This reverts commit 7dabc1ff9b896943cc8df76aa5e99abdb5368a40.

Forgot to open a new branch
---
 .../src/gui/settings/ChannelPage.cpp          | 22 +-----
 retroshare-gui/src/gui/settings/ChannelPage.h |  9 +--
 .../src/gui/settings/ChannelPage.ui           | 70 ++++++-------------
 3 files changed, 25 insertions(+), 76 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ChannelPage.cpp b/retroshare-gui/src/gui/settings/ChannelPage.cpp
index 28f4d4f66..ef2fa6307 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChannelPage.cpp
@@ -22,8 +22,6 @@
 #include "rsharesettings.h"
 #include "util/misc.h"
 #include "gui/notifyqt.h"
-#include "../../libretroshare/src/retroshare/rsgxschannels.h"
-#include "../../libretroshare/src/services/p3gxschannels.h"
 
 ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
     : ConfigPage(parent, flags)
@@ -35,10 +33,7 @@ ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
 	ui.groupFrameSettingsWidget->setOpenAllInNewTabText(tr("Open each channel in a new tab"));
     ui.groupFrameSettingsWidget->setType(GroupFrameSettings::Channel) ;
 
-    connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
-
-    // Connecting the spin box with the maximum auto download size in channels
-    connect(ui.autoDownloadSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateMaxAutoDownloadSizeLimit(int)));
+	connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
 
 }
 
@@ -54,13 +49,6 @@ void ChannelPage::load()
 	Settings->beginGroup(QString("ChannelPostsWidget"));
     whileBlocking(ui.emoteicon_checkBox)->setChecked(Settings->value("Emoteicons_ChannelDecription", true).toBool());
     Settings->endGroup();
-
-    // Getting  the maximum auto download size from the configuration
-    uint64_t maxAutoDownloadSize;
-    rsGxsChannels->getMaxAutoDownloadSizeLimit(maxAutoDownloadSize);
-    int temp=(maxAutoDownloadSize/(Size_Of_1_GB));
-    whileBlocking(ui.autoDownloadSpinBox)->setValue(temp);
-
 }
 
 void ChannelPage::updateEmotes()
@@ -69,11 +57,3 @@ void ChannelPage::updateEmotes()
     Settings->setValue("Emoteicons_ChannelDecription", ui.emoteicon_checkBox->isChecked());
     Settings->endGroup();
 }
-
-// Function to update the maximum size allowed for auto download in channels
-void ChannelPage::updateMaxAutoDownloadSizeLimit(int value)
-{
-    uint64_t temp=(static_cast<uint64_t>(value)*Size_Of_1_GB);
-    rsGxsChannels->setMaxAutoDownloadSizeLimit(temp);
-}
-
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.h b/retroshare-gui/src/gui/settings/ChannelPage.h
index 3b5b43a77..93f32cabc 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.h
+++ b/retroshare-gui/src/gui/settings/ChannelPage.h
@@ -25,8 +25,6 @@
 #include "ui_ChannelPage.h"
 #include "gui/common/FilesDefs.h"
 
-#define Size_Of_1_GB	                            (1024 * 1024 * 1024)	// It is the size of 1 GB in bytes.
-
 class ChannelPage : public ConfigPage
 {
 	Q_OBJECT
@@ -36,7 +34,7 @@ public:
 	~ChannelPage();
 
 	/** Loads the settings for this page */
-    virtual void load();
+	virtual void load();
 
     virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/channels.svg") ; }
 	virtual QString pageName() const { return tr("Channels") ; }
@@ -44,10 +42,7 @@ public:
 
 private slots:
 	void updateEmotes();
-
- // Function to update the maximum size allowed for auto download in channels
-    void updateMaxAutoDownloadSizeLimit(int value);
-
+  
 private:
 	Ui::ChannelPage ui;
 };
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.ui b/retroshare-gui/src/gui/settings/ChannelPage.ui
index 38b3426e9..5e75e442e 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.ui
+++ b/retroshare-gui/src/gui/settings/ChannelPage.ui
@@ -6,23 +6,22 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>526</width>
+    <width>423</width>
     <height>334</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="tabsGroupBox">
+     <property name="title">
+      <string>Tabs</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>5</height>
-      </size>
-     </property>
-    </spacer>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="generalGroupBox">
@@ -40,43 +39,18 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="tabsGroupBox">
-     <property name="title">
-      <string>Tabs</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="2" column="0">
-    <widget class="QGroupBox" name="downloadsGroupBox">
-     <property name="title">
-      <string>Downloads</string>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-     <layout class="QFormLayout" name="formLayout">
-      <item row="0" column="0">
-       <widget class="QSpinBox" name="autoDownloadSpinBox">
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="maximum">
-         <number>200</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Maximum Auto Download Size (in GBs)</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>

From b3f55c5b51eae216aa4673966b0c668558fd7b74 Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Sun, 9 Apr 2023 18:48:15 +0530
Subject: [PATCH 215/503] Revert "Revert "Adeed a new spin box in the gui to
 track the variable which stores the maximum size limit allowed for
 autodownload in channels.""

This reverts commit e89ad86da05b5636303e24bd9d3f3944e592bd2c.

revert the reverted commits
---
 .../src/gui/settings/ChannelPage.cpp          | 22 +++++-
 retroshare-gui/src/gui/settings/ChannelPage.h |  9 ++-
 .../src/gui/settings/ChannelPage.ui           | 70 +++++++++++++------
 3 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ChannelPage.cpp b/retroshare-gui/src/gui/settings/ChannelPage.cpp
index ef2fa6307..28f4d4f66 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChannelPage.cpp
@@ -22,6 +22,8 @@
 #include "rsharesettings.h"
 #include "util/misc.h"
 #include "gui/notifyqt.h"
+#include "../../libretroshare/src/retroshare/rsgxschannels.h"
+#include "../../libretroshare/src/services/p3gxschannels.h"
 
 ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
     : ConfigPage(parent, flags)
@@ -33,7 +35,10 @@ ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
 	ui.groupFrameSettingsWidget->setOpenAllInNewTabText(tr("Open each channel in a new tab"));
     ui.groupFrameSettingsWidget->setType(GroupFrameSettings::Channel) ;
 
-	connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
+    connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
+
+    // Connecting the spin box with the maximum auto download size in channels
+    connect(ui.autoDownloadSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateMaxAutoDownloadSizeLimit(int)));
 
 }
 
@@ -49,6 +54,13 @@ void ChannelPage::load()
 	Settings->beginGroup(QString("ChannelPostsWidget"));
     whileBlocking(ui.emoteicon_checkBox)->setChecked(Settings->value("Emoteicons_ChannelDecription", true).toBool());
     Settings->endGroup();
+
+    // Getting  the maximum auto download size from the configuration
+    uint64_t maxAutoDownloadSize;
+    rsGxsChannels->getMaxAutoDownloadSizeLimit(maxAutoDownloadSize);
+    int temp=(maxAutoDownloadSize/(Size_Of_1_GB));
+    whileBlocking(ui.autoDownloadSpinBox)->setValue(temp);
+
 }
 
 void ChannelPage::updateEmotes()
@@ -57,3 +69,11 @@ void ChannelPage::updateEmotes()
     Settings->setValue("Emoteicons_ChannelDecription", ui.emoteicon_checkBox->isChecked());
     Settings->endGroup();
 }
+
+// Function to update the maximum size allowed for auto download in channels
+void ChannelPage::updateMaxAutoDownloadSizeLimit(int value)
+{
+    uint64_t temp=(static_cast<uint64_t>(value)*Size_Of_1_GB);
+    rsGxsChannels->setMaxAutoDownloadSizeLimit(temp);
+}
+
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.h b/retroshare-gui/src/gui/settings/ChannelPage.h
index 93f32cabc..3b5b43a77 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.h
+++ b/retroshare-gui/src/gui/settings/ChannelPage.h
@@ -25,6 +25,8 @@
 #include "ui_ChannelPage.h"
 #include "gui/common/FilesDefs.h"
 
+#define Size_Of_1_GB	                            (1024 * 1024 * 1024)	// It is the size of 1 GB in bytes.
+
 class ChannelPage : public ConfigPage
 {
 	Q_OBJECT
@@ -34,7 +36,7 @@ public:
 	~ChannelPage();
 
 	/** Loads the settings for this page */
-	virtual void load();
+    virtual void load();
 
     virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/channels.svg") ; }
 	virtual QString pageName() const { return tr("Channels") ; }
@@ -42,7 +44,10 @@ public:
 
 private slots:
 	void updateEmotes();
-  
+
+ // Function to update the maximum size allowed for auto download in channels
+    void updateMaxAutoDownloadSizeLimit(int value);
+
 private:
 	Ui::ChannelPage ui;
 };
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.ui b/retroshare-gui/src/gui/settings/ChannelPage.ui
index 5e75e442e..38b3426e9 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.ui
+++ b/retroshare-gui/src/gui/settings/ChannelPage.ui
@@ -6,22 +6,23 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>423</width>
+    <width>526</width>
     <height>334</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="tabsGroupBox">
-     <property name="title">
-      <string>Tabs</string>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="3" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
-      </item>
-     </layout>
-    </widget>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="generalGroupBox">
@@ -39,18 +40,43 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="tabsGroupBox">
+     <property name="title">
+      <string>Tabs</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+    <widget class="QGroupBox" name="downloadsGroupBox">
+     <property name="title">
+      <string>Downloads</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
+       <widget class="QSpinBox" name="autoDownloadSpinBox">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>200</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Maximum Auto Download Size (in GBs)</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>

From 2fe8bcc8fd28fbcb02c4bc5ffa4e229b1b1144d4 Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Sun, 9 Apr 2023 22:03:45 +0530
Subject: [PATCH 216/503] Revert "Merge remote-tracking branch
 'upstream/master'"

This reverts commit c390af58449d96f2178d5b4c3de03277e455225c, reversing
changes made to 1553508776059b465e5f4863ef2f30511b4b5b7b.

bad commit needs to be reverted
---
 libbitdht     | 2 +-
 libretroshare | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libbitdht b/libbitdht
index 2ddc86fb5..659423769 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
+Subproject commit 659423769541169457c41f71c8a038e2d64ba079
diff --git a/libretroshare b/libretroshare
index 036107c6a..74cd958cf 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 036107c6ace161832100776077a11a3d1657d291
+Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476

From 23dd7270f9f92a6639a3dd44c09be28b923ef7d0 Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Sun, 9 Apr 2023 22:07:35 +0530
Subject: [PATCH 217/503] Revert "Merge remote-tracking branch
 'upstream/master'"

This reverts commit c390af58449d96f2178d5b4c3de03277e455225c, reversing
changes made to 1553508776059b465e5f4863ef2f30511b4b5b7b.

bad commit needs to be reverted
---
 libbitdht                                     |  2 +-
 libretroshare                                 |  2 +-
 .../src/gui/settings/ChannelPage.cpp          | 22 +-----
 retroshare-gui/src/gui/settings/ChannelPage.h |  9 +--
 .../src/gui/settings/ChannelPage.ui           | 70 ++++++-------------
 5 files changed, 27 insertions(+), 78 deletions(-)

diff --git a/libbitdht b/libbitdht
index 2ddc86fb5..659423769 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
+Subproject commit 659423769541169457c41f71c8a038e2d64ba079
diff --git a/libretroshare b/libretroshare
index 036107c6a..74cd958cf 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 036107c6ace161832100776077a11a3d1657d291
+Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.cpp b/retroshare-gui/src/gui/settings/ChannelPage.cpp
index 28f4d4f66..ef2fa6307 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChannelPage.cpp
@@ -22,8 +22,6 @@
 #include "rsharesettings.h"
 #include "util/misc.h"
 #include "gui/notifyqt.h"
-#include "../../libretroshare/src/retroshare/rsgxschannels.h"
-#include "../../libretroshare/src/services/p3gxschannels.h"
 
 ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
     : ConfigPage(parent, flags)
@@ -35,10 +33,7 @@ ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
 	ui.groupFrameSettingsWidget->setOpenAllInNewTabText(tr("Open each channel in a new tab"));
     ui.groupFrameSettingsWidget->setType(GroupFrameSettings::Channel) ;
 
-    connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
-
-    // Connecting the spin box with the maximum auto download size in channels
-    connect(ui.autoDownloadSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateMaxAutoDownloadSizeLimit(int)));
+	connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
 
 }
 
@@ -54,13 +49,6 @@ void ChannelPage::load()
 	Settings->beginGroup(QString("ChannelPostsWidget"));
     whileBlocking(ui.emoteicon_checkBox)->setChecked(Settings->value("Emoteicons_ChannelDecription", true).toBool());
     Settings->endGroup();
-
-    // Getting  the maximum auto download size from the configuration
-    uint64_t maxAutoDownloadSize;
-    rsGxsChannels->getMaxAutoDownloadSizeLimit(maxAutoDownloadSize);
-    int temp=(maxAutoDownloadSize/(Size_Of_1_GB));
-    whileBlocking(ui.autoDownloadSpinBox)->setValue(temp);
-
 }
 
 void ChannelPage::updateEmotes()
@@ -69,11 +57,3 @@ void ChannelPage::updateEmotes()
     Settings->setValue("Emoteicons_ChannelDecription", ui.emoteicon_checkBox->isChecked());
     Settings->endGroup();
 }
-
-// Function to update the maximum size allowed for auto download in channels
-void ChannelPage::updateMaxAutoDownloadSizeLimit(int value)
-{
-    uint64_t temp=(static_cast<uint64_t>(value)*Size_Of_1_GB);
-    rsGxsChannels->setMaxAutoDownloadSizeLimit(temp);
-}
-
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.h b/retroshare-gui/src/gui/settings/ChannelPage.h
index 3b5b43a77..93f32cabc 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.h
+++ b/retroshare-gui/src/gui/settings/ChannelPage.h
@@ -25,8 +25,6 @@
 #include "ui_ChannelPage.h"
 #include "gui/common/FilesDefs.h"
 
-#define Size_Of_1_GB	                            (1024 * 1024 * 1024)	// It is the size of 1 GB in bytes.
-
 class ChannelPage : public ConfigPage
 {
 	Q_OBJECT
@@ -36,7 +34,7 @@ public:
 	~ChannelPage();
 
 	/** Loads the settings for this page */
-    virtual void load();
+	virtual void load();
 
     virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/channels.svg") ; }
 	virtual QString pageName() const { return tr("Channels") ; }
@@ -44,10 +42,7 @@ public:
 
 private slots:
 	void updateEmotes();
-
- // Function to update the maximum size allowed for auto download in channels
-    void updateMaxAutoDownloadSizeLimit(int value);
-
+  
 private:
 	Ui::ChannelPage ui;
 };
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.ui b/retroshare-gui/src/gui/settings/ChannelPage.ui
index 38b3426e9..5e75e442e 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.ui
+++ b/retroshare-gui/src/gui/settings/ChannelPage.ui
@@ -6,23 +6,22 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>526</width>
+    <width>423</width>
     <height>334</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="tabsGroupBox">
+     <property name="title">
+      <string>Tabs</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>5</height>
-      </size>
-     </property>
-    </spacer>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="generalGroupBox">
@@ -40,43 +39,18 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="tabsGroupBox">
-     <property name="title">
-      <string>Tabs</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="2" column="0">
-    <widget class="QGroupBox" name="downloadsGroupBox">
-     <property name="title">
-      <string>Downloads</string>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-     <layout class="QFormLayout" name="formLayout">
-      <item row="0" column="0">
-       <widget class="QSpinBox" name="autoDownloadSpinBox">
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="maximum">
-         <number>200</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Maximum Auto Download Size (in GBs)</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
    </item>
   </layout>
  </widget>

From fe92431cb6c0a1f00b45dda0161d715cd62f3719 Mon Sep 17 00:00:00 2001
From: Tushar Garg <tushargarg2122002@gmail.com>
Date: Mon, 10 Apr 2023 07:06:59 +0530
Subject: [PATCH 218/503] This is the UI part of the auto download adjustable
 size feature.

---
 .../src/gui/settings/ChannelPage.cpp          | 18 +++++
 retroshare-gui/src/gui/settings/ChannelPage.h |  5 ++
 .../src/gui/settings/ChannelPage.ui           | 70 +++++++++++++------
 3 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ChannelPage.cpp b/retroshare-gui/src/gui/settings/ChannelPage.cpp
index ef2fa6307..857cc972e 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChannelPage.cpp
@@ -22,6 +22,7 @@
 #include "rsharesettings.h"
 #include "util/misc.h"
 #include "gui/notifyqt.h"
+#include "retroshare/rsgxschannels.h"
 
 ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
     : ConfigPage(parent, flags)
@@ -35,6 +36,9 @@ ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags)
 
 	connect(ui.emoteicon_checkBox,SIGNAL(toggled(bool)),this,SLOT(updateEmotes())) ;
 
+    // Connecting the spin box with the maximum auto download size in channels
+    connect(ui.autoDownloadSpinBox, SIGNAL(valueChanged(int)), this, SLOT(updateMaxAutoDownloadSizeLimit(int)));
+
 }
 
 ChannelPage::~ChannelPage()
@@ -49,6 +53,13 @@ void ChannelPage::load()
 	Settings->beginGroup(QString("ChannelPostsWidget"));
     whileBlocking(ui.emoteicon_checkBox)->setChecked(Settings->value("Emoteicons_ChannelDecription", true).toBool());
     Settings->endGroup();
+
+    // Getting  the maximum auto download size from the configuration
+    uint64_t maxAutoDownloadSize;
+    rsGxsChannels->getMaxAutoDownloadSizeLimit(maxAutoDownloadSize);
+    int temp=(maxAutoDownloadSize/(Size_Of_1_GB));
+    whileBlocking(ui.autoDownloadSpinBox)->setValue(temp);
+
 }
 
 void ChannelPage::updateEmotes()
@@ -57,3 +68,10 @@ void ChannelPage::updateEmotes()
     Settings->setValue("Emoteicons_ChannelDecription", ui.emoteicon_checkBox->isChecked());
     Settings->endGroup();
 }
+
+// Function to update the maximum size allowed for auto download in channels
+void ChannelPage::updateMaxAutoDownloadSizeLimit(int value)
+{
+    uint64_t temp=(static_cast<uint64_t>(value)*Size_Of_1_GB);
+    rsGxsChannels->setMaxAutoDownloadSizeLimit(temp);
+}
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.h b/retroshare-gui/src/gui/settings/ChannelPage.h
index 93f32cabc..adb573711 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.h
+++ b/retroshare-gui/src/gui/settings/ChannelPage.h
@@ -25,6 +25,8 @@
 #include "ui_ChannelPage.h"
 #include "gui/common/FilesDefs.h"
 
+#define Size_Of_1_GB	                            (1024 * 1024 * 1024)	// It is the size of 1 GB in bytes.
+
 class ChannelPage : public ConfigPage
 {
 	Q_OBJECT
@@ -43,6 +45,9 @@ public:
 private slots:
 	void updateEmotes();
   
+    // Function to update the maximum size allowed for auto download in channels
+    void updateMaxAutoDownloadSizeLimit(int value);
+
 private:
 	Ui::ChannelPage ui;
 };
diff --git a/retroshare-gui/src/gui/settings/ChannelPage.ui b/retroshare-gui/src/gui/settings/ChannelPage.ui
index 5e75e442e..8ea42f71a 100644
--- a/retroshare-gui/src/gui/settings/ChannelPage.ui
+++ b/retroshare-gui/src/gui/settings/ChannelPage.ui
@@ -6,22 +6,23 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>423</width>
+    <width>526</width>
     <height>334</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="tabsGroupBox">
-     <property name="title">
-      <string>Tabs</string>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="3" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
-      </item>
-     </layout>
-    </widget>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>     
    </item>
    <item row="0" column="0">
     <widget class="QGroupBox" name="generalGroupBox">
@@ -39,18 +40,43 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="tabsGroupBox">
+     <property name="title">
+      <string>Tabs</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="GroupFrameSettingsWidget" name="groupFrameSettingsWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+    <widget class="QGroupBox" name="downloadsGroupBox">
+     <property name="title">
+      <string>Downloads</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
+       <widget class="QSpinBox" name="autoDownloadSpinBox">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>200</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Maximum Auto Download Size (in GBs)</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>     
    </item>
   </layout>
  </widget>

From c90ea518c5063e57b1c390b2f9fd696811468a91 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 10 Apr 2023 21:17:49 +0200
Subject: [PATCH 219/503] FeedReader: Fixed embedding of images with https

---
 plugins/FeedReader/services/p3FeedReaderThread.cc | 6 +++---
 plugins/FeedReader/util/CURLWrapper.cpp           | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 38f966663..45c869581 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -196,7 +196,7 @@ static std::string getBaseLink(std::string link)
 
 static std::string calculateLink(const std::string &baseLink, const std::string &link)
 {
-	if (link.substr(0, 7) == "http://") {
+	if (link.substr(0, 7) == "http://" || link.substr(0, 8) == "https://") {
 		/* absolute link */
 		return link;
 	}
@@ -204,8 +204,8 @@ static std::string calculateLink(const std::string &baseLink, const std::string
 	/* calculate link of base link */
 	std::string resultLink = baseLink;
 
-	/* link should begin with "http://" */
-	if (resultLink.substr(0, 7) != "http://") {
+	/* link should begin with "http://" or "https://" */
+	if (resultLink.substr(0, 7) != "http://" || resultLink.substr(0, 8) != "https://") {
 		resultLink.insert(0, "http://");
 	}
 
diff --git a/plugins/FeedReader/util/CURLWrapper.cpp b/plugins/FeedReader/util/CURLWrapper.cpp
index 4e8c5c9bb..87fd986ff 100644
--- a/plugins/FeedReader/util/CURLWrapper.cpp
+++ b/plugins/FeedReader/util/CURLWrapper.cpp
@@ -94,6 +94,7 @@ CURLcode CURLWrapper::downloadBinary(const std::string &link, std::vector<unsign
 	curl_easy_setopt(mCurl, CURLOPT_URL, link.c_str());
 	curl_easy_setopt(mCurl, CURLOPT_WRITEFUNCTION, writeFunctionBinary);
 	curl_easy_setopt(mCurl, CURLOPT_WRITEDATA, &data);
+	curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, false);
 
 	return curl_easy_perform(mCurl);
 }

From 6590a17eb61787bb15052a66d46b35772809c644 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 11 Apr 2023 21:59:00 +0200
Subject: [PATCH 220/503] Added paste picture from clipboard feature for
 picture posts

---
 .../src/gui/Posted/PostedCreatePostDialog.cpp | 31 +++++++++++++++++
 .../src/gui/Posted/PostedCreatePostDialog.h   |  1 +
 .../src/gui/Posted/PostedCreatePostDialog.ui  | 34 ++++++++++++-------
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
index aace423f8..ec41434c1 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
@@ -19,6 +19,7 @@
  *******************************************************************************/
 
 #include <QBuffer>
+#include <QClipboard>
 #include <QMessageBox>
 #include <QByteArray>
 #include <QStringList>
@@ -59,6 +60,7 @@ PostedCreatePostDialog::PostedCreatePostDialog(RsPosted *posted, const RsGxsGrou
 
 	connect(ui->postButton, SIGNAL(clicked()), this, SLOT(createPost()));
 	connect(ui->addPicButton, SIGNAL(clicked() ), this , SLOT(addPicture()));
+	connect(ui->pasteButton, SIGNAL(clicked() ), this , SLOT(pastePicture()));
 	connect(ui->RichTextEditWidget, SIGNAL(textSizeOk(bool)),ui->postButton, SLOT(setEnabled(bool)));
 
 	ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/postedlinks.png"));
@@ -256,6 +258,35 @@ void PostedCreatePostDialog::addPicture()
 
 }
 
+void PostedCreatePostDialog::pastePicture()
+{
+	imagefilename = "";
+	imagebytes.clear();
+	QPixmap empty;
+	ui->imageLabel->setPixmap(empty);
+
+	// paste picture from clipboard
+	const QClipboard *clipboard = QApplication::clipboard();
+	const QMimeData *mimeData = clipboard->mimeData();
+
+	QImage image;
+	if (mimeData->hasImage()) {
+		image = (qvariant_cast<QImage>(mimeData->imageData()));
+
+		QImage opt;
+		if(ImageUtil::optimizeSizeBytes(imagebytes, image, opt,"JPG", 640*480, MAXMESSAGESIZE - 2000)) { //Leave space for other stuff
+			ui->imageLabel->setPixmap(QPixmap::fromImage(opt));
+			ui->stackedWidgetPicture->setCurrentIndex(IMG_PICTURE);
+			ui->removeButton->show();
+		} 
+	} else {
+		QMessageBox::information(nullptr,tr("No clipboard image found."),tr("There is no image data in the clipboard to paste"));
+		imagefilename = "";
+		imagebytes.clear();
+		return;
+	}
+}
+
 int PostedCreatePostDialog::viewMode()
 {
 	if (ui->viewPostButton->isChecked()) {
diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
index 48ae3cbd4..8576c5ea9 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
@@ -50,6 +50,7 @@ private:
 private slots:
 	void createPost();
 	void addPicture();
+	void pastePicture();
 	void on_removeButton_clicked();
 	void fileHashingFinished(QList<HashedFile> hashedFiles);
 	void reject() override; //QDialog
diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
index a44f226b1..8af895d9c 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>575</width>
-    <height>518</height>
+    <height>549</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -152,8 +152,8 @@
                    <property name="topMargin">
                     <number>9</number>
                    </property>
-                   <item row="1" column="0">
-                    <spacer name="addPicLeft_HSpacer">
+                   <item row="1" column="2">
+                    <spacer name="addPicRight_HSpacer">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
@@ -182,15 +182,8 @@
                      </property>
                     </widget>
                    </item>
-                   <item row="2" column="0" colspan="3">
-                    <widget class="QLabel" name="sizeWarningLabel">
-                     <property name="text">
-                      <string>Post size is limited to 32 KB, pictures will be downscaled.</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="2">
-                    <spacer name="addPicRight_HSpacer">
+                   <item row="1" column="0">
+                    <spacer name="addPicLeft_HSpacer">
                      <property name="orientation">
                       <enum>Qt::Horizontal</enum>
                      </property>
@@ -203,6 +196,13 @@
                     </spacer>
                    </item>
                    <item row="3" column="0" colspan="3">
+                    <widget class="QLabel" name="sizeWarningLabel">
+                     <property name="text">
+                      <string>Post size is limited to 32 KB, pictures will be downscaled.</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="4" column="0" colspan="3">
                     <spacer name="addPic_VSpacer">
                      <property name="orientation">
                       <enum>Qt::Vertical</enum>
@@ -215,6 +215,16 @@
                      </property>
                     </spacer>
                    </item>
+                   <item row="2" column="1">
+                    <widget class="QPushButton" name="pasteButton">
+                     <property name="toolTip">
+                      <string>Paste image from clipboard</string>
+                     </property>
+                     <property name="text">
+                      <string>Paste Picture</string>
+                     </property>
+                    </widget>
+                   </item>
                   </layout>
                  </item>
                  <item row="1" column="0">

From f06fa656b81ab5039cc0fe9b1e0f6b7cb4ab0476 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Wed, 12 Apr 2023 22:32:17 +0530
Subject: [PATCH 221/503] This commit added a browse button the wire for image
 addition functionality.

---
 .../src/gui/TheWire/PulseAddDialog.cpp        |  32 +++-
 .../src/gui/TheWire/PulseAddDialog.h          |   1 +
 .../src/gui/TheWire/PulseAddDialog.ui         | 150 +++++++++++-------
 3 files changed, 123 insertions(+), 60 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 15fe997a6..84a8e322c 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -20,6 +20,7 @@
 
 #include <iostream>
 #include <QtGui>
+#include <QFileDialog>
 
 #include "PulseReply.h"
 #include "gui/gxs/GxsIdDetails.h"
@@ -42,9 +43,15 @@ PulseAddDialog::PulseAddDialog(QWidget *parent)
 	connect(ui.textEdit_Pulse, SIGNAL( textChanged( void ) ), this, SLOT( pulseTextChanged( void ) ) );
 	connect(ui.pushButton_picture, SIGNAL(clicked()), this, SLOT( toggle()));
 
+    // this connection is from browse push button to the slot function onBrowseButtonClicked()
+    connect(ui.pushButton_Browse, SIGNAL(clicked()), this, SLOT( onBrowseButtonClicked()));
+
 	ui.pushButton_picture->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/photo.png")));
 	ui.frame_picture->hide();
 
+    // initially hiding the browse button as the attach image button is not pressed
+    ui.frame_PictureBrowse->hide();
+
 	setAcceptDrops(true);
 }
 
@@ -153,8 +160,12 @@ void PulseAddDialog::cleanup()
 	ui.label_image4->clear();
 	ui.label_image4->setText(tr("Drag and Drop Image"));
 
-	// Hide Drag & Drop Frame
-	ui.frame_picture->hide();
+    ui.lineEdit_FilePath->clear();
+
+    // Hide Drag & Drop Frame and the browse frame
+    ui.frame_picture->hide();
+    ui.frame_PictureBrowse->hide();
+
 	ui.pushButton_picture->setChecked(false);
 }
 
@@ -510,12 +521,29 @@ void PulseAddDialog::toggle()
 {
 	if (ui.pushButton_picture->isChecked())
 	{
+        // Show the input methods (drag and drop field and the browse button)
 		ui.frame_picture->show();
+        ui.frame_PictureBrowse->show();
+
 		ui.pushButton_picture->setToolTip(tr("Hide Pictures"));
 	}
 	else
 	{
+        // Hide the input methods (drag and drop field and the browse button)
 		ui.frame_picture->hide();
+        ui.frame_PictureBrowse->hide();
+
 		ui.pushButton_picture->setToolTip(tr("Add Pictures"));
 	}
 }
+
+// Function to get the file dialog for the browse button
+void PulseAddDialog::onBrowseButtonClicked()
+{
+    QString filePath = QFileDialog::getOpenFileName(this, tr("Select image file"), QString(), tr("Image files (*.png *.jpg *.jpeg *.bmp *.gif)"));
+    if (!filePath.isEmpty()) {
+        ui.lineEdit_FilePath->setText(filePath);
+        addImage(filePath);
+    }
+}
+
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.h b/retroshare-gui/src/gui/TheWire/PulseAddDialog.h
index 258efb736..69007b025 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.h
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.h
@@ -53,6 +53,7 @@ private slots:
 	void clearDialog();
 	void pulseTextChanged();
 	void toggle();
+    void onBrowseButtonClicked();
 
 private:
 	// OLD VERSIONs, private now.
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
index a731ec3b0..5ef30ef19 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
@@ -7,20 +7,20 @@
     <x>0</x>
     <y>0</y>
     <width>720</width>
-    <height>449</height>
+    <height>513</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" name="PulseAddDialog_GL">
-   <property name="topMargin">
-    <number>0</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="spacing">
     <number>6</number>
    </property>
-   <item row="0" column="0">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <item>
     <widget class="QFrame" name="frame_from">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -52,7 +52,6 @@
         <property name="font">
          <font>
           <pointsize>12</pointsize>
-          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -118,7 +117,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item>
     <widget class="QFrame" name="frame_reply">
      <layout class="QVBoxLayout" name="frame_reply_VL">
       <property name="leftMargin">
@@ -232,18 +231,9 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item>
     <widget class="QFrame" name="frame_input">
-     <layout class="QVBoxLayout" name="frame_input_VL">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QTextEdit" name="textEdit_Pulse">
         <property name="font">
@@ -262,7 +252,7 @@
         <property name="minimumSize">
          <size>
           <width>0</width>
-          <height>100</height>
+          <height>80</height>
          </size>
         </property>
         <property name="frameShape">
@@ -271,29 +261,13 @@
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QGridLayout" name="frame_picture_GL">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_image1">
-           <property name="minimumSize">
-            <size>
-             <width>80</width>
-             <height>80</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Drag and Drop Image</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
+        <layout class="QGridLayout" name="gridLayout">
          <item row="0" column="1">
           <widget class="QLabel" name="label_image2">
            <property name="minimumSize">
             <size>
-             <width>80</width>
-             <height>80</height>
+             <width>40</width>
+             <height>40</height>
             </size>
            </property>
            <property name="text">
@@ -308,8 +282,24 @@
           <widget class="QLabel" name="label_image3">
            <property name="minimumSize">
             <size>
-             <width>80</width>
-             <height>80</height>
+             <width>40</width>
+             <height>40</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Drag and Drop Image</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_image1">
+           <property name="minimumSize">
+            <size>
+             <width>40</width>
+             <height>40</height>
             </size>
            </property>
            <property name="text">
@@ -324,8 +314,8 @@
           <widget class="QLabel" name="label_image4">
            <property name="minimumSize">
             <size>
-             <width>80</width>
-             <height>80</height>
+             <width>40</width>
+             <height>40</height>
             </size>
            </property>
            <property name="text">
@@ -340,15 +330,49 @@
        </widget>
       </item>
       <item>
-       <widget class="QFrame" name="frame_URL">
-        <layout class="QGridLayout" name="frame_URL_GL">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_URL">
-           <property name="text">
-            <string>URL</string>
+       <widget class="QFrame" name="frame_PictureBrowse">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>50</height>
+         </size>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLineEdit" name="lineEdit_FilePath">
+           <property name="minimumSize">
+            <size>
+             <width>541</width>
+             <height>25</height>
+            </size>
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="pushButton_Browse">
+           <property name="minimumSize">
+            <size>
+             <width>101</width>
+             <height>25</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Browse...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QFrame" name="frame_URL">
+        <layout class="QGridLayout" name="frame_URL_GL">
          <item row="0" column="1">
           <widget class="QLineEdit" name="lineEdit_URL"/>
          </item>
@@ -359,13 +383,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_DisplayAs">
-           <property name="text">
-            <string>Display As</string>
-           </property>
-          </widget>
-         </item>
          <item row="1" column="1">
           <widget class="QLineEdit" name="lineEdit_DisplayAs"/>
          </item>
@@ -376,13 +393,31 @@
            </property>
           </widget>
          </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_DisplayAs">
+           <property name="text">
+            <string>Display As</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_URL">
+           <property name="text">
+            <string>URL</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
      </layout>
+     <zorder>frame_URL</zorder>
+     <zorder>frame_picture</zorder>
+     <zorder>frame_PictureBrowse</zorder>
+     <zorder>textEdit_Pulse</zorder>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item>
     <layout class="QHBoxLayout" name="butons_HL">
      <property name="leftMargin">
       <number>6</number>
@@ -421,7 +456,6 @@
        <property name="font">
         <font>
          <pointsize>12</pointsize>
-         <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>

From 3c583f67244397d7ce31a62941bcab25ac79166f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 12 Apr 2023 23:11:45 +0200
Subject: [PATCH 222/503] fixed crash due to calling a method in board item
 after deletion

---
 retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
index 02af1afc3..684b85e54 100644
--- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
@@ -287,14 +287,13 @@ void BaseBoardsCommentsItem::readToggled(bool checked)
 		return;
 	}
 
+    setReadStatus(false, checked);	// Can't call this inside an async call since the widget may be destroyed afterwards!
+                                    // So we do it right away.
+
     RsThread::async( [this,checked]() {
 		RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
         
         rsPosted->setCommentReadStatus(msgPair, !checked);
-        
-        RsQThreadUtils::postToObject( [this,checked]() {
-			setReadStatus(false, checked);
-        } );
     });
 }
 

From a7b2091bb80154c58278bdba9b5ca9384c597acd Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 13 Apr 2023 21:51:37 +0200
Subject: [PATCH 223/503] added a waiting cursor when loading a channel

---
 .../src/gui/gxschannels/GxsChannelPostsModel.cpp      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 3136004a2..197013c8b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -27,6 +27,8 @@
 #include "retroshare/rsgxschannels.h"
 #include "retroshare/rsexpr.h"
 
+#include "gui/MainWindow.h"
+#include "gui/mainpagestack.h"
 #include "gui/common/FilesDefs.h"
 #include "util/qtthreadsutils.h"
 #include "util/HandleRichText.h"
@@ -453,7 +455,6 @@ const RsGxsGroupId& RsGxsChannelPostsModel::currentGroupId() const
 {
 	return mChannelGroup.mMeta.mGroupId;
 }
-
 void RsGxsChannelPostsModel::updateChannel(const RsGxsGroupId& channel_group_id)
 {
     if(channel_group_id.isNull())
@@ -586,7 +587,9 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
 	if(group_id.isNull())
 		return;
 
-	RsThread::async([this, group_id]()
+    MainWindow::getPage(MainWindow::Channels)->setCursor(Qt::WaitCursor) ; // Maybe we should pass that widget when calling update_posts
+
+    RsThread::async([this, group_id]()
 	{
         // 1 - get message data from p3GxsChannels
 
@@ -641,7 +644,9 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
             delete comments;
             delete votes;
 
-		}, this );
+            MainWindow::getPage(MainWindow::Channels)->setCursor(Qt::ArrowCursor) ;
+
+        }, this );
 
     });
 }

From 5fae434f03d5e4eccb0abbf0573e40006cac9a00 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:19:32 +0530
Subject: [PATCH 224/503] this commit changed the QFileDialog::getOpenFileName
 to misc::getOpenFileName

---
 build_scripts/Windows-msys2/build.bat             | 4 ++--
 libretroshare                                     | 2 +-
 retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build_scripts/Windows-msys2/build.bat b/build_scripts/Windows-msys2/build.bat
index 529a1350f..cfccc3e53 100644
--- a/build_scripts/Windows-msys2/build.bat
+++ b/build_scripts/Windows-msys2/build.bat
@@ -9,11 +9,11 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 %cecho% info "Build %SourceName%"
-call "%~dp0build\build.bat" 64 release autologin "CONFIG+=rs_use_native_dialogs"
+call "%~dp0build\build.bat" 64 release autologin "CONFIG+=rs_efs" "CONFIG+=gxsthewire" "CONFIG+=no_retroshare_plugins" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_libsam3"
 if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Pack %SourceName%"
-call "%~dp0build\pack.bat" 64 release autologin "CONFIG+=rs_use_native_dialogs"
+call "%~dp0build\pack.bat" 64 release autologin "CONFIG+=rs_efs" "CONFIG+=gxsthewire" "CONFIG+=no_retroshare_plugins" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_libsam3"
 if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL%
 
 exit /B 0
diff --git a/libretroshare b/libretroshare
index 74cd958cf..7a50d7a81 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
+Subproject commit 7a50d7a81d60c4bf76ea4bd81f45a0f028419e89
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 84a8e322c..572772a1e 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -20,11 +20,11 @@
 
 #include <iostream>
 #include <QtGui>
-#include <QFileDialog>
 
 #include "PulseReply.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
+#include "util/misc.h"
 
 #include "PulseAddDialog.h"
 
@@ -540,7 +540,8 @@ void PulseAddDialog::toggle()
 // Function to get the file dialog for the browse button
 void PulseAddDialog::onBrowseButtonClicked()
 {
-    QString filePath = QFileDialog::getOpenFileName(this, tr("Select image file"), QString(), tr("Image files (*.png *.jpg *.jpeg *.bmp *.gif)"));
+    QString filePath;
+    misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", filePath);
     if (!filePath.isEmpty()) {
         ui.lineEdit_FilePath->setText(filePath);
         addImage(filePath);

From df8e6b9f9674336532fb66aa6644031a8845ef1c Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:21:45 +0530
Subject: [PATCH 225/503] Revert "this commit changed the
 QFileDialog::getOpenFileName to misc::getOpenFileName"

This reverts commit 5fae434f03d5e4eccb0abbf0573e40006cac9a00.
---
 build_scripts/Windows-msys2/build.bat             | 4 ++--
 libretroshare                                     | 2 +-
 retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build_scripts/Windows-msys2/build.bat b/build_scripts/Windows-msys2/build.bat
index cfccc3e53..529a1350f 100644
--- a/build_scripts/Windows-msys2/build.bat
+++ b/build_scripts/Windows-msys2/build.bat
@@ -9,11 +9,11 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 %cecho% info "Build %SourceName%"
-call "%~dp0build\build.bat" 64 release autologin "CONFIG+=rs_efs" "CONFIG+=gxsthewire" "CONFIG+=no_retroshare_plugins" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_libsam3"
+call "%~dp0build\build.bat" 64 release autologin "CONFIG+=rs_use_native_dialogs"
 if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Pack %SourceName%"
-call "%~dp0build\pack.bat" 64 release autologin "CONFIG+=rs_efs" "CONFIG+=gxsthewire" "CONFIG+=no_retroshare_plugins" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_libsam3"
+call "%~dp0build\pack.bat" 64 release autologin "CONFIG+=rs_use_native_dialogs"
 if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL%
 
 exit /B 0
diff --git a/libretroshare b/libretroshare
index 7a50d7a81..74cd958cf 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 7a50d7a81d60c4bf76ea4bd81f45a0f028419e89
+Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 572772a1e..84a8e322c 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -20,11 +20,11 @@
 
 #include <iostream>
 #include <QtGui>
+#include <QFileDialog>
 
 #include "PulseReply.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
-#include "util/misc.h"
 
 #include "PulseAddDialog.h"
 
@@ -540,8 +540,7 @@ void PulseAddDialog::toggle()
 // Function to get the file dialog for the browse button
 void PulseAddDialog::onBrowseButtonClicked()
 {
-    QString filePath;
-    misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", filePath);
+    QString filePath = QFileDialog::getOpenFileName(this, tr("Select image file"), QString(), tr("Image files (*.png *.jpg *.jpeg *.bmp *.gif)"));
     if (!filePath.isEmpty()) {
         ui.lineEdit_FilePath->setText(filePath);
         addImage(filePath);

From b543281bb396964f0aa6b92079320109a9ea8cc4 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:24:37 +0530
Subject: [PATCH 226/503] this commit changed the QFileDialog::getOpenFileName
 to misc::getOpenFileName

---
 retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 84a8e322c..572772a1e 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -20,11 +20,11 @@
 
 #include <iostream>
 #include <QtGui>
-#include <QFileDialog>
 
 #include "PulseReply.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
+#include "util/misc.h"
 
 #include "PulseAddDialog.h"
 
@@ -540,7 +540,8 @@ void PulseAddDialog::toggle()
 // Function to get the file dialog for the browse button
 void PulseAddDialog::onBrowseButtonClicked()
 {
-    QString filePath = QFileDialog::getOpenFileName(this, tr("Select image file"), QString(), tr("Image files (*.png *.jpg *.jpeg *.bmp *.gif)"));
+    QString filePath;
+    misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", filePath);
     if (!filePath.isEmpty()) {
         ui.lineEdit_FilePath->setText(filePath);
         addImage(filePath);

From bf0ae5e1ee4f0c976e6e8def9e95626ec1ddade4 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 14 Apr 2023 23:19:47 +0200
Subject: [PATCH 227/503] Dsplay on account selection box the headshot image

---
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 23031d6ec..7b36ebb90 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -23,6 +23,8 @@
 #include "WireGroupDialog.h"
 #include "WireGroupItem.h"
 #include "gui/settings/rsharesettings.h"
+#include "gui/gxs/GxsIdDetails.h"
+#include "gui/common/FilesDefs.h"
 
 #include "PulseViewGroup.h"
 #include "PulseReplySeperator.h"
@@ -307,8 +309,20 @@ void WireDialog::updateGroups(std::vector<RsWireGroup>& groups)
 		{
 			// grab own groups.
 			// setup Chooser too.
-			mOwnGroups.push_back(it);
-			ui.groupChooser->addItem(QString::fromStdString(it.mMeta.mGroupName));
+			mOwnGroups.push_back(it); 
+			QPixmap pixmap;
+			if (it.mHeadshot.mData)
+			{
+				if (GxsIdDetails::loadPixmapFromData( it.mHeadshot.mData,it.mHeadshot.mSize,pixmap,GxsIdDetails::ORIGINAL))
+					pixmap = pixmap.scaled(32,32);
+			} 
+			else 
+			{
+				// default.
+				pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(32,32);
+			}
+
+			ui.groupChooser->addItem(QPixmap(pixmap),QString::fromStdString(it.mMeta.mGroupName));
 		}
 	}
 }

From cd14b2e9bb7250303731a8dc41af00937cc7aafc Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 15 Apr 2023 19:30:00 +0200
Subject: [PATCH 228/503] Added paste icon for boards

---
 .../src/gui/Posted/PostedCreatePostDialog.ui  | 14 +++-
 retroshare-gui/src/gui/icons.qrc              |  1 +
 .../src/gui/icons/svg/paste_image.svg         | 75 +++++++++++++++++++
 3 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/svg/paste_image.svg

diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
index 8af895d9c..2a19f02d8 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>575</width>
-    <height>549</height>
+    <height>468</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -223,6 +223,16 @@
                      <property name="text">
                       <string>Paste Picture</string>
                      </property>
+                     <property name="icon">
+                      <iconset resource="../icons.qrc">
+                       <normaloff>:/icons/svg/paste_image.svg</normaloff>:/icons/svg/paste_image.svg</iconset>
+                     </property>
+                     <property name="iconSize">
+                      <size>
+                       <width>32</width>
+                       <height>32</height>
+                      </size>
+                     </property>
                     </widget>
                    </item>
                   </layout>
@@ -235,7 +245,7 @@
                    <property name="sizeHint" stdset="0">
                     <size>
                      <width>267</width>
-                     <height>138</height>
+                     <height>20</height>
                     </size>
                    </property>
                   </spacer>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 60cb262ca..c92057c29 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -208,6 +208,7 @@
         <file>icons/svg/newsfeed.svg</file>
         <file>icons/svg/options.svg</file>
         <file>icons/svg/paste.svg</file>
+        <file>icons/svg/paste_image.svg</file>
         <file>icons/svg/people-notify.svg</file>
         <file>icons/svg/people.svg</file>
         <file>icons/svg/person.svg</file>
diff --git a/retroshare-gui/src/gui/icons/svg/paste_image.svg b/retroshare-gui/src/gui/icons/svg/paste_image.svg
new file mode 100644
index 000000000..03a89491e
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/paste_image.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="48px"
+   viewBox="0 0 24 24"
+   width="48px"
+   fill="#000000"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="paste_image.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="10.833333"
+     inkscape:cx="23.953846"
+     inkscape:cy="24.046154"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path2" />
+  <path
+     d="M19 2h-4.18C14.4.84 13.3 0 12 0c-1.3 0-2.4.84-2.82 2H5c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-7 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm7 18H5V4h2v3h10V4h2v16z"
+     id="path4"
+     style="fill:#039bd5;fill-opacity:1" />
+  <g
+     transform="matrix(0.02667227,0,0,0.02667227,5.6271015,7.5787337)"
+     id="g14">
+    <g
+       id="g6">
+      <g
+         id="g4">
+        <path
+           d="M 426.667,68.267 H 51.2 C 22.923,68.267 0,91.19 0,119.467 V 358.4 c 0,28.277 22.923,51.2 51.2,51.2 h 375.467 c 28.277,0 51.2,-22.923 51.2,-51.2 V 119.467 c 0,-28.277 -22.923,-51.2 -51.2,-51.2 z m 17.066,197.734 -107.4,-107.4 c -6.664,-6.663 -17.468,-6.663 -24.132,0 L 170.667,300.134 114.466,243.933 c -6.664,-6.663 -17.468,-6.663 -24.132,0 L 34.133,300.134 V 119.467 c 0,-9.426 7.641,-17.067 17.067,-17.067 h 375.467 c 9.426,0 17.067,7.641 17.067,17.067 v 146.534 z"
+           data-original="#000000"
+           class="active-path"
+           data-old_color="#000000"
+           fill="#039bd5"
+           id="path2-3" />
+      </g>
+    </g>
+    <g
+       id="g12">
+      <g
+         id="g10">
+        <circle
+           cx="153.60001"
+           cy="187.733"
+           r="51.200001"
+           data-original="#000000"
+           class="active-path"
+           data-old_color="#000000"
+           fill="#039bd5"
+           id="circle8" />
+      </g>
+    </g>
+  </g>
+</svg>

From dceda36f6e5501bc7b945c3836cca8a85d0d9897 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sat, 15 Apr 2023 19:28:37 +0200
Subject: [PATCH 229/503] Moved QAction for saving an image from
 customContextMenu of GxsForumThreadWidget and ChatWidget to RSTextBrowser

---
 retroshare-gui/src/gui/chat/ChatWidget.cpp    | 15 +-----
 retroshare-gui/src/gui/chat/ChatWidget.h      |  1 -
 retroshare-gui/src/gui/chat/ChatWidget.ui     |  9 ----
 .../src/gui/common/RSTextBrowser.cpp          | 47 +++++++++++++++++--
 retroshare-gui/src/gui/common/RSTextBrowser.h | 15 +++++-
 .../gui/gxsforums/GxsForumThreadWidget.cpp    | 29 ------------
 .../src/gui/gxsforums/GxsForumThreadWidget.h  |  3 --
 .../src/gui/gxsforums/GxsForumThreadWidget.ui | 12 -----
 retroshare-gui/src/lang/retroshare_en.ts      |  7 ++-
 9 files changed, 63 insertions(+), 75 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 47c15a137..6a0117f00 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -165,7 +165,6 @@ ChatWidget::ChatWidget(QWidget *parent)
 	connect(ui->actionResetFont, SIGNAL(triggered()), this, SLOT(resetFont()));
 	connect(ui->actionQuote, SIGNAL(triggered()), this, SLOT(quote()));
 	connect(ui->actionDropPlacemark, SIGNAL(triggered()), this, SLOT(dropPlacemark()));
-	connect(ui->actionSave_image, SIGNAL(triggered()), this, SLOT(saveImage()));
 	connect(ui->actionImport_sticker, SIGNAL(triggered()), this, SLOT(saveSticker()));
 	connect(ui->actionShow_Hidden_Images, SIGNAL(triggered()), ui->textBrowser, SLOT(showImages()));
 	ui->actionShow_Hidden_Images->setIcon(ui->textBrowser->getBlockedImage());
@@ -1151,10 +1150,7 @@ void ChatWidget::pasteText(const QString& S)
 
 void ChatWidget::contextMenuTextBrowser(QPoint point)
 {
-	QMatrix matrix;
-	matrix.translate(ui->textBrowser->horizontalScrollBar()->value(), ui->textBrowser->verticalScrollBar()->value());
-
-	QMenu *contextMnu = ui->textBrowser->createStandardContextMenu(matrix.map(point));
+	QMenu *contextMnu = ui->textBrowser->createStandardContextMenuFromPoint(point);
 
 	contextMnu->addSeparator();
 	contextMnu->addAction(ui->actionClearChatHistory);
@@ -1167,9 +1163,7 @@ void ChatWidget::contextMenuTextBrowser(QPoint point)
 		if (! ui->textBrowser->getShowImages())
 			contextMnu->addAction(ui->actionShow_Hidden_Images);
 
-		ui->actionSave_image->setData(point);
 		ui->actionImport_sticker->setData(point);
-		contextMnu->addAction(ui->actionSave_image);
 		contextMnu->addAction(ui->actionImport_sticker);
 	}
 
@@ -1995,13 +1989,6 @@ void ChatWidget::dropPlacemark()
                                                          // or not.
 }
 
-void ChatWidget::saveImage()
-{
-	QPoint point = ui->actionSave_image->data().toPoint();
-	QTextCursor cursor = ui->textBrowser->cursorForPosition(point);
-	ImageUtil::extractImage(window(), cursor);
-}
-
 void ChatWidget::saveSticker()
 {
 	QPoint point = ui->actionImport_sticker->data().toPoint();
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.h b/retroshare-gui/src/gui/chat/ChatWidget.h
index 82fb6a486..e42df06fe 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.h
+++ b/retroshare-gui/src/gui/chat/ChatWidget.h
@@ -196,7 +196,6 @@ private slots:
 
 	void quote();
 	void dropPlacemark();
-	void saveImage();
 	void saveSticker();
 
 private:
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui
index d46093071..39bd84bb7 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.ui
+++ b/retroshare-gui/src/gui/chat/ChatWidget.ui
@@ -1049,15 +1049,6 @@ border-image: url(:/images/closepressed.png)
     <string>Insert horizontal rule</string>
    </property>
   </action>
-  <action name="actionSave_image">
-   <property name="icon">
-    <iconset resource="../images.qrc">
-     <normaloff>:/images/document_save.png</normaloff>:/images/document_save.png</iconset>
-   </property>
-   <property name="text">
-    <string>Save image</string>
-   </property>
-  </action>
   <action name="actionImport_sticker">
    <property name="icon">
     <iconset resource="../icons.qrc">
diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.cpp b/retroshare-gui/src/gui/common/RSTextBrowser.cpp
index cd2bd988e..449f4e1c6 100644
--- a/retroshare-gui/src/gui/common/RSTextBrowser.cpp
+++ b/retroshare-gui/src/gui/common/RSTextBrowser.cpp
@@ -22,6 +22,7 @@
 
 #include "RSImageBlockWidget.h"
 #include "gui/common/FilesDefs.h"
+#include "util/imageutil.h"
 
 #include <retroshare/rsinit.h> //To get RsAccounts
 
@@ -33,6 +34,7 @@
 #include <QPainter>
 #include <QPlainTextEdit>
 #include <QTextDocumentFragment>
+#include <QScrollBar>
 
 #include <iostream>
 
@@ -317,18 +319,43 @@ QString RSTextBrowser::anchorForPosition(const QPoint &pos) const
 	return anchor;
 }
 
-QMenu *RSTextBrowser::createStandardContextMenu()
+void RSTextBrowser::addContextMenuAction(QAction *action)
 {
-	return createStandardContextMenu(QPoint());
+	mContextMenuActions.push_back(action);
 }
-QMenu *RSTextBrowser::createStandardContextMenu(const QPoint &position)
+
+void RSTextBrowser::contextMenuEvent(QContextMenuEvent *event)
 {
-	QMenu *menu = QTextBrowser::createStandardContextMenu(position);
+	emit calculateContextMenuActions();
+
+	QMenu *contextMenu = createStandardContextMenuFromPoint(event->pos());
+
+	QList<QAction*>::iterator it;
+	for (it = mContextMenuActions.begin(); it != mContextMenuActions.end(); ++it) {
+		contextMenu->addAction(*it);
+	}
+
+	contextMenu->exec(QCursor::pos());
+
+	delete(contextMenu);
+}
+
+QMenu *RSTextBrowser::createStandardContextMenuFromPoint(const QPoint &widgetPos)
+{
+	QMatrix matrix;
+	matrix.translate(horizontalScrollBar()->value(), verticalScrollBar()->value());
+
+	QMenu *menu = QTextBrowser::createStandardContextMenu(matrix.map(widgetPos));
 
 	menu->addSeparator();
 	QAction *a = menu->addAction(FilesDefs::getIconFromQtResourcePath("://icons/textedit/code.png"), tr("View &Source"), this, SLOT(viewSource()));
 	a->setEnabled(!this->document()->isEmpty());
 
+	if (checkImage(widgetPos)) {
+		a = menu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/document_save.png"), tr("Save image"), this, SLOT(saveImage()));
+		a->setData(widgetPos);
+	}
+
 	return menu;
 }
 
@@ -350,3 +377,15 @@ void RSTextBrowser::viewSource()
 
 	delete dialog;
 }
+
+void RSTextBrowser::saveImage()
+{
+	QAction *action = dynamic_cast<QAction*>(sender()) ;
+	if (!action) {
+		return;
+	}
+
+	QPoint point = action->data().toPoint();
+	QTextCursor cursor = cursorForPosition(point);
+	ImageUtil::extractImage(window(), cursor);
+}
diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.h b/retroshare-gui/src/gui/common/RSTextBrowser.h
index 57f351d2b..04de979c5 100644
--- a/retroshare-gui/src/gui/common/RSTextBrowser.h
+++ b/retroshare-gui/src/gui/common/RSTextBrowser.h
@@ -49,6 +49,8 @@ public:
 	bool checkImage(QPoint pos) {QString imageStr; return checkImage(pos, imageStr); }
 	QString anchorForPosition(const QPoint &pos) const;
 
+	// Add QAction to context menu (action won't be deleted)
+	void addContextMenuAction(QAction *action);
 
 	void activateLinkClick(bool active);
 
@@ -58,8 +60,10 @@ public:
 	QVariant textColorQuotes() const { return highlighter->textColorQuotes();}
 	bool getShowImages() const { return mShowImages; }
 
-	QMenu *createStandardContextMenu();
-	QMenu *createStandardContextMenu(const QPoint &position);
+	QMenu *createStandardContextMenuFromPoint(const QPoint &widgetPos);
+
+Q_SIGNALS:
+	void calculateContextMenuActions();
 
 public slots:
 	void showImages();
@@ -70,9 +74,15 @@ private slots:
 	void linkClicked(const QUrl &url);
 	void destroyImageBlockWidget();
 	void viewSource();
+	void saveImage();
 
 protected:
 	void paintEvent(QPaintEvent *event);
+	virtual void contextMenuEvent(QContextMenuEvent *event);
+
+private:
+	// Hide method from QTextBrowser
+	using QTextBrowser::createStandardContextMenu;
 
 private:
 	QString mPlaceholderText;
@@ -80,6 +90,7 @@ private:
 	RSImageBlockWidget *mImageBlockWidget;
 	bool mLinkClickActive;
 	RsSyntaxHighlighter *highlighter;
+	QList<QAction*> mContextMenuActions;
 #ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG
 	QRect mCursorRectStart;
 	QRect mCursorRectLeft;
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index 5ea514a54..1309848c2 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -276,7 +276,6 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
 
     connect(ui->versions_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(changedVersion()));
     connect(ui->threadTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(threadListCustomPopupMenu(QPoint)));
-    connect(ui->postText, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTextBrowser(QPoint)));
     connect(ui->forumName, SIGNAL(clicked(QPoint)), this, SLOT(showForumInfo()));
 
     ui->subscribeToolButton->hide() ;
@@ -303,8 +302,6 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
     connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterItems(QString)));
     connect(ui->filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterColumnChanged(int)));
 
-    connect(ui->actionSave_image, SIGNAL(triggered()), this, SLOT(saveImage()));
-
     connect(ui->threadedView_TB, SIGNAL(toggled(bool)), this, SLOT(toggleThreadedView(bool)));
     connect(ui->flatView_TB, SIGNAL(toggled(bool)), this, SLOT(toggleFlatView(bool)));
     connect(ui->latestPostInThreadView_TB, SIGNAL(toggled(bool)), this, SLOT(toggleLstPostInThreadView(bool)));
@@ -793,25 +790,6 @@ void GxsForumThreadWidget::threadListCustomPopupMenu(QPoint /*point*/)
     contextMnu.exec(QCursor::pos());
 }
 
-void GxsForumThreadWidget::contextMenuTextBrowser(QPoint point)
-{
-    QMatrix matrix;
-    matrix.translate(ui->postText->horizontalScrollBar()->value(), ui->postText->verticalScrollBar()->value());
-
-    QMenu *contextMnu = ui->postText->createStandardContextMenu(matrix.map(point));
-
-    contextMnu->addSeparator();
-
-    if(ui->postText->checkImage(point))
-    {
-        ui->actionSave_image->setData(point);
-        contextMnu->addAction(ui->actionSave_image);
-    }
-
-    contextMnu->exec(ui->postText->viewport()->mapToGlobal(point));
-    delete(contextMnu);
-}
-
 void GxsForumThreadWidget::headerContextMenuRequested(const QPoint &pos)
 {
     QMenu* header_context_menu = new QMenu(tr("Show column"), this);
@@ -1823,13 +1801,6 @@ void GxsForumThreadWidget::replyForumMessageData(const RsGxsForumMsg &msg)
     }
 }
 
-void GxsForumThreadWidget::saveImage()
-{
-    QPoint point = ui->actionSave_image->data().toPoint();
-    QTextCursor cursor = ui->postText->cursorForPosition(point);
-    ImageUtil::extractImage(window(), cursor);
-}
-
 void GxsForumThreadWidget::toggleThreadedView(bool b)        { if(b) changedViewBox(VIEW_THREADED); }
 void GxsForumThreadWidget::toggleFlatView(bool b)            { if(b) changedViewBox(VIEW_FLAT); }
 void GxsForumThreadWidget::toggleLstPostInThreadView(bool b) { if(b) changedViewBox(VIEW_LAST_POST); }
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
index 8e64c2b75..322c64fae 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
@@ -108,7 +108,6 @@ protected:
 private slots:
 	/** Create the context popup menu and it's submenus */
 	void threadListCustomPopupMenu(QPoint point);
-	void contextMenuTextBrowser(QPoint point);
 	void headerContextMenuRequested(const QPoint& pos);
     void showForumInfo();
 
@@ -134,8 +133,6 @@ private slots:
     // This method is used to perform an asynchroneous action on the message data. Any of the methods above can be used as parameter.
 	void async_msg_action(const MsgMethod& method);
 
-	void saveImage();
-
 	void markMsgAsRead();
 	void markMsgAsReadChildren();
 	void markMsgAsUnread();
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index 0682550cb..5a9c51e93 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -568,9 +568,6 @@
            <family>MS Sans Serif</family>
           </font>
          </property>
-         <property name="contextMenuPolicy">
-          <enum>Qt::CustomContextMenu</enum>
-         </property>
         </widget>
        </item>
       </layout>
@@ -578,15 +575,6 @@
     </widget>
    </item>
   </layout>
-  <action name="actionSave_image">
-   <property name="icon">
-    <iconset resource="../images.qrc">
-     <normaloff>:/images/document_save.png</normaloff>:/images/document_save.png</iconset>
-   </property>
-   <property name="text">
-    <string>Save image</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts
index 3b670aeaa..d11bfb453 100644
--- a/retroshare-gui/src/lang/retroshare_en.ts
+++ b/retroshare-gui/src/lang/retroshare_en.ts
@@ -19289,7 +19289,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+4"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>

From 09dd588e7f9ee802f1afb4d130cc6749f1444de5 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 16 Apr 2023 14:02:17 +0200
Subject: [PATCH 230/503] Removed unnecessary include in
 PostedCreatePostDialog.h

---
 retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
index 8576c5ea9..d7b8a261c 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
@@ -24,7 +24,6 @@
 #include <QDialog>
 #include <gui/common/HashBox.h>
 #include "retroshare/rsposted.h"
-#include "util/RichTextEdit.h"
 
 namespace Ui {
 	class PostedCreatePostDialog;

From 4802de9e5242d475a895ab6eb74ed4f9f06e20e3 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 16 Apr 2023 14:05:40 +0200
Subject: [PATCH 231/503] Removed include of ui_CreateGxsForumMsg.h from
 CreateGxsForumMsg.h

---
 .../src/gui/gxsforums/CreateGxsForumMsg.cpp   | 173 +++++++++---------
 .../src/gui/gxsforums/CreateGxsForumMsg.h     |   9 +-
 2 files changed, 96 insertions(+), 86 deletions(-)

diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
index e93b81c08..493f254d4 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
@@ -19,6 +19,7 @@
  *******************************************************************************/
 
 #include "CreateGxsForumMsg.h"
+#include "ui_CreateGxsForumMsg.h"
 
 #include <QMessageBox>
 #include <QFile>
@@ -54,63 +55,64 @@
 /** Constructor */
 CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessageId &pId, const RsGxsMessageId& mOId, const RsGxsId& posterId, bool isModerating)
     : QDialog(NULL, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
-      mForumId(fId), mParentId(pId), mOrigMsgId(mOId),mPosterId(posterId),mIsModerating(isModerating)
+      mForumId(fId), mParentId(pId), mOrigMsgId(mOId),mPosterId(posterId),mIsModerating(isModerating),
+      ui(new Ui::CreateGxsForumMsg)
 {
 	/* Invoke the Qt Designer generated object setup routine */
-	ui.setupUi(this);
+	ui->setupUi(this);
 
 	setAttribute(Qt::WA_DeleteOnClose, true);
 
 	/* Setup UI helper */
 	mStateHelper = new UIStateHelper(this);
-	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.postButton);
-	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui.innerFrame);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui.forumName);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui.forumSubject);
-	mStateHelper->addClear(CREATEGXSFORUMMSG_FORUMINFO, ui.forumName);
+	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui->postButton);
+	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui->innerFrame);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui->forumName);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui->forumSubject);
+	mStateHelper->addClear(CREATEGXSFORUMMSG_FORUMINFO, ui->forumName);
 
-	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui.postButton);
-	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui.innerFrame);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui.forumName);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui.forumSubject);
-	mStateHelper->addClear(CREATEGXSFORUMMSG_PARENTMSG, ui.forumName);
+	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui->postButton);
+	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui->innerFrame);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui->forumName);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui->forumSubject);
+	mStateHelper->addClear(CREATEGXSFORUMMSG_PARENTMSG, ui->forumName);
 
-	mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui.postButton);
-	mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui.innerFrame);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui.forumName);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui.forumSubject);
-	mStateHelper->addClear(CREATEGXSFORUMMSG_ORIGMSG, ui.forumName);
+	mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui->postButton);
+	mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui->innerFrame);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui->forumName);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui->forumSubject);
+	mStateHelper->addClear(CREATEGXSFORUMMSG_ORIGMSG, ui->forumName);
 
 
 	QString text = mOId.isNull()?(pId.isNull() ? tr("Start New Thread") : tr("Post Forum Message")):tr("Edit Message");
 	setWindowTitle(text);
 	
 	if (!mOId.isNull())
-	ui.postButton->setText(tr ("Update"));
+	ui->postButton->setText(tr ("Update"));
 
-	ui.forumMessage->setPlaceholderText(tr ("Text"));
+	ui->forumMessage->setPlaceholderText(tr ("Text"));
 
-    ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png"));
-	ui.headerFrame->setHeaderText(text);
+    ui->headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png"));
+	ui->headerFrame->setHeaderText(text);
 
-	ui.generateSpinBox->setEnabled(false);
+	ui->generateSpinBox->setEnabled(false);
 
 	Settings->loadWidgetInformation(this);
 
-	connect(ui.hashBox, SIGNAL(fileHashingFinished(QList<HashedFile>)), this, SLOT(fileHashingFinished(QList<HashedFile>)));
+	connect(ui->hashBox, SIGNAL(fileHashingFinished(QList<HashedFile>)), this, SLOT(fileHashingFinished(QList<HashedFile>)));
 
 	// connect up the buttons.
-	connect(ui.postButton, SIGNAL(clicked()), this, SLOT(createMsg()));
-	connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
-	connect(ui.emoticonButton, SIGNAL(clicked()), this, SLOT(smileyWidgetForums()));
-	connect(ui.attachFileButton, SIGNAL(clicked()), this, SLOT(addFile()));
-	connect(ui.attachPictureButton, SIGNAL(clicked()), this, SLOT(addPicture()));
-	connect(ui.forumMessage, SIGNAL(textChanged()), this, SLOT(checkLength()));
-	connect(ui.generateCheckBox, SIGNAL(toggled(bool)), ui.generateSpinBox, SLOT(setEnabled(bool)));
+	connect(ui->postButton, SIGNAL(clicked()), this, SLOT(createMsg()));
+	connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+	connect(ui->emoticonButton, SIGNAL(clicked()), this, SLOT(smileyWidgetForums()));
+	connect(ui->attachFileButton, SIGNAL(clicked()), this, SLOT(addFile()));
+	connect(ui->attachPictureButton, SIGNAL(clicked()), this, SLOT(addPicture()));
+	connect(ui->forumMessage, SIGNAL(textChanged()), this, SLOT(checkLength()));
+	connect(ui->generateCheckBox, SIGNAL(toggled(bool)), ui->generateSpinBox, SLOT(setEnabled(bool)));
 
 	setAcceptDrops(true);
-	ui.hashBox->setDropWidget(this);
-	ui.hashBox->setAutoHide(false);
+	ui->hashBox->setDropWidget(this);
+	ui->hashBox->setAutoHide(false);
 
 	mParentMsgLoaded = false;
 	mForumMetaLoaded = false;
@@ -118,11 +120,11 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
 
 	newMsg();
 	
-	ui.hashGroupBox->hide();
+	ui->hashGroupBox->hide();
 
 #ifndef ENABLE_GENERATE
-	ui.generateCheckBox->hide();
-	ui.generateSpinBox->hide();
+	ui->generateCheckBox->hide();
+	ui->generateSpinBox->hide();
 #endif
     processSettings(true);
 }
@@ -130,6 +132,9 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
 CreateGxsForumMsg::~CreateGxsForumMsg()
 {
     processSettings(false);
+
+    delete ui;
+
 }
 
 void CreateGxsForumMsg::processSettings(bool load)
@@ -142,14 +147,14 @@ void CreateGxsForumMsg::processSettings(bool load)
         RsGxsId gxs_id(Settings->value("IDChooser", QString::fromStdString(RsGxsId().toStdString())).toString().toStdString());
 
         if(!gxs_id.isNull() && rsIdentity->isOwnId(gxs_id))
-            ui.idChooser->setChosenId(gxs_id);
+            ui->idChooser->setChosenId(gxs_id);
     }
     else
     {
         // state of ID Chooser combobox
         RsGxsId id;
 
-        if(ui.idChooser->getChosenId(id))
+        if(ui->idChooser->getChosenId(id))
             Settings->setValue("IDChooser", QString::fromStdString(id.toStdString()));
     }
 
@@ -171,11 +176,11 @@ void  CreateGxsForumMsg::newMsg()
         std::set<RsGxsId> id_set ;
         id_set.insert(mPosterId) ;
 
-		ui.idChooser->loadIds(IDCHOOSER_ID_REQUIRED | IDCHOOSER_NO_CREATE, mPosterId);
-		ui.idChooser->setIdConstraintSet(id_set);
+		ui->idChooser->loadIds(IDCHOOSER_ID_REQUIRED | IDCHOOSER_NO_CREATE, mPosterId);
+		ui->idChooser->setIdConstraintSet(id_set);
     }
     else
-		ui.idChooser->loadIds(IDCHOOSER_ID_REQUIRED, mPosterId);
+		ui->idChooser->loadIds(IDCHOOSER_ID_REQUIRED, mPosterId);
 
         if (mForumId.isNull()) {
 		mStateHelper->setActive(CREATEGXSFORUMMSG_FORUMINFO, false);
@@ -185,7 +190,7 @@ void  CreateGxsForumMsg::newMsg()
 		mStateHelper->clear(CREATEGXSFORUMMSG_FORUMINFO);
 		mStateHelper->clear(CREATEGXSFORUMMSG_PARENTMSG);
 		mStateHelper->clear(CREATEGXSFORUMMSG_ORIGMSG);
-		ui.forumName->setText(tr("No Forum"));
+		ui->forumName->setText(tr("No Forum"));
 		return;
 	}
 
@@ -306,7 +311,7 @@ void  CreateGxsForumMsg::loadFormInformation()
 	if(!mPosterId.isNull())
 		fl |= IDCHOOSER_NO_CREATE;
 
-	ui.idChooser->setFlags(fl) ;
+	ui->idChooser->setFlags(fl) ;
 
 	QString name = QString::fromUtf8(mForumMeta.mGroupName.c_str());
 	QString subj;
@@ -327,19 +332,19 @@ void  CreateGxsForumMsg::loadFormInformation()
 			subj = "Re: " + title;
 	}
 
-	ui.forumName->setText(misc::removeNewLine(name));
+	ui->forumName->setText(misc::removeNewLine(name));
 
     std::cerr << "Setting name to \"" << misc::removeNewLine(name).toStdString() << std::endl;
 	if(!subj.isNull())
-		ui.forumSubject->setText(misc::removeNewLine(subj));
+		ui->forumSubject->setText(misc::removeNewLine(subj));
 
-	if (ui.forumSubject->text().isEmpty())
+	if (ui->forumSubject->text().isEmpty())
 	{
-		ui.forumSubject->setFocus();
-		ui.forumSubject->setPlaceholderText(tr ("Title"));
+		ui->forumSubject->setFocus();
+		ui->forumSubject->setPlaceholderText(tr ("Title"));
 	}
 	else
-		ui.forumMessage->setFocus();
+		ui->forumMessage->setFocus();
 
 #ifdef TOGXS
 	if (mForumMeta.mGroupFlags & RS_DISTRIB_AUTHEN_REQ)
@@ -347,18 +352,18 @@ void  CreateGxsForumMsg::loadFormInformation()
 	if (1)
 #endif
 	{
-		ui.signBox->setChecked(true);
-		ui.signBox->setEnabled(false);
-		ui.signBox->hide();
+		ui->signBox->setChecked(true);
+		ui->signBox->setEnabled(false);
+		ui->signBox->hide();
 	}
 	else
 	{
 		/* Uncheck sign box by default for anonymous forums */
-		ui.signBox->setChecked(false);
-		ui.signBox->setEnabled(true);
+		ui->signBox->setChecked(false);
+		ui->signBox->setEnabled(true);
 	}
 
-	//ui.forumMessage->setText("");
+	//ui->forumMessage->setText("");
 }
 
 static const uint32_t MAX_ALLOWED_GXS_MESSAGE_SIZE = 199000;
@@ -366,27 +371,27 @@ static const uint32_t MAX_ALLOWED_GXS_MESSAGE_SIZE = 199000;
 void CreateGxsForumMsg::checkLength()
 {
 	QString text;
-	RsHtml::optimizeHtml(ui.forumMessage, text);
+	RsHtml::optimizeHtml(ui->forumMessage, text);
 	std::wstring msg = text.toStdWString();
 	int charRemains = MAX_ALLOWED_GXS_MESSAGE_SIZE - msg.length();
 	if(charRemains >= 0) {
 		text = tr("It remains %1 characters after HTML conversion.").arg(charRemains);
-		ui.info_Label->setStyleSheet("QLabel#info_Label { }");
+		ui->info_Label->setStyleSheet("QLabel#info_Label { }");
 	}else{
 		text = tr("Warning: This message is too big of %1 characters after HTML conversion.").arg((0-charRemains));
-	    ui.info_Label->setStyleSheet("QLabel#info_Label {color: red; font: bold; }");
+	    ui->info_Label->setStyleSheet("QLabel#info_Label {color: red; font: bold; }");
 	}
-	ui.postButton->setToolTip(text);
-	ui.postButton->setEnabled(charRemains>=0);
-	ui.info_Label->setText(text);
+	ui->postButton->setToolTip(text);
+	ui->postButton->setEnabled(charRemains>=0);
+	ui->info_Label->setText(text);
 }
 
 void  CreateGxsForumMsg::createMsg()
 {
-	QString name = misc::removeNewLine(ui.forumSubject->text());
+	QString name = misc::removeNewLine(ui->forumSubject->text());
 	QString desc;
 
-	RsHtml::optimizeHtml(ui.forumMessage, desc);
+	RsHtml::optimizeHtml(ui->forumMessage, desc);
 
 	if(name.isEmpty() | desc.isEmpty()) {
 		/* error message */
@@ -415,9 +420,9 @@ void  CreateGxsForumMsg::createMsg()
 	if ((msg.mMsg == "") && (msg.mMeta.mMsgName == ""))
 		return; /* do nothing */
 
-	if (ui.signBox->isChecked()) {
+	if (ui->signBox->isChecked()) {
 		RsGxsId authorId;
-		switch (ui.idChooser->getChosenId(authorId)) {
+		switch (ui->idChooser->getChosenId(authorId)) {
 		case GxsIdChooser::KnowId:
 		case GxsIdChooser::UnKnowId:
 			msg.mMeta.mAuthorId = authorId;
@@ -447,23 +452,23 @@ void  CreateGxsForumMsg::createMsg()
 			QMessageBox::warning(this, tr("RetroShare"),tr("Congrats, you found a bug!")+" "+QString(__FILE__)+":"+QString(__LINE__), QMessageBox::Ok, QMessageBox::Ok);
 
 			return;
-		}//switch (ui.idChooser->getChosenId(authorId))
+		}//switch (ui->idChooser->getChosenId(authorId))
 	} else {
 		//std::cerr << "CreateGxsForumMsg::createMsg() No Signature (for now :)";
 		//std::cerr << std::endl;
 		QMessageBox::warning(this, tr("RetroShare"),tr("Please choose Signing Id, it is required"), QMessageBox::Ok, QMessageBox::Ok);
 		return;
-	}//if (ui.signBox->isChecked())
+	}//if (ui->signBox->isChecked())
 
 	int generateCount = 0;
 
 #ifdef ENABLE_GENERATE
-	if (ui.generateCheckBox->isChecked()) {
-		generateCount = ui.generateSpinBox->value();
+	if (ui->generateCheckBox->isChecked()) {
+		generateCount = ui->generateSpinBox->value();
 		if (QMessageBox::question(this, tr("Generate mass data"), tr("Do you really want to generate %1 messages ?").arg(generateCount), QMessageBox::Yes|QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
 			return;
 		}//if (QMessageBox::question(this,
-	}//if (ui.generateCheckBox->isChecked())
+	}//if (ui->generateCheckBox->isChecked())
 #endif
 
 	uint32_t token;
@@ -490,7 +495,7 @@ void CreateGxsForumMsg::closeEvent (QCloseEvent * /*event*/)
 
 void CreateGxsForumMsg::reject()
 {
-    if (ui.forumMessage->document()->isModified()) {
+    if (ui->forumMessage->document()->isModified()) {
         QMessageBox::StandardButton ret;
         ret = QMessageBox::warning(this, tr("Cancel Forum Message"),
                                    tr("Forum Message has not been sent yet!\n"
@@ -511,7 +516,7 @@ void CreateGxsForumMsg::reject()
 
 void CreateGxsForumMsg::smileyWidgetForums()
 {
-	Emoticons::showSmileyWidget(this, ui.emoticonButton, SLOT(addSmileys()), false);
+	Emoticons::showSmileyWidget(this, ui->emoticonButton, SLOT(addSmileys()), false);
 }
 
 void CreateGxsForumMsg::addSmileys()
@@ -520,17 +525,17 @@ void CreateGxsForumMsg::addSmileys()
 	// add trailing space
 	smiley += QString(" ");
 	// add preceding space when needed (not at start of text or preceding space already exists)
-	if(!ui.forumMessage->textCursor().atStart() && ui.forumMessage->toPlainText()[ui.forumMessage->textCursor().position() - 1] != QChar(' '))
+	if(!ui->forumMessage->textCursor().atStart() && ui->forumMessage->toPlainText()[ui->forumMessage->textCursor().position() - 1] != QChar(' '))
 		smiley = QString(" ") + smiley;
-	ui.forumMessage->textCursor().insertText(smiley);
+	ui->forumMessage->textCursor().insertText(smiley);
 }
 
 void CreateGxsForumMsg::addFile()
 {
 	QStringList files;
 	if (misc::getOpenFileNames(this, RshareSettings::LASTDIR_EXTRAFILE, tr("Add Extra File"), "", files)) {
-		ui.hashBox->addAttachments(files,RS_FILE_REQ_ANONYMOUS_ROUTING);
-		ui.hashGroupBox->show();
+		ui->hashBox->addAttachments(files,RS_FILE_REQ_ANONYMOUS_ROUTING);
+		ui->hashGroupBox->show();
 	}
 }
 
@@ -541,7 +546,7 @@ void CreateGxsForumMsg::addPicture()
 		QString encodedImage;
 		if (RsHtml::makeEmbeddedImage(file, encodedImage, 640*480, MAX_ALLOWED_GXS_MESSAGE_SIZE - 200)) {
 			QTextDocumentFragment fragment = QTextDocumentFragment::fromHtml(encodedImage);
-			ui.forumMessage->textCursor().insertFragment(fragment);
+			ui->forumMessage->textCursor().insertFragment(fragment);
 		}
 	}
 }
@@ -563,11 +568,11 @@ void CreateGxsForumMsg::fileHashingFinished(QList<HashedFile> hashedFiles)
 	}
 
 	if (!mesgString.isEmpty()) {
-		ui.forumMessage->textCursor().insertHtml(mesgString);
+		ui->forumMessage->textCursor().insertHtml(mesgString);
 	}
 
-	ui.forumMessage->setFocus( Qt::OtherFocusReason );
-	ui.hashGroupBox->hide();
+	ui->forumMessage->setFocus( Qt::OtherFocusReason );
+	ui->hashGroupBox->hide();
 }
 
 void CreateGxsForumMsg::loadCircleInfo(const RsGxsGroupId& circle_id)
@@ -603,11 +608,11 @@ void CreateGxsForumMsg::loadCircleInfo(const RsGxsGroupId& circle_id)
             //for(std::set<RsGxsId>::const_iterator it(cg.mInvitedMembers.begin());it!=cg.mInvitedMembers.end();++it)
             //    std::cerr << "  added constraint to circle element " << *it << std::endl;
 
-            ui.idChooser->setIdConstraintSet(cg.mInvitedMembers) ;
-            ui.idChooser->setFlags(IDCHOOSER_NO_CREATE | ui.idChooser->flags()) ;	// since there's a circle involved, no ID creation can be needed
+            ui->idChooser->setIdConstraintSet(cg.mInvitedMembers) ;
+            ui->idChooser->setFlags(IDCHOOSER_NO_CREATE | ui->idChooser->flags()) ;	// since there's a circle involved, no ID creation can be needed
 
             RsGxsId tmpid ;
-            if(ui.idChooser->countEnabledEntries() == 0)
+            if(ui->idChooser->countEnabledEntries() == 0)
             {
                 QMessageBox::information(NULL,tr("No compatible ID for this forum"),tr("None of your identities is allowed to post in this forum. This could be due to the forum being limited to a circle that contains none of your identities, or forum flags requiring a PGP-signed identity.")) ;
                 close() ;
@@ -618,10 +623,10 @@ void CreateGxsForumMsg::loadCircleInfo(const RsGxsGroupId& circle_id)
 
 void CreateGxsForumMsg::setSubject(const QString& msg)
 {
-	ui.forumSubject->setText(msg);
+	ui->forumSubject->setText(msg);
 }
 
 void CreateGxsForumMsg::insertPastedText(const QString& msg)
 {
-	ui.forumMessage->append(msg);
+	ui->forumMessage->append(msg);
 }
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h
index c542e881d..8697fbbc3 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.h
@@ -21,10 +21,15 @@
 #ifndef _CREATE_GXSFORUM_MSG_DIALOG_H
 #define _CREATE_GXSFORUM_MSG_DIALOG_H
 
-#include "ui_CreateGxsForumMsg.h"
+#include <QDialog>
 
 #include <retroshare/rsgxsforums.h>
 #include <retroshare/rsgxscircles.h>
+#include "gui/common/HashBox.h"
+
+namespace Ui {
+	class CreateGxsForumMsg;
+}
 
 class UIStateHelper;
 
@@ -80,7 +85,7 @@ private:
 	UIStateHelper *mStateHelper;
 
 	/** Qt Designer generated object */
-	Ui::CreateGxsForumMsg ui;
+	Ui::CreateGxsForumMsg *ui;
 };
 
 #endif

From 3004505832cbda8565ef871e50b8d282cdabf565 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 17 Apr 2023 21:01:57 +0200
Subject: [PATCH 232/503] Added copy image to clipboard feature

---
 .../src/gui/common/RSTextBrowser.cpp          | 17 +++++++++++
 retroshare-gui/src/gui/common/RSTextBrowser.h |  1 +
 retroshare-gui/src/util/imageutil.cpp         | 30 +++++++++++++++++++
 retroshare-gui/src/util/imageutil.h           |  1 +
 4 files changed, 49 insertions(+)

diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.cpp b/retroshare-gui/src/gui/common/RSTextBrowser.cpp
index 449f4e1c6..c3aaaf454 100644
--- a/retroshare-gui/src/gui/common/RSTextBrowser.cpp
+++ b/retroshare-gui/src/gui/common/RSTextBrowser.cpp
@@ -356,6 +356,11 @@ QMenu *RSTextBrowser::createStandardContextMenuFromPoint(const QPoint &widgetPos
 		a->setData(widgetPos);
 	}
 
+	if (checkImage(widgetPos)) {
+		a = menu->addAction( tr("Copy image"), this, SLOT(copyImage()));
+		a->setData(widgetPos);
+	}
+
 	return menu;
 }
 
@@ -389,3 +394,15 @@ void RSTextBrowser::saveImage()
 	QTextCursor cursor = cursorForPosition(point);
 	ImageUtil::extractImage(window(), cursor);
 }
+
+void RSTextBrowser::copyImage()
+{
+	QAction *action = dynamic_cast<QAction*>(sender()) ;
+	if (!action) {
+		return;
+	}
+
+	QPoint point = action->data().toPoint();
+	QTextCursor cursor = cursorForPosition(point);
+	ImageUtil::copyImage(window(), cursor);
+}
diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.h b/retroshare-gui/src/gui/common/RSTextBrowser.h
index 04de979c5..120dd22e8 100644
--- a/retroshare-gui/src/gui/common/RSTextBrowser.h
+++ b/retroshare-gui/src/gui/common/RSTextBrowser.h
@@ -75,6 +75,7 @@ private slots:
 	void destroyImageBlockWidget();
 	void viewSource();
 	void saveImage();
+	void copyImage();
 
 protected:
 	void paintEvent(QPaintEvent *event);
diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index d710a9ae3..9356ae3b2 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -25,6 +25,8 @@
 #include <QApplication>
 #include <QByteArray>
 #include <QImage>
+#include <QClipboard>
+#include <QMimeData>
 #include <QMessageBox>
 #include <QString>
 #include <QTextCursor>
@@ -68,6 +70,34 @@ void ImageUtil::extractImage(QWidget *window, QTextCursor cursor, QString file)
 	}
 }
 
+void ImageUtil::copyImage(QWidget *window, QTextCursor cursor)
+{
+	cursor.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, 1);
+	cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, 2);
+	QString imagestr = cursor.selection().toHtml();
+	bool success = false;
+	int start = imagestr.indexOf("base64,") + 7;
+	int stop = imagestr.indexOf("\"", start);
+	int length = stop - start;
+	if((start >= 0) && (length > 0))
+	{
+		QByteArray ba = QByteArray::fromBase64(imagestr.mid(start, length).toLatin1());
+		QImage image = QImage::fromData(ba);
+		if(!image.isNull())
+		{
+			success = true;
+			QClipboard *clipboard = QApplication::clipboard();
+			QMimeData *data = new QMimeData;
+			data->setImageData(image);
+			clipboard->setMimeData(data, QClipboard::Clipboard);
+		}
+	}
+	if(!success)
+	{
+		QMessageBox::warning(window, QApplication::translate("ImageUtil", "Copy image"), QApplication::translate("ImageUtil", "Not an image"));
+	}
+}
+
 bool ImageUtil::optimizeSizeBytes(QByteArray &bytearray, const QImage &original, QImage &optimized, const char *format, int maxPixels, int maxBytes)
 {
 	//nothing to do if it fits into the limits
diff --git a/retroshare-gui/src/util/imageutil.h b/retroshare-gui/src/util/imageutil.h
index 9e5bf37cb..137c0ea8e 100644
--- a/retroshare-gui/src/util/imageutil.h
+++ b/retroshare-gui/src/util/imageutil.h
@@ -32,6 +32,7 @@ public:
 	ImageUtil();
 
 	static void extractImage(QWidget *window, QTextCursor cursor, QString file = "");
+	static void copyImage(QWidget *window, QTextCursor cursor);
     static bool optimizeSizeHtml(QString &html, const QImage& original, QImage &optimized, int maxPixels = -1, int maxBytes = -1);
     static bool optimizeSizeBytes(QByteArray &bytearray, const QImage &original, QImage &optimized, const char *format, int maxPixels, int maxBytes);
     static bool hasAlphaContent(const QImage& image);

From bf7c2f7b10530e0013fd35e91ebb05354ee2fd66 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 17 Apr 2023 22:35:10 +0200
Subject: [PATCH 233/503] update paste image

---
 .../src/gui/icons/svg/paste_image.svg         | 54 ++++++++++++-------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/retroshare-gui/src/gui/icons/svg/paste_image.svg b/retroshare-gui/src/gui/icons/svg/paste_image.svg
index 03a89491e..464798ffd 100644
--- a/retroshare-gui/src/gui/icons/svg/paste_image.svg
+++ b/retroshare-gui/src/gui/icons/svg/paste_image.svg
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   height="48px"
+   width="800px"
+   height="800px"
    viewBox="0 0 24 24"
-   width="48px"
-   fill="#000000"
    version="1.1"
-   id="svg6"
+   id="svg9"
    sodipodi:docname="paste_image.svg"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
-     id="defs10" />
+     id="defs13" />
   <sodipodi:namedview
-     id="namedview8"
+     id="namedview11"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
@@ -23,25 +25,37 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="10.833333"
-     inkscape:cx="23.953846"
-     inkscape:cy="24.046154"
+     inkscape:zoom="0.65"
+     inkscape:cx="400.76923"
+     inkscape:cy="400.76923"
      inkscape:window-width="1366"
      inkscape:window-height="705"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg6" />
-  <path
-     d="M0 0h24v24H0z"
-     fill="none"
-     id="path2" />
-  <path
-     d="M19 2h-4.18C14.4.84 13.3 0 12 0c-1.3 0-2.4.84-2.82 2H5c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-7 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm7 18H5V4h2v3h10V4h2v16z"
-     id="path4"
-     style="fill:#039bd5;fill-opacity:1" />
+     inkscape:current-layer="svg9" />
   <g
-     transform="matrix(0.02667227,0,0,0.02667227,5.6271015,7.5787337)"
+     id=""
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     style="fill:#039bd5;fill-opacity:1"
+     transform="matrix(1.0392218,0,0,1.0392218,-1.9428799,-0.49382824)">
+    <g
+       id=""
+       fill="#212121"
+       fill-rule="nonzero"
+       style="fill:#039bd5;fill-opacity:1">
+      <path
+         id="🎨-Color"
+         style="fill:#039bd5;fill-opacity:1;stroke-width:34.6407"
+         transform="matrix(0.02886775,0,0,0.02886775,1.4076686,0.47519042)"
+         d="m 306.18945,52.820312 c -40.0879,10e-7 -73.09816,30.310784 -77.36133,69.263668 l -61.08593,0.0176 -5.33594,0.17969 c -40.5569,2.74231 -72.605469,36.50942 -72.605469,77.76172 v 467.80859 l 0.179688,5.33594 c 2.742299,40.55688 36.509321,72.60547 77.761721,72.60547 h 52.125 l 3.52539,-0.23633 c 12.68112,-1.72033 22.45508,-12.58924 22.45508,-25.74219 0,-14.34857 -11.63181,-25.98242 -25.98047,-25.98242 h -52.125 l -3.52539,-0.23633 C 151.53568,691.8754 141.76172,681.00453 141.76172,667.85158 V 200.04297 l 0.23633,-3.52539 c 1.72034,-12.68112 12.5912,-22.45508 25.74414,-22.45508 l 73.84375,-0.006 c 13.97689,20.75897 37.69587,34.41602 64.60351,34.41602 h 121.47461 c 26.90774,0 50.62476,-13.65705 64.60156,-34.41602 l 73.84376,0.006 3.52539,0.23828 c 12.681,1.72034 22.45507,12.58925 22.45507,25.74219 v 51.87305 l 0.23828,3.52539 c 1.72033,12.68102 12.5912,22.45507 25.74415,22.45507 14.34857,0 25.98046,-11.6319 25.98046,-25.98046 v -51.87305 l -0.18164,-5.33594 c -2.74229,-40.5569 -36.50942,-72.60547 -77.76171,-72.60547 l -61.08594,-0.0176 C 500.76027,83.131296 467.75208,52.820313 427.66406,52.820312 Z m 0,51.960938 h 121.47461 c 14.28463,0 25.86328,11.58073 25.86328,25.86523 0,14.28461 -11.57865,25.86329 -25.86328,25.86329 H 306.18945 c -14.2845,0 -25.86523,-11.57868 -25.86523,-25.86329 0,-14.2845 11.58073,-25.86523 25.86523,-25.86523 z m 104.03711,225.16602 c -0.33514,0 -0.66945,0.003 -1.0039,0.006 0.0913,0.10704 0.17843,0.24832 0.26953,0.35743 0.6531,-0.11675 1.30303,-0.25154 1.95703,-0.36328 z m 171.90039,104.82031 c 0.14437,0.15262 0.28921,0.30435 0.4336,0.45703 -0.005,-0.10958 -0.0139,-0.21866 -0.0195,-0.32813 -0.14235,-0.0328 -0.27106,-0.0979 -0.41407,-0.1289 z M 409.08203,623.94336 c -0.34384,0.18716 -0.46718,0.25312 -0.68555,0.37109 8.7e-4,0.001 8e-4,0.003 0.002,0.004 0.16412,-0.0872 0.10477,-0.0549 0.64453,-0.3418 0.0129,-0.011 0.0261,-0.0221 0.0391,-0.0332 z m 209.33789,74.14844 c -0.31273,0.21286 -0.62794,0.42235 -0.94336,0.63086 0.55318,0.008 1.09907,-0.028 1.63477,-0.14258 -0.2314,-0.16229 -0.46355,-0.32441 -0.69141,-0.48828 z" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.03347274,0,0,0.03347274,6.3883953,6.7648694)"
      id="g14">
     <g
        id="g6">

From 1400d91ef6f897983c65f8cf3085adb90f188aa3 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 18 Apr 2023 07:50:44 +0200
Subject: [PATCH 234/503] Use ElidedLabel for title in BoardsPostDisplayWidget

---
 retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp  | 4 ++--
 retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h    | 7 ++++---
 .../src/gui/Posted/BoardPostDisplayWidget_card.ui         | 8 +++++++-
 .../src/gui/Posted/BoardPostDisplayWidget_compact.ui      | 8 +++++++-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
index 8209b5d1b..d0a09b7e2 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
@@ -400,7 +400,7 @@ QLabel         *BoardPostDisplayWidget_compact::newLabel()       { return ui->ne
 QToolButton    *BoardPostDisplayWidget_compact::readButton()     { return ui->readButton; }
 GxsIdLabel     *BoardPostDisplayWidget_compact::fromLabel()      { return ui->fromLabel; }
 QLabel         *BoardPostDisplayWidget_compact::dateLabel()      { return ui->dateLabel; }
-QLabel         *BoardPostDisplayWidget_compact::titleLabel()     { return ui->titleLabel; }
+ElidedLabel    *BoardPostDisplayWidget_compact::titleLabel()     { return ui->titleLabel; }
 QLabel         *BoardPostDisplayWidget_compact::scoreLabel()     { return ui->scoreLabel; }
 QLabel         *BoardPostDisplayWidget_compact::notes()          { return ui->notes; }
 QToolButton    *BoardPostDisplayWidget_compact::shareButton()    { return ui->shareButton; }
@@ -469,7 +469,7 @@ QLabel         *BoardPostDisplayWidget_card::newLabel()       { return ui->newLa
 QToolButton    *BoardPostDisplayWidget_card::readButton()     { return ui->readButton; }
 GxsIdLabel     *BoardPostDisplayWidget_card::fromLabel()      { return ui->fromLabel; }
 QLabel         *BoardPostDisplayWidget_card::dateLabel()      { return ui->dateLabel; }
-QLabel         *BoardPostDisplayWidget_card::titleLabel()     { return ui->titleLabel; }
+ElidedLabel    *BoardPostDisplayWidget_card::titleLabel()     { return ui->titleLabel; }
 QLabel         *BoardPostDisplayWidget_card::scoreLabel()     { return ui->scoreLabel; }
 QLabel         *BoardPostDisplayWidget_card::notes()          { return ui->notes; }
 QToolButton    *BoardPostDisplayWidget_card::shareButton()    { return ui->shareButton; }
diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
index 189f83ae5..27d4a33aa 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
@@ -37,6 +37,7 @@ class QToolButton;
 class QTextEdit;
 class ClickableLabel;
 class GxsIdLabel;
+class ElidedLabel;
 
 struct RsPostedPost;
 
@@ -72,7 +73,7 @@ protected:
     virtual QToolButton *commentButton() =0;
     virtual QToolButton *voteDownButton() =0;
     virtual QLabel      *newLabel() =0;
-    virtual QLabel      *titleLabel()=0;
+    virtual ElidedLabel *titleLabel()=0;
     virtual GxsIdLabel  *fromLabel()=0;
     virtual QLabel      *dateLabel()=0;
     virtual QLabel      *scoreLabel() =0;
@@ -123,7 +124,7 @@ public:
     QLabel      *newLabel()       override;
     GxsIdLabel  *fromLabel()      override;
     QLabel      *dateLabel()      override;
-    QLabel      *titleLabel()     override;
+    ElidedLabel *titleLabel()     override;
     QLabel      *scoreLabel()     override;
     QLabel      *notes()          override;
     QLabel      *pictureLabel()   override;
@@ -162,7 +163,7 @@ public:
     QLabel      *newLabel()       override;
     GxsIdLabel  *fromLabel()      override;
     QLabel      *dateLabel()      override;
-    QLabel      *titleLabel()     override;
+    ElidedLabel *titleLabel()     override;
     QLabel      *scoreLabel()     override;
     QLabel      *notes()          override;
     QToolButton *readButton()     override;
diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_card.ui b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_card.ui
index 85eb14906..553577fb8 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_card.ui
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_card.ui
@@ -305,7 +305,7 @@
            </layout>
           </item>
           <item>
-           <widget class="QLabel" name="titleLabel">
+           <widget class="ElidedLabel" name="titleLabel">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -464,6 +464,12 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/ElidedLabel.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GxsIdLabel</class>
    <extends>QLabel</extends>
diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_compact.ui b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_compact.ui
index 8c6e89748..5e920cfed 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_compact.ui
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget_compact.ui
@@ -211,7 +211,7 @@
            <number>3</number>
           </property>
           <item>
-           <widget class="QLabel" name="titleLabel">
+           <widget class="ElidedLabel" name="titleLabel">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -515,6 +515,12 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/ElidedLabel.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GxsIdLabel</class>
    <extends>QLabel</extends>

From c250b229ed9e625e4c5a466807962107c243c490 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 18 Apr 2023 20:10:52 +0200
Subject: [PATCH 235/503] Added ElidedLabel for title in PostedItem

---
 retroshare-gui/src/gui/Posted/PostedItem.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui
index aafc8528c..24d570b16 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.ui
+++ b/retroshare-gui/src/gui/Posted/PostedItem.ui
@@ -253,7 +253,7 @@
          <number>6</number>
         </property>
         <item>
-         <widget class="QLabel" name="titleLabel">
+         <widget class="ElidedLabel" name="titleLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
             <horstretch>0</horstretch>

From 7b28bf52569296cf1fb7bceba6aa07a8502f2945 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 19 Apr 2023 00:42:26 +0200
Subject: [PATCH 236/503] Moved RSTextBrowser::checkImage to ImageUtil for use
 in MimeTextEdit

---
 retroshare-gui/src/gui/chat/ChatWidget.cpp    |  4 +-
 .../src/gui/common/MimeTextEdit.cpp           | 37 +++++++++
 retroshare-gui/src/gui/common/MimeTextEdit.h  |  2 +
 .../src/gui/common/RSTextBrowser.cpp          | 75 ++++---------------
 retroshare-gui/src/gui/common/RSTextBrowser.h |  2 -
 retroshare-gui/src/util/imageutil.cpp         | 60 +++++++++++++++
 retroshare-gui/src/util/imageutil.h           |  8 +-
 7 files changed, 121 insertions(+), 67 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 6a0117f00..03f954964 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -627,7 +627,7 @@ bool ChatWidget::eventFilter(QObject *obj, QEvent *event)
 			QString toolTipText = ui->textBrowser->anchorForPosition(helpEvent->pos());
 			if (toolTipText.isEmpty() && !ui->textBrowser->getShowImages()){
 				QString imageStr;
-				if (ui->textBrowser->checkImage(helpEvent->pos(), imageStr)) {
+				if (ImageUtil::checkImage(ui->textBrowser, helpEvent->pos(), imageStr)) {
 					toolTipText = imageStr;
 				}
 			} else if (toolTipText.startsWith(PERSONID)){
@@ -1158,7 +1158,7 @@ void ChatWidget::contextMenuTextBrowser(QPoint point)
 		contextMnu->addAction(ui->actionQuote);
 	contextMnu->addAction(ui->actionDropPlacemark);
 
-	if(ui->textBrowser->checkImage(point))
+	if(ImageUtil::checkImage(ui->textBrowser, point))
 	{
 		if (! ui->textBrowser->getShowImages())
 			contextMnu->addAction(ui->actionShow_Hidden_Images);
diff --git a/retroshare-gui/src/gui/common/MimeTextEdit.cpp b/retroshare-gui/src/gui/common/MimeTextEdit.cpp
index b24a65879..3d3398b0c 100644
--- a/retroshare-gui/src/gui/common/MimeTextEdit.cpp
+++ b/retroshare-gui/src/gui/common/MimeTextEdit.cpp
@@ -32,6 +32,7 @@
 #include "MimeTextEdit.h"
 #include "util/HandleRichText.h"
 #include "gui/RetroShareLink.h"
+#include "util/imageutil.h"
 
 #include <retroshare/rspeers.h>
 
@@ -246,6 +247,18 @@ void MimeTextEdit::contextMenuEvent(QContextMenuEvent *e)
 
 	QMenu *contextMenu = createStandardContextMenu(e->pos());
 
+	if (ImageUtil::checkImage(this, e->pos())) {
+		contextMenu->addSeparator();
+
+		QAction *a = contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/document_save.png"), tr("Save image"), this, SLOT(saveImage()));
+		a->setData(e->pos());
+
+		a = contextMenu->addAction( tr("Copy image"), this, SLOT(copyImage()));
+		a->setData(e->pos());
+
+		contextMenu->addSeparator();
+	}
+
 	/* Add actions for pasting links */
 	contextMenu->addAction( tr("Paste as plain text"), this, SLOT(pastePlainText()));
 	QAction *spoilerAction =  contextMenu->addAction(tr("Spoiler"), this, SLOT(spoiler()));
@@ -292,3 +305,27 @@ void MimeTextEdit::spoiler()
 {
 	RsHtml::insertSpoilerText(this->textCursor());
 }
+
+void MimeTextEdit::saveImage()
+{
+	QAction *action = dynamic_cast<QAction*>(sender()) ;
+	if (!action) {
+		return;
+	}
+
+	QPoint point = action->data().toPoint();
+	QTextCursor cursor = cursorForPosition(point);
+	ImageUtil::extractImage(window(), cursor);
+}
+
+void MimeTextEdit::copyImage()
+{
+	QAction *action = dynamic_cast<QAction*>(sender()) ;
+	if (!action) {
+		return;
+	}
+
+	QPoint point = action->data().toPoint();
+	QTextCursor cursor = cursorForPosition(point);
+	ImageUtil::copyImage(window(), cursor);
+}
diff --git a/retroshare-gui/src/gui/common/MimeTextEdit.h b/retroshare-gui/src/gui/common/MimeTextEdit.h
index 9c47cac23..b575c1ac9 100644
--- a/retroshare-gui/src/gui/common/MimeTextEdit.h
+++ b/retroshare-gui/src/gui/common/MimeTextEdit.h
@@ -75,6 +75,8 @@ private slots:
 	void pasteOwnCertificateLink();
 	void pastePlainText();
 	void spoiler();
+	void saveImage();
+	void copyImage();
 
 private:
 	QString textUnderCursor() const;
diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.cpp b/retroshare-gui/src/gui/common/RSTextBrowser.cpp
index c3aaaf454..c11d4edef 100644
--- a/retroshare-gui/src/gui/common/RSTextBrowser.cpp
+++ b/retroshare-gui/src/gui/common/RSTextBrowser.cpp
@@ -234,64 +234,6 @@ void RSTextBrowser::activateLinkClick(bool active)
 	mLinkClickActive = active;
 }
 
-/**
- * @brief RSTextBrowser::checkImage
- * @param pos where to check if image is shown in viewport coordinate
- * @param imageStr return html source of cursor
- * @return True if an image is under cursor
- */
-bool RSTextBrowser::checkImage(QPoint pos, QString &imageStr)
-{
-	//Get text cursor under pos. But if pos is under text browser end line this return last cursor.
-	QTextCursor cursor = cursorForPosition(pos);
-	//First get rect of cursor (could be at left or right of image)
-	QRect cursorRectStart = cursorRect(cursor);
-	//Second get text
-	cursor.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, 1);//To get character just before
-	QRect cursorRectLeft = cursorRect(cursor);
-	cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, 2);
-	QRect cursorRectRight = cursorRect(cursor);
-	imageStr = cursor.selection().toHtml();
-#ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG
-	mCursorRectStart = cursorRectStart;
-	mCursorRectLeft = cursorRectLeft;
-	mCursorRectRight = cursorRectRight;
-
-	std::cerr << "cursorRect LTRB :" << cursorRectStart.left() << ";" << cursorRectStart.top() << ";" << cursorRectStart.right() << ";" << cursorRectStart.bottom() << std::endl;
-	std::cerr << "cursorRectLeft  :" << cursorRectLeft.left() << ";" << cursorRectLeft.top() << ";" << cursorRectLeft.right() << ";" << cursorRectLeft.bottom() << std::endl;
-	std::cerr << "cursorRectRight :" << cursorRectRight.left() << ";" << cursorRectRight.top() << ";" << cursorRectRight.right() << ";" << cursorRectRight.bottom() << std::endl;
-	std::cerr << "pos XY          :" << pos.x() << ";" << pos.y() << std::endl;
-#endif
-	QRect cursorRectEnd = cursorRectStart;
-	//Finally set left with right of precedent character.
-	if (cursorRectEnd.top() < cursorRectLeft.bottom())
-	{
-		cursorRectEnd.setLeft(cursorRectLeft.right());
-	} else {
-		//Image on new line
-		cursorRectEnd.setLeft(0);
-	}
-	//And set Right with left of next character.
-	if (cursorRectEnd.bottom() > cursorRectRight.top())
-	{
-		cursorRectEnd.setRight(cursorRectRight.left());
-	} else {
-		//New line after Image.
-	}
-#ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG
-	mCursorRectEnd = cursorRectEnd;
-
-	std::cerr << "final cursorRect:" << cursorRectEnd.left() << ";" << cursorRectEnd.top() << ";" << cursorRectEnd.right() << ";" << cursorRectEnd.bottom() << std::endl;
-	viewport()->update();
-#endif
-	//If pos is on text rect
-	if (cursorRectEnd.contains(pos))
-	{
-		return imageStr.indexOf("base64,") != -1;
-	}
-	return false;
-}
-
 /**
  * @brief RSTextBrowser::anchorForPosition Replace anchorAt that doesn't works as expected.
  * @param pos Where to get anchor from text
@@ -351,16 +293,27 @@ QMenu *RSTextBrowser::createStandardContextMenuFromPoint(const QPoint &widgetPos
 	QAction *a = menu->addAction(FilesDefs::getIconFromQtResourcePath("://icons/textedit/code.png"), tr("View &Source"), this, SLOT(viewSource()));
 	a->setEnabled(!this->document()->isEmpty());
 
-	if (checkImage(widgetPos)) {
+	if (ImageUtil::checkImage(this, widgetPos
+#ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG
+	                          , &mCursorRectStart, &mCursorRectLeft, &mCursorRectRight, &mCursorRectEnd
+#endif
+	)) {
 		a = menu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/document_save.png"), tr("Save image"), this, SLOT(saveImage()));
 		a->setData(widgetPos);
-	}
 
-	if (checkImage(widgetPos)) {
 		a = menu->addAction( tr("Copy image"), this, SLOT(copyImage()));
 		a->setData(widgetPos);
 	}
 
+#ifdef RSTEXTBROWSER_CHECKIMAGE_DEBUG
+	std::cerr << "cursorRect LTRB :" << mCursorRectStart.left() << ";" << mCursorRectStart.top() << ";" << mCursorRectStart.right() << ";" << mCursorRectStart.bottom() << std::endl;
+	std::cerr << "cursorRectLeft  :" << mCursorRectLeft.left() << ";" << mCursorRectLeft.top() << ";" << mCursorRectLeft.right() << ";" << mCursorRectLeft.bottom() << std::endl;
+	std::cerr << "cursorRectRight :" << mCursorRectRight.left() << ";" << mCursorRectRight.top() << ";" << mCursorRectRight.right() << ";" << mCursorRectRight.bottom() << std::endl;
+	std::cerr << "pos XY          :" << widgetPos.x() << ";" << widgetPos.y() << std::endl;
+	std::cerr << "final cursorRect:" << mCursorRectEnd.left() << ";" << mCursorRectEnd.top() << ";" << mCursorRectEnd.right() << ";" << mCursorRectEnd.bottom() << std::endl;
+	viewport()->update();
+#endif
+
 	return menu;
 }
 
diff --git a/retroshare-gui/src/gui/common/RSTextBrowser.h b/retroshare-gui/src/gui/common/RSTextBrowser.h
index 120dd22e8..a10a2b30a 100644
--- a/retroshare-gui/src/gui/common/RSTextBrowser.h
+++ b/retroshare-gui/src/gui/common/RSTextBrowser.h
@@ -45,8 +45,6 @@ public:
 	void setImageBlockWidget(RSImageBlockWidget *widget);
 	void resetImagesStatus(bool load);
 	QPixmap getBlockedImage();
-	bool checkImage(QPoint pos, QString &imageStr);
-	bool checkImage(QPoint pos) {QString imageStr; return checkImage(pos, imageStr); }
 	QString anchorForPosition(const QPoint &pos) const;
 
 	// Add QAction to context menu (action won't be deleted)
diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index 9356ae3b2..3368db309 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -23,6 +23,8 @@
 #include "util/rstime.h"
 
 #include <QApplication>
+#include <QWidget>
+#include <QTextEdit>
 #include <QByteArray>
 #include <QImage>
 #include <QClipboard>
@@ -39,6 +41,64 @@
 
 ImageUtil::ImageUtil() {}
 
+bool ImageUtil::checkImage(const QTextEdit *edit, const QPoint &pos, QRect *cursorRectStartOut, QRect *cursorRectLeftOut, QRect *cursorRectRightOut, QRect *cursorRectEndOut)
+{
+	QString imageStr;
+	return checkImage(edit, pos, imageStr, cursorRectStartOut, cursorRectLeftOut, cursorRectRightOut, cursorRectEndOut);
+}
+
+bool ImageUtil::checkImage(const QTextEdit *edit, const QPoint &pos, QString &imageStr, QRect *cursorRectStartOut, QRect *cursorRectLeftOut, QRect *cursorRectRightOut, QRect *cursorRectEndOut)
+{
+	//Get text cursor under pos. But if pos is under text browser end line this return last cursor.
+	QTextCursor cursor = edit->cursorForPosition(pos);
+	//First get rect of cursor (could be at left or right of image)
+	QRect cursorRectStart = edit->cursorRect(cursor);
+	//Second get text
+	cursor.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, 1);//To get character just before
+	QRect cursorRectLeft = edit->cursorRect(cursor);
+	cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, 2);
+	QRect cursorRectRight = edit->cursorRect(cursor);
+	imageStr = cursor.selection().toHtml();
+
+	if (cursorRectStartOut) {
+		*cursorRectStartOut = cursorRectStart;
+	}
+	if (cursorRectLeftOut) {
+		*cursorRectLeftOut = cursorRectLeft;
+	}
+	if (cursorRectRightOut) {
+		*cursorRectRightOut = cursorRectRight;
+	}
+
+	QRect cursorRectEnd = cursorRectStart;
+	//Finally set left with right of precedent character.
+	if (cursorRectEnd.top() < cursorRectLeft.bottom())
+	{
+		cursorRectEnd.setLeft(cursorRectLeft.right());
+	} else {
+		//Image on new line
+		cursorRectEnd.setLeft(0);
+	}
+	//And set Right with left of next character.
+	if (cursorRectEnd.bottom() > cursorRectRight.top())
+	{
+		cursorRectEnd.setRight(cursorRectRight.left());
+	} else {
+		//New line after Image.
+	}
+
+	if (cursorRectEndOut) {
+		*cursorRectEndOut = cursorRectEnd;
+	}
+
+	//If pos is on text rect
+	if (cursorRectEnd.contains(pos))
+	{
+		return imageStr.indexOf("base64,") != -1;
+	}
+	return false;
+}
+
 void ImageUtil::extractImage(QWidget *window, QTextCursor cursor, QString file)
 {
 	cursor.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, 1);
diff --git a/retroshare-gui/src/util/imageutil.h b/retroshare-gui/src/util/imageutil.h
index 137c0ea8e..8e7d26987 100644
--- a/retroshare-gui/src/util/imageutil.h
+++ b/retroshare-gui/src/util/imageutil.h
@@ -22,15 +22,19 @@
 #define IMAGEUTIL_H
 
 #include <QTextCursor>
-#include <QWidget>
-#include <QByteArray>
 #include <qiterator.h>
 
+class QWidget;
+class QTextEdit;
+class QByteArray;
+
 class ImageUtil
 {
 public:
 	ImageUtil();
 
+	static bool checkImage(const QTextEdit *edit, const QPoint &pos, QRect *cursorRectStartOut = NULL, QRect *cursorRectLeftOut = NULL, QRect *cursorRectRightOut = NULL, QRect *cursorRectEndOut = NULL);
+	static bool checkImage(const QTextEdit *edit, const QPoint &pos, QString &imageStr, QRect *cursorRectStartOut = NULL, QRect *cursorRectLeftOut = NULL, QRect *cursorRectRightOut = NULL, QRect *cursorRectEndOut = NULL);
 	static void extractImage(QWidget *window, QTextCursor cursor, QString file = "");
 	static void copyImage(QWidget *window, QTextCursor cursor);
     static bool optimizeSizeHtml(QString &html, const QImage& original, QImage &optimized, int maxPixels = -1, int maxBytes = -1);

From 4a6938084860d8128fea6b76cc2e76da3f45de8e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 19 Apr 2023 20:43:12 +0200
Subject: [PATCH 237/503] fixed right-click menu on board posts

---
 .../src/gui/Posted/BoardPostDisplayWidget.cpp |  17 ++-
 .../src/gui/Posted/BoardPostDisplayWidget.h   |  13 +-
 .../gui/Posted/PostedListWidgetWithModel.cpp  | 138 +++++-------------
 .../gui/Posted/PostedListWidgetWithModel.h    |   2 +-
 4 files changed, 57 insertions(+), 113 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
index 8209b5d1b..21ccfc57f 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
@@ -43,6 +43,7 @@
 
 #define LINK_IMAGE ":/images/thumb-link.png"
 
+
 // #ifdef DEBUG_BOARDPOSTDISPLAYWIDGET 1
 
 /** Constructor */
@@ -58,6 +59,7 @@ BoardPostDisplayWidgetBase::BoardPostDisplayWidgetBase(const RsPostedPost& post,
 {
 }
 
+
 void BoardPostDisplayWidgetBase::setCommentsSize(int comNb)
 {
     QString sComButText = tr("Comment");
@@ -168,6 +170,7 @@ void BoardPostDisplayWidgetBase::baseSetup()
 
     readButton()->setChecked(false);
 
+#ifdef TO_REMOVE
     QMenu *menu = new QMenu();
     menu->addAction(CopyLinkAction);
     menu->addSeparator();
@@ -175,6 +178,7 @@ void BoardPostDisplayWidgetBase::baseSetup()
     shareButton()->setPopupMode(QToolButton::InstantPopup);
 
     connect(menu,SIGNAL(aboutToShow()),this,SLOT(handleShareButtonClicked()));
+#endif
 
     RsReputationLevel overall_reputation = rsReputations->overallReputationLevel(mPost.mMeta.mAuthorId);
     bool redacted = (overall_reputation == RsReputationLevel::LOCALLY_NEGATIVE);
@@ -182,7 +186,9 @@ void BoardPostDisplayWidgetBase::baseSetup()
     if(redacted)
     {
         commentButton()->setDisabled(true);
+#ifdef TO_REMOVE
         shareButton()->setDisabled(true);
+#endif
         voteUpButton()->setDisabled(true);
         voteDownButton()->setDisabled(true);
         fromLabel()->setId(mPost.mMeta.mAuthorId);
@@ -275,6 +281,7 @@ void BoardPostDisplayWidgetBase::baseSetup()
     emit sizeChanged(this);
 #endif
 }
+#ifdef TO_REMOVE
 void BoardPostDisplayWidgetBase::handleShareButtonClicked()
 {
     emit shareButtonClicked();
@@ -284,6 +291,8 @@ void BoardPostDisplayWidgetBase::handleCopyLinkClicked()
 {
     emit copylinkClicked();
 }
+#endif
+
 //===================================================================================================================================
 //==                                                 class BoardPostDisplayWidget                                                  ==
 //===================================================================================================================================
@@ -292,6 +301,7 @@ BoardPostDisplayWidget_compact::BoardPostDisplayWidget_compact(const RsPostedPos
     : BoardPostDisplayWidgetBase(post,display_flags,parent), ui(new Ui::BoardPostDisplayWidget_compact())
 {
 	ui->setupUi(this);
+    ui->shareButton->hide();
 	BoardPostDisplayWidget_compact::setup();
 }
 
@@ -403,7 +413,7 @@ QLabel         *BoardPostDisplayWidget_compact::dateLabel()      { return ui->da
 QLabel         *BoardPostDisplayWidget_compact::titleLabel()     { return ui->titleLabel; }
 QLabel         *BoardPostDisplayWidget_compact::scoreLabel()     { return ui->scoreLabel; }
 QLabel         *BoardPostDisplayWidget_compact::notes()          { return ui->notes; }
-QToolButton    *BoardPostDisplayWidget_compact::shareButton()    { return ui->shareButton; }
+//QToolButton    *BoardPostDisplayWidget_compact::shareButton()    { return ui->shareButton; }
 QLabel         *BoardPostDisplayWidget_compact::pictureLabel()   { return ui->pictureLabel; }
 QFrame         *BoardPostDisplayWidget_compact::feedFrame()      { return ui->feedFrame; }
 
@@ -415,7 +425,8 @@ BoardPostDisplayWidget_card::BoardPostDisplayWidget_card(const RsPostedPost& pos
     : BoardPostDisplayWidgetBase(post,display_flags,parent), ui(new Ui::BoardPostDisplayWidget_card())
 {
 	ui->setupUi(this);
-	BoardPostDisplayWidget_card::setup();
+    ui->shareButton->hide();
+    BoardPostDisplayWidget_card::setup();
 }
 
 BoardPostDisplayWidget_card::~BoardPostDisplayWidget_card()
@@ -472,7 +483,7 @@ QLabel         *BoardPostDisplayWidget_card::dateLabel()      { return ui->dateL
 QLabel         *BoardPostDisplayWidget_card::titleLabel()     { return ui->titleLabel; }
 QLabel         *BoardPostDisplayWidget_card::scoreLabel()     { return ui->scoreLabel; }
 QLabel         *BoardPostDisplayWidget_card::notes()          { return ui->notes; }
-QToolButton    *BoardPostDisplayWidget_card::shareButton()    { return ui->shareButton; }
+//QToolButton    *BoardPostDisplayWidget_card::shareButton()    { return ui->shareButton; }
 QLabel         *BoardPostDisplayWidget_card::pictureLabel()   { return ui->pictureLabel; }
 QFrame         *BoardPostDisplayWidget_card::feedFrame()      { return ui->feedFrame; }
 
diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
index 189f83ae5..78a04a7fb 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.h
@@ -79,7 +79,7 @@ protected:
     virtual QLabel      *notes() =0;
     virtual QLabel      *pictureLabel()=0;
     virtual QToolButton *readButton() =0;
-    virtual QToolButton *shareButton() =0;
+//    virtual QToolButton *shareButton() =0;
     virtual QFrame      *feedFrame() =0;
 
 protected slots:
@@ -89,9 +89,10 @@ protected slots:
     void makeUpVote() ;
     void makeDownVote() ;
 	void setCommentsSize(int comNb) ;
+#ifdef TO_REMOVE
     void handleShareButtonClicked() ;
     void handleCopyLinkClicked() ;
-
+#endif
 
 signals:
     void changeReadStatusRequested(const RsGxsMessageId&,bool);
@@ -99,8 +100,8 @@ signals:
     void expand(RsGxsMessageId,bool);
     void commentsRequested(const RsGxsMessageId&,bool);
     void thumbnailOpenned();
-    void shareButtonClicked();
-    void copylinkClicked();
+//    void shareButtonClicked();
+//    void copylinkClicked();
 
 protected:
 	RsPostedPost mPost;
@@ -128,7 +129,9 @@ public:
     QLabel      *notes()          override;
     QLabel      *pictureLabel()   override;
     QToolButton *readButton()     override;
+#ifdef TO_REMOVE
     QToolButton *shareButton()    override;
+#endif
     QFrame      *feedFrame()      override;
 
 public slots:
@@ -166,7 +169,7 @@ public:
     QLabel      *scoreLabel()     override;
     QLabel      *notes()          override;
     QToolButton *readButton()     override;
-    QToolButton *shareButton()    override;
+//    QToolButton *shareButton()    override;
     QLabel      *pictureLabel()   override;
     QFrame      *feedFrame()      override;
 
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index a9c0a95a7..5c63ce2e9 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -219,7 +219,7 @@ QWidget *PostedPostDelegate::createEditor(QWidget *parent, const QStyleOptionVie
 	else
 		w = new BoardPostDisplayWidget_card(post,displayFlags(post.mMeta.mMsgId),parent);
 
-	QObject::connect(w,SIGNAL(vote(RsGxsGrpMsgIdPair,bool)),mPostListWidget,SLOT(voteMsg(RsGxsGrpMsgIdPair,bool)));
+    QObject::connect(w,SIGNAL(vote(RsGxsGrpMsgIdPair,bool)),mPostListWidget,SLOT(voteMsg(RsGxsGrpMsgIdPair,bool)));
 	QObject::connect(w,SIGNAL(expand(RsGxsMessageId,bool)),this,SLOT(expandItem(RsGxsMessageId,bool)));
 	QObject::connect(w,SIGNAL(commentsRequested(RsGxsMessageId,bool)),mPostListWidget,SLOT(openComments(RsGxsMessageId)));
 	QObject::connect(w,SIGNAL(changeReadStatusRequested(RsGxsMessageId,bool)),mPostListWidget,SLOT(changeReadStatus(RsGxsMessageId,bool)));
@@ -230,7 +230,6 @@ QWidget *PostedPostDelegate::createEditor(QWidget *parent, const QStyleOptionVie
 	QObject::connect(w,SIGNAL(expand(RsGxsMessageId,bool)),this,SLOT(markCurrentPostAsRead()));
 	QObject::connect(w,SIGNAL(commentsRequested(RsGxsMessageId,bool)),mPostListWidget,SLOT(markCurrentPostAsRead()));
 	QObject::connect(w,SIGNAL(shareButtonClicked()),mPostListWidget,SLOT(markCurrentPostAsRead()));
-	QObject::connect(w,SIGNAL(copylinkClicked()),mPostListWidget,SLOT(copyMessageLink()));
 
 	w->setGeometry(option.rect);
 	w->adjustSize();
@@ -277,7 +276,6 @@ PostedListWidgetWithModel::PostedListWidgetWithModel(const RsGxsGroupId& postedI
     connect(ui->nextButton,SIGNAL(clicked()),this,SLOT(nextPosts()));
     connect(ui->prevButton,SIGNAL(clicked()),this,SLOT(prevPosts()));
 
-    connect(ui->postsTree,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(postContextMenu(QPoint)));
     connect(ui->viewModeButton,SIGNAL(clicked()),this,SLOT(switchDisplayMode()));
 
     connect(mPostedPostsModel,SIGNAL(boardPostsLoaded()),this,SLOT(postPostLoad()));
@@ -296,7 +294,11 @@ PostedListWidgetWithModel::PostedListWidgetWithModel(const RsGxsGroupId& postedI
 
     connect(ui->postsTree,SIGNAL(sizeChanged(QSize)),this,SLOT(handlePostsTreeSizeChange(QSize)));
 
-	/* load settings */
+    ui->postsTree->setContextMenuPolicy(Qt::CustomContextMenu);
+    //QObject::connect(this,SIGNAL(copylinkClicked()),this,SLOT(copyMessageLink()));
+    connect(ui->postsTree,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(postContextMenu(const QPoint&)));
+
+    /* load settings */
 	processSettings(true);
 
 	/* Initialize subscribe button */
@@ -325,6 +327,32 @@ PostedListWidgetWithModel::PostedListWidgetWithModel(const RsGxsGroupId& postedI
     }, mEventHandlerId, RsEventType::GXS_POSTED );
 }
 
+void PostedListWidgetWithModel::postContextMenu(const QPoint& point)
+{
+    QMenu menu(this);
+
+    // 1 - check that we are clicking on a post
+
+    QModelIndex index = ui->postsTree->indexAt(point);
+
+    if(!index.isValid())
+        return;
+
+    // 2 - generate the menu for that post.
+
+    menu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyMessageLink()))->setData(index);
+    menu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_AUTHOR), tr("Show author in People tab"), this, SLOT(showAuthorInPeople()))->setData(index);
+
+#ifdef TODO
+    // This feature is not implemented yet in libretroshare.
+
+    if(IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags))
+        menu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/edit_16.png"), tr("Edit"), this, SLOT(editPost()));
+#endif
+
+    menu.exec(QCursor::pos());
+}
+
 void PostedListWidgetWithModel::switchDisplayMode()
 {
     if(mPostedPostsDelegate->getDisplayMode() == BoardPostDisplayWidget_compact::DISPLAY_MODE_CARD)
@@ -403,7 +431,7 @@ void PostedListWidgetWithModel::prevPosts()
 
 void PostedListWidgetWithModel::showAuthorInPeople()
 {
-    QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
+    QModelIndex index = qobject_cast<QAction*>(QObject::sender())->data().toModelIndex();
 
     if(!index.isValid())
         throw std::runtime_error("No post under mouse!");
@@ -428,23 +456,6 @@ void PostedListWidgetWithModel::showAuthorInPeople()
     MainWindow::showWindow(MainWindow::People);
     idDialog->navigate(RsGxsId(post.mMeta.mAuthorId));
 }
-void PostedListWidgetWithModel::postContextMenu(const QPoint&)
-{
-    QMenu menu(this);
-
-	menu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyMessageLink()));
-    menu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_AUTHOR), tr("Show author in People tab"), this, SLOT(showAuthorInPeople()));
-
-#ifdef TODO
-    // This feature is not implemented yet in libretroshare.
-
-	if(IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags))
-		menu.addAction(FilesDefs::getIconFromQtResourcePath(":/images/edit_16.png"), tr("Edit"), this, SLOT(editPost()));
-#endif
-
-	menu.exec(QCursor::pos());
-}
-
 void PostedListWidgetWithModel::copyMessageLink()
 {
     try
@@ -452,7 +463,7 @@ void PostedListWidgetWithModel::copyMessageLink()
 		if (groupId().isNull())
 			throw std::runtime_error("No channel currently selected!");
 
-		QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
+        QModelIndex index = qobject_cast<QAction*>(QObject::sender())->data().toModelIndex();
 
 		if(!index.isValid())
 			throw std::runtime_error("No post under mouse!");
@@ -528,87 +539,6 @@ void PostedListWidgetWithModel::handleEvent_main_thread(std::shared_ptr<const Rs
 	}
 }
 
-#ifdef TO_REMOVE
-void PostedListWidgetWithModel::showPostDetails()
-{
-    QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
-	RsPostedPost post = index.data(Qt::UserRole).value<RsPostedPost>() ;
-
-	QTextDocument doc;
-	doc.setHtml(post.mMsg.c_str());
-
-    if(post.mMeta.mPublishTs == 0)
-    {
-        ui->postDetails_TE->clear();
-        ui->postLogo_LB->hide();
-		ui->postName_LB->hide();
-		ui->postTime_LB->hide();
-		mChannelPostFilesModel->clear();
-
-        return;
-    }
-
-	ui->postLogo_LB->show();
-	ui->postName_LB->show();
-	ui->postTime_LB->show();
-
-    if(index.row()==0 && index.column()==0)
-        std::cerr << "here" << std::endl;
-
-	std::cerr << "showPostDetails: setting mLastSelectedPosts[groupId()] to current post Id " << post.mMeta.mMsgId << ". Previous value: " << mLastSelectedPosts[groupId()] << std::endl;
-    mLastSelectedPosts[groupId()] = post.mMeta.mMsgId;
-
-    std::list<ChannelPostFileInfo> files;
-    for(auto& file:post.mFiles)
-        files.push_back(ChannelPostFileInfo(file,post.mMeta.mPublishTs));
-
-    mChannelPostFilesModel->setFiles(files);
-
-    auto all_msgs_versions(post.mOlderVersions);
-    all_msgs_versions.insert(post.mMeta.mMsgId);
-
-    ui->commentsDialog->commentLoad(post.mMeta.mGroupId, all_msgs_versions, post.mMeta.mMsgId);
-
-    std::cerr << "Showing details about selected index : "<< index.row() << "," << index.column() << std::endl;
-
-    ui->postDetails_TE->setText(RsHtml().formatText(NULL, QString::fromUtf8(post.mMsg.c_str()), /* RSHTML_FORMATTEXT_EMBED_SMILEYS |*/ RSHTML_FORMATTEXT_EMBED_LINKS));
-
-	QPixmap postImage;
-
-	if (post.mThumbnail.mData != NULL)
-		GxsIdDetails::loadPixmapFromData(post.mThumbnail.mData, post.mThumbnail.mSize, postImage,GxsIdDetails::ORIGINAL);
-	else
-		postImage = FilesDefs::getPixmapFromQtResourcePath(ChannelPostThumbnailView::CHAN_DEFAULT_IMAGE);
-
-    int W = QFontMetricsF(font()).height() * 8;
-
-    // Using fixed width so that the post will not displace the text when we browse.
-
-	ui->postLogo_LB->setPixmap(postImage);
-	ui->postLogo_LB->setFixedSize(W,postImage.height()/(float)postImage.width()*W);
-
-	ui->postName_LB->setText(QString::fromUtf8(post.mMeta.mMsgName.c_str()));
-	ui->postName_LB->setFixedWidth(W);
-	ui->postTime_LB->setText(QDateTime::fromMSecsSinceEpoch(post.mMeta.mPublishTs*1000).toString("MM/dd/yyyy, hh:mm"));
-	ui->postTime_LB->setFixedWidth(W);
-
-    //ui->channelPostFiles_TV->resizeColumnToContents(RsGxsChannelPostFilesModel::COLUMN_FILES_FILE);
-    //ui->channelPostFiles_TV->resizeColumnToContents(RsGxsChannelPostFilesModel::COLUMN_FILES_SIZE);
-    ui->channelPostFiles_TV->setAutoSelect(true);
-
- 	// Now also set the post as read
-
-	if(IS_MSG_UNREAD(post.mMeta.mMsgStatus) || IS_MSG_NEW(post.mMeta.mMsgStatus))
-	{
-		RsGxsGrpMsgIdPair postId;
-		postId.second = post.mMeta.mMsgId;
-		postId.first  = post.mMeta.mGroupId;
-
-		RsThread::async([postId]() { rsGxsChannels->markRead(postId, true) ; } );
-	}
-}
-#endif
-
 void PostedListWidgetWithModel::updateGroupData()
 {
 	if(groupId().isNull())
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
index a447424e8..e6b98120a 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
@@ -136,6 +136,7 @@ private slots:
 #ifdef TO_REMOVE
 	void showPostDetails();
 #endif
+    void postContextMenu(const QPoint&);
     void showAuthorInPeople();
     void tabCloseRequested(int index);
     void updateSorting(int);
@@ -145,7 +146,6 @@ private slots:
 	void subscribeGroup(bool subscribe);
 	void settingsChanged();
 	void postPostLoad();
-	void postContextMenu(const QPoint&);
 	void copyMessageLink();
     void nextPosts();
     void prevPosts();

From d04c28cffc2a539378e17065b06a623396204817 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 20 Apr 2023 19:00:51 +0200
Subject: [PATCH 238/503] Fixed to get reizable people page

* Fixed to get resizable people page
* Moved text for auto ban as tooltip, keep short text for the checkbox
* Removed empty wasting spacer from Boards bar
---
 retroshare-gui/src/gui/Identity/IdDialog.ui   | 31 +++++++++----------
 .../gui/Posted/PostedListWidgetWithModel.ui   | 16 ----------
 .../src/gui/msgs/MessageComposer.ui           |  4 +--
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index f18ddbc87..196fbdae4 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -301,8 +301,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>634</width>
-             <height>538</height>
+             <width>479</width>
+             <height>731</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">
@@ -338,21 +338,14 @@
                    </property>
                   </widget>
                  </item>
-                 <item>
-                  <spacer name="verticalSpacer">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>518</width>
-                     <height>17</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
                  <item>
                   <widget class="QFrame" name="info_Frame_Invite">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
                    <property name="palette">
                     <palette>
                      <active>
@@ -490,6 +483,9 @@
                       <property name="text">
                        <string notr="true">Invite messages stay into your Outbox until an acknowledgement of receipt has been received.</string>
                       </property>
+                      <property name="wordWrap">
+                       <bool>true</bool>
+                      </property>
                      </widget>
                     </item>
                     <item>
@@ -895,9 +891,12 @@ border-image: url(:/images/closepressed.png)
                </item>
                <item row="11" column="1">
                 <widget class="QCheckBox" name="autoBanIdentities_CB">
-                 <property name="text">
+                 <property name="toolTip">
                   <string>Auto-Ban all identities signed by the same node</string>
                  </property>
+                 <property name="text">
+                  <string>Auto-Ban</string>
+                 </property>
                 </widget>
                </item>
                <item row="4" column="1">
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
index 9ed0fc3db..2bafbc8a2 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
@@ -454,22 +454,6 @@ p, li { white-space: pre-wrap; }
             </item>
            </widget>
           </item>
-          <item>
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Minimum</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item>
            <widget class="LineEditClear" name="filter_LE">
             <property name="placeholderText">
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui
index 8b2e3d601..9b5e8605c 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.ui
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1215</width>
-    <height>825</height>
+    <width>800</width>
+    <height>650</height>
    </rect>
   </property>
   <property name="windowTitle">

From 7858db9b2c9cc3d5428710d945a52963a0cd9a66 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 20 Apr 2023 19:48:13 +0200
Subject: [PATCH 239/503] Use ElidedLabel for post name Label

---
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
index c4005cfc6..9afe3e5d0 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@@ -402,7 +402,7 @@
           <string notr="true">&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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:11pt; 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;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
@@ -534,7 +534,7 @@ p, li { white-space: pre-wrap; }
             <item>
              <layout class="QVBoxLayout" name="verticalLayout_6">
               <item>
-               <widget class="QLabel" name="postName_LB">
+               <widget class="ElidedLabel" name="postName_LB">
                 <property name="font">
                  <font>
                   <weight>75</weight>

From a71d6e243003553396a26b47cd39706daefdf1a6 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 20 Apr 2023 23:26:57 +0200
Subject: [PATCH 240/503] Picture attachments improved

* Added a remove button to clear pictures
* Improved picture attachments
---
 .../src/gui/TheWire/PulseAddDialog.cpp        |  46 ++++++--
 .../src/gui/TheWire/PulseAddDialog.h          |   3 +-
 .../src/gui/TheWire/PulseAddDialog.ui         | 102 +++++++++---------
 3 files changed, 91 insertions(+), 60 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 572772a1e..8877d5cf6 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -42,15 +42,26 @@ PulseAddDialog::PulseAddDialog(QWidget *parent)
 	connect(ui.pushButton_Cancel, SIGNAL( clicked( void ) ), this, SLOT( cancelPulse( void ) ) );
 	connect(ui.textEdit_Pulse, SIGNAL( textChanged( void ) ), this, SLOT( pulseTextChanged( void ) ) );
 	connect(ui.pushButton_picture, SIGNAL(clicked()), this, SLOT( toggle()));
+	connect(ui.pushButton_remove, SIGNAL(clicked()), this, SLOT( removePictures()));
+
 
     // this connection is from browse push button to the slot function onBrowseButtonClicked()
     connect(ui.pushButton_Browse, SIGNAL(clicked()), this, SLOT( onBrowseButtonClicked()));
 
 	ui.pushButton_picture->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/photo.png")));
+	ui.pushButton_Browse->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/add-image.png")));
+	ui.pushButton_remove->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/mail/delete.png")));
+
 	ui.frame_picture->hide();
+	ui.pushButton_picture->hide();
 
     // initially hiding the browse button as the attach image button is not pressed
-    ui.frame_PictureBrowse->hide();
+	//ui.frame_PictureBrowse->hide();
+
+	ui.label_image1->hide();
+	ui.label_image2->hide();
+	ui.label_image3->hide();
+	ui.label_image4->hide();
 
 	setAcceptDrops(true);
 }
@@ -160,11 +171,10 @@ void PulseAddDialog::cleanup()
 	ui.label_image4->clear();
 	ui.label_image4->setText(tr("Drag and Drop Image"));
 
-    ui.lineEdit_FilePath->clear();
-
     // Hide Drag & Drop Frame and the browse frame
     ui.frame_picture->hide();
-    ui.frame_PictureBrowse->hide();
+    //ui.frame_PictureBrowse->hide();
+	ui.pushButton_picture->hide();
 
 	ui.pushButton_picture->setChecked(false);
 }
@@ -489,24 +499,29 @@ void PulseAddDialog::addImage(const QString &path)
 		std::cerr << "PulseAddDialog::addImage() Installing in Image1";
 		std::cerr << std::endl;
 		ui.label_image1->setPixmap(icon);
+		ui.label_image1->show();
+		ui.frame_picture->show();
 		mImage1.copy((uint8_t *) ba.data(), ba.size());
 		std::cerr << "PulseAddDialog::addImage() Installing in Image1 Size: " << mImage1.mSize;
 		std::cerr << std::endl;
 	}
 	else if (mImage2.empty()) {
 		ui.label_image2->setPixmap(icon);
+		ui.label_image2->show();
 		mImage2.copy((uint8_t *) ba.data(), ba.size());
 		std::cerr << "PulseAddDialog::addImage() Installing in Image2 Size: " << mImage2.mSize;
 		std::cerr << std::endl;
 	}
 	else if (mImage3.empty()) {
 		ui.label_image3->setPixmap(icon);
+		ui.label_image3->show();
 		mImage3.copy((uint8_t *) ba.data(), ba.size());
 		std::cerr << "PulseAddDialog::addImage() Installing in Image3 Size: " << mImage3.mSize;
 		std::cerr << std::endl;
 	}
 	else if (mImage4.empty()) {
 		ui.label_image4->setPixmap(icon);
+		ui.label_image4->show();
 		mImage4.copy((uint8_t *) ba.data(), ba.size());
 		std::cerr << "PulseAddDialog::addImage() Installing in Image4 Size: " << mImage4.mSize;
 		std::cerr << std::endl;
@@ -523,7 +538,6 @@ void PulseAddDialog::toggle()
 	{
         // Show the input methods (drag and drop field and the browse button)
 		ui.frame_picture->show();
-        ui.frame_PictureBrowse->show();
 
 		ui.pushButton_picture->setToolTip(tr("Hide Pictures"));
 	}
@@ -531,7 +545,6 @@ void PulseAddDialog::toggle()
 	{
         // Hide the input methods (drag and drop field and the browse button)
 		ui.frame_picture->hide();
-        ui.frame_PictureBrowse->hide();
 
 		ui.pushButton_picture->setToolTip(tr("Add Pictures"));
 	}
@@ -543,8 +556,27 @@ void PulseAddDialog::onBrowseButtonClicked()
     QString filePath;
     misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load Picture File"), "Pictures (*.png *.xpm *.jpg *.jpeg *.gif *.webp )", filePath);
     if (!filePath.isEmpty()) {
-        ui.lineEdit_FilePath->setText(filePath);
+        //ui.lineEdit_FilePath->setText(filePath);
         addImage(filePath);
     }
 }
 
+void PulseAddDialog::removePictures()
+{
+
+	mImage1.clear();
+	ui.label_image1->clear();
+	mImage2.clear();
+	ui.label_image2->clear();
+	mImage3.clear();
+	ui.label_image3->clear();
+	mImage4.clear();
+	ui.label_image4->clear();
+
+	ui.label_image1->hide();
+	ui.label_image2->hide();
+	ui.label_image3->hide();
+	ui.label_image4->hide();
+
+	ui.frame_picture->hide();
+}
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.h b/retroshare-gui/src/gui/TheWire/PulseAddDialog.h
index 69007b025..b1e8eca47 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.h
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.h
@@ -53,7 +53,8 @@ private slots:
 	void clearDialog();
 	void pulseTextChanged();
 	void toggle();
-    void onBrowseButtonClicked();
+	void onBrowseButtonClicked();
+	void removePictures();
 
 private:
 	// OLD VERSIONs, private now.
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
index 5ef30ef19..25738136d 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>720</width>
+    <width>735</width>
     <height>513</height>
    </rect>
   </property>
@@ -52,6 +52,7 @@
         <property name="font">
          <font>
           <pointsize>12</pointsize>
+          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -249,6 +250,12 @@
       </item>
       <item>
        <widget class="QFrame" name="frame_picture">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
@@ -278,6 +285,22 @@
            </property>
           </widget>
          </item>
+         <item row="1" column="1">
+          <widget class="QLabel" name="label_image4">
+           <property name="minimumSize">
+            <size>
+             <width>40</width>
+             <height>40</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Drag and Drop Image</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_image3">
            <property name="minimumSize">
@@ -310,63 +333,22 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QLabel" name="label_image4">
-           <property name="minimumSize">
-            <size>
-             <width>40</width>
-             <height>40</height>
-            </size>
+         <item row="0" column="2" rowspan="2">
+          <widget class="QToolButton" name="pushButton_remove">
+           <property name="toolTip">
+            <string>Remove all images</string>
            </property>
            <property name="text">
-            <string>Drag and Drop Image</string>
+            <string/>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="frame_PictureBrowse">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>50</height>
-         </size>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QLineEdit" name="lineEdit_FilePath">
-           <property name="minimumSize">
+           <property name="iconSize">
             <size>
-             <width>541</width>
-             <height>25</height>
+             <width>24</width>
+             <height>24</height>
             </size>
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QPushButton" name="pushButton_Browse">
-           <property name="minimumSize">
-            <size>
-             <width>101</width>
-             <height>25</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Browse...</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
@@ -413,7 +395,6 @@
      </layout>
      <zorder>frame_URL</zorder>
      <zorder>frame_picture</zorder>
-     <zorder>frame_PictureBrowse</zorder>
      <zorder>textEdit_Pulse</zorder>
     </widget>
    </item>
@@ -423,7 +404,7 @@
       <number>6</number>
      </property>
      <item>
-      <widget class="QPushButton" name="pushButton_picture">
+      <widget class="QToolButton" name="pushButton_picture">
        <property name="text">
         <string/>
        </property>
@@ -438,6 +419,22 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QToolButton" name="pushButton_Browse">
+       <property name="toolTip">
+        <string>Add Picture</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="buttonHSpacer">
        <property name="orientation">
@@ -456,6 +453,7 @@
        <property name="font">
         <font>
          <pointsize>12</pointsize>
+         <weight>75</weight>
          <bold>true</bold>
         </font>
        </property>

From 2cb87368042675a01ceb658e9d2f3efda77e12c0 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 22 Apr 2023 15:02:32 +0200
Subject: [PATCH 241/503] fixed update of forum when marking msg as read/unread
 with children

---
 retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
index 77292dadf..d793c29fe 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
@@ -1278,8 +1278,8 @@ void RsGxsForumModel::recursSetMsgReadStatus(ForumModelIndex i,bool read_status,
         void *ref ;
         convertTabEntryToRefPointer(i,ref);	// we dont use i+1 here because i is not a row, but an index in the mPosts tab
 
-        QModelIndex itemIndex = createIndex(i - 1, 0, ref);
-		emit dataChanged(itemIndex, itemIndex);
+        QModelIndex itemIndex = (mTreeMode == TREE_MODE_FLAT)?createIndex(i - 1, 0, ref):createIndex(mPosts[i].prow,0,ref);
+        emit dataChanged(itemIndex, itemIndex);
 	}
 
 	if(!with_children)

From 9d956f6126c6d13ff98954217ae69165118060b5 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 22 Apr 2023 16:19:04 +0200
Subject: [PATCH 242/503] fixed layout update problem when switching channels

---
 .../GxsChannelPostsWidgetWithModel.cpp        | 34 ++++++++++++-------
 .../GxsChannelPostsWidgetWithModel.h          |  5 +--
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index b99f71faf..381e4b7b9 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -279,18 +279,18 @@ void ChannelPostDelegate::setWidgetGrid(bool use_grid)
 
 QWidget *ChannelPostFilesDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/*option*/, const QModelIndex& index) const
 {
-	ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
+    ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;
 
-	if(index.column() == RsGxsChannelPostFilesModel::COLUMN_FILES_FILE)
-	{
+    if(index.column() == RsGxsChannelPostFilesModel::COLUMN_FILES_FILE)
+    {
         GxsChannelFilesStatusWidget* w = new GxsChannelFilesStatusWidget(file,parent,true);
         w->setFocusPolicy(Qt::StrongFocus);
         connect(w,SIGNAL(onButtonClick()),this->parent(),SLOT(updateDAll_PB()));
 
-		return w;
-	}
-	else
-		return NULL;
+        return w;
+    }
+    else
+        return NULL;
 }
 void ChannelPostFilesDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const
 {
@@ -392,7 +392,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
 
     mChannelPostsDelegate->setAspectRatio(ChannelPostThumbnailView::ASPECT_RATIO_16_9);
 
-    connect(ui->postsTree,SIGNAL(zoomRequested(bool)),this,SLOT(updateZoomFactor(bool)));
+    connect(ui->postsTree,SIGNAL(zoomRequested(bool)),this,SLOT(onUpdateZoomFactor(bool)));
     connect(ui->commentsDialog,SIGNAL(commentsLoaded(int)),this,SLOT(updateCommentsCount(int)));
 
     ui->channelPostFiles_TV->setModel(mChannelPostFilesModel = new RsGxsChannelPostFilesModel(this));
@@ -520,9 +520,17 @@ void GxsChannelPostsWidgetWithModel::currentTabChanged(int t)
         break;
     }
 }
-void GxsChannelPostsWidgetWithModel::updateZoomFactor(bool zoom_or_unzoom)
+void GxsChannelPostsWidgetWithModel::onUpdateZoomFactor(bool zoom_or_unzoom)
 {
-    mChannelPostsDelegate->zoom(zoom_or_unzoom);
+    if(zoom_or_unzoom)
+        updateZoomFactor(1);
+    else
+        updateZoomFactor(-1);
+}
+void GxsChannelPostsWidgetWithModel::updateZoomFactor(int what_to_do)
+{
+    if(what_to_do != 0)
+        mChannelPostsDelegate->zoom(what_to_do > 0);
 
     for(int i=0;i<mChannelPostsModel->columnCount();++i)
         ui->postsTree->setColumnWidth(i,mChannelPostsDelegate->cellSize(i,font(),ui->postsTree->width()));
@@ -532,8 +540,7 @@ void GxsChannelPostsWidgetWithModel::updateZoomFactor(bool zoom_or_unzoom)
     int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),s.width()))));
 
     mChannelPostsModel->setNumColumns(n_columns);	// forces the update
-
-    ui->postsTree->dataChanged(QModelIndex(),QModelIndex());
+    mChannelPostsModel->triggerViewUpdate();
 }
 
 void GxsChannelPostsWidgetWithModel::sortColumnPostFiles(int col,Qt::SortOrder so)
@@ -1067,8 +1074,9 @@ void GxsChannelPostsWidgetWithModel::postChannelPostLoad()
             best = i;
 
     mChannelPostsDelegate->setAspectRatio(static_cast<ChannelPostThumbnailView::AspectRatio>(best));
-    mChannelPostsModel->triggerViewUpdate();
     handlePostsTreeSizeChange(ui->postsTree->size(),true); // force the update
+
+    updateZoomFactor(0);
 }
 
 void GxsChannelPostsWidgetWithModel::updateDisplay(bool update_group_data,bool update_posts)
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index 70673f57f..874562d32 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -154,7 +154,7 @@ private slots:
 	void editPost();
 	void postContextMenu(const QPoint&);
 	void copyMessageLink();
-	void updateZoomFactor(bool zoom_or_unzoom);
+    void onUpdateZoomFactor(bool zoom_or_unzoom);
     void switchView();
     void switchOnlyUnread(bool b);
     void markMessageUnread();
@@ -168,7 +168,8 @@ public slots:
     void copyChannelFilesLink();
 
 private:
-	void processSettings(bool load);
+    void updateZoomFactor(int what_to_do);	// -1=unzoom, 0=nothing, 1=zoom
+    void processSettings(bool load);
     RsGxsMessageId getCurrentItemId() const;
     void selectItem(const RsGxsMessageId& msg_id);
 

From 3e35ce4dddccd13e2b2916e362807bff30d67816 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 22 Apr 2023 18:16:04 +0200
Subject: [PATCH 243/503] improved the logic to make the channel layout update
 faster

---
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 22 +++++++------------
 .../gui/gxschannels/GxsChannelPostsModel.h    |  2 +-
 .../GxsChannelPostsWidgetWithModel.cpp        |  8 +++++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 197013c8b..91a2a578c 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -63,7 +63,7 @@ void RsGxsChannelPostsModel::setMode(TreeMode mode)
     if(mode == TREE_MODE_LIST)
         setNumColumns(2);
 
-    triggerViewUpdate();
+    triggerViewUpdate(true,true);
 }
 
 void RsGxsChannelPostsModel::computeCommentCounts( std::vector<RsGxsChannelPost>& posts, std::vector<RsGxsComment>& comments)
@@ -118,12 +118,15 @@ void RsGxsChannelPostsModel::preMods()
 }
 void RsGxsChannelPostsModel::postMods()
 {
-	triggerViewUpdate();
 	emit layoutChanged();
 }
-void RsGxsChannelPostsModel::triggerViewUpdate()
+void RsGxsChannelPostsModel::triggerViewUpdate(bool data_changed, bool layout_changed)
 {
-    emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,mColumns-1,(void*)NULL));
+    if(data_changed)
+        emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,mColumns-1,(void*)NULL));
+
+    if(layout_changed)
+        emit layoutChanged();
 }
 
 void RsGxsChannelPostsModel::getFilesList(std::list<ChannelPostFileInfo>& files)
@@ -316,17 +319,8 @@ bool RsGxsChannelPostsModel::setNumColumns(int n)
 
 	preMods();
 
-	beginResetModel();
-	endResetModel();
-
 	mColumns = n;
 
-	if (rowCount()>0)
-	{
-		beginInsertRows(QModelIndex(),0,rowCount()-1);
-		endInsertRows();
-	}
-
 	postMods();
 
 	return true;
@@ -548,7 +542,7 @@ void RsGxsChannelPostsModel::updateSinglePost(const RsGxsChannelPost& post,std::
     uint32_t count;
     updateFilter(count);
 
-    triggerViewUpdate();
+    triggerViewUpdate(true,false);
 }
 
 void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vector<RsGxsChannelPost>& posts)
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
index c12e31635..42dcbb9f7 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
@@ -115,7 +115,7 @@ public:
 	void updateChannel(const RsGxsGroupId& channel_group_id);
     const RsGxsGroupId& currentGroupId() const;
 
-    void triggerViewUpdate();
+    void triggerViewUpdate(bool data_changed,bool layout_changed);
 
     // sets the number of columns. Returns 0 if nothing changes.
     bool setNumColumns(int n);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 381e4b7b9..7593d4e18 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -540,7 +540,11 @@ void GxsChannelPostsWidgetWithModel::updateZoomFactor(int what_to_do)
     int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),s.width()))));
 
     mChannelPostsModel->setNumColumns(n_columns);	// forces the update
-    mChannelPostsModel->triggerViewUpdate();
+
+    if(what_to_do)
+        mChannelPostsModel->triggerViewUpdate(true,false);
+    else
+        mChannelPostsModel->triggerViewUpdate(false,true);
 }
 
 void GxsChannelPostsWidgetWithModel::sortColumnPostFiles(int col,Qt::SortOrder so)
@@ -646,7 +650,7 @@ void GxsChannelPostsWidgetWithModel::switchView()
     selectItem(msg_id);
     ui->postsTree->setFocus();
 
-    mChannelPostsModel->triggerViewUpdate();	// This is already called by setMode(), but the model cannot know how many
+    mChannelPostsModel->triggerViewUpdate(false,true);	// This is already called by setMode(), but the model cannot know how many
                                                 // columns is actually has until we call handlePostsTreeSizeChange(), so
                                                 // we have to call it again here.
 }

From 2ab012261b5b63debefe659785c036c16a33beaf Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 22 Apr 2023 22:50:53 +0200
Subject: [PATCH 244/503] fixed wrong column size when first showing the
 channel posts tab

---
 .../GxsChannelPostsWidgetWithModel.cpp            | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 7593d4e18..bd1405915 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -92,9 +92,9 @@ Q_DECLARE_METATYPE(ChannelPostFileInfo)
 int ChannelPostDelegate::cellSize(int col,const QFont& font,uint32_t parent_width) const
 {
     if(mUseGrid || col==0)
-        return mZoom*COLUMN_SIZE_FONT_FACTOR_W*QFontMetricsF(font).height();
+        return (int)floor(mZoom*COLUMN_SIZE_FONT_FACTOR_W*QFontMetricsF(font).height());
     else
-        return 0.8*parent_width - mZoom*COLUMN_SIZE_FONT_FACTOR_W*QFontMetricsF(font).height();
+        return (int)floor(0.8*parent_width - mZoom*COLUMN_SIZE_FONT_FACTOR_W*QFontMetricsF(font).height());
 }
 
 void ChannelPostDelegate::zoom(bool zoom_or_unzoom)
@@ -517,6 +517,7 @@ void GxsChannelPostsWidgetWithModel::currentTabChanged(int t)
     case CHANNEL_TABS_POSTS:
         ui->showUnread_TB->setHidden(false);
         ui->viewType_TB->setHidden(false);
+        updateZoomFactor(0); // fixes a bug due to the widget now knowing its size when not displayed.
         break;
     }
 }
@@ -532,15 +533,13 @@ void GxsChannelPostsWidgetWithModel::updateZoomFactor(int what_to_do)
     if(what_to_do != 0)
         mChannelPostsDelegate->zoom(what_to_do > 0);
 
+    QSize s = ui->postsTree->size();
+    int n_columns = std::max(1,(int)floor(s.width() / (float)(mChannelPostsDelegate->cellSize(0,font(),s.width()))));
+    mChannelPostsModel->setNumColumns(n_columns);	// forces the update
+
     for(int i=0;i<mChannelPostsModel->columnCount();++i)
         ui->postsTree->setColumnWidth(i,mChannelPostsDelegate->cellSize(i,font(),ui->postsTree->width()));
 
-    QSize s = ui->postsTree->size();
-
-    int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),s.width()))));
-
-    mChannelPostsModel->setNumColumns(n_columns);	// forces the update
-
     if(what_to_do)
         mChannelPostsModel->triggerViewUpdate(true,false);
     else

From f06506ec5418315a26d7da88ca1ae23c083c6d30 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 23 Apr 2023 19:31:30 +0200
Subject: [PATCH 245/503] Corrected checkbox text

---
 retroshare-gui/src/gui/Identity/IdDialog.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index 196fbdae4..ff3775aee 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -301,7 +301,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>479</width>
+             <width>456</width>
              <height>731</height>
             </rect>
            </property>
@@ -895,7 +895,7 @@ border-image: url(:/images/closepressed.png)
                   <string>Auto-Ban all identities signed by the same node</string>
                  </property>
                  <property name="text">
-                  <string>Auto-Ban</string>
+                  <string>Auto-Ban profile</string>
                  </property>
                 </widget>
                </item>

From 0ff4426d7203800d50e66075b0ab3f271be7307b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 23 Apr 2023 22:47:33 +0200
Subject: [PATCH 246/503] removed multiple references to temporary passed
 accross threads, causing random crashes

---
 retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp   | 4 ++--
 retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp | 4 ++--
 retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp    | 2 +-
 retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
index 684b85e54..57adbb39d 100644
--- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
@@ -186,13 +186,13 @@ void BaseBoardsCommentsItem::loadMessage()
 		if (posts.size() == 1)
 		{
 			std::cerr << (void*)this << ": Obtained post, with msgId = " << posts[0].mMeta.mMsgId << std::endl;
-			const RsPostedPost& post(posts[0]);
+            RsPostedPost post(posts[0]);	// no reference to temporary because it's passed to a thread!
 
 			RsQThreadUtils::postToObject( [post,this]() { setPost(post,true); mIsLoadingMessage = false;}, this );
 		}
 		else if(comments.size() == 1)
 		{
-			const RsGxsComment& cmt = comments[0];
+            RsGxsComment cmt(comments[0]);
 			std::cerr << (void*)this << ": Obtained comment, setting messageId to threadID = " << cmt.mMeta.mThreadId << std::endl;
 
 			RsQThreadUtils::postToObject( [cmt,this]()
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
index 296f3f173..ecbba96af 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
@@ -292,13 +292,13 @@ void ChannelsCommentsItem::loadMessage()
 #ifdef DEBUG_ITEM
 			std::cerr << (void*)this << ": Obtained post, with msgId = " << posts[0].mMeta.mMsgId << std::endl;
 #endif
-            const RsGxsChannelPost& post(posts[0]);
+            RsGxsChannelPost post(posts[0]);	// no reference to temporary here, because we pass this to a thread
 
 			RsQThreadUtils::postToObject( [post,this]() { setPost(post);  }, this );
 		}
 		else if(comments.size() == 1)
 		{
-			const RsGxsComment& cmt = comments[0];
+            RsGxsComment cmt(comments[0]);
 #ifdef DEBUG_ITEM
 			std::cerr << (void*)this << ": Obtained comment, setting messageId to threadID = " << cmt.mMeta.mThreadId << std::endl;
 #endif
diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
index 1d61bb98b..43c94a377 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
@@ -125,7 +125,7 @@ void GxsForumGroupItem::loadGroup()
 			std::cerr << std::endl;
 			return;
 		}
-		const RsGxsForumGroup& group(groups[0]);
+        RsGxsForumGroup group(groups[0]);// no reference to teporary accross threads!
 
 		RsQThreadUtils::postToObject( [group,this]()
 		{
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
index 556dd1108..eedb4ae20 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
@@ -235,7 +235,7 @@ void GxsForumMsgItem::loadMessage()
 			std::cerr << std::endl;
 			return;
 		}
-		const RsGxsForumMsg& msg(msgs[0]);
+        RsGxsForumMsg msg(msgs[0]);
 
 		RsQThreadUtils::postToObject( [msg,this]()
 		{
@@ -280,7 +280,7 @@ void GxsForumMsgItem::loadParentMessage(const RsGxsMessageId& parent_msg)
 			std::cerr << std::endl;
 			return;
 		}
-		const RsGxsForumMsg& msg(msgs[0]);
+        RsGxsForumMsg msg(msgs[0]);
 
 		RsQThreadUtils::postToObject( [msg,this]()
 		{

From 35e08e3b665992f9acb36c164da0225e18aa7930 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 25 Apr 2023 11:33:37 +0200
Subject: [PATCH 247/503] fixed keeping post sizes when selelecting unread
 posts

---
 retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp   | 4 ----
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 91a2a578c..6179acae7 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -173,11 +173,7 @@ void RsGxsChannelPostsModel::updateFilter(uint32_t& count)
 {
 	preMods();
 
-	beginResetModel();
-
 	mFilteredPosts.clear();
-	//mFilteredPosts.push_back(0);
-	endResetModel();
 
     for(size_t i=0;i<mPosts.size();++i)
         if(postPassesFilter(mPosts[i],mFilteredStrings,mFilterUnread))
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index bd1405915..b36a3cc5c 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -379,7 +379,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
     connect(ui->viewType_TB,SIGNAL(clicked()),this,SLOT(switchView()));
 
     ui->showUnread_TB->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/message-state-unread.png"));
-    ui->showUnread_TB->setChecked(false);
+    whileBlocking(ui->showUnread_TB)->setChecked(false);
     ui->showUnread_TB->setToolTip(tr("Show unread posts only"));
     connect(ui->showUnread_TB,SIGNAL(toggled(bool)),this,SLOT(switchOnlyUnread(bool)));
 

From a04ab8664f65e9502403f87710254c2eb520f95a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 25 Apr 2023 21:26:26 +0200
Subject: [PATCH 248/503] removed double saving of distant chat permissions
 (GUI + libretroshare) leading to inconsistencies

---
 retroshare-gui/src/gui/settings/ChatPage.cpp | 23 +++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp
index 86cfaf816..1f35fe62c 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChatPage.cpp
@@ -125,9 +125,6 @@ void ChatPage::updateFontsAndEmotes()
 /** Saves the changes on this page */
 void ChatPage::updateChatParams()
 {
-	// state of distant Chat combobox
-	Settings->setValue("DistantChat", ui.distantChatComboBox->currentIndex());
-
 	Settings->setChatScreenFont(fontTempChat.toString());
 	NotifyQt::getInstance()->notifyChatFontChanged();
 
@@ -395,9 +392,23 @@ ChatPage::load()
     whileBlocking(ui.minimumContrast)->setValue(Settings->value("MinimumContrast", 4.5).toDouble());
     Settings->endGroup();
 
-	     // state of distant Chat combobox
-    int index = Settings->value("DistantChat", 0).toInt();
-    whileBlocking(ui.distantChatComboBox)->setCurrentIndex(index);
+    // state of distant Chat combobox
+
+    switch(rsMsgs->getDistantChatPermissionFlags())
+    {
+        default:
+        case RS_DISTANT_CHAT_CONTACT_PERMISSION_FLAG_FILTER_NONE:
+            whileBlocking(ui.distantChatComboBox)->setCurrentIndex(0);
+            break ;
+
+        case RS_DISTANT_CHAT_CONTACT_PERMISSION_FLAG_FILTER_NON_CONTACTS:
+            whileBlocking(ui.distantChatComboBox)->setCurrentIndex(1);
+            break ;
+
+        case RS_DISTANT_CHAT_CONTACT_PERMISSION_FLAG_FILTER_EVERYBODY:
+            whileBlocking(ui.distantChatComboBox)->setCurrentIndex(2);
+            break ;
+    }
 
     fontTempChat.fromString(Settings->getChatScreenFont());
 

From ea346b5d2a7d24da615305f5ef40e1cd6171cd55 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 27 Apr 2023 22:46:07 +0200
Subject: [PATCH 249/503] fixed keeping new zoom size when resizing the channel
 post window

---
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp   | 5 +++++
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index b36a3cc5c..1865019ec 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -504,6 +504,11 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
     }, mEventHandlerId, RsEventType::GXS_CHANNELS );
 }
 
+void GxsChannelPostsWidgetWithModel::resizeEvent(QResizeEvent *e)
+{
+    GxsMessageFrameWidget::resizeEvent(e);
+    updateZoomFactor(0);
+}
 void GxsChannelPostsWidgetWithModel::currentTabChanged(int t)
 {
     switch(t)
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index 874562d32..c325c722b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -138,6 +138,7 @@ protected:
 
 	/* GxsMessageFrameWidget */
     virtual void setAllMessagesReadDo(bool read) override;
+    virtual void resizeEvent(QResizeEvent *e) override;
 
 private slots:
 	void showPostDetails();

From dbddf7166f2d6000b21b4711f3a80f17bdf08d11 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Tue, 2 May 2023 23:50:37 +0530
Subject: [PATCH 250/503] This is the gui part of the commit where the wire
 feed is refreshed if there is any event published.

---
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 42 ++++++++++++++++++-
 retroshare-gui/src/gui/TheWire/WireDialog.h   |  3 ++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 23031d6ec..98225cf7e 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -59,7 +59,7 @@
 WireDialog::WireDialog(QWidget *parent)
     : MainPage(parent), mGroupSet(GROUP_SET_ALL)
     , mAddDialog(nullptr), mGroupSelected(nullptr), mWireQueue(nullptr)
-    , mHistoryIndex(-1)
+    , mHistoryIndex(-1), mEventHandlerId(0)
 {
 	ui.setupUi(this);
 
@@ -89,6 +89,42 @@ WireDialog::WireDialog(QWidget *parent)
 
 	// load settings
 	processSettings(true);
+
+    // Needs to be asynced because this function is called by another thread!
+    rsEvents->registerEventsHandler(
+                [this](std::shared_ptr<const RsEvent> event)
+    { RsQThreadUtils::postToObject([=]() { handleEvent_main_thread(event); }, this ); },
+                mEventHandlerId, RsEventType::WIRE );
+}
+
+void WireDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
+{
+    const RsWireEvent *e = dynamic_cast<const RsWireEvent*>(event.get());
+
+    if(e)
+        switch(e->mWireEventCode)
+        {
+        case RsWireEventCode::NEW_POST:             // [[fallthrough]];
+            refreshGroups();
+            break;
+        case RsWireEventCode::NEW_REPLY:             // [[fallthrough]];
+            refreshGroups();
+            break;
+        case RsWireEventCode::NEW_LIKE:             // [[fallthrough]];
+            refreshGroups();
+            break;
+        case RsWireEventCode::NEW_REPUBLISH:             // [[fallthrough]];
+            refreshGroups();
+            break;
+        case RsWireEventCode::NEW_WIRE:             // [[fallthrough]];
+            refreshGroups();
+            break;
+        case RsWireEventCode::FOLLOW_STATUS_CHANGED:             // [[fallthrough]];
+            refreshGroups();
+            break;
+        default:
+            break;
+        }
 }
 
 WireDialog::~WireDialog()
@@ -97,7 +133,9 @@ WireDialog::~WireDialog()
 	processSettings(false);
 	
 	clearTwitterView();
-	delete(mWireQueue);
+    delete(mWireQueue);
+
+    rsEvents->unregisterEventsHandler(mEventHandlerId);
 }
 
 void WireDialog::processSettings(bool load)
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.h b/retroshare-gui/src/gui/TheWire/WireDialog.h
index 8ccf13377..1ac7faebc 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.h
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.h
@@ -164,6 +164,9 @@ private:
 	std::map<RsGxsGroupId, RsWireGroup> mAllGroups;
 	std::vector<RsWireGroup> mOwnGroups;
 
+    void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
+    RsEventsHandlerId_t mEventHandlerId;
+
 	int32_t mHistoryIndex;
 	std::vector<WireViewHistory> mHistory;
 

From beed6a08c828bc4a81f51ea5d52f6f1448fc74ec Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 4 May 2023 22:30:06 +0200
Subject: [PATCH 251/503] made SearchDialog to use RsEvents in order to catch
 turtle search results

---
 .../src/gui/FileTransfer/SearchDialog.cpp     | 35 ++++++++++++++++++-
 .../src/gui/FileTransfer/SearchDialog.h       |  4 +++
 retroshare-gui/src/main.cpp                   |  2 +-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 94e4229cc..2ecf442e4 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -37,6 +37,7 @@
 #include "gui/advsearch/advancedsearchdialog.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "util/QtVersion.h"
+#include "util/qtthreadsutils.h"
 
 #include <retroshare/rsfiles.h>
 #include <retroshare/rsturtle.h>
@@ -217,6 +218,15 @@ SearchDialog::SearchDialog(QWidget *parent)
 
     checkText(ui.lineEdit->text());
 
+    // add an event handler to get search results (previously available through notifyQt)
+
+    mEventHandlerId = 0;
+
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
+    {
+        RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
+    }, mEventHandlerId, RsEventType::FILE_TRANSFER );
+
 }
 
 SearchDialog::~SearchDialog()
@@ -235,6 +245,29 @@ SearchDialog::~SearchDialog()
 
     ui.searchResultWidget->setItemDelegateForColumn(SR_SIZE_COL, nullptr);
     ui.searchResultWidget->setItemDelegateForColumn(SR_AGE_COL, nullptr);
+
+    rsEvents->unregisterEventsHandler(mEventHandlerId);
+}
+
+void SearchDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
+{
+    if(event->mType != RsEventType::FILE_TRANSFER)
+        return;
+
+    auto fe = dynamic_cast<const RsFileTransferEvent*>(event.get());
+
+    if(!fe || fe->mFileTransferEventCode!=RsFileTransferEventCode::NEW_DISTANT_SEARCH_RESULTS)
+        return;
+
+    for(uint32_t i=0;i<fe->mResults.size();++i)
+    {
+        FileDetail f;
+        f.hash = fe->mResults[i].fHash;
+        f.name = fe->mResults[i].fName;
+        f.size = fe->mResults[i].fSize;
+
+        updateFiles(fe->mRequestId,f);
+    }
 }
 
 void SearchDialog::processSettings(bool bLoad)
@@ -961,7 +994,7 @@ void SearchDialog::processResultQueue()
 	while(!searchResultsQueue.empty() && nb_treated_elements++ < 250)
 	{
 		qulonglong search_id = searchResultsQueue.back().first ;
-		FileDetail& file = searchResultsQueue.back().second ;
+        const FileDetail& file = searchResultsQueue.back().second ;
 
 #ifdef DEBUG
 		std::cout << "Updating file detail:" << std::endl ;
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
index 25925c36d..5661f6246 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
@@ -22,6 +22,7 @@
 #define _SEARCHDIALOG_H
 
 #include "retroshare/rstypes.h"
+#include "retroshare/rsevents.h"
 #include "ui_SearchDialog.h"
 #include "retroshare-gui/mainpage.h"
 
@@ -125,6 +126,7 @@ private:
     void setIconAndType(QTreeWidgetItem *item, const QString& filename);
     void downloadDirectory(const QTreeWidgetItem *item, const QString &base);
     void getSourceFriendsForHash(const RsFileHash &hash,std::list<RsPeerId> &srcIds);
+    void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 
 /** the advanced search dialog instance */
     AdvancedSearchDialog * advSearchDialog;
@@ -176,6 +178,8 @@ private:
 
 	 bool _queueIsAlreadyTakenCareOf ;
 	 std::vector<std::pair<qulonglong,FileDetail> > searchResultsQueue ;
+
+     RsEventsHandlerId_t mEventHandlerId ;
 };
 
 #endif
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 2d3fabf89..3361597c8 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -540,7 +540,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 	qRegisterMetaType<RsPeerId>("RsPeerId") ;
 
 	std::cerr << "connecting signals and slots" << std::endl ;
-	QObject::connect(notify,SIGNAL(gotTurtleSearchResult(qulonglong,FileDetail)),w->transfersDialog->searchDialog	,SLOT(updateFiles(qulonglong,FileDetail))) ;
+//	QObject::connect(notify,SIGNAL(gotTurtleSearchResult(qulonglong,FileDetail)),w->transfersDialog->searchDialog	,SLOT(updateFiles(qulonglong,FileDetail))) ;
 	QObject::connect(notify,SIGNAL(deferredSignatureHandlingRequested()),notify,SLOT(handleSignatureEvent()),Qt::QueuedConnection) ;
 	QObject::connect(notify,SIGNAL(chatLobbyTimeShift(int)),notify,SLOT(handleChatLobbyTimeShift(int)),Qt::QueuedConnection) ;
 	QObject::connect(notify,SIGNAL(diskFull(int,int))						,w                   		,SLOT(displayDiskSpaceWarning(int,int))) ;

From 93d7589a94e0f979f055730347ba1016f02f6f6b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 4 May 2023 22:30:41 +0200
Subject: [PATCH 252/503] removed unused notifyQt calls to notify turtleSearch
 results

---
 retroshare-gui/src/gui/notifyqt.cpp | 3 +++
 retroshare-gui/src/gui/notifyqt.h   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp
index 9012e77bd..d2dee5ac4 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -482,6 +482,8 @@ void NotifyQt::notifyTurtleSearchResult(uint32_t /*search_id*/,const std::list<T
     std::cerr << "(EE) missing code to handle GXS turtle search result." << std::endl;
 }
 
+#ifdef TO_REMOVE
+// Mai 2023: distant turtle search now uses RsEvents.
 void NotifyQt::notifyTurtleSearchResult(const RsPeerId& pid,uint32_t search_id,const std::list<TurtleFileInfo>& files)
 {
 	{
@@ -507,6 +509,7 @@ void NotifyQt::notifyTurtleSearchResult(const RsPeerId& pid,uint32_t search_id,c
 		emit gotTurtleSearchResult(search_id,det) ;
 	}
 }
+#endif
 
 void NotifyQt::notifyHistoryChanged(uint32_t msgId, int type)
 {
diff --git a/retroshare-gui/src/gui/notifyqt.h b/retroshare-gui/src/gui/notifyqt.h
index d2b15fa09..0f9ae11e2 100644
--- a/retroshare-gui/src/gui/notifyqt.h
+++ b/retroshare-gui/src/gui/notifyqt.h
@@ -67,7 +67,9 @@ class NotifyQt: public QObject, public NotifyClient
 		virtual void notifyChatStatus(const ChatId &chat_id,const std::string& status_string);
 		virtual void notifyChatCleared(const ChatId &chat_id);
 		virtual void notifyCustomState(const std::string& peer_id, const std::string& status_string);
+#ifdef TO_REMOVE
 		virtual void notifyTurtleSearchResult(const RsPeerId &pid, uint32_t search_id, const std::list<TurtleFileInfo>& found_files);
+#endif
 		virtual void notifyTurtleSearchResult(uint32_t search_id,const std::list<TurtleGxsInfo>& found_groups);
 		virtual void notifyPeerHasNewAvatar(std::string peer_id) ;
 		virtual void notifyOwnAvatarChanged() ;

From 7070a6cad6269d44dbf6a835528057bf4c3de6cc Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 12 Apr 2023 13:42:42 +0200
Subject: [PATCH 253/503] FeedReader: Fixed compile of FeedReader plugin

---
 plugins/FeedReader/services/rsFeedReaderItems.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/FeedReader/services/rsFeedReaderItems.h b/plugins/FeedReader/services/rsFeedReaderItems.h
index a8cce7084..d2ee7574e 100644
--- a/plugins/FeedReader/services/rsFeedReaderItems.h
+++ b/plugins/FeedReader/services/rsFeedReaderItems.h
@@ -62,6 +62,7 @@ public:
 	virtual ~RsFeedReaderFeed() {}
 
 	virtual void clear();
+	virtual void serial_process(RsGenericSerializer::SerializeJob, RsGenericSerializer::SerializeContext&) {}
 
 	uint32_t                 feedId;
 	uint32_t                 parentId;
@@ -105,6 +106,7 @@ public:
 	virtual ~RsFeedReaderMsg() {}
 
 	virtual void clear();
+	virtual void serial_process(RsGenericSerializer::SerializeJob, RsGenericSerializer::SerializeContext&) {}
 	virtual std::ostream& print(std::ostream &out, uint16_t indent = 0);
 
 	std::string msgId;

From ecffb3cb7ff0f0f3aa547a63c2251699673ed412 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Thu, 13 Apr 2023 13:30:24 +0200
Subject: [PATCH 254/503] FeedReader: Fixed download of favicon

---
 plugins/FeedReader/services/p3FeedReaderThread.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 45c869581..130d2fac1 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -204,8 +204,14 @@ static std::string calculateLink(const std::string &baseLink, const std::string
 	/* calculate link of base link */
 	std::string resultLink = baseLink;
 
+	int hostStart = 0;
 	/* link should begin with "http://" or "https://" */
-	if (resultLink.substr(0, 7) != "http://" || resultLink.substr(0, 8) != "https://") {
+	if (resultLink.substr(0, 7) == "http://") {
+		hostStart = 7;
+	} else if (resultLink.substr(0, 8) == "https://") {
+		hostStart = 8;
+	} else {
+		hostStart = 7;
 		resultLink.insert(0, "http://");
 	}
 
@@ -216,7 +222,7 @@ static std::string calculateLink(const std::string &baseLink, const std::string
 
 	if (*link.begin() == '/') {
 		/* link begins with "/" */
-		size_t found = resultLink.find('/', 7);
+		size_t found = resultLink.find('/', hostStart);
 		if (found != std::string::npos) {
 			resultLink.erase(found);
 		}
@@ -245,7 +251,7 @@ static bool getFavicon(CURLWrapper &CURL, const std::string &url, std::string &i
 	if (code == CURLE_OK) {
 		if (CURL.responseCode() == 200) {
 			std::string contentType = CURL.contentType();
-			if (isContentType(contentType, "image/x-icon") ||
+			if (isContentType(contentType, "image/") ||
 				isContentType(contentType, "application/octet-stream") ||
 				isContentType(contentType, "text/plain")) {
 				if (!vicon.empty()) {

From 571f709b50222be19490b60e41ba437036046a7f Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 11 Apr 2023 00:36:41 +0200
Subject: [PATCH 255/503] FeedReader: The feed can be used as source for board

---
 plugins/FeedReader/FeedReaderPlugin.cpp       |   2 +-
 plugins/FeedReader/gui/AddFeedDialog.cpp      | 214 ++++++++++++--
 plugins/FeedReader/gui/AddFeedDialog.h        |  12 +-
 plugins/FeedReader/gui/AddFeedDialog.ui       | 116 ++++++--
 .../gui/FeedReaderMessageWidget.cpp           |  14 +-
 .../FeedReader/gui/FeedReaderStringDefs.cpp   |  18 +-
 plugins/FeedReader/interface/rsFeedReader.h   |  13 +-
 plugins/FeedReader/lang/FeedReader_en.ts      |  90 ++++--
 plugins/FeedReader/services/p3FeedReader.cc   | 263 +++++++++++++++++-
 plugins/FeedReader/services/p3FeedReader.h    |  10 +-
 .../FeedReader/services/p3FeedReaderThread.cc |  26 +-
 .../FeedReader/services/rsFeedReaderItems.cc  |   8 +-
 .../FeedReader/services/rsFeedReaderItems.h   |  31 ++-
 13 files changed, 704 insertions(+), 113 deletions(-)

diff --git a/plugins/FeedReader/FeedReaderPlugin.cpp b/plugins/FeedReader/FeedReaderPlugin.cpp
index 24b602f9c..bc44a3036 100644
--- a/plugins/FeedReader/FeedReaderPlugin.cpp
+++ b/plugins/FeedReader/FeedReaderPlugin.cpp
@@ -92,7 +92,7 @@ void FeedReaderPlugin::setInterfaces(RsPlugInInterfaces &interfaces)
 {
 	mInterfaces = interfaces;
 
-	mFeedReader = new p3FeedReader(mPlugInHandler, mInterfaces.mGxsForums);
+	mFeedReader = new p3FeedReader(mPlugInHandler, mInterfaces.mGxsForums, mInterfaces.mPosted);
 	rsFeedReader = mFeedReader;
 
 	mNotify = new FeedReaderNotify();
diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp
index 19d02d968..c99b29b7a 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.cpp
+++ b/plugins/FeedReader/gui/AddFeedDialog.cpp
@@ -30,9 +30,11 @@
 #include "gui/common/UIStateHelper.h"
 
 #include <retroshare/rsgxsforums.h>
+#include <retroshare/rsposted.h>
 #include <iostream>
 
-#define TOKEN_TYPE_FORUM_GROUPS 1
+#define TOKEN_TYPE_FORUM_GROUPS  1
+#define TOKEN_TYPE_POSTED_GROUPS 2
 
 AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify, QWidget *parent)
 	: QDialog(parent, Qt::Window), mFeedReader(feedReader), mNotify(notify), ui(new Ui::AddFeedDialog)
@@ -47,9 +49,12 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify,
 
 	mStateHelper->addWidget(TOKEN_TYPE_FORUM_GROUPS, ui->forumComboBox, UISTATE_LOADING_DISABLED);
 	mStateHelper->addWidget(TOKEN_TYPE_FORUM_GROUPS, ui->buttonBox->button(QDialogButtonBox::Ok), UISTATE_LOADING_DISABLED);
+	mStateHelper->addWidget(TOKEN_TYPE_POSTED_GROUPS, ui->postedComboBox, UISTATE_LOADING_DISABLED);
+	mStateHelper->addWidget(TOKEN_TYPE_POSTED_GROUPS, ui->buttonBox->button(QDialogButtonBox::Ok), UISTATE_LOADING_DISABLED);
 
 	/* Setup TokenQueue */
-	mTokenQueue = new TokenQueue(rsGxsForums->getTokenService(), this);
+	mForumTokenQueue = new TokenQueue(rsGxsForums->getTokenService(), this);
+	mPostedTokenQueue = new TokenQueue(rsPosted->getTokenService(), this);
 
 	/* Connect signals */
 	connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(createFeed()));
@@ -59,18 +64,23 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify,
 	connect(ui->useStandardStorageTimeCheckBox, SIGNAL(toggled(bool)), this, SLOT(useStandardStorageTimeToggled()));
 	connect(ui->useStandardUpdateInterval, SIGNAL(toggled(bool)), this, SLOT(useStandardUpdateIntervalToggled()));
 	connect(ui->useStandardProxyCheckBox, SIGNAL(toggled(bool)), this, SLOT(useStandardProxyToggled()));
-	connect(ui->typeForumRadio, SIGNAL(toggled(bool)), this, SLOT(typeForumToggled()));
+	connect(ui->typeForumCheckBox, SIGNAL(toggled(bool)), this, SLOT(typeForumToggled()));
+	connect(ui->typePostedCheckBox, SIGNAL(toggled(bool)), this, SLOT(typePostedToggled()));
+	connect(ui->typeLocalCheckBox, SIGNAL(toggled(bool)), this, SLOT(typeLocalToggled()));
+	connect(ui->postedFirstImageCheckBox, SIGNAL(toggled(bool)), this, SLOT(postedFirstImageToggled()));
 	connect(ui->previewButton, SIGNAL(clicked()), this, SLOT(preview()));
 
 	/* currently only for local feeds */
-	connect(ui->saveCompletePageCheckBox, SIGNAL(toggled(bool)), this, SLOT(denyForumToggled()));
+	connect(ui->saveCompletePageCheckBox, SIGNAL(toggled(bool)), this, SLOT(denyForumAndPostedToggled()));
 
 	connect(ui->urlLineEdit, SIGNAL(textChanged(QString)), this, SLOT(validate()));
 	connect(ui->nameLineEdit, SIGNAL(textChanged(QString)), this, SLOT(validate()));
 	connect(ui->useInfoFromFeedCheckBox, SIGNAL(toggled(bool)), this, SLOT(validate()));
-	connect(ui->typeLocalRadio, SIGNAL(toggled(bool)), this, SLOT(validate()));
-	connect(ui->typeForumRadio, SIGNAL(toggled(bool)), this, SLOT(validate()));
+	connect(ui->typeLocalCheckBox, SIGNAL(toggled(bool)), this, SLOT(validate()));
+	connect(ui->typeForumCheckBox, SIGNAL(toggled(bool)), this, SLOT(validate()));
 	connect(ui->forumComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(validate()));
+	connect(ui->typePostedCheckBox, SIGNAL(toggled(bool)), this, SLOT(validate()));
+	connect(ui->postedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(validate()));
 
 	connect(ui->clearCachePushButton, SIGNAL(clicked()), this, SLOT(clearMessageCache()));
 
@@ -79,13 +89,22 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify,
 
 	ui->activatedCheckBox->setChecked(true);
 	mStateHelper->setWidgetEnabled(ui->forumComboBox, false);
+	mStateHelper->setWidgetEnabled(ui->postedComboBox, false);
 	ui->useInfoFromFeedCheckBox->setChecked(true);
 	ui->updateForumInfoCheckBox->setEnabled(false);
 	ui->updateForumInfoCheckBox->setChecked(true);
+	ui->updatePostedInfoCheckBox->setEnabled(false);
+	ui->updatePostedInfoCheckBox->setChecked(true);
+	ui->postedFirstImageCheckBox->setEnabled(false);
+	ui->postedFirstImageCheckBox->setChecked(false);
+	ui->postedOnlyImageCheckBox->setEnabled(false);
+	ui->postedOnlyImageCheckBox->setChecked(false);
 	ui->useAuthenticationCheckBox->setChecked(false);
 	ui->useStandardStorageTimeCheckBox->setChecked(true);
 	ui->useStandardUpdateInterval->setChecked(true);
 	ui->useStandardProxyCheckBox->setChecked(true);
+	ui->embedImagesCheckBox->setChecked(true);
+	ui->saveCompletePageCheckBox->setEnabled(false);
 
 	/* not yet supported */
 	ui->authenticationGroupBox->setEnabled(false);
@@ -98,6 +117,9 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify,
 	/* fill own forums */
 	requestForumGroups();
 
+	/* fill own posted */
+	requestPostedGroups();
+
 	validate();
 
 	ui->urlLineEdit->setFocus();
@@ -112,7 +134,8 @@ AddFeedDialog::~AddFeedDialog()
 	processSettings(false);
 
 	delete(ui);
-	delete(mTokenQueue);
+	delete(mForumTokenQueue);
+	delete(mPostedTokenQueue);
 }
 
 void AddFeedDialog::processSettings(bool load)
@@ -161,18 +184,65 @@ void AddFeedDialog::useStandardProxyToggled()
 
 void AddFeedDialog::typeForumToggled()
 {
-	bool checked = ui->typeForumRadio->isChecked();
+	bool checked = ui->typeForumCheckBox->isChecked();
 	mStateHelper->setWidgetEnabled(ui->forumComboBox, checked);
 	ui->updateForumInfoCheckBox->setEnabled(checked);
+
+	if (checked) {
+		ui->typeLocalCheckBox->setChecked(false);
+	}
 }
 
-void AddFeedDialog::denyForumToggled()
+void AddFeedDialog::postedFirstImageToggled()
+{
+	bool checked = ui->postedFirstImageCheckBox->isChecked();
+	ui->postedOnlyImageCheckBox->setEnabled(checked);
+
+	if (!checked) {
+		ui->postedOnlyImageCheckBox->setChecked(false);
+	}
+}
+
+void AddFeedDialog::typePostedToggled()
+{
+	bool checked = ui->typePostedCheckBox->isChecked();
+	mStateHelper->setWidgetEnabled(ui->postedComboBox, checked);
+	ui->updatePostedInfoCheckBox->setEnabled(checked);
+	ui->postedFirstImageCheckBox->setEnabled(checked);
+
+	if (checked) {
+		ui->typeLocalCheckBox->setChecked(false);
+	}else {
+		ui->postedFirstImageCheckBox->setChecked(false);
+	}
+}
+
+void AddFeedDialog::typeLocalToggled()
+{
+	bool checked = ui->typeLocalCheckBox->isChecked();
+	if (checked) {
+		mStateHelper->setWidgetEnabled(ui->forumComboBox, false);
+		mStateHelper->setWidgetEnabled(ui->postedComboBox, false);
+		ui->typeForumCheckBox->setChecked(false);
+		ui->typePostedCheckBox->setChecked(false);
+		ui->saveCompletePageCheckBox->setEnabled(true);
+	} else {
+		ui->saveCompletePageCheckBox->setEnabled(false);
+		ui->saveCompletePageCheckBox->setChecked(false);
+	}
+}
+
+void AddFeedDialog::denyForumAndPostedToggled()
 {
 	if (ui->saveCompletePageCheckBox->isChecked()) {
-		ui->typeForumRadio->setEnabled(false);
-		ui->typeLocalRadio->setChecked(true);
+		ui->typeForumCheckBox->setEnabled(false);
+		ui->typeForumCheckBox->setChecked(false);
+		ui->typePostedCheckBox->setEnabled(false);
+		ui->typePostedCheckBox->setChecked(false);
+		ui->typeLocalCheckBox->setChecked(true);
 	} else {
-		ui->typeForumRadio->setEnabled(true);
+		ui->typeForumCheckBox->setEnabled(true);
+		ui->typePostedCheckBox->setEnabled(true);
 	}
 }
 
@@ -189,11 +259,15 @@ void AddFeedDialog::validate()
 
 	ui->previewButton->setEnabled(ok);
 
-	if (!ui->typeLocalRadio->isChecked() && !ui->typeForumRadio->isChecked()) {
+	if (!ui->typeLocalCheckBox->isChecked() && !ui->typeForumCheckBox->isChecked() && !ui->typePostedCheckBox->isChecked()) {
 		ok = false;
 	}
 
-	if (ui->typeForumRadio->isChecked() && ui->forumComboBox->itemData(ui->forumComboBox->currentIndex()).toString().isEmpty()) {
+	if (ui->typeForumCheckBox->isChecked() && ui->forumComboBox->itemData(ui->forumComboBox->currentIndex()).toString().isEmpty()) {
+		ok = false;
+	}
+
+	if (ui->typePostedCheckBox->isChecked() && ui->postedComboBox->itemData(ui->postedComboBox->currentIndex()).toString().isEmpty()) {
 		ok = false;
 	}
 
@@ -224,20 +298,31 @@ bool AddFeedDialog::fillFeed(uint32_t feedId)
 		ui->urlLineEdit->setText(QString::fromUtf8(feedInfo.url.c_str()));
 		ui->useInfoFromFeedCheckBox->setChecked(feedInfo.flag.infoFromFeed);
 		ui->updateForumInfoCheckBox->setChecked(feedInfo.flag.updateForumInfo);
+		ui->updatePostedInfoCheckBox->setChecked(feedInfo.flag.updatePostedInfo);
+		ui->postedFirstImageCheckBox->setChecked(feedInfo.flag.postedFirstImage);
+		ui->postedOnlyImageCheckBox->setChecked(feedInfo.flag.postedOnlyImage);
 		ui->activatedCheckBox->setChecked(!feedInfo.flag.deactivated);
 		ui->embedImagesCheckBox->setChecked(feedInfo.flag.embedImages);
 		ui->saveCompletePageCheckBox->setChecked(feedInfo.flag.saveCompletePage);
 
 		ui->descriptionPlainTextEdit->setPlainText(QString::fromUtf8(feedInfo.description.c_str()));
 
-		if (feedInfo.flag.forum) {
-			mStateHelper->setWidgetEnabled(ui->forumComboBox, true);
-			ui->typeForumRadio->setChecked(true);
-			ui->saveCompletePageCheckBox->setEnabled(false);
+		if (feedInfo.flag.forum || feedInfo.flag.posted) {
+			if (feedInfo.flag.forum) {
+				mStateHelper->setWidgetEnabled(ui->forumComboBox, true);
+				ui->typeForumCheckBox->setChecked(true);
 
-			setActiveForumId(feedInfo.forumId);
+				setActiveForumId(feedInfo.forumId);
+			}
+			if (feedInfo.flag.posted) {
+				mStateHelper->setWidgetEnabled(ui->postedComboBox, true);
+				ui->typePostedCheckBox->setChecked(true);
+
+				setActivePostedId(feedInfo.postedId);
+			}
+			ui->saveCompletePageCheckBox->setEnabled(false);
 		} else {
-			ui->typeLocalRadio->setChecked(true);
+			ui->typeLocalCheckBox->setChecked(true);
 			mStateHelper->setWidgetEnabled(ui->forumComboBox, false);
 		}
 
@@ -286,6 +371,21 @@ void AddFeedDialog::setActiveForumId(const std::string &forumId)
 	}
 }
 
+void AddFeedDialog::setActivePostedId(const std::string &postedId)
+{
+	if (mStateHelper->isLoading(TOKEN_TYPE_POSTED_GROUPS)) {
+		mFillPostedId = postedId;
+		return;
+	}
+
+	int index = ui->postedComboBox->findData(QString::fromStdString(postedId));
+	if (index >= 0) {
+		ui->postedComboBox->setCurrentIndex(index);
+	} else {
+		ui->postedComboBox->setCurrentIndex(0);
+	}
+}
+
 void AddFeedDialog::getFeedInfo(FeedInfo &feedInfo)
 {
 	feedInfo.parentId = mParentId;
@@ -294,18 +394,27 @@ void AddFeedDialog::getFeedInfo(FeedInfo &feedInfo)
 	feedInfo.url = ui->urlLineEdit->text().toUtf8().constData();
 	feedInfo.flag.infoFromFeed = ui->useInfoFromFeedCheckBox->isChecked();
 	feedInfo.flag.updateForumInfo = ui->updateForumInfoCheckBox->isChecked() && ui->updateForumInfoCheckBox->isEnabled();
+	feedInfo.flag.updatePostedInfo = ui->updatePostedInfoCheckBox->isChecked() && ui->updatePostedInfoCheckBox->isEnabled();
+	feedInfo.flag.postedFirstImage = ui->postedFirstImageCheckBox->isChecked() && ui->postedFirstImageCheckBox->isEnabled();
+	feedInfo.flag.postedOnlyImage = ui->postedOnlyImageCheckBox->isChecked() && ui->postedOnlyImageCheckBox->isEnabled();
 	feedInfo.flag.deactivated = !ui->activatedCheckBox->isChecked();
 	feedInfo.flag.embedImages = ui->embedImagesCheckBox->isChecked();
 	feedInfo.flag.saveCompletePage = ui->saveCompletePageCheckBox->isChecked();
 
 	feedInfo.description = ui->descriptionPlainTextEdit->toPlainText().toUtf8().constData();
 
-	feedInfo.flag.forum = ui->typeForumRadio->isChecked();
+	feedInfo.flag.forum = ui->typeForumCheckBox->isChecked();
 
 	if (feedInfo.flag.forum) {
 		feedInfo.forumId = ui->forumComboBox->itemData(ui->forumComboBox->currentIndex()).toString().toStdString();
 	}
 
+	feedInfo.flag.posted = ui->typePostedCheckBox->isChecked();
+
+	if (feedInfo.flag.posted) {
+		feedInfo.postedId = ui->postedComboBox->itemData(ui->postedComboBox->currentIndex()).toString().toStdString();
+	}
+
 	feedInfo.flag.authentication = ui->useAuthenticationCheckBox->isChecked();
 	feedInfo.user = ui->userLineEdit->text().toUtf8().constData();
 	feedInfo.password = ui->passwordLineEdit->text().toUtf8().constData();
@@ -382,10 +491,10 @@ void AddFeedDialog::requestForumGroups()
 	RsTokReqOptions opts;
 	opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
 
-	mTokenQueue->cancelActiveRequestTokens(TOKEN_TYPE_FORUM_GROUPS);
+	mForumTokenQueue->cancelActiveRequestTokens(TOKEN_TYPE_FORUM_GROUPS);
 
 	uint32_t token;
-	mTokenQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, TOKEN_TYPE_FORUM_GROUPS);
+	mForumTokenQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, TOKEN_TYPE_FORUM_GROUPS);
 }
 
 void AddFeedDialog::loadForumGroups(const uint32_t &token)
@@ -416,9 +525,50 @@ void AddFeedDialog::loadForumGroups(const uint32_t &token)
 	}
 }
 
+void AddFeedDialog::requestPostedGroups()
+{
+	mStateHelper->setLoading(TOKEN_TYPE_POSTED_GROUPS, true);
+
+	RsTokReqOptions opts;
+	opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
+
+	mPostedTokenQueue->cancelActiveRequestTokens(TOKEN_TYPE_POSTED_GROUPS);
+
+	uint32_t token;
+	mPostedTokenQueue->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, TOKEN_TYPE_POSTED_GROUPS);
+}
+
+void AddFeedDialog::loadPostedGroups(const uint32_t &token)
+{
+	std::vector<RsPostedGroup> groups;
+	rsPosted->getGroupData(token, groups);
+
+	ui->postedComboBox->clear();
+
+	for (std::vector<RsPostedGroup>::iterator it = groups.begin(); it != groups.end(); ++it) {
+		const RsPostedGroup &group = *it;
+
+		/* show only own posted */
+		if (IS_GROUP_PUBLISHER(group.mMeta.mSubscribeFlags) && IS_GROUP_ADMIN(group.mMeta.mSubscribeFlags) && !group.mMeta.mAuthorId.isNull()) {
+			ui->postedComboBox->addItem(QString::fromUtf8(group.mMeta.mGroupName.c_str()), QString::fromStdString(group.mMeta.mGroupId.toStdString()));
+		}
+	}
+
+	/* insert empty item */
+	ui->postedComboBox->insertItem(0, "", "");
+	ui->postedComboBox->setCurrentIndex(0);
+
+	mStateHelper->setLoading(TOKEN_TYPE_POSTED_GROUPS, false);
+
+	if (!mFillPostedId.empty()) {
+		setActivePostedId(mFillPostedId);
+		mFillPostedId.clear();
+	}
+}
+
 void AddFeedDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req)
 {
-	if (queue == mTokenQueue)
+	if (queue == mForumTokenQueue)
 	{
 		/* now switch on req */
 		switch(req.mUserType)
@@ -433,4 +583,20 @@ void AddFeedDialog::loadRequest(const TokenQueue *queue, const TokenRequest &req
 
 		}
 	}
+
+	if (queue == mPostedTokenQueue)
+	{
+		/* now switch on req */
+		switch(req.mUserType)
+		{
+		case TOKEN_TYPE_POSTED_GROUPS:
+			loadPostedGroups(req.mToken);
+			break;
+
+		default:
+			std::cerr << "AddFeedDialog::loadRequest() ERROR: INVALID TYPE";
+			std::cerr << std::endl;
+
+		}
+	}
 }
diff --git a/plugins/FeedReader/gui/AddFeedDialog.h b/plugins/FeedReader/gui/AddFeedDialog.h
index 111238d33..e557580e1 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.h
+++ b/plugins/FeedReader/gui/AddFeedDialog.h
@@ -53,7 +53,10 @@ private slots:
 	void useStandardUpdateIntervalToggled();
 	void useStandardProxyToggled();
 	void typeForumToggled();
-	void denyForumToggled();
+	void postedFirstImageToggled();
+	void typePostedToggled();
+	void typeLocalToggled();
+	void denyForumAndPostedToggled();
 	void validate();
 	void createFeed();
 	void preview();
@@ -63,9 +66,12 @@ private:
 	void processSettings(bool load);
 	void getFeedInfo(FeedInfo &feedInfo);
 	void setActiveForumId(const std::string &forumId);
+	void setActivePostedId(const std::string &postedId);
 
 	void requestForumGroups();
 	void loadForumGroups(const uint32_t &token);
+	void requestPostedGroups();
+	void loadPostedGroups(const uint32_t &token);
 
 private:
 	RsFeedReader *mFeedReader;
@@ -73,13 +79,15 @@ private:
 	uint32_t mFeedId;
 	uint32_t mParentId;
 	std::string mFillForumId;
+	std::string mFillPostedId;
 
 	RsFeedTransformationType mTransformationType;
 	std::list<std::string> mXPathsToUse;
 	std::list<std::string> mXPathsToRemove;
 	std::string mXslt;
 
-	TokenQueue *mTokenQueue;
+	TokenQueue *mForumTokenQueue;
+	TokenQueue *mPostedTokenQueue;
 	UIStateHelper *mStateHelper;
 
 	Ui::AddFeedDialog *ui;
diff --git a/plugins/FeedReader/gui/AddFeedDialog.ui b/plugins/FeedReader/gui/AddFeedDialog.ui
index a10cec8a4..f3bcaf85f 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.ui
+++ b/plugins/FeedReader/gui/AddFeedDialog.ui
@@ -50,7 +50,7 @@
         <property name="title">
          <string>Type</string>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
+        <layout class="QGridLayout" name="gridLayout_2">
          <property name="leftMargin">
           <number>6</number>
          </property>
@@ -63,27 +63,75 @@
          <property name="bottomMargin">
           <number>6</number>
          </property>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <item>
-            <widget class="QRadioButton" name="typeForumRadio">
-             <property name="text">
-              <string>Forum</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="RSComboBox" name="forumComboBox"/>
-           </item>
-          </layout>
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="typeForumCheckBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Forum</string>
+           </property>
+          </widget>
          </item>
-         <item>
-          <widget class="QRadioButton" name="typeLocalRadio">
+         <item row="0" column="1">
+          <widget class="RSComboBox" name="forumComboBox"/>
+         </item>
+         <item row="8" column="0">
+          <widget class="QCheckBox" name="typeLocalCheckBox">
            <property name="text">
             <string>Local Feed</string>
            </property>
           </widget>
          </item>
+         <item row="1" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="QCheckBox" name="updateForumInfoCheckBox">
+             <property name="text">
+              <string>Update forum information</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="4" column="1">
+          <widget class="RSComboBox" name="postedComboBox"/>
+         </item>
+         <item row="4" column="0">
+          <widget class="QCheckBox" name="typePostedCheckBox">
+           <property name="text">
+            <string>Board</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <layout class="QGridLayout" name="gridLayout">
+           <item row="0" column="0">
+            <widget class="QCheckBox" name="updatePostedInfoCheckBox">
+             <property name="text">
+              <string>Update board information</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QCheckBox" name="postedOnlyImageCheckBox">
+             <property name="text">
+              <string>Only image</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QCheckBox" name="postedFirstImageCheckBox">
+             <property name="text">
+              <string>Use first image as board image</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
         </layout>
        </widget>
       </item>
@@ -309,7 +357,6 @@
           <property name="font">
            <font>
             <pointsize>11</pointsize>
-            <weight>75</weight>
             <italic>true</italic>
             <bold>true</bold>
            </font>
@@ -377,13 +424,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QCheckBox" name="updateForumInfoCheckBox">
-           <property name="text">
-            <string>Update forum information</string>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QCheckBox" name="embedImagesCheckBox">
            <property name="text">
@@ -398,6 +438,19 @@
            </property>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
       </item>
@@ -423,22 +476,31 @@
   <tabstop>urlLineEdit</tabstop>
   <tabstop>nameLineEdit</tabstop>
   <tabstop>descriptionPlainTextEdit</tabstop>
-  <tabstop>typeForumRadio</tabstop>
+  <tabstop>typeForumCheckBox</tabstop>
   <tabstop>forumComboBox</tabstop>
+  <tabstop>updateForumInfoCheckBox</tabstop>
+  <tabstop>typePostedCheckBox</tabstop>
+  <tabstop>postedComboBox</tabstop>
+  <tabstop>updatePostedInfoCheckBox</tabstop>
+  <tabstop>postedFirstImageCheckBox</tabstop>
+  <tabstop>checkBox</tabstop>
+  <tabstop>typeLocalCheckBox</tabstop>
   <tabstop>activatedCheckBox</tabstop>
   <tabstop>useInfoFromFeedCheckBox</tabstop>
-  <tabstop>updateForumInfoCheckBox</tabstop>
+  <tabstop>embedImagesCheckBox</tabstop>
+  <tabstop>saveCompletePageCheckBox</tabstop>
+  <tabstop>previewButton</tabstop>
   <tabstop>useAuthenticationCheckBox</tabstop>
   <tabstop>userLineEdit</tabstop>
   <tabstop>passwordLineEdit</tabstop>
   <tabstop>useStandardStorageTimeCheckBox</tabstop>
+  <tabstop>clearCachePushButton</tabstop>
   <tabstop>storageTimeSpinBox</tabstop>
   <tabstop>useStandardUpdateInterval</tabstop>
   <tabstop>updateIntervalSpinBox</tabstop>
   <tabstop>useStandardProxyCheckBox</tabstop>
   <tabstop>proxyAddressLineEdit</tabstop>
   <tabstop>proxyPortSpinBox</tabstop>
-  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
index 1550bc636..96198f400 100644
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
@@ -245,9 +245,19 @@ void FeedReaderMessageWidget::setFeedId(uint32_t feedId)
 		ui->msgReadAllButton->setEnabled(false);
 		ui->msgTreeWidget->setPlaceholderText("");
 	} else {
-		if (mFeedInfo.flag.forum) {
+		if (mFeedInfo.flag.forum || mFeedInfo.flag.posted) {
 			ui->msgReadAllButton->setEnabled(false);
-			ui->msgTreeWidget->setPlaceholderText(tr("The messages will be added to the forum"));
+
+			if (mFeedInfo.flag.forum && mFeedInfo.flag.posted) {
+				ui->msgTreeWidget->setPlaceholderText(tr("The messages will be added to the forum and the board"));
+			} else {
+				if (mFeedInfo.flag.forum) {
+					ui->msgTreeWidget->setPlaceholderText(tr("The messages will be added to the forum"));
+				}
+				if (mFeedInfo.flag.posted) {
+					ui->msgTreeWidget->setPlaceholderText(tr("The messages will be added to the board"));
+				}
+			}
 		} else {
 			ui->msgReadAllButton->setEnabled(true);
 			ui->msgTreeWidget->setPlaceholderText("");
diff --git a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
index 99c537498..fefb3ed32 100644
--- a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
+++ b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
@@ -109,9 +109,9 @@ QString FeedReaderStringDefs::errorString(RsFeedReaderErrorState errorState, con
 	case RS_FEED_ERRORSTATE_PROCESS_UNKNOWN_FORMAT:
 		errorText = QApplication::translate("FeedReaderStringDefs", "Unknown XML format");
 		break;
-	case RS_FEED_ERRORSTATE_PROCESS_FORUM_CREATE:
-		errorText = QApplication::translate("FeedReaderStringDefs", "Can't create forum");
-		break;
+//	case RS_FEED_ERRORSTATE_PROCESS_FORUM_CREATE:
+//		errorText = QApplication::translate("FeedReaderStringDefs", "Can't create forum");
+//		break;
 	case RS_FEED_ERRORSTATE_PROCESS_FORUM_NOT_FOUND:
 		errorText = QApplication::translate("FeedReaderStringDefs", "Forum not found");
 		break;
@@ -121,6 +121,18 @@ QString FeedReaderStringDefs::errorString(RsFeedReaderErrorState errorState, con
 	case RS_FEED_ERRORSTATE_PROCESS_FORUM_NO_AUTHOR:
 		errorText = QApplication::translate("FeedReaderStringDefs", "Forum has no author");
 		break;
+//	case RS_FEED_ERRORSTATE_PROCESS_POSTED_CREATE:
+//		errorText = QApplication::translate("FeedReaderStringDefs", "Can't create board");
+//		break;
+	case RS_FEED_ERRORSTATE_PROCESS_POSTED_NOT_FOUND:
+		errorText = QApplication::translate("FeedReaderStringDefs", "Board not found");
+		break;
+	case RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_ADMIN:
+		errorText = QApplication::translate("FeedReaderStringDefs", "You are not admin of the board");
+		break;
+	case RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_AUTHOR:
+		errorText = QApplication::translate("FeedReaderStringDefs", "Board has no author");
+		break;
 
 	case RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR:
 		errorText = QApplication::translate("FeedReaderStringDefs", "Can't read html");
diff --git a/plugins/FeedReader/interface/rsFeedReader.h b/plugins/FeedReader/interface/rsFeedReader.h
index bf524ad0c..7158d29ee 100644
--- a/plugins/FeedReader/interface/rsFeedReader.h
+++ b/plugins/FeedReader/interface/rsFeedReader.h
@@ -42,10 +42,14 @@ enum RsFeedReaderErrorState {
 	/* process */
 	RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR         = 50,
 	RS_FEED_ERRORSTATE_PROCESS_UNKNOWN_FORMAT         = 51,
-	RS_FEED_ERRORSTATE_PROCESS_FORUM_CREATE           = 100,
+//	RS_FEED_ERRORSTATE_PROCESS_FORUM_CREATE           = 100,
 	RS_FEED_ERRORSTATE_PROCESS_FORUM_NOT_FOUND        = 101,
 	RS_FEED_ERRORSTATE_PROCESS_FORUM_NO_ADMIN         = 102,
 	RS_FEED_ERRORSTATE_PROCESS_FORUM_NO_AUTHOR        = 103,
+//	RS_FEED_ERRORSTATE_PROCESS_POSTED_CREATE          = 104,
+	RS_FEED_ERRORSTATE_PROCESS_POSTED_NOT_FOUND       = 105,
+	RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_ADMIN        = 106,
+	RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_AUTHOR       = 107,
 
 	RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR             = 150,
 	RS_FEED_ERRORSTATE_PROCESS_XPATH_INTERNAL_ERROR   = 151,
@@ -102,6 +106,8 @@ public:
 		flag.deactivated = false;
 		flag.forum = false;
 		flag.updateForumInfo = false;
+		flag.posted = false;
+		flag.updatePostedInfo = false;
 		flag.embedImages = false;
 		flag.saveCompletePage = false;
 		flag.preview = false;
@@ -122,6 +128,7 @@ public:
 	time_t                   lastUpdate;
 	uint32_t                 storageTime;
 	std::string              forumId;
+	std::string              postedId;
 	WorkState                workstate;
 	RsFeedReaderErrorState   errorState;
 	std::string              errorString;
@@ -141,6 +148,10 @@ public:
 		bool deactivated : 1;
 		bool forum : 1;
 		bool updateForumInfo : 1;
+		bool posted : 1;
+		bool updatePostedInfo : 1;
+		bool postedFirstImage : 1;
+		bool postedOnlyImage : 1;
 		bool embedImages : 1;
 		bool saveCompletePage : 1;
 		bool preview : 1;
diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts
index 89cde2fe0..f366ccc9c 100644
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@@ -9,7 +9,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+92"/>
+        <source>Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Update board information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Only image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Use first image as board image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
         <source>Authentication (not yet supported)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -99,22 +119,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-196"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Local Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+292"/>
         <source>Transformation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -144,12 +164,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-329"/>
         <source>Update forum information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+343"/>
         <source>Save complete web page (experimental for local feeds)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -164,18 +184,18 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+17"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/AddFeedDialog.cpp" line="+77"/>
+        <location filename="../gui/AddFeedDialog.cpp" line="+87"/>
         <source>Feed Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
-        <location line="+115"/>
+        <location line="+186"/>
+        <location line="+148"/>
         <location line="+15"/>
         <source>Edit feed</source>
         <translation type="unfinished"></translation>
@@ -277,7 +297,7 @@
 <context>
     <name>FeedReaderDialog</name>
     <message>
-        <location filename="../gui/FeedReaderDialog.ui" line="+91"/>
+        <location filename="../gui/FeedReaderDialog.ui" line="+98"/>
         <source>Feeds</source>
         <translation type="unfinished"></translation>
     </message>
@@ -402,7 +422,7 @@
 <context>
     <name>FeedReaderFeedItem</name>
     <message>
-        <location filename="../gui/FeedReaderFeedItem.ui" line="+195"/>
+        <location filename="../gui/FeedReaderFeedItem.ui" line="+197"/>
         <location filename="../gui/FeedReaderFeedItem.cpp" line="+116"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
@@ -542,12 +562,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+127"/>
         <source>The messages will be added to the forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="-3"/>
+        <source>The messages will be added to the forum and the board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>The messages will be added to the board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -659,12 +689,12 @@
     </message>
     <message>
         <location line="+3"/>
-        <location line="+96"/>
+        <location line="+108"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-79"/>
+        <location line="-91"/>
         <source>Internal download error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -699,12 +729,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Can&apos;t create forum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+6"/>
         <source>Forum not found</source>
         <translation type="unfinished"></translation>
     </message>
@@ -718,6 +743,21 @@
         <source>Forum has no author</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+6"/>
+        <source>Board not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>You are not admin of the board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Board has no author</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+4"/>
         <source>Can&apos;t read html</source>
@@ -790,7 +830,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+55"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -825,7 +865,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+28"/>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc
index d70591c36..4c2eacaaf 100644
--- a/plugins/FeedReader/services/p3FeedReader.cc
+++ b/plugins/FeedReader/services/p3FeedReader.cc
@@ -24,6 +24,7 @@
 #include "rsitems/rsconfigitems.h"
 #include "retroshare/rsiface.h"
 #include "retroshare/rsgxsforums.h"
+#include "retroshare/rsposted.h"
 #include "util/rsstring.h"
 #include "util/rstime.h"
 #include "gxs/rsgenexchange.h"
@@ -34,6 +35,7 @@ RsFeedReader *rsFeedReader = NULL;
 
 #define FEEDREADER_CLEAN_INTERVAL 1 * 60 * 60 // check every hour
 #define FEEDREADER_FORUM_PREFIX  "RSS: "
+#define FEEDREADER_POSTED_PREFIX "RSS: "
 
 #define MAX_REQUEST_AGE 30 // 30 seconds
 
@@ -41,7 +43,7 @@ RsFeedReader *rsFeedReader = NULL;
  * #define FEEDREADER_DEBUG
  *********/
 
-p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsGxsForums *forums)
+p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsGxsForums *forums, RsPosted *posted)
 	: RsPQIService(RS_SERVICE_TYPE_PLUGIN_FEEDREADER,  5, pgHandler),
 	  mFeedReaderMtx("p3FeedReader"), mDownloadMutex("p3FeedReaderDownload"), mProcessMutex("p3FeedReaderProcess"), mPreviewMutex("p3FeedReaderPreview")
 {
@@ -55,6 +57,7 @@ p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsGxsForums *forums)
 	mStandardProxyPort = 0;
 	mLastClean = 0;
 	mForums = forums;
+	mPosted = posted;
 	mNotify = NULL;
 	mSaveInBackground = false;
 	mStopped = false;
@@ -92,6 +95,7 @@ static void feedToInfo(const RsFeedReaderFeed *feed, FeedInfo &info)
 	info.updateInterval = feed->updateInterval;
 	info.lastUpdate = feed->lastUpdate;
 	info.forumId = feed->forumId;
+	info.postedId = feed->postedId;
 	info.storageTime = feed->storageTime;
 	info.errorState = feed->errorState;
 	info.errorString = feed->errorString;
@@ -110,6 +114,10 @@ static void feedToInfo(const RsFeedReaderFeed *feed, FeedInfo &info)
 	info.flag.deactivated = (feed->flag & RS_FEED_FLAG_DEACTIVATED);
 	info.flag.forum = (feed->flag & RS_FEED_FLAG_FORUM);
 	info.flag.updateForumInfo = (feed->flag & RS_FEED_FLAG_UPDATE_FORUM_INFO);
+	info.flag.posted = (feed->flag & RS_FEED_FLAG_POSTED);
+	info.flag.updatePostedInfo = (feed->flag & RS_FEED_FLAG_UPDATE_POSTED_INFO);
+	info.flag.postedFirstImage = (feed->flag & RS_FEED_FLAG_POSTED_FIRST_IMAGE);
+	info.flag.postedOnlyImage = (feed->flag & RS_FEED_FLAG_POSTED_ONLY_IMAGE);
 	info.flag.embedImages = (feed->flag & RS_FEED_FLAG_EMBED_IMAGES);
 	info.flag.saveCompletePage = (feed->flag & RS_FEED_FLAG_SAVE_COMPLETE_PAGE);
 
@@ -151,6 +159,7 @@ static void infoToFeed(const FeedInfo &info, RsFeedReaderFeed *feed)
 	feed->storageTime = info.storageTime;
 
 	feed->forumId = info.forumId;
+	feed->postedId = info.postedId;
 
 	feed->transformationType = info.transformationType;
 	feed->xpathsToUse.ids = info.xpathsToUse;
@@ -193,6 +202,21 @@ static void infoToFeed(const FeedInfo &info, RsFeedReaderFeed *feed)
 	if (info.flag.updateForumInfo) {
 		feed->flag |= RS_FEED_FLAG_UPDATE_FORUM_INFO;
 	}
+	if (info.flag.posted) {
+		feed->flag |= RS_FEED_FLAG_POSTED;
+	}
+	if (info.flag.updatePostedInfo) {
+		feed->flag |= RS_FEED_FLAG_UPDATE_POSTED_INFO;
+	}
+	if (info.flag.updatePostedInfo) {
+		feed->flag |= RS_FEED_FLAG_UPDATE_POSTED_INFO;
+	}
+	if (info.flag.postedFirstImage) {
+		feed->flag |= RS_FEED_FLAG_POSTED_FIRST_IMAGE;
+	}
+	if (info.flag.postedOnlyImage) {
+		feed->flag |= RS_FEED_FLAG_POSTED_ONLY_IMAGE;
+	}
 }
 
 static void feedMsgToInfo(const RsFeedReaderMsg *msg, FeedMsgInfo &info)
@@ -478,6 +502,9 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 	std::string forumId;
 	std::string forumName;
 	std::string forumDescription;
+	std::string postedId;
+	std::string postedName;
+	std::string postedDescription;
 
 	{
 		RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
@@ -521,6 +548,7 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 
 		RsFeedReaderFeed *fi = feedIt->second;
 		std::string oldForumId = fi->forumId;
+		std::string oldPostedId = fi->postedId;
 		std::string oldName = fi->name;
 		std::string oldDescription = fi->description;
 
@@ -534,6 +562,15 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 			forumDescription = fi->description;
 			forumName.insert(0, FEEDREADER_FORUM_PREFIX);
 		}
+
+		if ((fi->flag & RS_FEED_FLAG_POSTED) && (fi->flag & RS_FEED_FLAG_UPDATE_POSTED_INFO) && !fi->postedId.empty() &&
+		    (fi->postedId != oldPostedId || fi->name != oldName || fi->description != oldDescription)) {
+			/* name or description changed, update posted */
+			postedId = fi->postedId;
+			postedName = fi->name;
+			postedDescription = fi->description;
+			postedName.insert(0, FEEDREADER_POSTED_PREFIX);
+		}
 	}
 
 	IndicateConfigChanged();
@@ -550,6 +587,14 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 		//TODO: error
 	}
 
+	if (!postedId.empty()) {
+		RsPostedGroup postedGroup;
+		if (getPostedGroup(RsGxsGroupId(postedId), postedGroup)) {
+			updatePostedGroup(postedGroup, postedName, postedDescription);
+		}
+		//TODO: error
+	}
+
 	return RS_FEED_ADD_RESULT_SUCCESS;
 }
 
@@ -682,6 +727,7 @@ bool p3FeedReader::addPreviewFeed(const FeedInfo &feedInfo, uint32_t &feedId)
 		fi->updateInterval = 0;
 		fi->lastUpdate = 0;
 		fi->forumId.clear();
+		fi->postedId.clear();
 		fi->storageTime = 0;
 
 		mFeeds[fi->feedId] = fi;
@@ -1885,8 +1931,12 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 
 	std::list<std::string> addedMsgs;
 	std::string forumId;
-	RsGxsId authorId;
+	RsGxsId forumAuthorId;
 	std::list<RsFeedReaderMsg> forumMsgs;
+	std::string postedId;
+	RsGxsId postedAuthorId;
+	std::list<RsFeedReaderMsg> postedMsgs;
+	uint32_t feedFlag = 0;
 
 	{
 		RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
@@ -1903,7 +1953,9 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 
 		RsFeedReaderFeed *fi = it->second;
 		bool forum = (fi->flag & RS_FEED_FLAG_FORUM) && !fi->preview;
+		bool posted = (fi->flag & RS_FEED_FLAG_POSTED) && !fi->preview;
 		RsFeedReaderErrorState errorState = RS_FEED_ERRORSTATE_OK;
+		feedFlag = fi->flag;
 
 		if (forum && !msgs.empty()) {
 			if (mForums) {
@@ -1913,9 +1965,9 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 					if (getForumGroup(RsGxsGroupId(fi->forumId), forumGroup)) {
 						if (IS_GROUP_PUBLISHER(forumGroup.mMeta.mSubscribeFlags) && IS_GROUP_ADMIN(forumGroup.mMeta.mSubscribeFlags)) {
 							forumId = fi->forumId;
-							authorId = forumGroup.mMeta.mAuthorId;
+							forumAuthorId = forumGroup.mMeta.mAuthorId;
 
-							if (authorId.isNull()) {
+							if (forumAuthorId.isNull()) {
 								errorState = RS_FEED_ERRORSTATE_PROCESS_FORUM_NO_AUTHOR;
 							}
 						} else {
@@ -1933,6 +1985,34 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 			}
 		}
 
+		if (posted && !msgs.empty()) {
+			if (mPosted) {
+				if (!fi->postedId.empty()) {
+					/* check posted */
+					RsPostedGroup postedGroup;
+					if (getPostedGroup(RsGxsGroupId(fi->postedId), postedGroup)) {
+						if (IS_GROUP_PUBLISHER(postedGroup.mMeta.mSubscribeFlags) && IS_GROUP_ADMIN(postedGroup.mMeta.mSubscribeFlags)) {
+							postedId = fi->postedId;
+							postedAuthorId = postedGroup.mMeta.mAuthorId;
+
+							if (postedAuthorId.isNull()) {
+								errorState = RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_AUTHOR;
+							}
+						} else {
+							errorState = RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_ADMIN;
+						}
+					} else {
+						errorState = RS_FEED_ERRORSTATE_PROCESS_POSTED_NOT_FOUND;
+					}
+				} else {
+					std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - posted id is empty (" << fi->name << ")" << std::endl;
+					errorState = RS_FEED_ERRORSTATE_PROCESS_POSTED_NOT_FOUND;
+				}
+			} else {
+				std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not set" << std::endl;
+			}
+		}
+
 		/* process msgs */
 		if (errorState == RS_FEED_ERRORSTATE_OK) {
 			/* process msgs */
@@ -1949,9 +2029,14 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 				} else {
 					rs_sprintf(miNew->msgId, "%lu", mNextMsgId++);
 				}
-				if (forum) {
+				if (forum || posted) {
 					miNew->flag = RS_FEEDMSG_FLAG_DELETED;
-					forumMsgs.push_back(*miNew);
+					if (forum) {
+						forumMsgs.push_back(*miNew);
+					}
+					if (posted) {
+						postedMsgs.push_back(*miNew);
+					}
 					miNew->description.clear();
 					miNew->descriptionTransformed.clear();
 				} else {
@@ -1996,7 +2081,7 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 					RsGxsForumMsg forumMsg;
 					forumMsg.mMeta.mGroupId = RsGxsGroupId(forumId);
 					forumMsg.mMeta.mMsgName = mi.title;
-					forumMsg.mMeta.mAuthorId = authorId;
+					forumMsg.mMeta.mAuthorId = forumAuthorId;
 
 					std::string description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
 					/* add link */
@@ -2006,7 +2091,7 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 					forumMsg.mMsg = description;
 
 					uint32_t token;
-					if (mForums->createMsg(token, forumMsg) && waitForToken(token)) {
+					if (mForums->createMsg(token, forumMsg) && waitForToken(mForums, token)) {
 						RsGxsGrpMsgIdPair msgPair;
 						if (mForums->acknowledgeMsg(token, msgPair)) {
 							/* set to new */
@@ -2026,6 +2111,67 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 		}
 	}
 
+	if (!postedId.empty() && !postedMsgs.empty()) {
+		if (mPosted) {
+			/* a bit tricky */
+			RsGenExchange *genExchange = dynamic_cast<RsGenExchange*>(mPosted);
+			if (genExchange) {
+				/* add messages as posted messages */
+				std::list<RsFeedReaderMsg>::iterator msgIt;
+				for (msgIt = postedMsgs.begin(); msgIt != postedMsgs.end(); ++msgIt) {
+					RsFeedReaderMsg &mi = *msgIt;
+
+					/* convert to posted messages */
+					RsPostedPost postedPost;
+					postedPost.mMeta.mGroupId = RsGxsGroupId(postedId);
+					postedPost.mMeta.mMsgName = mi.title;
+					postedPost.mMeta.mAuthorId = postedAuthorId;
+					postedPost.mLink = mi.link;
+
+					std::string description;
+					if (feedFlag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) {
+						if (!mi.postedFirstImage.empty()) {
+							/* use first image as image for posted and description without image as notes */
+							postedPost.mImage.copy(mi.postedFirstImage.data(), mi.postedFirstImage.size());
+							if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
+								/* ignore description */
+							} else {
+								description = mi.postedDescriptionWithoutFirstImage;
+							}
+						} else {
+							if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
+								/* ignore messages without image */
+								continue;
+							}
+							description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
+						}
+					} else {
+						description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
+					}
+
+					postedPost.mNotes = description;
+
+					uint32_t token;
+					if (mPosted->createPost(token, postedPost) && waitForToken(mPosted, token)) {
+						RsGxsGrpMsgIdPair msgPair;
+						if (mPosted->acknowledgeMsg(token, msgPair)) {
+							/* set to new */
+							genExchange->setMsgStatusFlags(token, msgPair, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD);
+						}
+					} else {
+#ifdef FEEDREADER_DEBUG
+						std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't add posted message " << mi.title << " for feed " << postedId << std::endl;
+#endif
+					}
+				}
+			} else {
+				std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not derived from RsGenExchange" << std::endl;
+			}
+		} else {
+			std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not set" << std::endl;
+		}
+	}
+
 	if (mNotify) {
 		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 
@@ -2080,6 +2226,9 @@ void p3FeedReader::setFeedInfo(uint32_t feedId, const std::string &name, const s
 	std::string forumId;
 	std::string forumName;
 	std::string forumDescription;
+	std::string postedId;
+	std::string postedName;
+	std::string postedDescription;
 
 	{
 		RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
@@ -2118,6 +2267,14 @@ void p3FeedReader::setFeedInfo(uint32_t feedId, const std::string &name, const s
 			forumDescription = fi->description;
 			forumName.insert(0, FEEDREADER_FORUM_PREFIX);
 		}
+
+		if ((fi->flag & RS_FEED_FLAG_POSTED) && (fi->flag & RS_FEED_FLAG_UPDATE_POSTED_INFO) && !fi->postedId.empty() && !preview) {
+			/* change posted too */
+			postedId = fi->postedId;
+			postedName = fi->name;
+			postedDescription = fi->description;
+			postedName.insert(0, FEEDREADER_POSTED_PREFIX);
+		}
 	}
 
 	if (changed) {
@@ -2137,6 +2294,14 @@ void p3FeedReader::setFeedInfo(uint32_t feedId, const std::string &name, const s
 		}
 		//TODO: error
 	}
+
+	if (!postedId.empty()) {
+		RsPostedGroup postedGroup;
+		if (getPostedGroup(RsGxsGroupId(postedId), postedGroup)) {
+			updatePostedGroup(postedGroup, postedName, postedDescription);
+		}
+		//TODO: error
+	}
 }
 
 bool p3FeedReader::getForumGroup(const RsGxsGroupId &groupId, RsGxsForumGroup &forumGroup)
@@ -2159,7 +2324,7 @@ bool p3FeedReader::getForumGroup(const RsGxsGroupId &groupId, RsGxsForumGroup &f
 	uint32_t token;
 	mForums->getTokenService()->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_SUMMARY, opts, grpIds);
 
-	if (!waitForToken(token)) {
+	if (!waitForToken(mForums, token)) {
 		std::cerr << "p3FeedReader::getForumGroup - waitForToken for request failed" << std::endl;
 		return false;
 	}
@@ -2202,7 +2367,7 @@ bool p3FeedReader::updateForumGroup(const RsGxsForumGroup &forumGroup, const std
 		return false;
 	}
 
-	if (!waitForToken(token)) {
+	if (!waitForToken(mForums, token)) {
 		std::cerr << "p3FeedReader::updateForumGroup - waitForToken for update failed" << std::endl;
 		return false;
 	}
@@ -2211,13 +2376,85 @@ bool p3FeedReader::updateForumGroup(const RsGxsForumGroup &forumGroup, const std
 	return true;
 }
 
-bool p3FeedReader::waitForToken(uint32_t token)
+bool p3FeedReader::getPostedGroup(const RsGxsGroupId &groupId, RsPostedGroup &postedGroup)
 {
-	if (!mForums) {
+	if (!mPosted) {
+		std::cerr << "p3FeedReader::getPostedGroup - can't get posted group " << groupId.toStdString() << ", member mPosted is not set" << std::endl;
 		return false;
 	}
 
-	RsTokenService *service = mForums->getTokenService();
+	if (groupId.isNull()) {
+		std::cerr << "p3FeedReader::getPostedGroup - group id is not valid" << std::endl;
+		return false;
+	}
+
+	std::list<RsGxsGroupId> grpIds;
+	grpIds.push_back(groupId);
+
+	RsTokReqOptions opts;
+	opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
+	uint32_t token;
+	mPosted->getTokenService()->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_SUMMARY, opts, grpIds);
+
+	if (!waitForToken(mPosted, token)) {
+		std::cerr << "p3FeedReader::getPostedGroup - waitForToken for request failed" << std::endl;
+		return false;
+	}
+
+	std::vector<RsPostedGroup> groups;
+	if (!mPosted->getGroupData(token, groups)) {
+		std::cerr << "p3FeedReader::getPostedGroup - Error getting data" << std::endl;
+		return false;
+	}
+
+	if (groups.size() != 1) {
+		std::cerr << "p3FeedReader::getPostedGroup - Wrong number of items" << std::endl;
+		return false;
+	}
+
+	postedGroup = groups[0];
+
+	return true;
+}
+
+bool p3FeedReader::updatePostedGroup(const RsPostedGroup &postedGroup, const std::string &groupName, const std::string &groupDescription)
+{
+	if (!mPosted) {
+		std::cerr << "p3FeedReader::updatePostedGroup - can't change posted " << postedGroup.mMeta.mGroupId.toStdString() << ", member mPosted is not set" << std::endl;
+		return false;
+	}
+
+	if (postedGroup.mMeta.mGroupName == groupName && postedGroup.mDescription == groupDescription) {
+		/* No change */
+		return true;
+	}
+
+	RsPostedGroup newPostedGroup = postedGroup;
+	newPostedGroup.mMeta.mGroupName = groupName;
+	newPostedGroup.mDescription = groupDescription;
+
+	uint32_t token;
+	if (!mPosted->updateGroup(token, newPostedGroup)) {
+		std::cerr << "p3FeedReader::updatePostedGroup - can't change posted " << newPostedGroup.mMeta.mGroupId.toStdString() << std::endl;
+		return false;
+	}
+
+	if (!waitForToken(mPosted, token)) {
+		std::cerr << "p3FeedReader::updatePostedGroup - waitForToken for update failed" << std::endl;
+		return false;
+	}
+
+	/* Posted updated */
+	return true;
+}
+
+bool p3FeedReader::waitForToken(RsGxsIfaceHelper *interface, uint32_t token)
+{
+	if (!interface) {
+		return false;
+	}
+
+	RsTokenService *service = interface->getTokenService();
 	int count = MAX_REQUEST_AGE * 2;
 
 	while (!mStopped) {
diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h
index 08fa3619b..d60b63ca2 100644
--- a/plugins/FeedReader/services/p3FeedReader.h
+++ b/plugins/FeedReader/services/p3FeedReader.h
@@ -33,11 +33,14 @@ class p3FeedReaderThread;
 
 class RsGxsForums;
 struct RsGxsForumGroup;
+class RsPosted;
+struct RsPostedGroup;
+class RsGxsIfaceHelper;
 
 class p3FeedReader : public RsPQIService, public RsFeedReader
 {
 public:
-	p3FeedReader(RsPluginHandler *pgHandler, RsGxsForums *forums);
+	p3FeedReader(RsPluginHandler *pgHandler, RsGxsForums *forums, RsPosted *posted);
 
 	/****************** FeedReader Interface *************/
 	virtual void stop();
@@ -92,7 +95,9 @@ public:
 
 	bool getForumGroup(const RsGxsGroupId &groupId, RsGxsForumGroup &forumGroup);
 	bool updateForumGroup(const RsGxsForumGroup &forumGroup, const std::string &groupName, const std::string &groupDescription);
-	bool waitForToken(uint32_t token);
+	bool getPostedGroup(const RsGxsGroupId &groupId, RsPostedGroup &postedGroup);
+	bool updatePostedGroup(const RsPostedGroup &postedGroup, const std::string &groupName, const std::string &groupDescription);
+	bool waitForToken(RsGxsIfaceHelper *interface, uint32_t token);
 
 protected:
 	/****************** p3Config STUFF *******************/
@@ -109,6 +114,7 @@ private:
 private:
 	time_t   mLastClean;
 	RsGxsForums *mForums;
+	RsPosted *mPosted;
 	RsFeedReaderNotify *mNotify;
 	volatile bool mStopped;
 
diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 130d2fac1..00da7a007 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -1076,12 +1076,15 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 
 	if (isRunning()) {
 		/* process description */
+		bool processPostedFirstImage = (feed.flag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) ? TRUE : FALSE;
+
 		//long todo; // encoding
 		HTMLWrapper html;
 		if (html.readHTML(msg->description.c_str(), url.c_str())) {
 			xmlNodePtr root = html.getRootElement();
 			if (root) {
 				std::list<xmlNodePtr> nodesToDelete;
+				xmlNodePtr postedFirstImageNode = NULL;
 
 				/* process all children */
 				std::list<xmlNodePtr> nodes;
@@ -1212,6 +1215,12 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 														rs_sprintf(imageBase64, "data:%s;base64,%s", contentType.c_str(), base64.c_str());
 														if (html.setAttr(node, "src", imageBase64.c_str())) {
 															removeImage = false;
+
+															if (processPostedFirstImage && postedFirstImageNode == NULL) {
+																/* set first image */
+																msg->postedFirstImage = data;
+																postedFirstImageNode = node;
+															}
 														}
 													}
 												}
@@ -1247,7 +1256,22 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 
 				if (result == RS_FEED_ERRORSTATE_OK) {
 					if (isRunning()) {
-						if (!html.saveHTML(msg->description)) {
+						if (html.saveHTML(msg->description)) {
+							if (postedFirstImageNode) {
+								/* Remove first image and create description without the image */
+								xmlUnlinkNode(postedFirstImageNode);
+								xmlFreeNode(postedFirstImageNode);
+
+								if (!html.saveHTML(msg->postedDescriptionWithoutFirstImage)) {
+									errorString = html.lastError();
+#ifdef FEEDREADER_DEBUG
+									std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
+									std::cerr << "  Error: " << errorString << std::endl;
+#endif
+									result = RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR;
+								}
+							}
+						} else {
 							errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
 							std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
diff --git a/plugins/FeedReader/services/rsFeedReaderItems.cc b/plugins/FeedReader/services/rsFeedReaderItems.cc
index 04a6c8f1e..5a2ad4fe1 100644
--- a/plugins/FeedReader/services/rsFeedReaderItems.cc
+++ b/plugins/FeedReader/services/rsFeedReaderItems.cc
@@ -46,6 +46,7 @@ void RsFeedReaderFeed::clear()
 	storageTime = 0;
 	flag = 0;
 	forumId.clear();
+	postedId.clear();
 	description.clear();
 	icon.clear();
 	errorState = RS_FEED_ERRORSTATE_OK;
@@ -85,6 +86,7 @@ uint32_t RsFeedReaderSerialiser::sizeFeed(RsFeedReaderFeed *item)
 	s += item->xpathsToUse.TlvSize();
 	s += item->xpathsToRemove.TlvSize();
 	s += GetTlvStringSize(item->xslt);
+	s += GetTlvStringSize(item->postedId);
 
 	return s;
 }
@@ -108,7 +110,7 @@ bool RsFeedReaderSerialiser::serialiseFeed(RsFeedReaderFeed *item, void *data, u
 	offset += 8;
 
 	/* add values */
-	ok &= setRawUInt16(data, tlvsize, &offset, 2); /* version */
+	ok &= setRawUInt16(data, tlvsize, &offset, 3); /* version */
 	ok &= setRawUInt32(data, tlvsize, &offset, item->feedId);
 	ok &= setRawUInt32(data, tlvsize, &offset, item->parentId);
 	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_LINK, item->url);
@@ -124,6 +126,7 @@ bool RsFeedReaderSerialiser::serialiseFeed(RsFeedReaderFeed *item, void *data, u
 	ok &= setRawUInt32(data, tlvsize, &offset, item->storageTime);
 	ok &= setRawUInt32(data, tlvsize, &offset, item->flag);
 	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_VALUE, item->forumId);
+	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_VALUE, item->postedId);
 	ok &= setRawUInt32(data, tlvsize, &offset, item->errorState);
 	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_VALUE, item->errorString);
 	ok &= setRawUInt32(data, tlvsize, &offset, item->transformationType);
@@ -208,6 +211,9 @@ RsFeedReaderFeed *RsFeedReaderSerialiser::deserialiseFeed(void *data, uint32_t *
 	ok &= getRawUInt32(data, rssize, &offset, &(item->storageTime));
 	ok &= getRawUInt32(data, rssize, &offset, &(item->flag));
 	ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_VALUE, item->forumId);
+	if (version >= 3) {
+		ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_VALUE, item->postedId);
+	}
 	uint32_t errorState = 0;
 	ok &= getRawUInt32(data, rssize, &offset, &errorState);
 	item->errorState = (RsFeedReaderErrorState) errorState;
diff --git a/plugins/FeedReader/services/rsFeedReaderItems.h b/plugins/FeedReader/services/rsFeedReaderItems.h
index d2ee7574e..39d604f46 100644
--- a/plugins/FeedReader/services/rsFeedReaderItems.h
+++ b/plugins/FeedReader/services/rsFeedReaderItems.h
@@ -34,17 +34,21 @@ const uint8_t RS_PKT_SUBTYPE_FEEDREADER_MSG   = 0x03;
 
 /**************************************************************************/
 
-#define RS_FEED_FLAG_FOLDER                        0x001
-#define RS_FEED_FLAG_INFO_FROM_FEED                0x002
-#define RS_FEED_FLAG_STANDARD_STORAGE_TIME         0x004
-#define RS_FEED_FLAG_STANDARD_UPDATE_INTERVAL      0x008
-#define RS_FEED_FLAG_STANDARD_PROXY                0x010
-#define RS_FEED_FLAG_AUTHENTICATION                0x020
-#define RS_FEED_FLAG_DEACTIVATED                   0x040
-#define RS_FEED_FLAG_FORUM                         0x080
-#define RS_FEED_FLAG_UPDATE_FORUM_INFO             0x100
-#define RS_FEED_FLAG_EMBED_IMAGES                  0x200
-#define RS_FEED_FLAG_SAVE_COMPLETE_PAGE            0x400
+#define RS_FEED_FLAG_FOLDER                        0x0001
+#define RS_FEED_FLAG_INFO_FROM_FEED                0x0002
+#define RS_FEED_FLAG_STANDARD_STORAGE_TIME         0x0004
+#define RS_FEED_FLAG_STANDARD_UPDATE_INTERVAL      0x0008
+#define RS_FEED_FLAG_STANDARD_PROXY                0x0010
+#define RS_FEED_FLAG_AUTHENTICATION                0x0020
+#define RS_FEED_FLAG_DEACTIVATED                   0x0040
+#define RS_FEED_FLAG_FORUM                         0x0080
+#define RS_FEED_FLAG_UPDATE_FORUM_INFO             0x0100
+#define RS_FEED_FLAG_EMBED_IMAGES                  0x0200
+#define RS_FEED_FLAG_SAVE_COMPLETE_PAGE            0x0400
+#define RS_FEED_FLAG_POSTED                        0x0800
+#define RS_FEED_FLAG_UPDATE_POSTED_INFO            0x1000
+#define RS_FEED_FLAG_POSTED_FIRST_IMAGE            0x2000
+#define RS_FEED_FLAG_POSTED_ONLY_IMAGE             0x4000
 
 class RsFeedReaderFeed : public RsItem
 {
@@ -76,6 +80,7 @@ public:
 	time_t                   lastUpdate;
 	uint32_t                 flag; // RS_FEED_FLAG_...
 	std::string              forumId;
+	std::string              postedId;
 	uint32_t                 storageTime;
 	std::string              description;
 	std::string              icon;
@@ -118,6 +123,10 @@ public:
 	std::string descriptionTransformed;
 	time_t      pubDate;
 	uint32_t    flag; // RS_FEEDMSG_FLAG_...
+
+	// Only in memory when receiving messages
+	std::vector<unsigned char> postedFirstImage;
+	std::string postedDescriptionWithoutFirstImage;
 };
 
 class RsFeedReaderSerialiser: public RsSerialType

From 186976e2095f3cc13f1a4fe09fcae69facb43974 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Thu, 13 Apr 2023 15:53:14 +0200
Subject: [PATCH 256/503] FeedReader: The feed can be moved with drag and drop
 to a folder

---
 plugins/FeedReader/FeedReader.pro           |   2 +
 plugins/FeedReader/gui/FeedReaderDialog.cpp |  37 ++++++
 plugins/FeedReader/gui/FeedReaderDialog.h   |   1 +
 plugins/FeedReader/gui/FeedReaderDialog.ui  |   6 +-
 plugins/FeedReader/gui/FeedTreeWidget.cpp   | 119 ++++++++++++++++++++
 plugins/FeedReader/gui/FeedTreeWidget.h     |  50 ++++++++
 plugins/FeedReader/interface/rsFeedReader.h |   1 +
 plugins/FeedReader/lang/FeedReader_en.ts    |  20 +++-
 plugins/FeedReader/services/p3FeedReader.cc |  56 +++++++++
 plugins/FeedReader/services/p3FeedReader.h  |   1 +
 10 files changed, 285 insertions(+), 8 deletions(-)
 create mode 100644 plugins/FeedReader/gui/FeedTreeWidget.cpp
 create mode 100644 plugins/FeedReader/gui/FeedTreeWidget.h

diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro
index b5dbbf43a..5c696b5c3 100644
--- a/plugins/FeedReader/FeedReader.pro
+++ b/plugins/FeedReader/FeedReader.pro
@@ -44,6 +44,7 @@ SOURCES =	FeedReaderPlugin.cpp \
 			gui/FeedReaderFeedNotify.cpp \
 			gui/FeedReaderUserNotify.cpp \
 			gui/FeedReaderFeedItem.cpp \
+			gui/FeedTreeWidget.cpp \
 			util/CURLWrapper.cpp \
 			util/XMLWrapper.cpp \
 			util/HTMLWrapper.cpp \
@@ -64,6 +65,7 @@ HEADERS =	FeedReaderPlugin.h \
 			gui/FeedReaderFeedNotify.h \
 			gui/FeedReaderUserNotify.h \
 			gui/FeedReaderFeedItem.h \
+			gui/FeedTreeWidget.h \
 			util/CURLWrapper.h \
 			util/XMLWrapper.h \
 			util/HTMLWrapper.h \
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.cpp b/plugins/FeedReader/gui/FeedReaderDialog.cpp
index abc2f1aa5..4c409a38c 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.cpp
+++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp
@@ -84,9 +84,16 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, FeedReaderNotify *n
 	connect(ui->feedAddButton, SIGNAL(clicked()), this, SLOT(newFeed()));
 	connect(ui->feedProcessButton, SIGNAL(clicked()), this, SLOT(processFeed()));
 
+	connect(ui->feedTreeWidget, SIGNAL(feedReparent(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(feedTreeReparent(QTreeWidgetItem*,QTreeWidgetItem*)));
+
 	mFeedCompareRole = new RSTreeWidgetItemCompareRole;
 	mFeedCompareRole->setRole(COLUMN_FEED_NAME, ROLE_FEED_SORT);
 
+	/* enable drag and drop */
+	ui->feedTreeWidget->setAcceptDrops(true);
+	ui->feedTreeWidget->setDragEnabled(true);
+	ui->feedTreeWidget->setDragDropMode(QAbstractItemView::InternalMove);
+
 	/* initialize root item */
 	mRootItem = new QTreeWidgetItem(ui->feedTreeWidget);
 	QString name = tr("Message Folders");
@@ -395,6 +402,9 @@ void FeedReaderDialog::updateFeeds(uint32_t parentId, QTreeWidgetItem *parentIte
 					mOpenFeedIds->removeAt(index);
 				}
 			}
+		} else {
+			/* disable drop */
+			item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
 		}
 	}
 
@@ -832,3 +842,30 @@ void FeedReaderDialog::processFeed()
 
 	mFeedReader->processFeed(feedId);
 }
+
+void FeedReaderDialog::feedTreeReparent(QTreeWidgetItem *item, QTreeWidgetItem *newParent)
+{
+	if (!item || ! newParent) {
+		return;
+	}
+
+	uint32_t feedId = item->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toUInt();
+	uint32_t parentId = newParent->data(COLUMN_FEED_DATA, ROLE_FEED_ID).toUInt();
+
+	if (feedId == 0) {
+		return;
+	}
+
+	RsFeedAddResult result = mFeedReader->setParent(feedId, parentId);
+	if (FeedReaderStringDefs::showError(this, result, tr("Move feed"), tr("Cannot move feed."))) {
+		return;
+	}
+
+	bool expanded = item->isExpanded();
+	item->parent()->removeChild(item);
+	newParent->addChild(item);
+	item->setExpanded(expanded);
+	newParent->setExpanded(true);
+
+	calculateFeedItems();
+}
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.h b/plugins/FeedReader/gui/FeedReaderDialog.h
index a221cfe64..d684f1f4b 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.h
+++ b/plugins/FeedReader/gui/FeedReaderDialog.h
@@ -61,6 +61,7 @@ private slots:
 	void editFeed();
 	void activateFeed();
 	void processFeed();
+	void feedTreeReparent(QTreeWidgetItem *item, QTreeWidgetItem *newParent);
 
 	void messageTabCloseRequested(int index);
 	void messageTabChanged(int index);
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.ui b/plugins/FeedReader/gui/FeedReaderDialog.ui
index 5eed95bc7..b6b004d69 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.ui
+++ b/plugins/FeedReader/gui/FeedReaderDialog.ui
@@ -150,7 +150,7 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="RSTreeWidget" name="feedTreeWidget">
+        <widget class="FeedTreeWidget" name="feedTreeWidget">
          <property name="contextMenuPolicy">
           <enum>Qt::CustomContextMenu</enum>
          </property>
@@ -186,9 +186,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>RSTreeWidget</class>
+   <class>FeedTreeWidget</class>
    <extends>QTreeWidget</extends>
-   <header>gui/common/RSTreeWidget.h</header>
+   <header>gui/FeedTreeWidget.h</header>
   </customwidget>
   <customwidget>
    <class>RSTabWidget</class>
diff --git a/plugins/FeedReader/gui/FeedTreeWidget.cpp b/plugins/FeedReader/gui/FeedTreeWidget.cpp
new file mode 100644
index 000000000..37baaf235
--- /dev/null
+++ b/plugins/FeedReader/gui/FeedTreeWidget.cpp
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * plugins/FeedReader/gui/FeedTreeWidget.cpp                                   *
+ *                                                                             *
+ * Copyright (C) 2012 RetroShare Team <retroshare.project@gmail.com>           *
+ *                                                                             *
+ * This program is free software: you can redistribute it and/or modify        *
+ * it under the terms of the GNU Affero General Public License as              *
+ * published by the Free Software Foundation, either version 3 of the          *
+ * License, or (at your option) any later version.                             *
+ *                                                                             *
+ * This program is distributed in the hope that it will be useful,             *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
+ * GNU Affero General Public License for more details.                         *
+ *                                                                             *
+ * You should have received a copy of the GNU Affero General Public License    *
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
+ *                                                                             *
+ *******************************************************************************/
+
+#include <QDropEvent>
+#include "FeedTreeWidget.h"
+
+FeedTreeWidget::FeedTreeWidget(QWidget *parent) : RSTreeWidget(parent)
+{
+	mDraggedItem = NULL;
+}
+
+void FeedTreeWidget::dragEnterEvent(QDragEnterEvent *event)
+{
+	mDraggedItem = currentItem();
+	RSTreeWidget::dragEnterEvent(event);
+}
+
+void FeedTreeWidget::dragLeaveEvent(QDragLeaveEvent *event)
+{
+	RSTreeWidget::dragLeaveEvent(event);
+	mDraggedItem = NULL;
+}
+
+bool FeedTreeWidget::canDrop(QDropEvent *event, QTreeWidgetItem **dropItem)
+{
+	if (dropItem) {
+		*dropItem = NULL;
+	}
+
+	if (!mDraggedItem) {
+		/* no drag item */
+		return false;
+	}
+
+	QModelIndex droppedIndex = indexAt(event->pos());
+	if (!droppedIndex.isValid()) {
+		/* no drop target */
+		return false;
+	}
+
+	QTreeWidgetItem *dropItemIntern = itemFromIndex(droppedIndex);
+	if (!dropItemIntern) {
+		/* no drop item */
+		return false;
+	}
+
+	if ((dropItemIntern->flags() & Qt::ItemIsDropEnabled) == 0) {
+		/* drop is disabled */
+		return false;
+	}
+
+	if (dropItemIntern == mDraggedItem->parent()) {
+		/* drag item parent */
+		return false;
+	}
+
+	if (dropItem) {
+		*dropItem = dropItemIntern;
+	}
+
+	return true;
+}
+
+void FeedTreeWidget::dragMoveEvent(QDragMoveEvent *event)
+{
+	if (!canDrop(event)) {
+		event->ignore();
+		return;
+	}
+
+	RSTreeWidget::dragMoveEvent(event);
+}
+
+void FeedTreeWidget::dropEvent(QDropEvent *event)
+{
+	QTreeWidgetItem *dropItem;
+	if (!canDrop(event, &dropItem)) {
+		event->ignore();
+		return;
+	}
+
+	if (!mDraggedItem) {
+		/* no drag item */
+		event->ignore();
+		return;
+	}
+
+	QTreeWidgetItem *draggedParent = mDraggedItem->parent();
+	if (!draggedParent) {
+		/* no drag item parent */
+		event->ignore();
+		return;
+	}
+
+	if (!dropItem) {
+		/* no drop item */
+		event->ignore();
+		return;
+	}
+
+	emit feedReparent(mDraggedItem, dropItem);
+}
diff --git a/plugins/FeedReader/gui/FeedTreeWidget.h b/plugins/FeedReader/gui/FeedTreeWidget.h
new file mode 100644
index 000000000..e9eb197a9
--- /dev/null
+++ b/plugins/FeedReader/gui/FeedTreeWidget.h
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * plugins/FeedReader/gui/FeedTreeWidget.h                                     *
+ *                                                                             *
+ * Copyright (C) 2012 by Retroshare Team <retroshare.project@gmail.com>        *
+ *                                                                             *
+ * This program is free software: you can redistribute it and/or modify        *
+ * it under the terms of the GNU Affero General Public License as              *
+ * published by the Free Software Foundation, either version 3 of the          *
+ * License, or (at your option) any later version.                             *
+ *                                                                             *
+ * This program is distributed in the hope that it will be useful,             *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
+ * GNU Affero General Public License for more details.                         *
+ *                                                                             *
+ * You should have received a copy of the GNU Affero General Public License    *
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
+ *                                                                             *
+ *******************************************************************************/
+
+#ifndef _FEEDTREEWIDGET_H
+#define _FEEDTREEWIDGET_H
+
+#include "gui/common/RSTreeWidget.h"
+
+/* Subclassing RSTreeWidget */
+class FeedTreeWidget : public RSTreeWidget
+{
+	Q_OBJECT
+
+public:
+	FeedTreeWidget(QWidget *parent = 0);
+
+Q_SIGNALS:
+	void feedReparent(QTreeWidgetItem *item, QTreeWidgetItem *newParent);
+
+protected:
+	void dragEnterEvent(QDragEnterEvent *event);
+	void dragLeaveEvent(QDragLeaveEvent *event);
+	void dragMoveEvent(QDragMoveEvent *event);
+	void dropEvent(QDropEvent *event);
+
+private:
+	bool canDrop(QDropEvent *event, QTreeWidgetItem **dropItem = NULL);
+
+private:
+	QTreeWidgetItem *mDraggedItem;
+};
+
+#endif
diff --git a/plugins/FeedReader/interface/rsFeedReader.h b/plugins/FeedReader/interface/rsFeedReader.h
index 7158d29ee..6ff39cdc9 100644
--- a/plugins/FeedReader/interface/rsFeedReader.h
+++ b/plugins/FeedReader/interface/rsFeedReader.h
@@ -216,6 +216,7 @@ public:
 	virtual RsFeedAddResult setFolder(uint32_t feedId, const std::string &name) = 0;
 	virtual RsFeedAddResult addFeed(const FeedInfo &feedInfo, uint32_t &feedId) = 0;
 	virtual RsFeedAddResult setFeed(uint32_t feedId, const FeedInfo &feedInfo) = 0;
+	virtual RsFeedAddResult setParent(uint32_t feedId, uint32_t parentId) = 0;
 	virtual bool            removeFeed(uint32_t feedId) = 0;
 	virtual bool            addPreviewFeed(const FeedInfo &feedInfo, uint32_t &feedId) = 0;
 	virtual void            getFeedList(uint32_t parentId, std::list<FeedInfo> &feedInfos) = 0;
diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts
index f366ccc9c..500c46810 100644
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@@ -194,7 +194,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+192"/>
         <location line="+148"/>
         <location line="+15"/>
         <source>Edit feed</source>
@@ -312,7 +312,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="+92"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="+99"/>
         <source>Message Folders</source>
         <translation type="unfinished"></translation>
     </message>
@@ -362,7 +362,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+195"/>
+        <location line="+198"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -418,6 +418,16 @@
         <source>Please enter a new name for the folder</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+61"/>
+        <source>Move feed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cannot move feed.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FeedReaderFeedItem</name>
@@ -520,7 +530,7 @@
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+113"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+115"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -612,7 +622,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+374"/>
+        <location line="+385"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc
index 4c2eacaaf..5d861710b 100644
--- a/plugins/FeedReader/services/p3FeedReader.cc
+++ b/plugins/FeedReader/services/p3FeedReader.cc
@@ -598,6 +598,62 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 	return RS_FEED_ADD_RESULT_SUCCESS;
 }
 
+RsFeedAddResult p3FeedReader::setParent(uint32_t feedId, uint32_t parentId)
+{
+	bool changed = false;
+
+	{
+		RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
+
+#ifdef FEEDREADER_DEBUG
+		std::cerr << "p3FeedReader::setParent - set parent " << parentId << std::endl;
+#endif
+
+		std::map<uint32_t, RsFeedReaderFeed*>::iterator feedIt = mFeeds.find(feedId);
+		if (feedIt == mFeeds.end()) {
+#ifdef FEEDREADER_DEBUG
+			std::cerr << "p3FeedReader::setParent - feed id " << feedId << " not found" << std::endl;
+#endif
+			return RS_FEED_ADD_RESULT_FEED_NOT_FOUND;
+		}
+
+		if (parentId) {
+			/* check parent id */
+			std::map<uint32_t, RsFeedReaderFeed*>::iterator parentIt = mFeeds.find(parentId);
+			if (parentIt == mFeeds.end()) {
+#ifdef FEEDREADER_DEBUG
+				std::cerr << "p3FeedReader::setParent - parent id " << parentId << " not found" << std::endl;
+#endif
+				return RS_FEED_ADD_RESULT_PARENT_NOT_FOUND;
+			}
+
+			if ((parentIt->second->flag & RS_FEED_FLAG_FOLDER) == 0) {
+#ifdef FEEDREADER_DEBUG
+				std::cerr << "p3FeedReader::setParent - parent " << parentIt->second->name << " is no folder" << std::endl;
+#endif
+				return RS_FEED_ADD_RESULT_PARENT_IS_NO_FOLDER;
+			}
+		}
+
+		RsFeedReaderFeed *fi = feedIt->second;
+
+		if (fi->parentId != parentId) {
+			fi->parentId = parentId;
+			changed = true;
+		}
+	}
+
+	if (changed) {
+		IndicateConfigChanged();
+
+		if (mNotify) {
+			mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
+		}
+	}
+
+	return RS_FEED_ADD_RESULT_SUCCESS;
+}
+
 void p3FeedReader::deleteAllMsgs_locked(RsFeedReaderFeed *fi)
 {
 	if (!fi) {
diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h
index d60b63ca2..d98259a3b 100644
--- a/plugins/FeedReader/services/p3FeedReader.h
+++ b/plugins/FeedReader/services/p3FeedReader.h
@@ -59,6 +59,7 @@ public:
 	virtual RsFeedAddResult setFolder(uint32_t feedId, const std::string &name);
 	virtual RsFeedAddResult addFeed(const FeedInfo &feedInfo, uint32_t &feedId);
 	virtual RsFeedAddResult setFeed(uint32_t feedId, const FeedInfo &feedInfo);
+	virtual RsFeedAddResult setParent(uint32_t feedId, uint32_t parentId);
 	virtual bool            removeFeed(uint32_t feedId);
 	virtual bool            addPreviewFeed(const FeedInfo &feedInfo, uint32_t &feedId);
 	virtual void            getFeedList(uint32_t parentId, std::list<FeedInfo> &feedInfos);

From 63390fddee88f535b2710a351fd10520d19b86c6 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Thu, 13 Apr 2023 20:16:10 +0200
Subject: [PATCH 257/503] FeedReader: Renamed enum RsFeedAddResult to
 RsFeedResult

---
 plugins/FeedReader/gui/AddFeedDialog.cpp      |  4 +-
 plugins/FeedReader/gui/FeedReaderDialog.cpp   |  6 +--
 .../FeedReader/gui/FeedReaderStringDefs.cpp   | 14 ++---
 plugins/FeedReader/gui/FeedReaderStringDefs.h |  2 +-
 plugins/FeedReader/interface/rsFeedReader.h   | 52 +++++++++----------
 plugins/FeedReader/services/p3FeedReader.cc   | 48 ++++++++---------
 plugins/FeedReader/services/p3FeedReader.h    | 38 +++++++-------
 7 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp
index c99b29b7a..588428a8d 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.cpp
+++ b/plugins/FeedReader/gui/AddFeedDialog.cpp
@@ -449,12 +449,12 @@ void AddFeedDialog::createFeed()
 
 	if (mFeedId == 0) {
 		/* add new feed */
-		RsFeedAddResult result = mFeedReader->addFeed(feedInfo, mFeedId);
+		RsFeedResult result = mFeedReader->addFeed(feedInfo, mFeedId);
 		if (FeedReaderStringDefs::showError(this, result, tr("Create feed"), tr("Cannot create feed."))) {
 			return;
 		}
 	} else {
-		RsFeedAddResult result = mFeedReader->setFeed(mFeedId, feedInfo);
+		RsFeedResult result = mFeedReader->setFeed(mFeedId, feedInfo);
 		if (FeedReaderStringDefs::showError(this, result, tr("Edit feed"), tr("Cannot change feed."))) {
 			return;
 		}
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.cpp b/plugins/FeedReader/gui/FeedReaderDialog.cpp
index 4c409a38c..1c3d6ca8c 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.cpp
+++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp
@@ -748,7 +748,7 @@ void FeedReaderDialog::newFolder()
 
 	if (dialog.exec() == QDialog::Accepted && !dialog.textValue().isEmpty()) {
 		uint32_t feedId;
-		RsFeedAddResult result = mFeedReader->addFolder(currentFeedId(), dialog.textValue().toUtf8().constData(), feedId);
+		RsFeedResult result = mFeedReader->addFolder(currentFeedId(), dialog.textValue().toUtf8().constData(), feedId);
 		FeedReaderStringDefs::showError(this, result, tr("Create folder"), tr("Cannot create folder."));
 	}
 }
@@ -801,7 +801,7 @@ void FeedReaderDialog::editFeed()
 		dialog.setTextValue(item->data(COLUMN_FEED_DATA, ROLE_FEED_NAME).toString());
 
 		if (dialog.exec() == QDialog::Accepted && !dialog.textValue().isEmpty()) {
-			RsFeedAddResult result = mFeedReader->setFolder(feedId, dialog.textValue().toUtf8().constData());
+			RsFeedResult result = mFeedReader->setFolder(feedId, dialog.textValue().toUtf8().constData());
 			FeedReaderStringDefs::showError(this, result, tr("Create folder"), tr("Cannot create folder."));
 		}
 	} else {
@@ -856,7 +856,7 @@ void FeedReaderDialog::feedTreeReparent(QTreeWidgetItem *item, QTreeWidgetItem *
 		return;
 	}
 
-	RsFeedAddResult result = mFeedReader->setParent(feedId, parentId);
+	RsFeedResult result = mFeedReader->setParent(feedId, parentId);
 	if (FeedReaderStringDefs::showError(this, result, tr("Move feed"), tr("Cannot move feed."))) {
 		return;
 	}
diff --git a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
index fefb3ed32..647c4cf7b 100644
--- a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
+++ b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
@@ -23,27 +23,27 @@
 
 #include "FeedReaderStringDefs.h"
 
-bool FeedReaderStringDefs::showError(QWidget *parent, RsFeedAddResult result, const QString &title, const QString &text)
+bool FeedReaderStringDefs::showError(QWidget *parent, RsFeedResult result, const QString &title, const QString &text)
 {
 	QString error;
 
 	switch (result) {
-	case RS_FEED_ADD_RESULT_SUCCESS:
+	case RS_FEED_RESULT_SUCCESS:
 		/* no error */
 		return false;
-	case RS_FEED_ADD_RESULT_FEED_NOT_FOUND:
+	case RS_FEED_RESULT_FEED_NOT_FOUND:
 		error = QApplication::translate("FeedReaderStringDefs", "Feed not found.");
 		break;
-	case RS_FEED_ADD_RESULT_PARENT_NOT_FOUND:
+	case RS_FEED_RESULT_PARENT_NOT_FOUND:
 		error = QApplication::translate("FeedReaderStringDefs", "Parent not found.");
 		break;
-	case RS_FEED_ADD_RESULT_PARENT_IS_NO_FOLDER:
+	case RS_FEED_RESULT_PARENT_IS_NO_FOLDER:
 		error = QApplication::translate("FeedReaderStringDefs", "Parent is no folder.");
 		break;
-	case RS_FEED_ADD_RESULT_FEED_IS_FOLDER:
+	case RS_FEED_RESULT_FEED_IS_FOLDER:
 		error = QApplication::translate("FeedReaderStringDefs", "Feed is a folder.");
 		break;
-	case RS_FEED_ADD_RESULT_FEED_IS_NO_FOLDER:
+	case RS_FEED_RESULT_FEED_IS_NO_FOLDER:
 		error = QApplication::translate("FeedReaderStringDefs", "Feed is no folder.");
 		break;
 	default:
diff --git a/plugins/FeedReader/gui/FeedReaderStringDefs.h b/plugins/FeedReader/gui/FeedReaderStringDefs.h
index f4b384c8f..587621e7d 100644
--- a/plugins/FeedReader/gui/FeedReaderStringDefs.h
+++ b/plugins/FeedReader/gui/FeedReaderStringDefs.h
@@ -30,7 +30,7 @@ class QWidget;
 class FeedReaderStringDefs
 {
 public:
-	static bool showError(QWidget *parent, RsFeedAddResult result, const QString &title, const QString &text);
+	static bool showError(QWidget *parent, RsFeedResult result, const QString &title, const QString &text);
 	static QString workState(FeedInfo::WorkState state);
 	static QString errorString(const FeedInfo &feedInfo);
 	static QString errorString(RsFeedReaderErrorState errorState, const std::string &errorString);
diff --git a/plugins/FeedReader/interface/rsFeedReader.h b/plugins/FeedReader/interface/rsFeedReader.h
index 6ff39cdc9..3de449ba0 100644
--- a/plugins/FeedReader/interface/rsFeedReader.h
+++ b/plugins/FeedReader/interface/rsFeedReader.h
@@ -60,14 +60,14 @@ enum RsFeedReaderErrorState {
 	RS_FEED_ERRORSTATE_PROCESS_XSLT_NO_RESULT         = 156
 };
 
-enum RsFeedAddResult
+enum RsFeedResult
 {
-	RS_FEED_ADD_RESULT_SUCCESS,
-	RS_FEED_ADD_RESULT_FEED_NOT_FOUND,
-	RS_FEED_ADD_RESULT_PARENT_NOT_FOUND,
-	RS_FEED_ADD_RESULT_PARENT_IS_NO_FOLDER,
-	RS_FEED_ADD_RESULT_FEED_IS_FOLDER,
-	RS_FEED_ADD_RESULT_FEED_IS_NO_FOLDER
+	RS_FEED_RESULT_SUCCESS,
+	RS_FEED_RESULT_FEED_NOT_FOUND,
+	RS_FEED_RESULT_PARENT_NOT_FOUND,
+	RS_FEED_RESULT_PARENT_IS_NO_FOLDER,
+	RS_FEED_RESULT_FEED_IS_FOLDER,
+	RS_FEED_RESULT_FEED_IS_NO_FOLDER
 };
 
 enum RsFeedTransformationType
@@ -212,25 +212,25 @@ public:
 	virtual bool     getSaveInBackground() = 0;
 	virtual void     setSaveInBackground(bool saveInBackground) = 0;
 
-	virtual RsFeedAddResult addFolder(uint32_t parentId, const std::string &name, uint32_t &feedId) = 0;
-	virtual RsFeedAddResult setFolder(uint32_t feedId, const std::string &name) = 0;
-	virtual RsFeedAddResult addFeed(const FeedInfo &feedInfo, uint32_t &feedId) = 0;
-	virtual RsFeedAddResult setFeed(uint32_t feedId, const FeedInfo &feedInfo) = 0;
-	virtual RsFeedAddResult setParent(uint32_t feedId, uint32_t parentId) = 0;
-	virtual bool            removeFeed(uint32_t feedId) = 0;
-	virtual bool            addPreviewFeed(const FeedInfo &feedInfo, uint32_t &feedId) = 0;
-	virtual void            getFeedList(uint32_t parentId, std::list<FeedInfo> &feedInfos) = 0;
-	virtual bool            getFeedInfo(uint32_t feedId, FeedInfo &feedInfo) = 0;
-	virtual bool            getMsgInfo(uint32_t feedId, const std::string &msgId, FeedMsgInfo &msgInfo) = 0;
-	virtual bool            removeMsg(uint32_t feedId, const std::string &msgId) = 0;
-	virtual bool            removeMsgs(uint32_t feedId, const std::list<std::string> &msgIds) = 0;
-	virtual bool            getMessageCount(uint32_t feedId, uint32_t *msgCount, uint32_t *newCount, uint32_t *unreadCount) = 0;
-	virtual bool            getFeedMsgList(uint32_t feedId, std::list<FeedMsgInfo> &msgInfos) = 0;
-	virtual bool            getFeedMsgIdList(uint32_t feedId, std::list<std::string> &msgIds) = 0;
-	virtual bool            processFeed(uint32_t feedId) = 0;
-	virtual bool            setMessageRead(uint32_t feedId, const std::string &msgId, bool read) = 0;
-	virtual bool            retransformMsg(uint32_t feedId, const std::string &msgId) = 0;
-	virtual bool            clearMessageCache(uint32_t feedId) = 0;
+	virtual RsFeedResult addFolder(uint32_t parentId, const std::string &name, uint32_t &feedId) = 0;
+	virtual RsFeedResult setFolder(uint32_t feedId, const std::string &name) = 0;
+	virtual RsFeedResult addFeed(const FeedInfo &feedInfo, uint32_t &feedId) = 0;
+	virtual RsFeedResult setFeed(uint32_t feedId, const FeedInfo &feedInfo) = 0;
+	virtual RsFeedResult setParent(uint32_t feedId, uint32_t parentId) = 0;
+	virtual bool         removeFeed(uint32_t feedId) = 0;
+	virtual bool         addPreviewFeed(const FeedInfo &feedInfo, uint32_t &feedId) = 0;
+	virtual void         getFeedList(uint32_t parentId, std::list<FeedInfo> &feedInfos) = 0;
+	virtual bool         getFeedInfo(uint32_t feedId, FeedInfo &feedInfo) = 0;
+	virtual bool         getMsgInfo(uint32_t feedId, const std::string &msgId, FeedMsgInfo &msgInfo) = 0;
+	virtual bool         removeMsg(uint32_t feedId, const std::string &msgId) = 0;
+	virtual bool         removeMsgs(uint32_t feedId, const std::list<std::string> &msgIds) = 0;
+	virtual bool         getMessageCount(uint32_t feedId, uint32_t *msgCount, uint32_t *newCount, uint32_t *unreadCount) = 0;
+	virtual bool         getFeedMsgList(uint32_t feedId, std::list<FeedMsgInfo> &msgInfos) = 0;
+	virtual bool         getFeedMsgIdList(uint32_t feedId, std::list<std::string> &msgIds) = 0;
+	virtual bool         processFeed(uint32_t feedId) = 0;
+	virtual bool         setMessageRead(uint32_t feedId, const std::string &msgId, bool read) = 0;
+	virtual bool         retransformMsg(uint32_t feedId, const std::string &msgId) = 0;
+	virtual bool         clearMessageCache(uint32_t feedId) = 0;
 
 	virtual RsFeedReaderErrorState processXPath(const std::list<std::string> &xpathsToUse, const std::list<std::string> &xpathsToRemove, std::string &description, std::string &errorString) = 0;
 	virtual RsFeedReaderErrorState processXslt(const std::string &xslt, std::string &description, std::string &errorString) = 0;
diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc
index 5d861710b..104e137c6 100644
--- a/plugins/FeedReader/services/p3FeedReader.cc
+++ b/plugins/FeedReader/services/p3FeedReader.cc
@@ -366,7 +366,7 @@ void p3FeedReader::stopPreviewThreads_locked()
 	}
 }
 
-RsFeedAddResult p3FeedReader::addFolder(uint32_t parentId, const std::string &name, uint32_t &feedId)
+RsFeedResult p3FeedReader::addFolder(uint32_t parentId, const std::string &name, uint32_t &feedId)
 {
 	feedId = 0;
 
@@ -380,14 +380,14 @@ RsFeedAddResult p3FeedReader::addFolder(uint32_t parentId, const std::string &na
 #ifdef FEEDREADER_DEBUG
 				std::cerr << "p3FeedReader::addFolder - parent id " << parentId << " not found" << std::endl;
 #endif
-				return RS_FEED_ADD_RESULT_PARENT_NOT_FOUND;
+				return RS_FEED_RESULT_PARENT_NOT_FOUND;
 			}
 
 			if ((parentIt->second->flag & RS_FEED_FLAG_FOLDER) == 0) {
 #ifdef FEEDREADER_DEBUG
 				std::cerr << "p3FeedReader::addFolder - parent " << parentIt->second->name << " is no folder" << std::endl;
 #endif
-				return RS_FEED_ADD_RESULT_PARENT_IS_NO_FOLDER;
+				return RS_FEED_RESULT_PARENT_IS_NO_FOLDER;
 			}
 		}
 
@@ -407,10 +407,10 @@ RsFeedAddResult p3FeedReader::addFolder(uint32_t parentId, const std::string &na
 		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_ADD);
 	}
 
-	return RS_FEED_ADD_RESULT_SUCCESS;
+	return RS_FEED_RESULT_SUCCESS;
 }
 
-RsFeedAddResult p3FeedReader::setFolder(uint32_t feedId, const std::string &name)
+RsFeedResult p3FeedReader::setFolder(uint32_t feedId, const std::string &name)
 {
 	{
 		RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
@@ -424,19 +424,19 @@ RsFeedAddResult p3FeedReader::setFolder(uint32_t feedId, const std::string &name
 #ifdef FEEDREADER_DEBUG
 			std::cerr << "p3FeedReader::setFolder - feed id " << feedId << " not found" << std::endl;
 #endif
-			return RS_FEED_ADD_RESULT_FEED_NOT_FOUND;
+			return RS_FEED_RESULT_FEED_NOT_FOUND;
 		}
 
 		if ((feedIt->second->flag & RS_FEED_FLAG_FOLDER) == 0) {
 #ifdef FEEDREADER_DEBUG
 			std::cerr << "p3FeedReader::setFolder - feed " << feedIt->second->name << " is no folder" << std::endl;
 #endif
-			return RS_FEED_ADD_RESULT_FEED_IS_NO_FOLDER;
+			return RS_FEED_RESULT_FEED_IS_NO_FOLDER;
 		}
 
 		RsFeedReaderFeed *fi = feedIt->second;
 		if (fi->name == name) {
-			return RS_FEED_ADD_RESULT_SUCCESS;
+			return RS_FEED_RESULT_SUCCESS;
 		}
 		fi->name = name;
 	}
@@ -447,10 +447,10 @@ RsFeedAddResult p3FeedReader::setFolder(uint32_t feedId, const std::string &name
 		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 	}
 
-	return RS_FEED_ADD_RESULT_SUCCESS;
+	return RS_FEED_RESULT_SUCCESS;
 }
 
-RsFeedAddResult p3FeedReader::addFeed(const FeedInfo &feedInfo, uint32_t &feedId)
+RsFeedResult p3FeedReader::addFeed(const FeedInfo &feedInfo, uint32_t &feedId)
 {
 	feedId = 0;
 
@@ -468,14 +468,14 @@ RsFeedAddResult p3FeedReader::addFeed(const FeedInfo &feedInfo, uint32_t &feedId
 #ifdef FEEDREADER_DEBUG
 				std::cerr << "p3FeedReader::addFeed - parent id " << feedInfo.parentId << " not found" << std::endl;
 #endif
-				return RS_FEED_ADD_RESULT_PARENT_NOT_FOUND;
+				return RS_FEED_RESULT_PARENT_NOT_FOUND;
 			}
 
 			if ((parentIt->second->flag & RS_FEED_FLAG_FOLDER) == 0) {
 #ifdef FEEDREADER_DEBUG
 				std::cerr << "p3FeedReader::addFeed - parent " << parentIt->second->name << " is no folder" << std::endl;
 #endif
-				return RS_FEED_ADD_RESULT_PARENT_IS_NO_FOLDER;
+				return RS_FEED_RESULT_PARENT_IS_NO_FOLDER;
 			}
 		}
 
@@ -494,10 +494,10 @@ RsFeedAddResult p3FeedReader::addFeed(const FeedInfo &feedInfo, uint32_t &feedId
 		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_ADD);
 	}
 
-	return RS_FEED_ADD_RESULT_SUCCESS;
+	return RS_FEED_RESULT_SUCCESS;
 }
 
-RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
+RsFeedResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 {
 	std::string forumId;
 	std::string forumName;
@@ -518,14 +518,14 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 #ifdef FEEDREADER_DEBUG
 			std::cerr << "p3FeedReader::setFeed - feed id " << feedId << " not found" << std::endl;
 #endif
-			return RS_FEED_ADD_RESULT_FEED_NOT_FOUND;
+			return RS_FEED_RESULT_FEED_NOT_FOUND;
 		}
 
 		if (feedIt->second->flag & RS_FEED_FLAG_FOLDER) {
 #ifdef FEEDREADER_DEBUG
 			std::cerr << "p3FeedReader::setFeed - feed " << feedIt->second->name << " is a folder" << std::endl;
 #endif
-			return RS_FEED_ADD_RESULT_FEED_IS_FOLDER;
+			return RS_FEED_RESULT_FEED_IS_FOLDER;
 		}
 
 		if (feedInfo.parentId) {
@@ -535,14 +535,14 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 #ifdef FEEDREADER_DEBUG
 				std::cerr << "p3FeedReader::setFeed - parent id " << feedInfo.parentId << " not found" << std::endl;
 #endif
-				return RS_FEED_ADD_RESULT_PARENT_NOT_FOUND;
+				return RS_FEED_RESULT_PARENT_NOT_FOUND;
 			}
 
 			if ((parentIt->second->flag & RS_FEED_FLAG_FOLDER) == 0) {
 #ifdef FEEDREADER_DEBUG
 				std::cerr << "p3FeedReader::setFeed - parent " << parentIt->second->name << " is no folder" << std::endl;
 #endif
-				return RS_FEED_ADD_RESULT_PARENT_IS_NO_FOLDER;
+				return RS_FEED_RESULT_PARENT_IS_NO_FOLDER;
 			}
 		}
 
@@ -595,10 +595,10 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 		//TODO: error
 	}
 
-	return RS_FEED_ADD_RESULT_SUCCESS;
+	return RS_FEED_RESULT_SUCCESS;
 }
 
-RsFeedAddResult p3FeedReader::setParent(uint32_t feedId, uint32_t parentId)
+RsFeedResult p3FeedReader::setParent(uint32_t feedId, uint32_t parentId)
 {
 	bool changed = false;
 
@@ -614,7 +614,7 @@ RsFeedAddResult p3FeedReader::setParent(uint32_t feedId, uint32_t parentId)
 #ifdef FEEDREADER_DEBUG
 			std::cerr << "p3FeedReader::setParent - feed id " << feedId << " not found" << std::endl;
 #endif
-			return RS_FEED_ADD_RESULT_FEED_NOT_FOUND;
+			return RS_FEED_RESULT_FEED_NOT_FOUND;
 		}
 
 		if (parentId) {
@@ -624,14 +624,14 @@ RsFeedAddResult p3FeedReader::setParent(uint32_t feedId, uint32_t parentId)
 #ifdef FEEDREADER_DEBUG
 				std::cerr << "p3FeedReader::setParent - parent id " << parentId << " not found" << std::endl;
 #endif
-				return RS_FEED_ADD_RESULT_PARENT_NOT_FOUND;
+				return RS_FEED_RESULT_PARENT_NOT_FOUND;
 			}
 
 			if ((parentIt->second->flag & RS_FEED_FLAG_FOLDER) == 0) {
 #ifdef FEEDREADER_DEBUG
 				std::cerr << "p3FeedReader::setParent - parent " << parentIt->second->name << " is no folder" << std::endl;
 #endif
-				return RS_FEED_ADD_RESULT_PARENT_IS_NO_FOLDER;
+				return RS_FEED_RESULT_PARENT_IS_NO_FOLDER;
 			}
 		}
 
@@ -651,7 +651,7 @@ RsFeedAddResult p3FeedReader::setParent(uint32_t feedId, uint32_t parentId)
 		}
 	}
 
-	return RS_FEED_ADD_RESULT_SUCCESS;
+	return RS_FEED_RESULT_SUCCESS;
 }
 
 void p3FeedReader::deleteAllMsgs_locked(RsFeedReaderFeed *fi)
diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h
index d98259a3b..ac251b23a 100644
--- a/plugins/FeedReader/services/p3FeedReader.h
+++ b/plugins/FeedReader/services/p3FeedReader.h
@@ -55,25 +55,25 @@ public:
 	virtual bool     getSaveInBackground();
 	virtual void     setSaveInBackground(bool saveInBackground);
 
-	virtual RsFeedAddResult addFolder(uint32_t parentId, const std::string &name, uint32_t &feedId);
-	virtual RsFeedAddResult setFolder(uint32_t feedId, const std::string &name);
-	virtual RsFeedAddResult addFeed(const FeedInfo &feedInfo, uint32_t &feedId);
-	virtual RsFeedAddResult setFeed(uint32_t feedId, const FeedInfo &feedInfo);
-	virtual RsFeedAddResult setParent(uint32_t feedId, uint32_t parentId);
-	virtual bool            removeFeed(uint32_t feedId);
-	virtual bool            addPreviewFeed(const FeedInfo &feedInfo, uint32_t &feedId);
-	virtual void            getFeedList(uint32_t parentId, std::list<FeedInfo> &feedInfos);
-	virtual bool            getFeedInfo(uint32_t feedId, FeedInfo &feedInfo);
-	virtual bool            getMsgInfo(uint32_t feedId, const std::string &msgId, FeedMsgInfo &msgInfo);
-	virtual bool            removeMsg(uint32_t feedId, const std::string &msgId);
-	virtual bool            removeMsgs(uint32_t feedId, const std::list<std::string> &msgIds);
-	virtual bool            getMessageCount(uint32_t feedId, uint32_t *msgCount, uint32_t *newCount, uint32_t *unreadCount);
-	virtual bool            getFeedMsgList(uint32_t feedId, std::list<FeedMsgInfo> &msgInfos);
-	virtual bool            getFeedMsgIdList(uint32_t feedId, std::list<std::string> &msgIds);
-	virtual bool            processFeed(uint32_t feedId);
-	virtual bool            setMessageRead(uint32_t feedId, const std::string &msgId, bool read);
-	virtual bool            retransformMsg(uint32_t feedId, const std::string &msgId);
-	virtual bool            clearMessageCache(uint32_t feedId);
+	virtual RsFeedResult addFolder(uint32_t parentId, const std::string &name, uint32_t &feedId);
+	virtual RsFeedResult setFolder(uint32_t feedId, const std::string &name);
+	virtual RsFeedResult addFeed(const FeedInfo &feedInfo, uint32_t &feedId);
+	virtual RsFeedResult setFeed(uint32_t feedId, const FeedInfo &feedInfo);
+	virtual RsFeedResult setParent(uint32_t feedId, uint32_t parentId);
+	virtual bool         removeFeed(uint32_t feedId);
+	virtual bool         addPreviewFeed(const FeedInfo &feedInfo, uint32_t &feedId);
+	virtual void         getFeedList(uint32_t parentId, std::list<FeedInfo> &feedInfos);
+	virtual bool         getFeedInfo(uint32_t feedId, FeedInfo &feedInfo);
+	virtual bool         getMsgInfo(uint32_t feedId, const std::string &msgId, FeedMsgInfo &msgInfo);
+	virtual bool         removeMsg(uint32_t feedId, const std::string &msgId);
+	virtual bool         removeMsgs(uint32_t feedId, const std::list<std::string> &msgIds);
+	virtual bool         getMessageCount(uint32_t feedId, uint32_t *msgCount, uint32_t *newCount, uint32_t *unreadCount);
+	virtual bool         getFeedMsgList(uint32_t feedId, std::list<FeedMsgInfo> &msgInfos);
+	virtual bool         getFeedMsgIdList(uint32_t feedId, std::list<std::string> &msgIds);
+	virtual bool         processFeed(uint32_t feedId);
+	virtual bool         setMessageRead(uint32_t feedId, const std::string &msgId, bool read);
+	virtual bool         retransformMsg(uint32_t feedId, const std::string &msgId);
+	virtual bool         clearMessageCache(uint32_t feedId);
 
 	virtual RsFeedReaderErrorState processXPath(const std::list<std::string> &xpathsToUse, const std::list<std::string> &xpathsToRemove, std::string &description, std::string &errorString);
 	virtual RsFeedReaderErrorState processXslt(const std::string &xslt, std::string &description, std::string &errorString);

From bcb4e527689b22f3279e01f456e23f30e8fc442b Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 16 Apr 2023 22:43:40 +0200
Subject: [PATCH 258/503] Added methods to set title, notes and link on
 PostedCreatePostDialog from outside

---
 .../src/gui/Posted/PostedCreatePostDialog.cpp     | 15 +++++++++++++++
 .../src/gui/Posted/PostedCreatePostDialog.h       |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
index ec41434c1..f0bc99551 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
@@ -330,3 +330,18 @@ void PostedCreatePostDialog::reject()
 
     QDialog::reject();
 }
+
+void PostedCreatePostDialog::setTitle(const QString& title)
+{
+	ui->titleEdit->setText(title);
+}
+
+void PostedCreatePostDialog::setNotes(const QString& notes)
+{
+	ui->RichTextEditWidget->setText(notes);
+}
+
+void PostedCreatePostDialog::setLink(const QString& link)
+{
+	ui->linkEdit->setText(link);
+}
diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
index d7b8a261c..e952f6be8 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
@@ -41,6 +41,10 @@ public:
     explicit PostedCreatePostDialog(RsPosted* posted, const RsGxsGroupId& grpId, const RsGxsId& default_author=RsGxsId(),QWidget *parent = 0);
 	~PostedCreatePostDialog();
 
+	void setTitle(const QString& title);
+	void setNotes(const QString& notes);
+	void setLink(const QString& link);
+
 private:
 	QString imagefilename;
 	QByteArray imagebytes;

From b14fecfc2af4c0dd18be65bbef0b8a922400cc60 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 16 Apr 2023 17:44:50 +0200
Subject: [PATCH 259/503] FeedReader: Message of a local feed can be added as
 forum and board message

---
 .../gui/FeedReaderMessageWidget.cpp           | 119 ++++++++++++++++++
 .../FeedReader/gui/FeedReaderMessageWidget.h  |   4 +
 plugins/FeedReader/interface/rsFeedReader.h   |  10 ++
 plugins/FeedReader/lang/FeedReader_en.ts      |  18 ++-
 plugins/FeedReader/services/p3FeedReader.cc   |  82 ++++++++++++
 plugins/FeedReader/services/p3FeedReader.h    |   5 +
 .../src/gui/gxsforums/CreateGxsForumMsg.cpp   |   6 +-
 7 files changed, 237 insertions(+), 7 deletions(-)

diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
index 96198f400..5be5d3ebc 100644
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
@@ -36,8 +36,12 @@
 #include "gui/settings/rsharesettings.h"
 #include "util/HandleRichText.h"
 #include "util/QtVersion.h"
+#include "gui/Posted/PostedCreatePostDialog.h"
+#include "gui/gxsforums/CreateGxsForumMsg.h"
 
 #include "retroshare/rsiface.h"
+#include "retroshare/rsgxsforums.h"
+#include "retroshare/rsposted.h"
 
 #define COLUMN_MSG_COUNT    4
 #define COLUMN_MSG_TITLE    0
@@ -350,6 +354,20 @@ void FeedReaderMessageWidget::msgTreeCustomPopupMenu(QPoint /*point*/)
 	action = contextMnu.addAction(QIcon(""), tr("Remove"), this, SLOT(removeMsg()));
 	action->setEnabled(!selectedItems.empty());
 
+	if (selectedItems.size() == 1 && (mFeedReader->forums() || mFeedReader->posted())) {
+		contextMnu.addSeparator();
+
+		if (mFeedReader->forums()) {
+			QMenu *menu = contextMnu.addMenu(tr("Add to forum"));
+			connect(menu, SIGNAL(aboutToShow()), this, SLOT(fillForumMenu()));
+		}
+
+		if (mFeedReader->posted()) {
+			QMenu *menu = contextMnu.addMenu(tr("Add to board"));
+			connect(menu, SIGNAL(aboutToShow()), this, SLOT(fillPostedMenu()));
+		}
+	}
+
 	contextMnu.addSeparator();
 
 	action = contextMnu.addAction(QIcon(""), tr("Retransform"), this, SLOT(retransformMsg()));
@@ -850,3 +868,104 @@ void FeedReaderMessageWidget::openLinkMsg()
 
 	QDesktopServices::openUrl(QUrl(link));
 }
+
+void FeedReaderMessageWidget::fillForumMenu()
+{
+	QMenu *menu = dynamic_cast<QMenu*>(sender()) ;
+	if (!menu) {
+		return;
+	}
+
+	disconnect(menu, SIGNAL(aboutToShow()), this, SLOT(fillForumMenu()));
+
+	std::vector<RsGxsForumGroup> groups;
+	if (mFeedReader->getForumGroups(groups, true)) {
+		for (std::vector<RsGxsForumGroup>::iterator it = groups.begin(); it != groups.end(); ++it) {
+			const RsGxsForumGroup &group = *it;
+			QAction *action = menu->addAction(QString::fromUtf8(group.mMeta.mGroupName.c_str()), this, SLOT(addToForum()));
+			action->setData(QString::fromUtf8(group.mMeta.mGroupId.toStdString().c_str()));
+		}
+	}
+}
+
+void FeedReaderMessageWidget::fillPostedMenu()
+{
+	QMenu *menu = dynamic_cast<QMenu*>(sender()) ;
+	if (!menu) {
+		return;
+	}
+
+	disconnect(menu, SIGNAL(aboutToShow()), this, SLOT(fillPostedMenu()));
+
+	std::vector<RsPostedGroup> groups;
+	if (mFeedReader->getPostedGroups(groups, true)) {
+		for (std::vector<RsPostedGroup>::iterator it = groups.begin(); it != groups.end(); ++it) {
+			const RsPostedGroup &group = *it;
+			QAction *action = menu->addAction(QString::fromUtf8(group.mMeta.mGroupName.c_str()), this, SLOT(addToPosted()));
+			action->setData(QString::fromUtf8(group.mMeta.mGroupId.toStdString().c_str()));
+		}
+	}
+}
+
+void FeedReaderMessageWidget::addToForum()
+{
+	QAction *action = dynamic_cast<QAction*>(sender()) ;
+	if (!action) {
+		return;
+	}
+
+	QString id = action->data().toString();
+	if (id.isEmpty()) {
+		return;
+	}
+
+	QList<QTreeWidgetItem*> selectedItems = ui->msgTreeWidget->selectedItems();
+	if (selectedItems.size() != 1) {
+		return;
+	}
+
+	std::string msgId = selectedItems[0]->data(COLUMN_MSG_DATA, ROLE_MSG_ID).toString().toStdString();
+	FeedMsgInfo msgInfo;
+	if (!mFeedReader->getMsgInfo(mFeedId, msgId, msgInfo)) {
+		return;
+	}
+
+	RsGxsGroupId forumId(id.toStdString());
+
+	CreateGxsForumMsg *msgDialog = new CreateGxsForumMsg(forumId, RsGxsMessageId(), RsGxsMessageId(), RsGxsId()) ;
+	msgDialog->setSubject(QString::fromUtf8(msgInfo.title.c_str()));
+	msgDialog->insertPastedText(QString::fromUtf8(msgInfo.description.c_str()));
+	msgDialog->show();
+}
+
+void FeedReaderMessageWidget::addToPosted()
+{
+	QAction *action = dynamic_cast<QAction*>(sender()) ;
+	if (!action) {
+		return;
+	}
+
+	QString id = action->data().toString();
+	if (id.isEmpty()) {
+		return;
+	}
+
+	QList<QTreeWidgetItem*> selectedItems = ui->msgTreeWidget->selectedItems();
+	if (selectedItems.size() != 1) {
+		return;
+	}
+
+	std::string msgId = selectedItems[0]->data(COLUMN_MSG_DATA, ROLE_MSG_ID).toString().toStdString();
+	FeedMsgInfo msgInfo;
+	if (!mFeedReader->getMsgInfo(mFeedId, msgId, msgInfo)) {
+		return;
+	}
+
+	RsGxsGroupId postedId(id.toStdString());
+
+	PostedCreatePostDialog *msgDialog = new PostedCreatePostDialog(mFeedReader->posted(), postedId);
+	msgDialog->setTitle(QString::fromUtf8(msgInfo.title.c_str()));
+	msgDialog->setNotes(QString::fromUtf8(msgInfo.description.c_str()));
+	msgDialog->setLink(QString::fromUtf8(msgInfo.link.c_str()));
+	msgDialog->show();
+}
diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.h b/plugins/FeedReader/gui/FeedReaderMessageWidget.h
index 452c407ad..317d61e71 100644
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.h
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.h
@@ -73,6 +73,10 @@ private slots:
 	void openLinkMsg();
 	void copyLinkMsg();
 	void retransformMsg();
+	void fillForumMenu();
+	void fillPostedMenu();
+	void addToForum();
+	void addToPosted();
 
 	/* FeedReaderNotify */
 	void feedChanged(uint32_t feedId, int type);
diff --git a/plugins/FeedReader/interface/rsFeedReader.h b/plugins/FeedReader/interface/rsFeedReader.h
index 3de449ba0..bfb239400 100644
--- a/plugins/FeedReader/interface/rsFeedReader.h
+++ b/plugins/FeedReader/interface/rsFeedReader.h
@@ -25,8 +25,13 @@
 #include <inttypes.h>
 #include <string>
 #include <list>
+#include <vector>
 
 class RsFeedReader;
+class RsGxsForums;
+class RsPosted;
+class RsGxsForumGroup;
+class RsPostedGroup;
 extern RsFeedReader *rsFeedReader;
 
 enum RsFeedReaderErrorState {
@@ -232,6 +237,11 @@ public:
 	virtual bool         retransformMsg(uint32_t feedId, const std::string &msgId) = 0;
 	virtual bool         clearMessageCache(uint32_t feedId) = 0;
 
+	virtual RsGxsForums* forums() = 0;
+	virtual RsPosted*    posted() = 0;
+	virtual bool         getForumGroups(std::vector<RsGxsForumGroup> &groups, bool onlyOwn) = 0;
+	virtual bool         getPostedGroups(std::vector<RsPostedGroup> &groups, bool onlyOwn) = 0;
+
 	virtual RsFeedReaderErrorState processXPath(const std::list<std::string> &xpathsToUse, const std::list<std::string> &xpathsToRemove, std::string &description, std::string &errorString) = 0;
 	virtual RsFeedReaderErrorState processXslt(const std::string &xslt, std::string &description, std::string &errorString) = 0;
 };
diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts
index 500c46810..af6f9422f 100644
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@@ -194,8 +194,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
-        <location line="+148"/>
+        <location line="+206"/>
+        <location line="+150"/>
         <location line="+15"/>
         <source>Edit feed</source>
         <translation type="unfinished"></translation>
@@ -530,7 +530,7 @@
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+115"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+117"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -616,13 +616,23 @@
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Add to forum</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+5"/>
+        <source>Add to board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Retransform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+385"/>
+        <location line="+374"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc
index 104e137c6..0e3310aa5 100644
--- a/plugins/FeedReader/services/p3FeedReader.cc
+++ b/plugins/FeedReader/services/p3FeedReader.cc
@@ -2532,3 +2532,85 @@ bool p3FeedReader::waitForToken(RsGxsIfaceHelper *interface, uint32_t token)
 
 	return false;
 }
+
+bool p3FeedReader::getForumGroups(std::vector<RsGxsForumGroup> &groups, bool onlyOwn)
+{
+	if (!mForums) {
+		std::cerr << "p3FeedReader::getForumGroups - can't get groups, member mForums is not set" << std::endl;
+		return false;
+	}
+
+	RsTokReqOptions opts;
+	opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
+
+	uint32_t token;
+	if (!mForums->requestGroupInfo(token, opts)) {
+		std::cerr << "p3FeedReader::getForumGroups - can't get group list" << std::endl;
+		return false;
+	}
+
+	if (!waitForToken(mForums, token)) {
+		std::cerr << "p3FeedReader::getForumGroups - waitForToken for list failed" << std::endl;
+		return false;
+	}
+
+	if (!mForums->getGroupData(token, groups)) {
+		std::cerr << "p3FeedReader::getForumGroups - getGroupData failed" << std::endl;
+		return false;
+	}
+
+	if (onlyOwn) {
+		// filter groups
+		for (std::vector<RsGxsForumGroup>::iterator it = groups.begin(); it != groups.end(); ) {
+			const RsGxsForumGroup &group = *it;
+			if (IS_GROUP_PUBLISHER(group.mMeta.mSubscribeFlags) && IS_GROUP_ADMIN(group.mMeta.mSubscribeFlags)) {
+				++it;
+			} else {
+				it = groups.erase(it);
+			}
+		}
+	}
+
+	return true;
+}
+
+bool p3FeedReader::getPostedGroups(std::vector<RsPostedGroup> &groups, bool onlyOwn)
+{
+	if (!mPosted) {
+		std::cerr << "p3FeedReader::getPostedGroups - can't get groups, member mPosted is not set" << std::endl;
+		return false;
+	}
+
+	RsTokReqOptions opts;
+	opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
+
+	uint32_t token;
+	if (!mPosted->requestGroupInfo(token, opts)) {
+		std::cerr << "p3FeedReader::getPostedGroups - can't get group list" << std::endl;
+		return false;
+	}
+
+	if (!waitForToken(mPosted, token)) {
+		std::cerr << "p3FeedReader::getPostedGroups - waitForToken for list failed" << std::endl;
+		return false;
+	}
+
+	if (!mPosted->getGroupData(token, groups)) {
+		std::cerr << "p3FeedReader::getForumGroups - getGroupData failed" << std::endl;
+		return false;
+	}
+
+	if (onlyOwn) {
+		// filter groups
+		for (std::vector<RsPostedGroup>::iterator it = groups.begin(); it != groups.end(); ) {
+			const RsPostedGroup &group = *it;
+			if (IS_GROUP_PUBLISHER(group.mMeta.mSubscribeFlags) && IS_GROUP_ADMIN(group.mMeta.mSubscribeFlags)) {
+				++it;
+			} else {
+				it = groups.erase(it);
+			}
+		}
+	}
+
+	return true;
+}
diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h
index ac251b23a..c69832506 100644
--- a/plugins/FeedReader/services/p3FeedReader.h
+++ b/plugins/FeedReader/services/p3FeedReader.h
@@ -75,6 +75,11 @@ public:
 	virtual bool         retransformMsg(uint32_t feedId, const std::string &msgId);
 	virtual bool         clearMessageCache(uint32_t feedId);
 
+	virtual RsGxsForums* forums() { return mForums; }
+	virtual RsPosted*    posted() { return mPosted; }
+	virtual bool         getForumGroups(std::vector<RsGxsForumGroup> &groups, bool onlyOwn);
+	virtual bool         getPostedGroups(std::vector<RsPostedGroup> &groups, bool onlyOwn);
+
 	virtual RsFeedReaderErrorState processXPath(const std::list<std::string> &xpathsToUse, const std::list<std::string> &xpathsToRemove, std::string &description, std::string &errorString);
 	virtual RsFeedReaderErrorState processXslt(const std::string &xslt, std::string &description, std::string &errorString);
 
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
index 493f254d4..4236b6f04 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
@@ -68,19 +68,19 @@ CreateGxsForumMsg::CreateGxsForumMsg(const RsGxsGroupId &fId, const RsGxsMessage
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui->postButton);
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_FORUMINFO, ui->innerFrame);
 	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui->forumName);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui->forumSubject);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_FORUMINFO, ui->forumSubject, false);
 	mStateHelper->addClear(CREATEGXSFORUMMSG_FORUMINFO, ui->forumName);
 
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui->postButton);
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_PARENTMSG, ui->innerFrame);
 	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui->forumName);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui->forumSubject);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_PARENTMSG, ui->forumSubject, false);
 	mStateHelper->addClear(CREATEGXSFORUMMSG_PARENTMSG, ui->forumName);
 
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui->postButton);
 	mStateHelper->addWidget(CREATEGXSFORUMMSG_ORIGMSG, ui->innerFrame);
 	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui->forumName);
-	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui->forumSubject);
+	mStateHelper->addLoadPlaceholder(CREATEGXSFORUMMSG_ORIGMSG, ui->forumSubject, false);
 	mStateHelper->addClear(CREATEGXSFORUMMSG_ORIGMSG, ui->forumName);
 
 

From e25c148c27469665d14a856c931cef82a7fe6cde Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 24 Apr 2023 22:53:26 +0200
Subject: [PATCH 260/503] FeedReader: Changed save type for
 IndicateConfigChanged in service to SAVE_NOW

---
 plugins/FeedReader/services/p3FeedReader.cc | 44 ++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc
index 0e3310aa5..7d6f44a1c 100644
--- a/plugins/FeedReader/services/p3FeedReader.cc
+++ b/plugins/FeedReader/services/p3FeedReader.cc
@@ -269,7 +269,7 @@ void p3FeedReader::setStandardStorageTime(uint32_t storageTime)
 
 	if (mStandardStorageTime != storageTime) {
 		mStandardStorageTime = storageTime;
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 	}
 }
 
@@ -286,7 +286,7 @@ void p3FeedReader::setStandardUpdateInterval(uint32_t updateInterval)
 
 	if (mStandardUpdateInterval != updateInterval) {
 		mStandardUpdateInterval = updateInterval;
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 	}
 }
 
@@ -308,7 +308,7 @@ void p3FeedReader::setStandardProxy(bool useProxy, const std::string &proxyAddre
 		mStandardProxyAddress = proxyAddress;
 		mStandardProxyPort = proxyPort;
 		mStandardUseProxy = useProxy;
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 	}
 }
 
@@ -325,7 +325,7 @@ void p3FeedReader::setSaveInBackground(bool saveInBackground)
 
 	if (saveInBackground != mSaveInBackground) {
 		mSaveInBackground = saveInBackground;
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 	}
 }
 
@@ -401,7 +401,7 @@ RsFeedResult p3FeedReader::addFolder(uint32_t parentId, const std::string &name,
 		feedId = fi->feedId;
 	}
 
-	IndicateConfigChanged();
+	IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 
 	if (mNotify) {
 		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_ADD);
@@ -441,7 +441,7 @@ RsFeedResult p3FeedReader::setFolder(uint32_t feedId, const std::string &name)
 		fi->name = name;
 	}
 
-	IndicateConfigChanged();
+	IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 
 	if (mNotify) {
 		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
@@ -488,7 +488,7 @@ RsFeedResult p3FeedReader::addFeed(const FeedInfo &feedInfo, uint32_t &feedId)
 		feedId = fi->feedId;
 	}
 
-	IndicateConfigChanged();
+	IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 
 	if (mNotify) {
 		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_ADD);
@@ -573,7 +573,7 @@ RsFeedResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
 		}
 	}
 
-	IndicateConfigChanged();
+	IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 
 	if (mNotify) {
 		mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
@@ -644,7 +644,7 @@ RsFeedResult p3FeedReader::setParent(uint32_t feedId, uint32_t parentId)
 	}
 
 	if (changed) {
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 
 		if (mNotify) {
 			mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
@@ -729,7 +729,7 @@ bool p3FeedReader::removeFeed(uint32_t feedId)
 	}
 
 	if (changed) {
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 	}
 
 	if (preview) {
@@ -910,7 +910,7 @@ bool p3FeedReader::removeMsg(uint32_t feedId, const std::string &msgId)
 	}
 
 	if (changed) {
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 	}
 
 	if (mNotify) {
@@ -962,7 +962,7 @@ bool p3FeedReader::removeMsgs(uint32_t feedId, const std::list<std::string> &msg
 	}
 
 	if (changed) {
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 	}
 
 	if (mNotify && !removedMsgs.empty()) {
@@ -1260,7 +1260,7 @@ bool p3FeedReader::setMessageRead(uint32_t feedId, const std::string &msgId, boo
 	}
 
 	if (changed) {
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 		if (mNotify) {
 			mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 			mNotify->notifyMsgChanged(feedId, msgId, NOTIFY_TYPE_MOD);
@@ -1314,7 +1314,7 @@ bool p3FeedReader::retransformMsg(uint32_t feedId, const std::string &msgId)
 	}
 
 	if (feedChanged || msgChanged) {
-		IndicateConfigChanged();
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 		if (mNotify) {
 			if (feedChanged) {
 				mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
@@ -1368,7 +1368,7 @@ bool p3FeedReader::clearMessageCache(uint32_t feedId)
 		}
 	}
 
-	IndicateConfigChanged();
+	IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 
 	return true;
 }
@@ -1499,7 +1499,7 @@ void p3FeedReader::cleanFeeds()
 		mLastClean = currentTime;
 
 		if (removedMsgIds.size()) {
-			IndicateConfigChanged();
+			IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 
 			if (mNotify) {
 				std::list<std::pair<uint32_t, std::string> >::iterator it;
@@ -1811,7 +1811,7 @@ void p3FeedReader::onDownloadSuccess(uint32_t feedId, const std::string &content
 			fi->icon = icon;
 
 			if (!preview) {
-				IndicateConfigChanged();
+				IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 			}
 		}
 
@@ -1862,7 +1862,7 @@ void p3FeedReader::onDownloadError(uint32_t feedId, RsFeedReaderErrorState resul
 #endif
 
 		if (!fi->preview) {
-			IndicateConfigChanged();
+			IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 		}
 	}
 
@@ -1974,7 +1974,7 @@ void p3FeedReader::onProcessSuccess_filterMsg(uint32_t feedId, std::list<RsFeedR
 		fi->errorString.clear();
 
 		if (!fi->preview) {
-			IndicateConfigChanged();
+			IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 		}
 	}
 }
@@ -2119,7 +2119,7 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 		}
 
 		if (!fi->preview) {
-			IndicateConfigChanged();
+			IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 		}
 	}
 
@@ -2266,7 +2266,7 @@ void p3FeedReader::onProcessError(uint32_t feedId, RsFeedReaderErrorState result
 #endif
 
 		if (!fi->preview) {
-			IndicateConfigChanged();
+			IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 		}
 	}
 
@@ -2335,7 +2335,7 @@ void p3FeedReader::setFeedInfo(uint32_t feedId, const std::string &name, const s
 
 	if (changed) {
 		if (!preview) {
-			IndicateConfigChanged();
+			IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 		}
 
 		if (mNotify) {

From af562cb4cad52b55985c9f13e3fc8927a87e6b12 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 26 Apr 2023 21:53:59 +0200
Subject: [PATCH 261/503] FeedReader: Added shrink of images for board post

---
 plugins/FeedReader/gui/AddFeedDialog.cpp      |   7 ++
 plugins/FeedReader/gui/AddFeedDialog.ui       |  10 +-
 plugins/FeedReader/gui/FeedReaderDialog.cpp   |  33 ++++++
 plugins/FeedReader/gui/FeedReaderDialog.h     |   1 +
 plugins/FeedReader/gui/FeedReaderNotify.cpp   |   5 +
 plugins/FeedReader/gui/FeedReaderNotify.h     |   2 +
 plugins/FeedReader/interface/rsFeedReader.h   |  27 +++++
 plugins/FeedReader/lang/FeedReader_en.ts      |  21 ++--
 plugins/FeedReader/services/p3FeedReader.cc   | 110 +++++++++++++++++-
 plugins/FeedReader/services/p3FeedReader.h    |   8 ++
 .../FeedReader/services/rsFeedReaderItems.h   |   1 +
 .../src/gui/Posted/PostedCreatePostDialog.cpp |  12 +-
 .../src/gui/Posted/PostedCreatePostDialog.h   |   3 +-
 13 files changed, 226 insertions(+), 14 deletions(-)

diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp
index 588428a8d..4e0645607 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.cpp
+++ b/plugins/FeedReader/gui/AddFeedDialog.cpp
@@ -99,6 +99,8 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify,
 	ui->postedFirstImageCheckBox->setChecked(false);
 	ui->postedOnlyImageCheckBox->setEnabled(false);
 	ui->postedOnlyImageCheckBox->setChecked(false);
+	ui->postedShinkImageCheckBox->setEnabled(false);
+	ui->postedShinkImageCheckBox->setChecked(false);
 	ui->useAuthenticationCheckBox->setChecked(false);
 	ui->useStandardStorageTimeCheckBox->setChecked(true);
 	ui->useStandardUpdateInterval->setChecked(true);
@@ -197,9 +199,11 @@ void AddFeedDialog::postedFirstImageToggled()
 {
 	bool checked = ui->postedFirstImageCheckBox->isChecked();
 	ui->postedOnlyImageCheckBox->setEnabled(checked);
+	ui->postedShinkImageCheckBox->setEnabled(checked);
 
 	if (!checked) {
 		ui->postedOnlyImageCheckBox->setChecked(false);
+		ui->postedShinkImageCheckBox->setChecked(false);
 	}
 }
 
@@ -209,6 +213,7 @@ void AddFeedDialog::typePostedToggled()
 	mStateHelper->setWidgetEnabled(ui->postedComboBox, checked);
 	ui->updatePostedInfoCheckBox->setEnabled(checked);
 	ui->postedFirstImageCheckBox->setEnabled(checked);
+	ui->postedShinkImageCheckBox->setEnabled(checked);
 
 	if (checked) {
 		ui->typeLocalCheckBox->setChecked(false);
@@ -301,6 +306,7 @@ bool AddFeedDialog::fillFeed(uint32_t feedId)
 		ui->updatePostedInfoCheckBox->setChecked(feedInfo.flag.updatePostedInfo);
 		ui->postedFirstImageCheckBox->setChecked(feedInfo.flag.postedFirstImage);
 		ui->postedOnlyImageCheckBox->setChecked(feedInfo.flag.postedOnlyImage);
+		ui->postedShinkImageCheckBox->setChecked(feedInfo.flag.postedShrinkImage);
 		ui->activatedCheckBox->setChecked(!feedInfo.flag.deactivated);
 		ui->embedImagesCheckBox->setChecked(feedInfo.flag.embedImages);
 		ui->saveCompletePageCheckBox->setChecked(feedInfo.flag.saveCompletePage);
@@ -397,6 +403,7 @@ void AddFeedDialog::getFeedInfo(FeedInfo &feedInfo)
 	feedInfo.flag.updatePostedInfo = ui->updatePostedInfoCheckBox->isChecked() && ui->updatePostedInfoCheckBox->isEnabled();
 	feedInfo.flag.postedFirstImage = ui->postedFirstImageCheckBox->isChecked() && ui->postedFirstImageCheckBox->isEnabled();
 	feedInfo.flag.postedOnlyImage = ui->postedOnlyImageCheckBox->isChecked() && ui->postedOnlyImageCheckBox->isEnabled();
+	feedInfo.flag.postedShrinkImage = ui->postedShinkImageCheckBox->isChecked() && ui->postedShinkImageCheckBox->isEnabled();
 	feedInfo.flag.deactivated = !ui->activatedCheckBox->isChecked();
 	feedInfo.flag.embedImages = ui->embedImagesCheckBox->isChecked();
 	feedInfo.flag.saveCompletePage = ui->saveCompletePageCheckBox->isChecked();
diff --git a/plugins/FeedReader/gui/AddFeedDialog.ui b/plugins/FeedReader/gui/AddFeedDialog.ui
index f3bcaf85f..40b9bd46d 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.ui
+++ b/plugins/FeedReader/gui/AddFeedDialog.ui
@@ -130,6 +130,13 @@
              </property>
             </widget>
            </item>
+           <item row="0" column="1">
+            <widget class="QCheckBox" name="postedShinkImageCheckBox">
+             <property name="text">
+              <string>Shrink image</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </item>
         </layout>
@@ -482,8 +489,9 @@
   <tabstop>typePostedCheckBox</tabstop>
   <tabstop>postedComboBox</tabstop>
   <tabstop>updatePostedInfoCheckBox</tabstop>
+  <tabstop>postedShinkImageCheckBox</tabstop>
   <tabstop>postedFirstImageCheckBox</tabstop>
-  <tabstop>checkBox</tabstop>
+  <tabstop>postedOnlyImageCheckBox</tabstop>
   <tabstop>typeLocalCheckBox</tabstop>
   <tabstop>activatedCheckBox</tabstop>
   <tabstop>useInfoFromFeedCheckBox</tabstop>
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.cpp b/plugins/FeedReader/gui/FeedReaderDialog.cpp
index 1c3d6ca8c..7ea17983b 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.cpp
+++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp
@@ -35,6 +35,7 @@
 #include "gui/settings/rsharesettings.h"
 #include "gui/notifyqt.h"
 #include "FeedReaderUserNotify.h"
+#include "gui/Posted/PostedCreatePostDialog.h"
 
 #include "interface/rsFeedReader.h"
 #include "retroshare/rsiface.h"
@@ -66,6 +67,7 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, FeedReaderNotify *n
 	mMessageWidget = NULL;
 
 	connect(mNotify, &FeedReaderNotify::feedChanged, this, &FeedReaderDialog::feedChanged, Qt::QueuedConnection);
+	connect(mNotify, &FeedReaderNotify::shrinkImage, this, &FeedReaderDialog::shrinkImage, Qt::QueuedConnection);
 
 	connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 
@@ -604,6 +606,37 @@ void FeedReaderDialog::feedChanged(uint32_t feedId, int type)
 	calculateFeedItems();
 }
 
+void FeedReaderDialog::shrinkImage()
+{
+	while (true) {
+		FeedReaderShrinkImageTask *shrinkImageTask = mFeedReader->getShrinkImageTask();
+
+		if (!shrinkImageTask) {
+			return;
+		}
+
+		switch (shrinkImageTask->mType) {
+		case FeedReaderShrinkImageTask::POSTED:
+		{
+			QImage image;
+			if (image.loadFromData(shrinkImageTask->mImage.data(), shrinkImageTask->mImage.size())) {
+				QByteArray imageBytes;
+				QImage imageOpt;
+				if (PostedCreatePostDialog::optimizeImage(image, imageBytes, imageOpt)) {
+					shrinkImageTask->mImageResult.assign(imageBytes.begin(), imageBytes.end());
+					shrinkImageTask->mResult = true;
+				}
+			}
+			break;
+		}
+		default:
+			shrinkImageTask->mResult = false;
+		}
+
+		mFeedReader->setShrinkImageTaskResult(shrinkImageTask);
+	}
+}
+
 FeedReaderMessageWidget *FeedReaderDialog::feedMessageWidget(uint32_t id)
 {
 	int tabCount = ui->messageTabWidget->count();
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.h b/plugins/FeedReader/gui/FeedReaderDialog.h
index d684f1f4b..b4854d2f3 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.h
+++ b/plugins/FeedReader/gui/FeedReaderDialog.h
@@ -69,6 +69,7 @@ private slots:
 
 	/* FeedReaderNotify */
 	void feedChanged(uint32_t feedId, int type);
+	void shrinkImage();
 
 private:
 	uint32_t currentFeedId();
diff --git a/plugins/FeedReader/gui/FeedReaderNotify.cpp b/plugins/FeedReader/gui/FeedReaderNotify.cpp
index f2aa7ad1d..33b0c294a 100644
--- a/plugins/FeedReader/gui/FeedReaderNotify.cpp
+++ b/plugins/FeedReader/gui/FeedReaderNotify.cpp
@@ -33,3 +33,8 @@ void FeedReaderNotify::notifyMsgChanged(uint32_t feedId, const std::string &msgI
 {
 	emit msgChanged(feedId, QString::fromStdString(msgId), type);
 }
+
+void FeedReaderNotify::notifyShrinkImage()
+{
+	emit shrinkImage();
+}
diff --git a/plugins/FeedReader/gui/FeedReaderNotify.h b/plugins/FeedReader/gui/FeedReaderNotify.h
index 5a8ad712a..18090e70c 100644
--- a/plugins/FeedReader/gui/FeedReaderNotify.h
+++ b/plugins/FeedReader/gui/FeedReaderNotify.h
@@ -34,10 +34,12 @@ public:
 	/* RsFeedReaderNotify */
 	virtual void notifyFeedChanged(uint32_t feedId, int type);
 	virtual void notifyMsgChanged(uint32_t feedId, const std::string &msgId, int type);
+	virtual void notifyShrinkImage();
 
 signals:
 	void feedChanged(uint32_t feedId, int type);
 	void msgChanged(uint32_t feedId, const QString &msgId, int type);
+	void shrinkImage();
 };
 
 #endif
diff --git a/plugins/FeedReader/interface/rsFeedReader.h b/plugins/FeedReader/interface/rsFeedReader.h
index bfb239400..ad1ecec9a 100644
--- a/plugins/FeedReader/interface/rsFeedReader.h
+++ b/plugins/FeedReader/interface/rsFeedReader.h
@@ -157,6 +157,7 @@ public:
 		bool updatePostedInfo : 1;
 		bool postedFirstImage : 1;
 		bool postedOnlyImage : 1;
+		bool postedShrinkImage : 1;
 		bool embedImages : 1;
 		bool saveCompletePage : 1;
 		bool preview : 1;
@@ -190,6 +191,28 @@ public:
 	} flag;
 };
 
+class FeedReaderShrinkImageTask
+{
+public:
+	enum Type {
+		POSTED
+	};
+
+public:
+	Type mType;
+	std::vector<unsigned char> mImage;
+	std::vector<unsigned char> mImageResult;
+	bool mResult;
+
+public:
+	FeedReaderShrinkImageTask(Type type, const std::vector<unsigned char> &image)
+	{
+		mType = type;
+		mImage = image;
+		mResult = false;
+	}
+};
+
 class RsFeedReaderNotify
 {
 public:
@@ -197,6 +220,7 @@ public:
 
 	virtual void notifyFeedChanged(uint32_t /*feedId*/, int /*type*/) {}
 	virtual void notifyMsgChanged(uint32_t /*feedId*/, const std::string &/*msgId*/, int /*type*/) {}
+	virtual void notifyShrinkImage() {}
 };
 
 class RsFeedReader
@@ -242,6 +266,9 @@ public:
 	virtual bool         getForumGroups(std::vector<RsGxsForumGroup> &groups, bool onlyOwn) = 0;
 	virtual bool         getPostedGroups(std::vector<RsPostedGroup> &groups, bool onlyOwn) = 0;
 
+	virtual FeedReaderShrinkImageTask *getShrinkImageTask() = 0;
+	virtual void         setShrinkImageTaskResult(FeedReaderShrinkImageTask *shrinkImageTask) = 0;
+
 	virtual RsFeedReaderErrorState processXPath(const std::list<std::string> &xpathsToUse, const std::list<std::string> &xpathsToRemove, std::string &description, std::string &errorString) = 0;
 	virtual RsFeedReaderErrorState processXslt(const std::string &xslt, std::string &description, std::string &errorString) = 0;
 };
diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts
index af6f9422f..93db4a686 100644
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@@ -28,6 +28,11 @@
         <source>Use first image as board image</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Shrink image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Authentication (not yet supported)</source>
@@ -119,7 +124,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-203"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -134,7 +139,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+292"/>
+        <location line="+299"/>
         <source>Transformation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -164,12 +169,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-336"/>
         <source>Update forum information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+343"/>
+        <location line="+350"/>
         <source>Save complete web page (experimental for local feeds)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -194,8 +199,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
-        <location line="+150"/>
+        <location line="+211"/>
+        <location line="+152"/>
         <location line="+15"/>
         <source>Edit feed</source>
         <translation type="unfinished"></translation>
@@ -312,7 +317,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="+99"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="+101"/>
         <source>Message Folders</source>
         <translation type="unfinished"></translation>
     </message>
@@ -367,7 +372,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+210"/>
+        <location line="+241"/>
         <source>Add new folder</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc
index 7d6f44a1c..fbda4d9e1 100644
--- a/plugins/FeedReader/services/p3FeedReader.cc
+++ b/plugins/FeedReader/services/p3FeedReader.cc
@@ -45,7 +45,7 @@ RsFeedReader *rsFeedReader = NULL;
 
 p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsGxsForums *forums, RsPosted *posted)
 	: RsPQIService(RS_SERVICE_TYPE_PLUGIN_FEEDREADER,  5, pgHandler),
-	  mFeedReaderMtx("p3FeedReader"), mDownloadMutex("p3FeedReaderDownload"), mProcessMutex("p3FeedReaderProcess"), mPreviewMutex("p3FeedReaderPreview")
+	  mFeedReaderMtx("p3FeedReader"), mDownloadMutex("p3FeedReaderDownload"), mProcessMutex("p3FeedReaderProcess"), mImageMutex("p3FeedReaderImage"), mPreviewMutex("p3FeedReaderPreview")
 {
 	mNextFeedId = 1;
 	mNextMsgId = 1;
@@ -118,6 +118,7 @@ static void feedToInfo(const RsFeedReaderFeed *feed, FeedInfo &info)
 	info.flag.updatePostedInfo = (feed->flag & RS_FEED_FLAG_UPDATE_POSTED_INFO);
 	info.flag.postedFirstImage = (feed->flag & RS_FEED_FLAG_POSTED_FIRST_IMAGE);
 	info.flag.postedOnlyImage = (feed->flag & RS_FEED_FLAG_POSTED_ONLY_IMAGE);
+	info.flag.postedShrinkImage = (feed->flag & RS_FEED_FLAG_POSTED_SHRINK_IMAGE);
 	info.flag.embedImages = (feed->flag & RS_FEED_FLAG_EMBED_IMAGES);
 	info.flag.saveCompletePage = (feed->flag & RS_FEED_FLAG_SAVE_COMPLETE_PAGE);
 
@@ -217,6 +218,9 @@ static void infoToFeed(const FeedInfo &info, RsFeedReaderFeed *feed)
 	if (info.flag.postedOnlyImage) {
 		feed->flag |= RS_FEED_FLAG_POSTED_ONLY_IMAGE;
 	}
+	if (info.flag.postedShrinkImage) {
+		feed->flag |= RS_FEED_FLAG_POSTED_SHRINK_IMAGE;
+	}
 }
 
 static void feedMsgToInfo(const RsFeedReaderMsg *msg, FeedMsgInfo &info)
@@ -1445,10 +1449,21 @@ int p3FeedReader::tick()
 		}
 	}
 
+	// check images
+	bool imageToShrink = false;
+	{
+		RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
+
+		imageToShrink = !mImages.empty();
+	}
+
 	if (mNotify) {
 		for (it = notifyIds.begin(); it != notifyIds.end(); ++it) {
 			mNotify->notifyFeedChanged(*it, NOTIFY_TYPE_MOD);
 		}
+		if (imageToShrink) {
+			mNotify->notifyShrinkImage();
+		}
 	}
 
 	return 0;
@@ -2188,7 +2203,15 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 					if (feedFlag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) {
 						if (!mi.postedFirstImage.empty()) {
 							/* use first image as image for posted and description without image as notes */
-							postedPost.mImage.copy(mi.postedFirstImage.data(), mi.postedFirstImage.size());
+							if (feedFlag & RS_FEED_FLAG_POSTED_SHRINK_IMAGE) {
+								// shrink image
+								std::vector<unsigned char> shrinkedImage;
+								if (shrinkImage(FeedReaderShrinkImageTask::POSTED, mi.postedFirstImage, shrinkedImage)) {
+									postedPost.mImage.copy(shrinkedImage.data(), shrinkedImage.size());	
+								}
+							} else {
+								postedPost.mImage.copy(mi.postedFirstImage.data(), mi.postedFirstImage.size());
+							}
 							if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
 								/* ignore description */
 							} else {
@@ -2614,3 +2637,86 @@ bool p3FeedReader::getPostedGroups(std::vector<RsPostedGroup> &groups, bool only
 
 	return true;
 }
+
+bool p3FeedReader::shrinkImage(FeedReaderShrinkImageTask::Type type, const std::vector<unsigned char> &image, std::vector<unsigned char> &resultImage)
+{
+	if (!mNotify) {
+		return false;
+	}
+
+	FeedReaderShrinkImageTask *shrinkImageTask = new FeedReaderShrinkImageTask(type, image);
+	{
+		RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
+
+		mImages.push_back(shrinkImageTask);
+	}
+
+	/* Wait until task is complete */
+	int nSeconds = 0;
+	while (true) {
+		if (mStopped) {
+			return false;
+		}
+
+		rstime::rs_usleep(1000 * 1000); // 1 second
+
+		if (++nSeconds >= 30) {
+			// timeout
+			std::list<FeedReaderShrinkImageTask*>::iterator it = std::find(mImages.begin(), mImages.end(), shrinkImageTask);
+			if (it != mImages.end()) {
+				mImages.erase(it);
+
+				delete(shrinkImageTask);
+
+				return false;
+			}
+
+			// not found in mImages?
+		}
+
+		{
+			RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
+
+			std::list<FeedReaderShrinkImageTask*>::iterator it = std::find(mResultImages.begin(), mResultImages.end(), shrinkImageTask);
+			if (it != mResultImages.end()) {
+				mResultImages.erase(it);
+
+				bool result = shrinkImageTask->mResult;
+				if (result) {
+					resultImage = shrinkImageTask->mImageResult;
+				}
+
+				delete(shrinkImageTask);
+
+				return result;
+			}
+		}
+	}
+
+	return false;
+}
+
+FeedReaderShrinkImageTask *p3FeedReader::getShrinkImageTask()
+{
+	RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
+
+	if (mImages.empty()) {
+		return NULL;
+	}
+
+	FeedReaderShrinkImageTask *imageResize = mImages.front();
+	mImages.pop_front();
+
+	return imageResize;
+}
+
+void p3FeedReader::setShrinkImageTaskResult(FeedReaderShrinkImageTask *shrinkImageTask)
+{
+	if (!shrinkImageTask) {
+		return;
+	}
+
+	RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
+
+	mResultImages.push_back(shrinkImageTask);
+}
diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h
index c69832506..edca9ee1e 100644
--- a/plugins/FeedReader/services/p3FeedReader.h
+++ b/plugins/FeedReader/services/p3FeedReader.h
@@ -80,6 +80,9 @@ public:
 	virtual bool         getForumGroups(std::vector<RsGxsForumGroup> &groups, bool onlyOwn);
 	virtual bool         getPostedGroups(std::vector<RsPostedGroup> &groups, bool onlyOwn);
 
+	virtual FeedReaderShrinkImageTask *getShrinkImageTask();
+	virtual void         setShrinkImageTaskResult(FeedReaderShrinkImageTask *shrinkedImageTask);
+
 	virtual RsFeedReaderErrorState processXPath(const std::list<std::string> &xpathsToUse, const std::list<std::string> &xpathsToRemove, std::string &description, std::string &errorString);
 	virtual RsFeedReaderErrorState processXslt(const std::string &xslt, std::string &description, std::string &errorString);
 
@@ -104,6 +107,7 @@ public:
 	bool getPostedGroup(const RsGxsGroupId &groupId, RsPostedGroup &postedGroup);
 	bool updatePostedGroup(const RsPostedGroup &postedGroup, const std::string &groupName, const std::string &groupDescription);
 	bool waitForToken(RsGxsIfaceHelper *interface, uint32_t token);
+	bool shrinkImage(FeedReaderShrinkImageTask::Type type, const std::vector<unsigned char> &image, std::vector<unsigned char> &resultImage);
 
 protected:
 	/****************** p3Config STUFF *******************/
@@ -145,6 +149,10 @@ private:
 	RsMutex mProcessMutex;
 	std::list<uint32_t> mProcessFeeds;
 
+	RsMutex mImageMutex;
+	std::list<FeedReaderShrinkImageTask*> mImages;
+	std::list<FeedReaderShrinkImageTask*> mResultImages;
+
 	RsMutex mPreviewMutex;
 	p3FeedReaderThread *mPreviewDownloadThread;
 	p3FeedReaderThread *mPreviewProcessThread;
diff --git a/plugins/FeedReader/services/rsFeedReaderItems.h b/plugins/FeedReader/services/rsFeedReaderItems.h
index 39d604f46..3adafd55a 100644
--- a/plugins/FeedReader/services/rsFeedReaderItems.h
+++ b/plugins/FeedReader/services/rsFeedReaderItems.h
@@ -49,6 +49,7 @@ const uint8_t RS_PKT_SUBTYPE_FEEDREADER_MSG   = 0x03;
 #define RS_FEED_FLAG_UPDATE_POSTED_INFO            0x1000
 #define RS_FEED_FLAG_POSTED_FIRST_IMAGE            0x2000
 #define RS_FEED_FLAG_POSTED_ONLY_IMAGE             0x4000
+#define RS_FEED_FLAG_POSTED_SHRINK_IMAGE           0x8000
 
 class RsFeedReaderFeed : public RsItem
 {
diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
index f0bc99551..bfccd3fc7 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.cpp
@@ -50,6 +50,8 @@
 #define IMG_ATTACH  0
 #define IMG_PICTURE 1
 
+const int MAXMESSAGESIZE = 199000;
+
 PostedCreatePostDialog::PostedCreatePostDialog(RsPosted *posted, const RsGxsGroupId& grpId, const RsGxsId& default_author, QWidget *parent):
 	QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint),
 	mPosted(posted), mGrpId(grpId),
@@ -226,7 +228,7 @@ void PostedCreatePostDialog::addPicture()
 		}
 
 		QImage opt;
-        if(ImageUtil::optimizeSizeBytes(imagebytes, image, opt,"JPG", 640*480, MAXMESSAGESIZE - 2000)) { //Leave space for other stuff
+        if (optimizeImage(image, imagebytes, opt)) {
 			ui->imageLabel->setPixmap(QPixmap::fromImage(opt));
 			ui->stackedWidgetPicture->setCurrentIndex(IMG_PICTURE);
 			ui->removeButton->show();
@@ -274,7 +276,7 @@ void PostedCreatePostDialog::pastePicture()
 		image = (qvariant_cast<QImage>(mimeData->imageData()));
 
 		QImage opt;
-		if(ImageUtil::optimizeSizeBytes(imagebytes, image, opt,"JPG", 640*480, MAXMESSAGESIZE - 2000)) { //Leave space for other stuff
+		if (optimizeImage(image, imagebytes, opt)) {
 			ui->imageLabel->setPixmap(QPixmap::fromImage(opt));
 			ui->stackedWidgetPicture->setCurrentIndex(IMG_PICTURE);
 			ui->removeButton->show();
@@ -287,6 +289,12 @@ void PostedCreatePostDialog::pastePicture()
 	}
 }
 
+bool PostedCreatePostDialog::optimizeImage(const QImage &image, QByteArray &imagebytes, QImage &imageOpt)
+{
+	// Leave space for other stuff
+	return ImageUtil::optimizeSizeBytes(imagebytes, image, imageOpt, "JPG", 640*480, MAXMESSAGESIZE - 2000);
+}
+
 int PostedCreatePostDialog::viewMode()
 {
 	if (ui->viewPostButton->isChecked()) {
diff --git a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
index e952f6be8..5ac2c2e7d 100644
--- a/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
+++ b/retroshare-gui/src/gui/Posted/PostedCreatePostDialog.h
@@ -45,10 +45,11 @@ public:
 	void setNotes(const QString& notes);
 	void setLink(const QString& link);
 
+	static bool optimizeImage(const QImage &image, QByteArray &imagebytes, QImage &imageOpt);
+
 private:
 	QString imagefilename;
 	QByteArray imagebytes;
-	const int MAXMESSAGESIZE = 199000;
 
 private slots:
 	void createPost();

From ff183ee98b11c801afbc96e5dc8bc1e4ca7a33ca Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 26 Apr 2023 22:39:03 +0200
Subject: [PATCH 262/503] FeedReader: Reduced the height of the dialog for
 creating a feed

---
 plugins/FeedReader/gui/AddFeedDialog.ui | 271 +++++++++++-------------
 1 file changed, 129 insertions(+), 142 deletions(-)

diff --git a/plugins/FeedReader/gui/AddFeedDialog.ui b/plugins/FeedReader/gui/AddFeedDialog.ui
index 40b9bd46d..ebb478162 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.ui
+++ b/plugins/FeedReader/gui/AddFeedDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1068</width>
-    <height>880</height>
+    <width>739</width>
+    <height>653</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -45,103 +45,6 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gradFrame_GL">
-      <item row="3" column="0">
-       <widget class="QGroupBox" name="typeGroupBox">
-        <property name="title">
-         <string>Type</string>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <property name="leftMargin">
-          <number>6</number>
-         </property>
-         <property name="topMargin">
-          <number>6</number>
-         </property>
-         <property name="rightMargin">
-          <number>6</number>
-         </property>
-         <property name="bottomMargin">
-          <number>6</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="typeForumCheckBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Forum</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="RSComboBox" name="forumComboBox"/>
-         </item>
-         <item row="8" column="0">
-          <widget class="QCheckBox" name="typeLocalCheckBox">
-           <property name="text">
-            <string>Local Feed</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <item>
-            <widget class="QCheckBox" name="updateForumInfoCheckBox">
-             <property name="text">
-              <string>Update forum information</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="4" column="1">
-          <widget class="RSComboBox" name="postedComboBox"/>
-         </item>
-         <item row="4" column="0">
-          <widget class="QCheckBox" name="typePostedCheckBox">
-           <property name="text">
-            <string>Board</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <layout class="QGridLayout" name="gridLayout">
-           <item row="0" column="0">
-            <widget class="QCheckBox" name="updatePostedInfoCheckBox">
-             <property name="text">
-              <string>Update board information</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QCheckBox" name="postedOnlyImageCheckBox">
-             <property name="text">
-              <string>Only image</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QCheckBox" name="postedFirstImageCheckBox">
-             <property name="text">
-              <string>Use first image as board image</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QCheckBox" name="postedShinkImageCheckBox">
-             <property name="text">
-              <string>Shrink image</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
       <item row="7" column="0">
        <widget class="QGroupBox" name="authenticationGroupBox">
         <property name="title">
@@ -378,40 +281,7 @@
         </item>
        </layout>
       </item>
-      <item row="4" column="0">
-       <widget class="QGroupBox" name="groupBox">
-        <property name="title">
-         <string>Transformation</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_4">
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <item>
-            <widget class="QLabel" name="transformationTypeLabel">
-             <property name="text">
-              <string>Transformation type</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="previewButton">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>Preview &amp;&amp; Transformation</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="3" column="1" rowspan="2">
+      <item row="3" column="1">
        <widget class="QGroupBox" name="flagGroupBox">
         <property name="title">
          <string>Misc</string>
@@ -445,18 +315,135 @@
            </property>
           </widget>
          </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QGroupBox" name="groupBox">
+        <property name="title">
+         <string>Transformation</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
          <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QLabel" name="transformationTypeLabel">
+             <property name="text">
+              <string>Transformation type</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="previewButton">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Preview &amp;&amp; Transformation</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="3" column="0" rowspan="3">
+       <widget class="QGroupBox" name="typeGroupBox">
+        <property name="title">
+         <string>Type</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_2">
+         <property name="leftMargin">
+          <number>6</number>
+         </property>
+         <property name="topMargin">
+          <number>6</number>
+         </property>
+         <property name="rightMargin">
+          <number>6</number>
+         </property>
+         <property name="bottomMargin">
+          <number>6</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="typeForumCheckBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
            </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
+           <property name="text">
+            <string>Forum</string>
            </property>
-          </spacer>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="RSComboBox" name="forumComboBox"/>
+         </item>
+         <item row="8" column="0">
+          <widget class="QCheckBox" name="typeLocalCheckBox">
+           <property name="text">
+            <string>Local Feed</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="QCheckBox" name="updateForumInfoCheckBox">
+             <property name="text">
+              <string>Update forum information</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item row="4" column="1">
+          <widget class="RSComboBox" name="postedComboBox"/>
+         </item>
+         <item row="4" column="0">
+          <widget class="QCheckBox" name="typePostedCheckBox">
+           <property name="text">
+            <string>Board</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <layout class="QGridLayout" name="gridLayout">
+           <item row="0" column="0">
+            <widget class="QCheckBox" name="updatePostedInfoCheckBox">
+             <property name="text">
+              <string>Update board information</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QCheckBox" name="postedOnlyImageCheckBox">
+             <property name="text">
+              <string>Only image</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QCheckBox" name="postedFirstImageCheckBox">
+             <property name="text">
+              <string>Use first image as board image</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QCheckBox" name="postedShinkImageCheckBox">
+             <property name="text">
+              <string>Shrink image</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
         </layout>
        </widget>

From 180b7d3703d8f3a275629ecb5b0ec26db2ea1d9a Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sat, 6 May 2023 01:23:23 +0200
Subject: [PATCH 263/503] FeedReader: Added process of response code 403 and
 added user agent

---
 .../FeedReader/gui/FeedReaderStringDefs.cpp   |  3 ++
 plugins/FeedReader/interface/rsFeedReader.h   |  1 +
 plugins/FeedReader/lang/FeedReader_en.ts      | 29 +++++++++++--------
 .../FeedReader/services/p3FeedReaderThread.cc |  3 ++
 plugins/FeedReader/util/CURLWrapper.cpp       |  4 +++
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
index 647c4cf7b..07f0d44ab 100644
--- a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
+++ b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
@@ -101,6 +101,9 @@ QString FeedReaderStringDefs::errorString(RsFeedReaderErrorState errorState, con
 	case RS_FEED_ERRORSTATE_DOWNLOAD_UNKOWN_RESPONSE_CODE:
 		errorText = QApplication::translate("FeedReaderStringDefs", "Unknown response code");
 		break;
+	case RS_FEED_ERRORSTATE_DOWNLOAD_BLOCKED:
+		errorText = QApplication::translate("FeedReaderStringDefs", "Download blocked");
+		break;
 
 	/* process */
 	case RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR:
diff --git a/plugins/FeedReader/interface/rsFeedReader.h b/plugins/FeedReader/interface/rsFeedReader.h
index ad1ecec9a..044dcdd80 100644
--- a/plugins/FeedReader/interface/rsFeedReader.h
+++ b/plugins/FeedReader/interface/rsFeedReader.h
@@ -43,6 +43,7 @@ enum RsFeedReaderErrorState {
 	RS_FEED_ERRORSTATE_DOWNLOAD_UNKNOWN_CONTENT_TYPE  = 3,
 	RS_FEED_ERRORSTATE_DOWNLOAD_NOT_FOUND             = 4,
 	RS_FEED_ERRORSTATE_DOWNLOAD_UNKOWN_RESPONSE_CODE  = 5,
+	RS_FEED_ERRORSTATE_DOWNLOAD_BLOCKED               = 6,
 
 	/* process */
 	RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR         = 50,
diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts
index 93db4a686..db5748893 100644
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@@ -9,7 +9,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+398"/>
         <source>Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34,7 +34,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-391"/>
         <source>Authentication (not yet supported)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -84,12 +84,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+88"/>
         <source>Embed images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-216"/>
         <source>Storage time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -124,7 +124,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="+200"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -139,7 +139,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+299"/>
+        <location line="-67"/>
         <source>Transformation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -154,7 +154,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-58"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
@@ -169,17 +169,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-336"/>
+        <location line="+100"/>
         <source>Update forum information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+350"/>
+        <location line="-86"/>
         <source>Save complete web page (experimental for local feeds)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-103"/>
+        <location line="-70"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -714,12 +714,12 @@
     </message>
     <message>
         <location line="+3"/>
-        <location line="+108"/>
+        <location line="+111"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-91"/>
+        <location line="-94"/>
         <source>Internal download error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -743,6 +743,11 @@
         <source>Unknown response code</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Download blocked</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Internal process error</source>
diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 00da7a007..1c8714a05 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -302,6 +302,9 @@ RsFeedReaderErrorState p3FeedReaderThread::download(const RsFeedReaderFeed &feed
 				}
 			}
 			break;
+		case 403:
+			result = RS_FEED_ERRORSTATE_DOWNLOAD_BLOCKED;
+			break;
 		case 404:
 			result = RS_FEED_ERRORSTATE_DOWNLOAD_NOT_FOUND;
 			break;
diff --git a/plugins/FeedReader/util/CURLWrapper.cpp b/plugins/FeedReader/util/CURLWrapper.cpp
index 87fd986ff..94ae7beaa 100644
--- a/plugins/FeedReader/util/CURLWrapper.cpp
+++ b/plugins/FeedReader/util/CURLWrapper.cpp
@@ -21,6 +21,8 @@
 #include "CURLWrapper.h"
 #include <string.h>
 
+#define USERAGENT "Mozilla/5.0 (rv:109.0) Gecko/20100101 Firefox/112.0"
+
 CURLWrapper::CURLWrapper(const std::string &proxy)
 {
 	mCurl = curl_easy_init();
@@ -65,6 +67,7 @@ CURLcode CURLWrapper::downloadText(const std::string &link, std::string &data)
 	curl_easy_setopt(mCurl, CURLOPT_WRITEFUNCTION, writeFunctionString);
 	curl_easy_setopt(mCurl, CURLOPT_WRITEDATA, &data);
 	curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, false);
+	curl_easy_setopt(mCurl, CURLOPT_USERAGENT, USERAGENT);
 
 	return curl_easy_perform(mCurl);
 }
@@ -95,6 +98,7 @@ CURLcode CURLWrapper::downloadBinary(const std::string &link, std::vector<unsign
 	curl_easy_setopt(mCurl, CURLOPT_WRITEFUNCTION, writeFunctionBinary);
 	curl_easy_setopt(mCurl, CURLOPT_WRITEDATA, &data);
 	curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, false);
+	curl_easy_setopt(mCurl, CURLOPT_USERAGENT, USERAGENT);
 
 	return curl_easy_perform(mCurl);
 }

From 40adcd2db1f0a34d336967149f31909ea0b7e39e Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 12 Apr 2023 14:39:43 +0200
Subject: [PATCH 264/503] Windows Build Environment: Added missing target
 "error" to git-log.bat

---
 build_scripts/Windows/build/git-log.bat | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build_scripts/Windows/build/git-log.bat b/build_scripts/Windows/build/git-log.bat
index 286d813e2..b2328d853 100644
--- a/build_scripts/Windows/build/git-log.bat
+++ b/build_scripts/Windows/build/git-log.bat
@@ -88,6 +88,10 @@ echo %RsRef%>"%RsLastRefFile%"
 
 exit /B %ERRORLEVEL%
 
+:error
+%cecho% error "\n%~n0 failed\n"
+exit /B 1
+
 :error_env
 echo Failed to initialize environment.
 endlocal

From 082603917c12da58ca94bf5cb5a1963a3d2a63fd Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 7 May 2023 17:09:00 +0200
Subject: [PATCH 265/503] fixed crash in setting posted items as read

---
 retroshare-gui/src/gui/Posted/PostedItem.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
index dcb5c2c97..06b585614 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
@@ -282,16 +282,12 @@ void BasePostedItem::readToggled(bool checked)
     if (mInFill) {
         return;
     }
+    setReadStatus(false, checked);
 
     RsThread::async([this,checked]()
     {
         RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
         rsPosted->setPostReadStatus(msgPair, !checked);
-
-        RsQThreadUtils::postToObject( [checked,this]()
-        {
-            setReadStatus(false, checked);
-        }, this );
     });
 }
 

From 77d275c7f0dd2fe9a938ce39ed457fee4cc906bb Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 7 May 2023 20:22:24 +0200
Subject: [PATCH 266/503] Fixed margins to remove wasting spaces

Fixed margins to remove wasting spaces
Fixed to hide desc groupbox instead of only desc text,
---
 retroshare-gui/src/gui/TheWire/PulseAddDialog.ui | 12 ++++++++++++
 retroshare-gui/src/gui/TheWire/PulseMessage.ui   |  9 +++++++++
 retroshare-gui/src/gui/TheWire/PulseReply.ui     | 12 ++++++++++++
 retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp    |  2 +-
 retroshare-gui/src/gui/gxs/GxsGroupDialog.ui     |  2 +-
 5 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
index 25738136d..c09119a40 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
@@ -235,6 +235,18 @@
    <item>
     <widget class="QFrame" name="frame_input">
      <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QTextEdit" name="textEdit_Pulse">
         <property name="font">
diff --git a/retroshare-gui/src/gui/TheWire/PulseMessage.ui b/retroshare-gui/src/gui/TheWire/PulseMessage.ui
index 09b64f780..46e4d8cd5 100644
--- a/retroshare-gui/src/gui/TheWire/PulseMessage.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseMessage.ui
@@ -14,9 +14,18 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
    <property name="topMargin">
     <number>0</number>
    </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item row="0" column="0" rowspan="2">
     <widget class="QWidget" name="widget_indent" native="true">
      <property name="enabled">
diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.ui b/retroshare-gui/src/gui/TheWire/PulseReply.ui
index 3f85dc164..497d606de 100644
--- a/retroshare-gui/src/gui/TheWire/PulseReply.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseReply.ui
@@ -25,6 +25,18 @@
    <string notr="true"/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QFrame" name="plainFrame">
      <property name="sizePolicy">
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index 8b5923657..5afb5414b 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -370,7 +370,7 @@ void GxsGroupDialog::setupVisibility()
 
 	ui.groupLogo->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_ICON);
 
-	ui.groupDesc->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
+	ui.groupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DESCRIPTION);
 
 	ui.distribGroupBox->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION);
 	ui.distributionLabel->setVisible(mEnabledFlags & GXS_GROUP_FLAGS_DISTRIBUTION);
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
index 11dcb0613..867652e01 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>746</width>
-    <height>590</height>
+    <height>533</height>
    </rect>
   </property>
   <property name="windowTitle">

From e1934fd9b03cd52c556eb06d94fb5d68b649592e Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 8 May 2023 07:55:57 +0200
Subject: [PATCH 267/503] Added missing include stdint.h to Histogram.h

---
 retroshare-gui/src/gui/statistics/Histogram.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/retroshare-gui/src/gui/statistics/Histogram.h b/retroshare-gui/src/gui/statistics/Histogram.h
index ca71d3b82..91ec84b5d 100644
--- a/retroshare-gui/src/gui/statistics/Histogram.h
+++ b/retroshare-gui/src/gui/statistics/Histogram.h
@@ -20,6 +20,7 @@
 
 #include <vector>
 #include <iostream>
+#include <stdint.h>
 
 class QPainter;
 

From 67dd1999a5c920cd12acb0741fb0b0907ad39002 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 8 May 2023 09:36:18 +0200
Subject: [PATCH 268/503] Windows Build: Added update of MSYS2 to prepare
 script

---
 build_scripts/Windows-msys2/env/tools/prepare-msys2.bat | 1 +
 build_scripts/Windows/env/tools/prepare-msys2.bat       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
index b1e0c4187..d07c7a058 100644
--- a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
@@ -45,6 +45,7 @@ set MSYS2SH=%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\sh
 
 %cecho% info "Initialize MSYS2"
 "%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
+"%MSYS2SH%" -lc "pacman --noconfirm -Sy"
 "%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
 call "%EnvMSYS2Path%\msys%MSYS2Base%\autorebase.bat"
diff --git a/build_scripts/Windows/env/tools/prepare-msys2.bat b/build_scripts/Windows/env/tools/prepare-msys2.bat
index e4a4da8d5..17fe6c36e 100644
--- a/build_scripts/Windows/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows/env/tools/prepare-msys2.bat
@@ -69,6 +69,7 @@ set MSYS2SH=%CMakeUnpackPath%\usr\bin\sh
 
 %cecho% info "Initialize MSYS2"
 "%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
+"%MSYS2SH%" -lc "pacman --noconfirm -Sy"
 "%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
 call "%CMakeUnpackPath%\autorebase.bat"

From 9c6bfc784712dbdb37ed46d05257e98124e5a6f8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 9 May 2023 10:33:34 +0200
Subject: [PATCH 269/503] added missing updateIcon() in messageUserNotify

---
 retroshare-gui/src/gui/msgs/MessageUserNotify.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
index 5414802e0..b29f264fb 100644
--- a/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageUserNotify.cpp
@@ -94,7 +94,8 @@ void MessageUserNotify::handleEvent_main_thread(std::shared_ptr<const RsEvent> e
 
 	std::set<RsMailMessageId>::const_iterator it;
 
-	switch (fe->mMailStatusEventCode) {
+    switch (fe->mMailStatusEventCode)
+    {
 	case RsMailStatusEventCode::NEW_MESSAGE:
 		for (it = fe->mChangedMsgIds.begin(); it != fe->mChangedMsgIds.end(); ++it) {
 			MessageInfo msgInfo;
@@ -102,7 +103,8 @@ void MessageUserNotify::handleEvent_main_thread(std::shared_ptr<const RsEvent> e
 					NotifyQt::getInstance()->addToaster(RS_POPUP_MSG, msgInfo.msgId.c_str(), msgInfo.title.c_str(), msgInfo.msg.c_str() );
 			}
 		}
-		break;
+        updateIcon();
+        break;
 	case RsMailStatusEventCode::MESSAGE_CHANGED:
 	case RsMailStatusEventCode::MESSAGE_REMOVED:
 		updateIcon();

From 726c42852c29c7edda428d67b35a086656159a74 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Tue, 9 May 2023 23:18:34 +0530
Subject: [PATCH 270/503] This commit removed the refresh button and edited
 some events for the retro share wire.

---
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 22 +++++++++++++------
 retroshare-gui/src/gui/TheWire/WireDialog.h   |  1 +
 retroshare-gui/src/gui/TheWire/WireDialog.ui  | 16 ++++----------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 13390e782..ea63e933e 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -67,7 +67,6 @@ WireDialog::WireDialog(QWidget *parent)
 
 	connect( ui.toolButton_createAccount, SIGNAL(clicked()), this, SLOT(createGroup()));
 	connect( ui.toolButton_createPulse, SIGNAL(clicked()), this, SLOT(createPulse()));
-	connect( ui.toolButton_refresh, SIGNAL(clicked()), this, SLOT(refreshGroups()));
 
 	connect(ui.comboBox_groupSet, SIGNAL(currentIndexChanged(int)), this, SLOT(selectGroupSet(int)));
 	connect(ui.comboBox_filterTime, SIGNAL(currentIndexChanged(int)), this, SLOT(selectFilterTime(int)));
@@ -104,29 +103,38 @@ void WireDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
     const RsWireEvent *e = dynamic_cast<const RsWireEvent*>(event.get());
 
     if(e)
+    {
+
+#ifdef GXSWIRE_DEBUG
+                RsDbg() << " Refreshing the feed if there is a matching event. "<< std::endl;
+#endif
+
+        // The following switch statements refresh the wire feed whenever there is a new event
         switch(e->mWireEventCode)
         {
-        case RsWireEventCode::NEW_POST:             // [[fallthrough]];
+        case RsWireEventCode::NEW_POST:
             refreshGroups();
             break;
-        case RsWireEventCode::NEW_REPLY:             // [[fallthrough]];
+        case RsWireEventCode::NEW_REPLY:
             refreshGroups();
             break;
-        case RsWireEventCode::NEW_LIKE:             // [[fallthrough]];
+        case RsWireEventCode::NEW_LIKE:
             refreshGroups();
             break;
-        case RsWireEventCode::NEW_REPUBLISH:             // [[fallthrough]];
+        case RsWireEventCode::NEW_REPUBLISH:
             refreshGroups();
             break;
-        case RsWireEventCode::NEW_WIRE:             // [[fallthrough]];
+        case RsWireEventCode::POST_UPDATED:
             refreshGroups();
             break;
-        case RsWireEventCode::FOLLOW_STATUS_CHANGED:             // [[fallthrough]];
+        case RsWireEventCode::FOLLOW_STATUS_CHANGED:
             refreshGroups();
             break;
         default:
             break;
+
         }
+    }
 }
 
 WireDialog::~WireDialog()
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.h b/retroshare-gui/src/gui/TheWire/WireDialog.h
index 1ac7faebc..a55369fc0 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.h
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.h
@@ -164,6 +164,7 @@ private:
 	std::map<RsGxsGroupId, RsWireGroup> mAllGroups;
 	std::vector<RsWireGroup> mOwnGroups;
 
+    // This function and variable below it handle the events for the wire
     void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
     RsEventsHandlerId_t mEventHandlerId;
 
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.ui b/retroshare-gui/src/gui/TheWire/WireDialog.ui
index 23eb87a78..b794a96e0 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.ui
@@ -100,13 +100,6 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QToolButton" name="toolButton_refresh">
-        <property name="text">
-         <string>Refresh</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="RSComboBox" name="groupChooser"/>
       </item>
@@ -189,7 +182,6 @@
          <property name="font">
           <font>
            <pointsize>10</pointsize>
-           <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
@@ -208,8 +200,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>220</width>
-            <height>444</height>
+            <width>224</width>
+            <height>465</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="groupsWidget_VL">
@@ -387,8 +379,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>521</width>
-             <height>437</height>
+             <width>523</width>
+             <height>462</height>
             </rect>
            </property>
            <property name="styleSheet">

From f54be58088fe92d62ea51291e965f4c19b4d3ae1 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 12 May 2023 20:41:27 +0200
Subject: [PATCH 271/503] Use ElidedLabel on PeerItem to not stretch the widget

* Use ElidedLabel on PeerItem to not stretch the widget
---
 retroshare-gui/src/gui/feeds/PeerItem.ui | 179 ++++++++++++-----------
 1 file changed, 95 insertions(+), 84 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui
index cf66466f3..603002f7f 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.ui
+++ b/retroshare-gui/src/gui/feeds/PeerItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>476</width>
-    <height>262</height>
+    <height>283</height>
    </rect>
   </property>
   <property name="autoFillBackground">
@@ -59,6 +59,9 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
+         <property name="verticalSpacing">
+          <number>0</number>
+         </property>
          <item row="0" column="0" rowspan="2">
           <widget class="AvatarWidget" name="avatar" native="true">
            <property name="minimumSize">
@@ -75,90 +78,11 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <layout class="QGridLayout" name="peerName_GL">
-           <item row="0" column="0">
-            <widget class="QLabel" name="peerNameLabel">
-             <property name="font">
-              <font>
-               <pointsize>17</pointsize>
-              </font>
-             </property>
-             <property name="text">
-              <string notr="true">Peer Name</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="titleLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="font">
-              <font>
-               <pointsize>11</pointsize>
-               <weight>75</weight>
-               <italic>true</italic>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string notr="true">Connected</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="0" column="2">
-          <layout class="QHBoxLayout" name="last_HL">
-           <item>
-            <spacer name="last_HSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>190</width>
-               <height>13</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QLabel" name="lastLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="font">
-              <font>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string notr="true">TextLabel</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="1" column="1" colspan="2">
+         <item row="1" column="1" colspan="4">
           <layout class="QHBoxLayout" name="buttons_HL">
+           <property name="spacing">
+            <number>6</number>
+           </property>
            <item>
             <widget class="QToolButton" name="sendmsgButton">
              <property name="focusPolicy">
@@ -266,6 +190,87 @@
            </item>
           </layout>
          </item>
+         <item row="0" column="1" colspan="4">
+          <layout class="QGridLayout" name="peerName_GL">
+           <property name="verticalSpacing">
+            <number>6</number>
+           </property>
+           <item row="0" column="2">
+            <widget class="QLabel" name="lastLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string notr="true">TextLabel</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <widget class="ElidedLabel" name="peerNameLabel">
+             <property name="font">
+              <font>
+               <pointsize>17</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string notr="true">Peer Name</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <spacer name="last_HSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>190</width>
+               <height>13</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="1" column="0" colspan="2">
+            <widget class="ElidedLabel" name="titleLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <pointsize>11</pointsize>
+               <weight>75</weight>
+               <italic>true</italic>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string notr="true">Connected</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
         </layout>
        </widget>
       </item>
@@ -526,6 +531,12 @@
    <header>gui/common/AvatarWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/ElidedLabel.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../icons.qrc"/>

From 65b1a5bce2aa2ca71442ceeed2a0035f919a2d10 Mon Sep 17 00:00:00 2001
From: Petr <petr.mvd+git@gmail.com>
Date: Sun, 14 May 2023 22:06:44 +0200
Subject: [PATCH 272/503] Update the tracked `libretroshare` submodule.

Fixes #2732.
---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index 74cd958cf..8c02b54e4 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
+Subproject commit 8c02b54e4d16e38b28e77263a0b1570c50df4c99

From 01506127c5508b14fed59624d11df21fed5824e9 Mon Sep 17 00:00:00 2001
From: Petr <petr.mvd+git@gmail.com>
Date: Mon, 15 May 2023 10:33:54 +0200
Subject: [PATCH 273/503] Re-enable creation of AppVeyor artifacts to provide
 nightly builds

Fixes #2651.

They were disabled in 05116b8311b708fa24f696142548cddd2dc48ef7 in 2019.
But since then in 2021 the retention [policy] has changed and artifacts
are now kept only for 1 month (for free accounts).

[policy]: https://www.appveyor.com/blog/2021/03/30/artifacts-retention-policy-update/
---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index cd706d02c..5bc004fa1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -258,10 +258,10 @@ after_build:
 #      artifacts configuration    #
 #---------------------------------#
 
-#artifacts:
-#  - path: '**\*.exe'
-#  - path: filelist.txt
-# - path: $(RS_DEPLOY)
+artifacts:
+  - path: '**\*.exe'
+  - path: filelist.txt
+  - path: $(RS_DEPLOY)
 
 #
 #  # pushing a single file

From 6775a64ed5534bfa151de282bb41ec0c6ab7cff7 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 15 May 2023 21:54:27 +0200
Subject: [PATCH 274/503] factored the collection of latest channel post
 versions and added a proper counting for new/unread posts

---
 .../src/gui/gxschannels/GxsChannelDialog.cpp  |  20 +-
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 265 +-----------------
 2 files changed, 21 insertions(+), 264 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
index 6d28f97a8..47317c801 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
@@ -369,7 +369,25 @@ void GxsChannelDialog::toggleAutoDownload()
 
 bool GxsChannelDialog::getGroupStatistics(const RsGxsGroupId& groupId,GxsGroupStatistic& stat)
 {
-    return rsGxsChannels->getChannelStatistics(groupId,stat);
+    // What follows is a hack to replace the GXS group statistics by the actual count of unread messages in channels,
+    // which should take into account old post versions, discard comments and votes, etc.
+
+    RsGxsChannelStatistics s;
+    bool res = rsGxsChannels->getChannelStatistics(groupId,s);
+
+    if(!res)
+        return false;
+
+    stat.mGrpId = groupId;
+    stat.mNumMsgs = s.mNumberOfPosts;
+
+    stat.mTotalSizeOfMsgs = 0;	// hopefuly unused. Required the loading of the full channel data, so not very convenient.
+    stat.mNumThreadMsgsNew = s.mNumberOfNewPosts;
+    stat.mNumThreadMsgsUnread = s.mNumberOfUnreadPosts;
+    stat.mNumChildMsgsNew = 0;
+    stat.mNumChildMsgsUnread = 0;
+
+    return true;
 }
 
 bool GxsChannelDialog::getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo)
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 6179acae7..4e4636b8b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -548,8 +548,9 @@ void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vecto
 	initEmptyHierarchy();
 	mChannelGroup = group;
 
-    createPostsArray(posts);
+//    createPostsArray(posts);
 
+    mPosts = posts;
 	std::sort(mPosts.begin(),mPosts.end());
 
 	for(uint32_t i=0;i<mPosts.size();++i)
@@ -641,268 +642,6 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
     });
 }
 
-void RsGxsChannelPostsModel::old_createPostsArray(std::vector<RsGxsChannelPost>& posts)
-{
-    // collect new versions of posts if any
-
-#ifdef DEBUG_CHANNEL_MODEL
-    std::cerr << "Inserting channel posts" << std::endl;
-#endif
-
-    std::vector<uint32_t> new_versions ;
-    for (uint32_t i=0;i<posts.size();++i)
-    {
-		if(posts[i].mMeta.mOrigMsgId == posts[i].mMeta.mMsgId)
-			posts[i].mMeta.mOrigMsgId.clear();
-
-#ifdef DEBUG_CHANNEL_MODEL
-        std::cerr << "  " << i << ": name=\"" << posts[i].mMeta.mMsgName << "\" msg_id=" << posts[i].mMeta.mMsgId << ": orig msg id = " << posts[i].mMeta.mOrigMsgId << std::endl;
-#endif
-
-        if(!posts[i].mMeta.mOrigMsgId.isNull())
-            new_versions.push_back(i) ;
-    }
-
-#ifdef DEBUG_CHANNEL_MODEL
-    std::cerr << "New versions: " << new_versions.size() << std::endl;
-#endif
-
-    if(!new_versions.empty())
-    {
-#ifdef DEBUG_CHANNEL_MODEL
-        std::cerr << "  New versions present. Replacing them..." << std::endl;
-        std::cerr << "  Creating search map."  << std::endl;
-#endif
-
-        // make a quick search map
-        std::map<RsGxsMessageId,uint32_t> search_map ;
-		for (uint32_t i=0;i<posts.size();++i)
-            search_map[posts[i].mMeta.mMsgId] = i ;
-
-        for(uint32_t i=0;i<new_versions.size();++i)
-        {
-#ifdef DEBUG_CHANNEL_MODEL
-            std::cerr << "  Taking care of new version  at index " << new_versions[i] << std::endl;
-#endif
-
-            uint32_t current_index = new_versions[i] ;
-            uint32_t source_index  = new_versions[i] ;
-
-            // What we do is everytime we find a replacement post, we climb up the replacement graph until we find the original post
-            // (or the most recent version of it). When we reach this post, we replace it with the data of the source post.
-            // In the mean time, all other posts have their MsgId cleared, so that the posts are removed from the list.
-
-            //std::vector<uint32_t> versions ;
-            std::map<RsGxsMessageId,uint32_t>::const_iterator vit ;
-
-            while(search_map.end() != (vit=search_map.find(posts[current_index].mMeta.mOrigMsgId)))
-            {
-#ifdef DEBUG_CHANNEL_MODEL
-                std::cerr << "    post at index " << current_index << " replaces a post at position " << vit->second ;
-#endif
-
-				// Now replace the post only if the new versionis more recent. It may happen indeed that the same post has been corrected multiple
-				// times. In this case, we only need to replace the post with the newest version
-
-				//uint32_t prev_index = current_index ;
-				current_index = vit->second ;
-
-				if(posts[current_index].mMeta.mMsgId.isNull())	// This handles the branching situation where this post has been already erased. No need to go down further.
-                {
-#ifdef DEBUG_CHANNEL_MODEL
-                    std::cerr << "  already erased. Stopping." << std::endl;
-#endif
-                    break ;
-                }
-
-				if(posts[current_index].mMeta.mPublishTs < posts[source_index].mMeta.mPublishTs)
-				{
-#ifdef DEBUG_CHANNEL_MODEL
-                    std::cerr << " and is more recent => following" << std::endl;
-#endif
-                    for(std::set<RsGxsMessageId>::const_iterator itt(posts[current_index].mOlderVersions.begin());itt!=posts[current_index].mOlderVersions.end();++itt)
-						posts[source_index].mOlderVersions.insert(*itt);
-
-					posts[source_index].mOlderVersions.insert(posts[current_index].mMeta.mMsgId);
-					posts[current_index].mMeta.mMsgId.clear();	    // clear the msg Id so the post will be ignored
-				}
-#ifdef DEBUG_CHANNEL_MODEL
-                else
-                    std::cerr << " but is older -> Stopping" << std::endl;
-#endif
-            }
-        }
-    }
-
-#ifdef DEBUG_CHANNEL_MODEL
-    std::cerr << "Now adding " << posts.size() << " posts into array structure..." << std::endl;
-#endif
-
-    mPosts.clear();
-
-    for (std::vector<RsGxsChannelPost>::const_reverse_iterator it = posts.rbegin(); it != posts.rend(); ++it)
-    {
-        if(!(*it).mMeta.mMsgId.isNull())
-		{
-#ifdef DEBUG_CHANNEL_MODEL
-            std::cerr << " adding post \"" << (*it).mMeta.mMsgName << "\"" << std::endl;
-#endif
-			mPosts.push_back(*it);
-		}
-#ifdef DEBUG_CHANNEL_MODEL
-        else
-            std::cerr << " skipped older version post \"" << (*it).mMeta.mMsgName << "\"" << std::endl;
-#endif
-    }
-}
-
-void RsGxsChannelPostsModel::createPostsArray(std::vector<RsGxsChannelPost>& posts)
-{
-    // The hierarchy of posts may contain edited posts. In the new model (03/2023), mOrigMsgId points to the original
-    // top-level post in the hierarchy of edited posts. However, in the old model, mOrigMsgId points to the edited post.
-    // Therefore the algorithm below is made to cope with both models at once.
-    //
-    // In the future, using the new model, it will be possible to delete old versions from the db, and detect new versions
-    // because they all share the same mOrigMsgId.
-    //
-    // We proceed as follows:
-    //
-    //	1 - create a search map to convert post IDs into their index in the posts tab
-    //  2 - recursively climb up the post mOrigMsgId until no parent is found. At top level, create the original post, and add all previous elements as newer versions.
-    //	3 - go through the list of original posts, select among them the most recent version, and set all others as older versions.
-    //
-    // The algorithm handles the case where some parent has been deleted.
-
-#ifdef DEBUG_CHANNEL_MODEL
-    std::cerr << "Inserting channel posts" << std::endl;
-#endif
-
-    //	1 - create a search map to convert post IDs into their index in the posts tab
-
-#ifdef DEBUG_CHANNEL_MODEL
-    std::cerr << "  Given list: " << std::endl;
-#endif
-    std::map<RsGxsMessageId,uint32_t> search_map ;
-
-    for (uint32_t i=0;i<posts.size();++i)
-    {
-#ifdef DEBUG_CHANNEL_MODEL
-        std::cerr << "    " << i << ": " << posts[i].mMeta.mMsgId << " orig=" << posts[i].mMeta.mOrigMsgId << " publish TS =" << posts[i].mMeta.mPublishTs << std::endl;
-#endif
-        search_map[posts[i].mMeta.mMsgId] = i ;
-    }
-
-    //  2 - recursively climb up the post mOrigMsgId until no parent is found. At top level, create the original post, and add all previous elements as newer versions.
-
-#ifdef DEBUG_CHANNEL_MODEL
-    std::cerr << "  Searching for top-level posts..." << std::endl;
-#endif
-    std::map<RsGxsMessageId,std::pair<uint32_t,std::set<RsGxsMessageId> > > original_versions ;
-
-    for (uint32_t i=0;i<posts.size();++i)
-    {
-#ifdef DEBUG_CHANNEL_MODEL
-        std::cerr << "    Post " << i;
-#endif
-
-        // We use a recursive function here, so as to collect versions when climbing up to the top level post, and
-        // set the top level as the orig for all visited posts on the way back.
-
-        std::function<RsGxsMessageId (uint32_t,std::set<RsGxsMessageId>& versions,rstime_t newest_time,uint32_t newest_index,int depth)> recurs_find_top_level
-                = [&posts,&search_map,&recurs_find_top_level,&original_versions](uint32_t index,
-                                                                                std::set<RsGxsMessageId>& collected_versions,
-                                                                                rstime_t newest_time,
-                                                                                uint32_t newest_index,
-                                                                                int depth)
-                -> RsGxsMessageId
-        {
-            const auto& m(posts[index].mMeta);
-
-            if(m.mPublishTs > newest_time)
-            {
-                newest_index = index;
-                newest_time = m.mPublishTs;
-            }
-            collected_versions.insert(m.mMsgId);
-
-            RsGxsMessageId top_level_id;
-            std::map<RsGxsMessageId,uint32_t>::const_iterator it;
-
-            if(m.mOrigMsgId.isNull() || m.mOrigMsgId==m.mMsgId)	// we have a top-level post.
-                top_level_id = m.mMsgId;
-            else if( (it = search_map.find(m.mOrigMsgId)) == search_map.end())	// we don't have the post. Never mind, we store the
-            {
-                top_level_id = m.mOrigMsgId;
-                collected_versions.insert(m.mOrigMsgId);	// this one will never be added to the set by the previous call
-            }
-            else
-            {
-                top_level_id = recurs_find_top_level(it->second,collected_versions,newest_time,newest_index,depth+1);
-                posts[index].mMeta.mOrigMsgId = top_level_id;	// this fastens calculation because it will skip already seen posts.
-
-                return top_level_id;
-            }
-
-#ifdef DEBUG_CHANNEL_MODEL
-            std::cerr << std::string(2*depth,' ') << "  top level = " << top_level_id ;
-#endif
-            auto vit = original_versions.find(top_level_id);
-
-            if(vit != original_versions.end())
-            {
-                if(posts[vit->second.first].mMeta.mPublishTs < newest_time)
-                    vit->second.first = newest_index;
-
-#ifdef DEBUG_CHANNEL_MODEL
-                std::cerr << "  already existing. " << std::endl;
-#endif
-            }
-            else
-            {
-                original_versions[top_level_id].first = newest_index;
-#ifdef DEBUG_CHANNEL_MODEL
-                std::cerr << "  new. " << std::endl;
-#endif
-            }
-            original_versions[top_level_id].second.insert(collected_versions.begin(),collected_versions.end());
-
-            return top_level_id;
-        };
-
-        auto versions_set = std::set<RsGxsMessageId>();
-        recurs_find_top_level(i,versions_set,posts[i].mMeta.mPublishTs,i,0);
-    }
-
-    mPosts.clear();
-
-#ifdef DEBUG_CHANNEL_MODEL
-    std::cerr << "  Total top_level posts: " << original_versions.size() << std::endl;
-
-    for(auto it:original_versions)
-    {
-        std::cerr << "    Post " << it.first << ". Total versions = " << it.second.second.size() << " latest: " << posts[it.second.first].mMeta.mMsgId << std::endl;
-
-        for(auto m:it.second.second)
-            if(m != it.first)
-                std::cerr << "      other (newer version): " << m << std::endl;
-    }
-#endif
-    // make sure the posts are delivered in the same order they appears in the posts[] tab.
-
-    std::vector<uint32_t> ids;
-
-    for(auto id:original_versions)
-        ids.push_back(id.second.first);
-
-    std::sort(ids.begin(),ids.end());
-
-    for(uint32_t i=0;i<ids.size();++i)
-    {
-        mPosts.push_back(posts[ids[i]]);
-        mPosts.back().mOlderVersions = original_versions[posts[ids[i]].mMeta.mMsgId].second;
-    }
-
-}
 void RsGxsChannelPostsModel::setAllMsgReadStatus(bool read_status)
 {
     // No need to call preMods()/postMods() here because we're not changing the model

From e25d8e50fcc00213290263305fe6c816ac34c72f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 15 May 2023 21:57:09 +0200
Subject: [PATCH 275/503] changed naming of posts to items, since it counts
 votes and comments as well

---
 .../GxsChannelPostsWidgetWithModel.ui            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
index 9afe3e5d0..6bd0fb86b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@@ -335,7 +335,7 @@
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Includes all posts, comments and votes. This number is progressively updated when new friend connect. The local vs. at friends difference may indicate that you would get older posts by increasing the synchronization period.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
-              <string>Posts (locally / at friends):</string>
+              <string>Items (locally / at friends):</string>
              </property>
             </widget>
            </item>
@@ -402,7 +402,7 @@
           <string notr="true">&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:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
@@ -657,6 +657,12 @@ p, li { white-space: pre-wrap; }
    <extends>QLineEdit</extends>
    <header location="global">gui/common/LineEditClear.h</header>
   </customwidget>
+  <customwidget>
+   <class>RSTreeView</class>
+   <extends>QTreeView</extends>
+   <header>gui/common/RSTreeView.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GxsIdLabel</class>
    <extends>QLabel</extends>
@@ -673,12 +679,6 @@ p, li { white-space: pre-wrap; }
    <extends>QToolButton</extends>
    <header>gui/common/SubscribeToolButton.h</header>
   </customwidget>
-  <customwidget>
-   <class>RSTreeView</class>
-   <extends>QTreeView</extends>
-   <header>gui/common/RSTreeView.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>GxsCommentDialog</class>
    <extends>QWidget</extends>

From 1ea18a583f7d547a2360f2ce81d5e7f892d18f74 Mon Sep 17 00:00:00 2001
From: Petr <petr.mvd+git@gmail.com>
Date: Mon, 15 May 2023 22:07:30 +0200
Subject: [PATCH 276/503] Remove `fsitem.h` from the list of headers

It is now a part of libretroshare.
---
 retroshare-friendserver/src/retroshare-friendserver.pro | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/retroshare-friendserver/src/retroshare-friendserver.pro b/retroshare-friendserver/src/retroshare-friendserver.pro
index a566a0927..eda1f35cb 100644
--- a/retroshare-friendserver/src/retroshare-friendserver.pro
+++ b/retroshare-friendserver/src/retroshare-friendserver.pro
@@ -29,8 +29,7 @@ SOURCES += retroshare-friendserver.cc \
            network.cc 
 
 HEADERS += friendserver.h \
-           network.h      \
-           fsitem.h	   
+           network.h
 
 ################################# Linux ##########################################
 

From b9e4bac510bd62a32d631f75e185d637fa770066 Mon Sep 17 00:00:00 2001
From: Petr <petr.mvd+git@gmail.com>
Date: Mon, 15 May 2023 22:14:07 +0200
Subject: [PATCH 277/503] Add various build artifacts to .gitignore

---
 .gitignore | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.gitignore b/.gitignore
index 777ba9433..b4dfddcac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,22 @@ Thumbs.db
 .kdev4
 *.kdev4
 
+.qmake.stash
+
 !supportlibs/libsam3/Makefile
 
 # QtCreator cruft
 *CMakeLists.txt.user
+
+# Build artifacts
+/jsonapi-generator/src/jsonapi-generator
+/jsonapi-generator/src/jsonapi-generator-doxygen-final.conf
+/jsonapi-generator/src/jsonapi-includes.inl
+/jsonapi-generator/src/jsonapi-wrappers.inl
+/jsonapi-generator/src/xml/
+/retroshare-friendserver/src/retroshare-friendserver
+/retroshare-gui/src/include/
+/retroshare-gui/src/retroshare
+/retroshare-gui/src/temp/
+/retroshare-service/src/retroshare-service
+/*.tar.?z

From 44e04ea0c17f7e1187754a8a852e43a322dbf37b Mon Sep 17 00:00:00 2001
From: Petr <petr.mvd+git@gmail.com>
Date: Tue, 16 May 2023 10:47:54 +0200
Subject: [PATCH 278/503] Advance submodule `retroshare-webui` to its latest
 `master` version

As mentioned in https://github.com/RetroShare/RetroShare/issues/2732#issuecomment-1549228796.
---
 retroshare-webui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-webui b/retroshare-webui
index 5cc37b3e5..b0ddb0918 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit 5cc37b3e5ad6b64b247e9d2066a9b6c8acae67ce
+Subproject commit b0ddb09184e8fff86bd3325e00c6d4b329ae1790

From c970e942215d164b087ad1e51ae8967bd7b12b32 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 17 May 2023 17:18:47 +0200
Subject: [PATCH 279/503] moved update of comment count to libretroshare

---
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 57 +++----------------
 .../GxsChannelPostsWidgetWithModel.cpp        | 13 -----
 2 files changed, 7 insertions(+), 63 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 4e4636b8b..e9be3e6ed 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -66,40 +66,6 @@ void RsGxsChannelPostsModel::setMode(TreeMode mode)
     triggerViewUpdate(true,true);
 }
 
-void RsGxsChannelPostsModel::computeCommentCounts( std::vector<RsGxsChannelPost>& posts, std::vector<RsGxsComment>& comments)
-{
-    // Store posts IDs in a std::map to avoid a quadratic cost
-
-    std::map<RsGxsMessageId,uint32_t> post_indices;
-
-    for(uint32_t i=0;i<posts.size();++i)
-    {
-        post_indices[posts[i].mMeta.mMsgId] = i;
-        posts[i].mCommentCount = 0;	// should be 0 already, but we secure that value.
-        posts[i].mUnreadCommentCount = 0;
-    }
-
-    // now look into comments and increase the count
-
-    for(uint32_t i=0;i<comments.size();++i)
-    {
-        auto it = post_indices.find(comments[i].mMeta.mThreadId);
-
-        // This happens when because of sync periods, we receive
-        // the comments for a post, but not the post itself.
-        // In this case, the post the comment refers to is just not here.
-        // it->second>=posts.size() is impossible by construction, since post_indices
-        // is previously filled using posts ids.
-
-        if(it == post_indices.end())
-            continue;
-
-        ++posts[it->second].mCommentCount;
-
-        if(IS_MSG_NEW(comments[i].mMeta.mMsgStatus))
-            ++posts[it->second].mUnreadCommentCount;
-    }
-}
 
 
 void RsGxsChannelPostsModel::initEmptyHierarchy()
@@ -598,30 +564,23 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
 
         RsGxsChannelGroup group = groups[0];
 
-        // We use the heap because the arrays need to be stored accross async
+        std::vector<RsGxsChannelPost> *posts    = new std::vector<RsGxsChannelPost>(); // We use the heap because the arrays need to be stored accross async
+        std::vector<RsGxsComment>      comments ;
+        std::vector<RsGxsVote>         votes    ;
 
-		std::vector<RsGxsChannelPost> *posts    = new std::vector<RsGxsChannelPost>();
-		std::vector<RsGxsComment>     *comments = new std::vector<RsGxsComment>();
-		std::vector<RsGxsVote>        *votes    = new std::vector<RsGxsVote>();
-
-		if(!rsGxsChannels->getChannelAllContent(group_id, *posts,*comments,*votes))
+        if(!rsGxsChannels->getChannelAllContent(group_id, *posts,comments,votes))
 		{
 			std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve channel messages for channel " << group_id << std::endl;
 			return;
 		}
         std::cerr << "Got channel all content for channel " << group_id << std::endl;
         std::cerr << "  posts   : " << posts->size() << std::endl;
-        std::cerr << "  comments: " << comments->size() << std::endl;
-        std::cerr << "  votes   : " << votes->size() << std::endl;
-
-        // This shouldn't be needed normally. We need it until a background process computes the number of comments per
-        // post and stores it in the service string. Since we request all data, this process isn't costing much anyway.
-
-        computeCommentCounts(*posts,*comments);
+        std::cerr << "  comments: " << comments.size() << std::endl;
+        std::cerr << "  votes   : " << votes.size() << std::endl;
 
         // 2 - update the model in the UI thread.
 
-        RsQThreadUtils::postToObject( [group,posts,comments,votes,this]()
+        RsQThreadUtils::postToObject( [group,posts,this]()
 		{
 			/* Here it goes any code you want to be executed on the Qt Gui
 			 * thread, for example to update the data model with new information
@@ -632,8 +591,6 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
             setPosts(group,*posts) ;
 
             delete posts;
-            delete comments;
-            delete votes;
 
             MainWindow::getPage(MainWindow::Channels)->setCursor(Qt::ArrowCursor) ;
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 1865019ec..35f8df044 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -821,19 +821,6 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
                         return;
                     }
 
-                    // Need to call this in order to get the actual comment count. The previous call only retrieves the message, since we supplied the message ID.
-                    // another way to go would be to save the comment ids of the existing message and re-insert them before calling getChannelContent.
-
-                    if(!rsGxsChannels->getChannelComments(grp_id,{ msg_id },comments))
-                    {
-                        RsErr() << " failed to retrieve message comment data for channel/msg " << grp_id << "/" << msg_id ;
-                        return;
-                    }
-
-                    // Normally, there's a single post in the "post" array. The function below takes a full array of posts however.
-
-                    RsGxsChannelPostsModel::computeCommentCounts(posts,comments);
-
                     // 2 - update the model in the UI thread.
 
                     RsQThreadUtils::postToObject( [post=posts[0],this]()

From b40e5e34bc491d31cf08ba27aebda45fbbd4a3ab Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Fri, 19 May 2023 17:00:50 +0530
Subject: [PATCH 280/503] name changes

name changes
---
 build_scripts/OBS                             |  2 +-
 libretroshare                                 |  2 +-
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 12 ++++++++----
 supportlibs/cmark                             |  2 +-
 supportlibs/rapidjson                         |  2 +-
 supportlibs/restbed                           |  2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index df16cb915..9be56feec 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit df16cb915465d058c75277678799ce4dadeae287
+Subproject commit 9be56feec49aa36deda5044bf6a118dcf100bff0
diff --git a/libretroshare b/libretroshare
index 74cd958cf..77eae86fa 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
+Subproject commit 77eae86faf647c47e6d215f2f309d9a4aa93bdd9
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index ea63e933e..6904f0c40 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -127,7 +127,7 @@ void WireDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
         case RsWireEventCode::POST_UPDATED:
             refreshGroups();
             break;
-        case RsWireEventCode::FOLLOW_STATUS_CHANGED:
+        case RsWireEventCode::NEW_WIRE:
             refreshGroups();
             break;
         default:
@@ -1058,12 +1058,16 @@ void WireDialog::postGroupsPulses(std::list<RsWirePulseSPtr> pulses)
 			std::cerr << std::endl;
 			continue;
 		}
+        std::cerr << "This is mMeta.mMsgId : " << reply->mMeta.mMsgId;
+        std::cerr << std::endl;
+        std::cerr << "This is mMeta.mMsgName : " << reply->mMeta.mMsgName;
+        std::cerr << std::endl;
 
 		PulseReply *firstReply = new PulseReply(this, reply);
-		addTwitterView(firstReply);
-		firstReply->showReplyLine(false);
+        addTwitterView(firstReply);
+        firstReply->showReplyLine(false);
 
-		addTwitterView(new PulseReplySeperator());
+        addTwitterView(new PulseReplySeperator());
 
 	}
 }
diff --git a/supportlibs/cmark b/supportlibs/cmark
index b9c7a496b..7195c6735 160000
--- a/supportlibs/cmark
+++ b/supportlibs/cmark
@@ -1 +1 @@
-Subproject commit b9c7a496ba7dd9c3495bae2ff2855899e47b245d
+Subproject commit 7195c6735f29be947ddc41f86c9ddfc8621d33b9
diff --git a/supportlibs/rapidjson b/supportlibs/rapidjson
index f54b0e47a..949c771b0 160000
--- a/supportlibs/rapidjson
+++ b/supportlibs/rapidjson
@@ -1 +1 @@
-Subproject commit f54b0e47a08782a6131cc3d60f94d038fa6e0a51
+Subproject commit 949c771b03de448bdedea80c44a4a5f65284bfeb
diff --git a/supportlibs/restbed b/supportlibs/restbed
index c27c6726d..0c99284fb 160000
--- a/supportlibs/restbed
+++ b/supportlibs/restbed
@@ -1 +1 @@
-Subproject commit c27c6726d28c42e2e1b7537ba63eeb23e944789d
+Subproject commit 0c99284fba4f37a89de24972e48b8154abc5dc75

From d3233dbc037aa0d35162c10d95d7834e5db22167 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Fri, 19 May 2023 17:06:10 +0530
Subject: [PATCH 281/503] Revert "name changes"

This reverts commit b40e5e34bc491d31cf08ba27aebda45fbbd4a3ab.

bad commit
---
 build_scripts/OBS                             |  2 +-
 libretroshare                                 |  2 +-
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 12 ++++--------
 supportlibs/cmark                             |  2 +-
 supportlibs/rapidjson                         |  2 +-
 supportlibs/restbed                           |  2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index 9be56feec..df16cb915 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 9be56feec49aa36deda5044bf6a118dcf100bff0
+Subproject commit df16cb915465d058c75277678799ce4dadeae287
diff --git a/libretroshare b/libretroshare
index 77eae86fa..74cd958cf 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 77eae86faf647c47e6d215f2f309d9a4aa93bdd9
+Subproject commit 74cd958cf8a3c8b3e2d3f8a22657b5e16bdad476
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 6904f0c40..ea63e933e 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -127,7 +127,7 @@ void WireDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
         case RsWireEventCode::POST_UPDATED:
             refreshGroups();
             break;
-        case RsWireEventCode::NEW_WIRE:
+        case RsWireEventCode::FOLLOW_STATUS_CHANGED:
             refreshGroups();
             break;
         default:
@@ -1058,16 +1058,12 @@ void WireDialog::postGroupsPulses(std::list<RsWirePulseSPtr> pulses)
 			std::cerr << std::endl;
 			continue;
 		}
-        std::cerr << "This is mMeta.mMsgId : " << reply->mMeta.mMsgId;
-        std::cerr << std::endl;
-        std::cerr << "This is mMeta.mMsgName : " << reply->mMeta.mMsgName;
-        std::cerr << std::endl;
 
 		PulseReply *firstReply = new PulseReply(this, reply);
-        addTwitterView(firstReply);
-        firstReply->showReplyLine(false);
+		addTwitterView(firstReply);
+		firstReply->showReplyLine(false);
 
-        addTwitterView(new PulseReplySeperator());
+		addTwitterView(new PulseReplySeperator());
 
 	}
 }
diff --git a/supportlibs/cmark b/supportlibs/cmark
index 7195c6735..b9c7a496b 160000
--- a/supportlibs/cmark
+++ b/supportlibs/cmark
@@ -1 +1 @@
-Subproject commit 7195c6735f29be947ddc41f86c9ddfc8621d33b9
+Subproject commit b9c7a496ba7dd9c3495bae2ff2855899e47b245d
diff --git a/supportlibs/rapidjson b/supportlibs/rapidjson
index 949c771b0..f54b0e47a 160000
--- a/supportlibs/rapidjson
+++ b/supportlibs/rapidjson
@@ -1 +1 @@
-Subproject commit 949c771b03de448bdedea80c44a4a5f65284bfeb
+Subproject commit f54b0e47a08782a6131cc3d60f94d038fa6e0a51
diff --git a/supportlibs/restbed b/supportlibs/restbed
index 0c99284fb..c27c6726d 160000
--- a/supportlibs/restbed
+++ b/supportlibs/restbed
@@ -1 +1 @@
-Subproject commit 0c99284fba4f37a89de24972e48b8154abc5dc75
+Subproject commit c27c6726d28c42e2e1b7537ba63eeb23e944789d

From fc1f1caa032227a34e2235690a2652af740d6526 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 20 May 2023 16:46:58 +0200
Subject: [PATCH 282/503] Fix loading group tree settings

---
 retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 61a394a21..3b1aad916 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -119,6 +119,9 @@ GxsGroupFrameDialog::GxsGroupFrameDialog(RsGxsIfaceHelper *ifaceImpl,const QStri
 	sizes << 300 << width(); // Qt calculates the right sizes
 	ui->splitter->setSizes(sizes);
 
+	// load settings
+	processSettings(true);
+
 #ifndef UNFINISHED
 	ui->todoPushButton->hide();
 #endif

From f667daba98e712105ef141da32bb7053f0585eff Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 20 May 2023 22:05:37 +0200
Subject: [PATCH 283/503] made rsGxsForum provide posts in a hierarchy, to ease
 the display from JSON API clients, and fixed the unread posts counting

---
 .../src/gui/gxsforums/GxsForumModel.cpp       | 407 +-----------------
 .../src/gui/gxsforums/GxsForumModel.h         |  39 +-
 .../src/gui/gxsforums/GxsForumsDialog.cpp     |  18 +-
 3 files changed, 40 insertions(+), 424 deletions(-)

diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
index d793c29fe..603354c8e 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
@@ -800,7 +800,6 @@ void RsGxsForumModel::update_posts(const RsGxsGroupId& group_id)
 		// 1 - get message data from p3GxsForums
 
 		std::list<RsGxsGroupId> forumIds;
-		std::vector<RsMsgMetaData> msg_metas;
 		std::vector<RsGxsForumGroup> groups;
 
 		forumIds.push_back(group_id);
@@ -811,21 +810,19 @@ void RsGxsForumModel::update_posts(const RsGxsGroupId& group_id)
 			return;
 		}
 
-		if(!rsGxsForums->getForumMsgMetaData(group_id,msg_metas))
-		{
-			std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum message info for forum " << group_id << std::endl;
-			return;
-		}
-
-		// 2 - sort the messages into a proper hierarchy
+        // 2 - sort messages into a proper hierarchy
 
 		auto post_versions = new std::map<RsGxsMessageId,std::vector<std::pair<time_t, RsGxsMessageId> > >() ;
-		std::vector<ForumModelPostEntry> *vect = new std::vector<ForumModelPostEntry>();
+        std::vector<ForumPostEntry> *vect = new std::vector<ForumPostEntry>();
 		RsGxsForumGroup group = groups[0];
 
-		computeMessagesHierarchy(group,msg_metas,*vect,*post_versions);
+        if(!rsGxsForums->getForumPostsHierarchy(group,*vect,*post_versions))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve forum hierarchy of message info for forum " << group_id << std::endl;
+            return;
+        }
 
-		// 3 - update the model in the UI thread.
+        // 3 - update the model in the UI thread.
 
 		RsQThreadUtils::postToObject( [group,vect,post_versions,this]()
 		{
@@ -835,10 +832,14 @@ void RsGxsForumModel::update_posts(const RsGxsGroupId& group_id)
 			 * Qt::QueuedConnection is important!
 			 */
 
-			setPosts(group,*vect,*post_versions) ;
+            std::vector<ForumModelPostEntry> psts;
+            for(const auto& p:*vect)
+                psts.push_back( ForumModelPostEntry(p));
 
-			delete vect;
-			delete post_versions;
+            setPosts(group,psts,*post_versions) ;
+
+            delete vect;
+            delete post_versions;
 
 
 		}, this );
@@ -846,379 +847,7 @@ void RsGxsForumModel::update_posts(const RsGxsGroupId& group_id)
 	});
 }
 
-ForumModelIndex RsGxsForumModel::addEntry(std::vector<ForumModelPostEntry>& posts,const ForumModelPostEntry& entry,ForumModelIndex parent)
-{
-    uint32_t N = posts.size();
-    posts.push_back(entry);
 
-    posts[N].mParent = parent;
-    posts[parent].mChildren.push_back(N);
-#ifdef DEBUG_FORUMMODEL
-    std::cerr << "Added new entry " << N << " children of " << parent << std::endl;
-#endif
-    if(N == parent)
-        std::cerr << "(EE) trying to add a post as its own parent!" << std::endl;
-    return ForumModelIndex(N);
-}
-
-void RsGxsForumModel::generateMissingItem(const RsGxsMessageId &msgId,ForumModelPostEntry& entry)
-{
-    entry.mPostFlags = ForumModelPostEntry::FLAG_POST_IS_MISSING ;
-    entry.mTitle = std::string(tr("[ ... Missing Message ... ]").toUtf8());
-    entry.mMsgId = msgId;
-    entry.mAuthorId.clear();
-    entry.mPublishTs=0;
-    entry.mReputationWarningLevel = 3;
-}
-
-void RsGxsForumModel::convertMsgToPostEntry(const RsGxsForumGroup& mForumGroup,const RsMsgMetaData& msg, bool /*useChildTS*/, ForumModelPostEntry& fentry)
-{
-    fentry.mTitle     = msg.mMsgName;
-    fentry.mAuthorId  = msg.mAuthorId;
-    fentry.mMsgId     = msg.mMsgId;
-    fentry.mPublishTs = msg.mPublishTs;
-    fentry.mPostFlags = 0;
-    fentry.mMsgStatus = msg.mMsgStatus;
-
-    if(mForumGroup.mPinnedPosts.ids.find(msg.mMsgId) != mForumGroup.mPinnedPosts.ids.end())
-		fentry.mPostFlags |= ForumModelPostEntry::FLAG_POST_IS_PINNED;
-
-	// Early check for a message that should be hidden because its author
-	// is flagged with a bad reputation
-
-    computeReputationLevel(mForumGroup.mMeta.mSignFlags,fentry);
-}
-
-void RsGxsForumModel::computeReputationLevel(uint32_t forum_sign_flags,ForumModelPostEntry& fentry)
-{
-	uint32_t idflags =0;
-	RsReputationLevel reputation_level =
-	        rsReputations->overallReputationLevel(fentry.mAuthorId, &idflags);
-
-	if(reputation_level == RsReputationLevel::LOCALLY_NEGATIVE)
-		fentry.mPostFlags |=  ForumModelPostEntry::FLAG_POST_IS_REDACTED;
-	else
-		fentry.mPostFlags &= ~ForumModelPostEntry::FLAG_POST_IS_REDACTED;
-
-	// We use a specific item model for forums in order to handle the post pinning.
-
-	if(reputation_level == RsReputationLevel::UNKNOWN)
-		fentry.mReputationWarningLevel = 3 ;
-	else if(reputation_level == RsReputationLevel::LOCALLY_NEGATIVE)
-		fentry.mReputationWarningLevel = 2 ;
-	else if(reputation_level < rsGxsForums->minReputationForForwardingMessages(forum_sign_flags,idflags))
-		fentry.mReputationWarningLevel = 1 ;
-	else
-		fentry.mReputationWarningLevel = 0 ;
-}
-
-static bool decreasing_time_comp(const std::pair<time_t,RsGxsMessageId>& e1,const std::pair<time_t,RsGxsMessageId>& e2) { return e2.first < e1.first ; }
-
-void RsGxsForumModel::computeMessagesHierarchy(const RsGxsForumGroup& forum_group,
-                                               const std::vector<RsMsgMetaData>& msgs_metas_array,
-                                               std::vector<ForumModelPostEntry>& posts,
-                                               std::map<RsGxsMessageId,std::vector<std::pair<time_t,RsGxsMessageId> > >& mPostVersions
-                                               )
-{
-    std::cerr << "updating messages data with " << msgs_metas_array.size() << " messages" << std::endl;
-
-#ifdef DEBUG_FORUMS
-    std::cerr << "Retrieved group data: " << std::endl;
-    std::cerr << "  Group ID: " << forum_group.mMeta.mGroupId << std::endl;
-    std::cerr << "  Admin lst: " << forum_group.mAdminList.ids.size() << " elements." << std::endl;
-    for(auto it(forum_group.mAdminList.ids.begin());it!=forum_group.mAdminList.ids.end();++it)
-        std::cerr << "    " << *it << std::endl;
-    std::cerr << "  Pinned Post: " << forum_group.mPinnedPosts.ids.size() << " messages." << std::endl;
-    for(auto it(forum_group.mPinnedPosts.ids.begin());it!=forum_group.mPinnedPosts.ids.end();++it)
-        std::cerr << "    " << *it << std::endl;
-#endif
-
-	/* get messages */
-	std::map<RsGxsMessageId,RsMsgMetaData> msgs;
-
-	for(uint32_t i=0;i<msgs_metas_array.size();++i)
-	{
-#ifdef DEBUG_FORUMS
-		std::cerr << "Adding message " << msgs_metas_array[i].mMeta.mMsgId << " with parent " << msgs_metas_array[i].mMeta.mParentId << " to message map" << std::endl;
-#endif
-		msgs[msgs_metas_array[i].mMsgId] = msgs_metas_array[i] ;
-	}
-
-#ifdef DEBUG_FORUMS
-	size_t count = msgs.size();
-#endif
-//	int pos = 0;
-//	int steps = count / PROGRESSBAR_MAX;
-//	int step = 0;
-
-    initEmptyHierarchy(posts);
-
-    // ThreadList contains the list of parent threads. The algorithm below iterates through all messages
-    // and tries to establish parenthood relationships between them, given that we only know the
-    // immediate parent of a message and now its children. Some messages have a missing parent and for them
-    // a fake top level parent is generated.
-
-    // In order to be efficient, we first create a structure that lists the children of every mesage ID in the list.
-    // Then the hierarchy of message is build by attaching the kids to every message until all of them have been processed.
-    // The messages with missing parents will be the last ones remaining in the list.
-
-	std::list<std::pair< RsGxsMessageId, ForumModelIndex > > threadStack;
-    std::map<RsGxsMessageId,std::list<RsGxsMessageId> > kids_array ;
-    std::set<RsGxsMessageId> missing_parents;
-
-    // First of all, remove all older versions of posts. This is done by first adding all posts into a hierarchy structure
-    // and then removing all posts which have a new versions available. The older versions are kept appart.
-
-#ifdef DEBUG_FORUMS
-	std::cerr << "GxsForumsFillThread::run() Collecting post versions" << std::endl;
-#endif
-	mPostVersions.clear();
-
-	for ( auto msgIt = msgs.begin(); msgIt != msgs.end();++msgIt)
-	{
-		if(!msgIt->second.mOrigMsgId.isNull() && msgIt->second.mOrigMsgId != msgIt->second.mMsgId)
-		{
-#ifdef DEBUG_FORUMS
-			std::cerr << "  Post " << msgIt->second.mMeta.mMsgId << " is a new version of " << msgIt->second.mMeta.mOrigMsgId << std::endl;
-#endif
-			auto msgIt2 = msgs.find(msgIt->second.mOrigMsgId);
-
-			// Ensuring that the post exists allows to only collect the existing data.
-
-			if(msgIt2 == msgs.end())
-				continue ;
-
-			// Make sure that the author is the same than the original message, or is a moderator. This should always happen when messages are constructed using
-            // the UI but nothing can prevent a nasty user to craft a new version of a message with his own signature.
-
-			if(msgIt2->second.mAuthorId != msgIt->second.mAuthorId)
-			{
-				if( !IS_FORUM_MSG_MODERATION(msgIt->second.mMsgFlags) )			// if authors are different the moderation flag needs to be set on the editing msg
-					continue ;
-
-				if( !forum_group.canEditPosts(msgIt->second.mAuthorId))			// if author is not a moderator, continue
-					continue ;
-			}
-
-			// always add the post a self version
-
-			if(mPostVersions[msgIt->second.mOrigMsgId].empty())
-				mPostVersions[msgIt->second.mOrigMsgId].push_back(std::make_pair(msgIt2->second.mPublishTs,msgIt2->second.mMsgId)) ;
-
-			mPostVersions[msgIt->second.mOrigMsgId].push_back(std::make_pair(msgIt->second.mPublishTs,msgIt->second.mMsgId)) ;
-		}
-    }
-
-    // The following code assembles all new versions of a given post into the same array, indexed by the oldest version of the post.
-
-    for(auto it(mPostVersions.begin());it!=mPostVersions.end();++it)
-    {
-		auto& v(it->second) ;
-
-		for(size_t i=0;i<v.size();++i)
-		{
-            if(v[i].second != it->first)
-			{
-				RsGxsMessageId sub_msg_id = v[i].second ;
-
-				auto it2 = mPostVersions.find(sub_msg_id);
-
-				if(it2 != mPostVersions.end())
-				{
-					for(size_t j=0;j<it2->second.size();++j)
-						if(it2->second[j].second != sub_msg_id)	// dont copy it, since it is already present at slot i
-							v.push_back(it2->second[j]) ;
-
-					mPostVersions.erase(it2) ;	// it2 is never equal to it
-				}
-			}
-		}
-    }
-
-
-    // Now remove from msg ids, all posts except the most recent one. And make the mPostVersion be indexed by the most recent version of the post,
-    // which corresponds to the item in the tree widget.
-
-#ifdef DEBUG_FORUMS
-	std::cerr << "Final post versions: " << std::endl;
-#endif
-	std::map<RsGxsMessageId,std::vector<std::pair<time_t,RsGxsMessageId> > > mTmp;
-    std::map<RsGxsMessageId,RsGxsMessageId> most_recent_versions ;
-
-    for(auto it(mPostVersions.begin());it!=mPostVersions.end();++it)
-    {
-#ifdef DEBUG_FORUMS
-        std::cerr << "Original post: " << it.key() << std::endl;
-#endif
-        // Finally, sort the posts from newer to older
-
-        std::sort(it->second.begin(),it->second.end(),decreasing_time_comp) ;
-
-#ifdef DEBUG_FORUMS
-		std::cerr << "   most recent version " << (*it)[0].first << "  " << (*it)[0].second << std::endl;
-#endif
-		for(size_t i=1;i<it->second.size();++i)
-		{
-			msgs.erase(it->second[i].second) ;
-
-#ifdef DEBUG_FORUMS
-			std::cerr << "   older version " << (*it)[i].first << "  " << (*it)[i].second << std::endl;
-#endif
-		}
-
-        mTmp[it->second[0].second] = it->second ;	// index the versions map by the ID of the most recent post.
-
-		// Now make sure that message parents are consistent. Indeed, an old post may have the old version of a post as parent. So we need to change that parent
-		// to the newest version. So we create a map of which is the most recent version of each message, so that parent messages can be searched in it.
-
-	for(size_t i=1;i<it->second.size();++i)
-		most_recent_versions[it->second[i].second] = it->second[0].second ;
-	}
-    mPostVersions = mTmp ;
-
-    // The next step is to find the top level thread messages. These are defined as the messages without
-    // any parent message ID.
-
-    // this trick is needed because while we remove messages, the parents a given msg may already have been removed
-    // and wrongly understand as a missing parent.
-
-	std::map<RsGxsMessageId,RsMsgMetaData> kept_msgs;
-
-	for ( auto msgIt = msgs.begin(); msgIt != msgs.end();++msgIt)
-    {
-
-        if(msgIt->second.mParentId.isNull())
-		{
-
-			/* add all threads */
-			const RsMsgMetaData& msg = msgIt->second;
-
-#ifdef DEBUG_FORUMS
-			std::cerr << "GxsForumsFillThread::run() Adding TopLevel Thread: mId: " << msg.mMsgId << std::endl;
-#endif
-
-            ForumModelPostEntry entry;
-			convertMsgToPostEntry(forum_group,msg, mUseChildTS, entry);
-
-            ForumModelIndex entry_index = addEntry(posts,entry,0);
-
-			//if (!mFlatView)
-				threadStack.push_back(std::make_pair(msg.mMsgId,entry_index)) ;
-
-			//calculateExpand(msg, item);
-			//mItems.append(entry_index);
-		}
-		else
-        {
-#ifdef DEBUG_FORUMS
-			std::cerr << "GxsForumsFillThread::run() Storing kid " << msgIt->first << " of message " << msgIt->second.mParentId << std::endl;
-#endif
-            // The same missing parent may appear multiple times, so we first store them into a unique container.
-
-            RsGxsMessageId parent_msg = msgIt->second.mParentId;
-
-            if(msgs.find(parent_msg) == msgs.end())
-            {
-                // also check that the message is not versionned
-
-                std::map<RsGxsMessageId,RsGxsMessageId>::const_iterator mrit = most_recent_versions.find(parent_msg) ;
-
-                if(mrit != most_recent_versions.end())
-                    parent_msg = mrit->second ;
-                else
-					missing_parents.insert(parent_msg);
-            }
-
-            kids_array[parent_msg].push_back(msgIt->first) ;
-            kept_msgs.insert(*msgIt) ;
-        }
-    }
-
-    msgs = kept_msgs;
-
-    // Also create a list of posts by time, when they are new versions of existing posts. Only the last one will have an item created.
-
-    // Add a fake toplevel item for the parent IDs that we dont actually have.
-
-    for(std::set<RsGxsMessageId>::const_iterator it(missing_parents.begin());it!=missing_parents.end();++it)
-	{
-		// add dummy parent item
-        ForumModelPostEntry e ;
-        generateMissingItem(*it,e);
-
-        ForumModelIndex e_index = addEntry(posts,e,0);	// no parent -> parent is level 0
-		//mItems.append( e_index );
-
-		threadStack.push_back(std::make_pair(*it,e_index)) ;
-	}
-#ifdef DEBUG_FORUMS
-	std::cerr << "GxsForumsFillThread::run() Processing stack:" << std::endl;
-#endif
-    // Now use a stack to go down the hierarchy
-
-	while (!threadStack.empty())
-    {
-        std::pair<RsGxsMessageId, uint32_t> threadPair = threadStack.front();
-		threadStack.pop_front();
-
-        std::map<RsGxsMessageId, std::list<RsGxsMessageId> >::iterator it = kids_array.find(threadPair.first) ;
-
-#ifdef DEBUG_FORUMS
-		std::cerr << "GxsForumsFillThread::run() Node: " << threadPair.first << std::endl;
-#endif
-        if(it == kids_array.end())
-            continue ;
-
-
-        for(std::list<RsGxsMessageId>::const_iterator it2(it->second.begin());it2!=it->second.end();++it2)
-        {
-            // We iterate through the top level thread items, and look for which message has the current item as parent.
-            // When found, the item is put in the thread list itself, as a potential new parent.
-
-            auto mit = msgs.find(*it2) ;
-
-            if(mit == msgs.end())
-			{
-				std::cerr << "GxsForumsFillThread::run()    Cannot find submessage " << *it2 << " !!!" << std::endl;
-				continue ;
-			}
-
-            const RsMsgMetaData& msg(mit->second) ;
-#ifdef DEBUG_FORUMS
-			std::cerr << "GxsForumsFillThread::run()    adding sub_item " << msg.mMsgId << std::endl;
-#endif
-
-
-            ForumModelPostEntry e ;
-			convertMsgToPostEntry(forum_group,msg,mUseChildTS,e) ;
-            ForumModelIndex e_index = addEntry(posts,e, threadPair.second);
-
-			//calculateExpand(msg, item);
-
-			/* add item to process list */
-			threadStack.push_back(std::make_pair(msg.mMsgId, e_index));
-
-			msgs.erase(mit);
-		}
-
-#ifdef DEBUG_FORUMS
-		std::cerr << "GxsForumsFillThread::run() Erasing entry " << it->first << " from kids tab." << std::endl;
-#endif
-        kids_array.erase(it) ; // This is not strictly needed, but it improves performance by reducing the search space.
-	}
-
-#ifdef DEBUG_FORUMS
-    std::cerr << "Kids array now has " << kids_array.size() << " elements" << std::endl;
-    for(std::map<RsGxsMessageId,std::list<RsGxsMessageId> >::const_iterator it(kids_array.begin());it!=kids_array.end();++it)
-    {
-        std::cerr << "Node " << it->first << std::endl;
-        for(std::list<RsGxsMessageId>::const_iterator it2(it->second.begin());it2!=it->second.end();++it2)
-            std::cerr << "  " << *it2 << std::endl;
-    }
-
-	std::cerr << "GxsForumsFillThread::run() stopped: " << (wasStopped() ? "yes" : "no") << std::endl;
-#endif
-}
 
 void RsGxsForumModel::setMsgReadStatus(const QModelIndex& i,bool read_status,bool with_children)
 {
@@ -1248,8 +877,8 @@ void RsGxsForumModel::setMsgReadStatus(const QModelIndex& i,bool read_status,boo
 
 void RsGxsForumModel::recursSetMsgReadStatus(ForumModelIndex i,bool read_status,bool with_children)
 {
-	int newStatus = (read_status ? mPosts[i].mMsgStatus & ~static_cast<int>(GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD)
-	                             : mPosts[i].mMsgStatus |  static_cast<int>(GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD));
+    uint32_t newStatus = (read_status ? mPosts[i].mMsgStatus & ~static_cast<int>(GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD)
+                                      : mPosts[i].mMsgStatus |  static_cast<int>(GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD));
 	bool bChanged = (mPosts[i].mMsgStatus != newStatus);
 	mPosts[i].mMsgStatus = newStatus;
 	//Remove Unprocessed and New flags
@@ -1420,7 +1049,7 @@ void RsGxsForumModel::setAuthorOpinion(const QModelIndex& indx, RsOpinion op)
     for(uint32_t i=0;i<mPosts.size();++i)
     	if(mPosts[i].mAuthorId == author_id)
         {
-			computeReputationLevel(mForumGroup.mMeta.mSignFlags,mPosts[i]);
+            rsGxsForums->updateReputationLevel(mForumGroup.mMeta.mSignFlags,mPosts[i]);
 
 			// notify the widgets that the data has changed.
 			emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(0,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL));
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
index 50de234fa..47eecaabd 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
@@ -23,44 +23,19 @@
 #include <QModelIndex>
 #include <QColor>
 
-// This class holds the actual hierarchy of posts, represented by identifiers
-// It is responsible for auto-updating when necessary and holds a mutex to allow the Model to
-// safely access the data.
-
-// The model contains a post in place 0 that is the parent of all posts.
-
-typedef uint32_t ForumModelIndex;
-
-struct ForumModelPostEntry
+struct ForumModelPostEntry: public ForumPostEntry
 {
-    ForumModelPostEntry() : mPublishTs(0),mMostRecentTsInThread(0),mPostFlags(0),mReputationWarningLevel(0),mMsgStatus(0),prow(0) {}
+    ForumModelPostEntry() : mMostRecentTsInThread(0),prow(0) {}
+    ForumModelPostEntry(const ForumPostEntry& p) : mMostRecentTsInThread(0),prow(0)  { *static_cast<ForumPostEntry*>(this) = p; }
 
-    enum {					// flags for display of posts. To be used in mPostFlags
-        FLAG_POST_IS_PINNED              = 0x0001,
-        FLAG_POST_IS_MISSING             = 0x0002,
-        FLAG_POST_IS_REDACTED            = 0x0004,
-        FLAG_POST_HAS_UNREAD_CHILDREN    = 0x0008,
-        FLAG_POST_HAS_READ_CHILDREN      = 0x0010,
-        FLAG_POST_PASSES_FILTER          = 0x0020,
-        FLAG_POST_CHILDREN_PASSES_FILTER = 0x0040,
-    };
-
-    std::string        mTitle ;
-    RsGxsId            mAuthorId ;
-    RsGxsMessageId     mMsgId;
-    uint32_t           mPublishTs;
-    uint32_t           mMostRecentTsInThread;
-    uint32_t           mPostFlags;
-    int                mReputationWarningLevel;
-    int                mMsgStatus;
-
-    std::vector<ForumModelIndex> mChildren;
-    ForumModelIndex mParent;
-    int prow ;									// parent row
+    uint32_t mMostRecentTsInThread;
+    int prow ;		// parent row. Used by Qt abstract item models.
 };
 
 // This class is the item model used by Qt to display the information
 
+typedef uint32_t ForumModelIndex;
+
 class RsGxsForumModel : public QAbstractItemModel
 {
 	Q_OBJECT
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
index c7de87063..5733d5a39 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
@@ -104,11 +104,23 @@ bool GxsForumsDialog::getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo)
 
 bool GxsForumsDialog::getGroupStatistics(const RsGxsGroupId& groupId,GxsGroupStatistic& stat)
 {
-    return rsGxsForums->getForumStatistics(groupId,stat);
+    RsGxsForumStatistics s;
+
+    if(!rsGxsForums->getForumStatistics(groupId,s))
+        return false;
+
+    stat.mGrpId = groupId;
+    stat.mNumMsgs = s.mNumberOfMessages;
+
+    stat.mTotalSizeOfMsgs = 0;	// hopefuly unused. Required the loading of the full channel data, so not very convenient.
+    stat.mNumThreadMsgsNew = s.mNumberOfNewMessages;
+    stat.mNumThreadMsgsUnread = s.mNumberOfUnreadMessages;
+    stat.mNumChildMsgsNew = 0;
+    stat.mNumChildMsgsUnread = 0;
+
+    return true;
 }
 
-
-
 QString GxsForumsDialog::getHelpString() const
 {
 	int H = misc::getFontSizeFactor("HelpButton").height();

From e46f1c285cebe56d5b489b82ceb840518f7b3e5c Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 22 May 2023 06:58:50 +0200
Subject: [PATCH 284/503] Make post title in board clickable after change to
 ElidedLabel

---
 .../src/gui/Posted/BoardPostDisplayWidget.cpp | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
index 37062e098..541cecac0 100644
--- a/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
+++ b/retroshare-gui/src/gui/Posted/BoardPostDisplayWidget.cpp
@@ -23,6 +23,7 @@
 #include <QStyle>
 #include <QTextDocument>
 #include <QToolButton>
+#include <QDesktopServices>
 
 #include "rshare.h"
 #include "BoardPostDisplayWidget.h"
@@ -214,8 +215,6 @@ void BoardPostDisplayWidgetBase::baseSetup()
         // The only combination that seems to work: load as EncodedUrl, extract toEncoded().
         QByteArray urlarray(mPost.mLink.c_str());
         QUrl url = QUrl::fromEncoded(urlarray.trimmed());
-        QString urlstr = "Invalid Link";
-        QString sitestr = "Invalid Link";
 
         bool urlOkay = url.isValid();
         if (urlOkay)
@@ -227,25 +226,24 @@ void BoardPostDisplayWidgetBase::baseSetup()
                             && (scheme != "retroshare"))
             {
                 urlOkay = false;
-                sitestr = "Invalid Link Scheme";
             }
         }
 
+        ElidedLabel *label = titleLabel();
+        label->setText( QString::fromUtf8(mPost.mMeta.mMsgName.c_str()) );
+
         if (urlOkay)
         {
-            urlstr =  QString("<a href=\"");
-            urlstr += QString(url.toEncoded());
-            urlstr += QString("\" ><span style=\" text-decoration: underline; color:#2255AA;\"> ");
-            urlstr += QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
-            urlstr += QString(" </span></a>");
-
             QString siteurl = url.toEncoded();
 
-            titleLabel()->setText(urlstr);
-            titleLabel()->setToolTip(siteurl);
+            label->setStyleSheet("text-decoration: underline; color:#2255AA;");
+            label->setCursor(QCursor(Qt::PointingHandCursor));
+            label->setToolTip(siteurl);
+
+            connect(label, &ElidedLabel::clicked, this, [url] () {
+                QDesktopServices::openUrl(url);
+            }, Qt::QueuedConnection);
         }
-        else
-            titleLabel()->setText( QString::fromUtf8(mPost.mMeta.mMsgName.c_str()) );
     }
 
     //QString score = "Hot" + QString::number(post.mHotScore);

From 87282618a4b17bf6092c7cf74eaf63dbfc826795 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Tue, 23 May 2023 00:27:30 +0530
Subject: [PATCH 285/503] Changed the follow status changed to new wire

---
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index ea63e933e..90121b613 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -127,6 +127,9 @@ void WireDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
         case RsWireEventCode::POST_UPDATED:
             refreshGroups();
             break;
+        case RsWireEventCode::NEW_WIRE:
+            refreshGroups();
+            break;
         case RsWireEventCode::FOLLOW_STATUS_CHANGED:
             refreshGroups();
             break;

From 238c6eda9ff5931a3bf091bfc5474afc7d0f9ff6 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 25 May 2023 21:35:12 +0200
Subject: [PATCH 286/503] improved debug outpug of friendserver code

---
 .../src/retroshare-friendserver.cc            | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/retroshare-friendserver/src/retroshare-friendserver.cc b/retroshare-friendserver/src/retroshare-friendserver.cc
index 6c5cba940..fabe3889d 100644
--- a/retroshare-friendserver/src/retroshare-friendserver.cc
+++ b/retroshare-friendserver/src/retroshare-friendserver.cc
@@ -27,6 +27,7 @@
 
 #include "retroshare/rstor.h"
 #include "retroshare/rsinit.h"
+#include "pqi/authgpg.h"
 
 #include "friendserver.h"
 
@@ -48,24 +49,31 @@ int main(int argc, char* argv[])
 
     std::string base_directory = "FSData";
     std::string tor_executable_path ;
+    bool verbose = false;
 
 	argstream as(argc,argv);
 
     as >> parameter( 'c',"base-dir", base_directory, "set base directory to store data files (keys, etc)", false )
        >> parameter( 't',"tor-executable", tor_executable_path, "set absolute path for tor executable", false )
+       >> option( 'v',"verbose", verbose, "display additional debug information")
        >> help( 'h', "help", "Display this Help" );
 
 	as.defaultErrorHandling(true, true);
 
     RsConfigOptions conf;
+    conf.optBaseDir = base_directory;
     conf.main_executable_path = argv[0];
 
     if(!tor_executable_path.empty())
         RsTor::setTorExecutablePath(tor_executable_path);
 
+    RsTor::setVerbose(verbose);
+
     RsInit::InitRsConfig();
     RsInit::InitRetroShare(conf);
 
+    AuthPGP::exit();	// This allows to release the keyring created by libretroshare, since it's not useful, as TorManager has its own.
+
     // Create the base directory if needed
 
     if(!RsDirUtil::checkCreateDirectory(base_directory))
@@ -107,22 +115,22 @@ int main(int argc, char* argv[])
 
     RsTor::getHiddenServiceInfo(service_id,onion_address,service_port,service_target_address,target_port) ;
 
-    RsDbg() << "Tor properly started: " ;
-    RsDbg() << "  Hidden service address: " << onion_address << ":" << service_port;
-    RsDbg() << "  Target address        : " << service_target_address << ":" << target_port;
+    RsInfo() << "Tor properly started: " ;
+    RsInfo() << "  Hidden service address: " << onion_address << ":" << service_port;
+    RsInfo() << "  Target address        : " << service_target_address << ":" << target_port;
 
     // Now start the real thing.
 
     FriendServer fs(base_directory,service_target_address,target_port);
     fs.start();
 
-    RsDbg() << "";
-    RsDbg() << "================== Retroshare Friend Server has properly started =====================" ;
-    RsDbg() << "=                                                                                    =";
-    RsDbg() << "= Address:Port " << onion_address << ":" << service_port << ((service_port<10000)?" ":"") << "  =";
-    RsDbg() << "=                                                                                    =";
-    RsDbg() << "======================================================================================" ;
-    RsDbg() << "";
+    RsInfo() << "";
+    RsInfo() << "================== Retroshare Friend Server has properly started =====================" ;
+    RsInfo() << "=                                                                                    =";
+    RsInfo() << "= Address:Port " << onion_address << ":" << service_port << ((service_port<10000)?" ":"") << "  =";
+    RsInfo() << "=                                                                                    =";
+    RsInfo() << "======================================================================================" ;
+    RsInfo() << "";
 
     while(fs.isRunning())
         std::this_thread::sleep_for(std::chrono::seconds(2));

From 852ec16c6acf889472d13dda876072c2865a8edf Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Fri, 26 May 2023 22:20:05 +0530
Subject: [PATCH 287/503] Removed extra refresh function calls and break
 statements.

---
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 90121b613..38ea1b398 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -113,27 +113,21 @@ void WireDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
         switch(e->mWireEventCode)
         {
         case RsWireEventCode::NEW_POST:
-            refreshGroups();
-            break;
+
         case RsWireEventCode::NEW_REPLY:
-            refreshGroups();
-            break;
+
         case RsWireEventCode::NEW_LIKE:
-            refreshGroups();
-            break;
+
         case RsWireEventCode::NEW_REPUBLISH:
-            refreshGroups();
-            break;
+
         case RsWireEventCode::POST_UPDATED:
-            refreshGroups();
-            break;
+
         case RsWireEventCode::NEW_WIRE:
-            refreshGroups();
-            break;
+
         case RsWireEventCode::FOLLOW_STATUS_CHANGED:
-            refreshGroups();
-            break;
+
         default:
+            refreshGroups();
             break;
 
         }

From d642fde9d518bf7fcadde8902c27d60c396bc4b8 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 28 May 2023 00:48:10 +0200
Subject: [PATCH 288/503] Fixed x86 build

---
 retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp        | 8 ++++----
 retroshare-gui/src/gui/gxsforums/GxsForumModel.h          | 6 +++---
 retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
index 603354c8e..b68a50173 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
@@ -117,14 +117,14 @@ int RsGxsForumModel::columnCount(const QModelIndex &/*parent*/) const
 	return COLUMN_THREAD_NB_COLUMNS ;
 }
 
-std::vector<std::pair<time_t,RsGxsMessageId> > RsGxsForumModel::getPostVersions(const RsGxsMessageId& mid) const
+std::vector<std::pair<rstime_t,RsGxsMessageId> > RsGxsForumModel::getPostVersions(const RsGxsMessageId& mid) const
 {
     auto it = mPostVersions.find(mid);
 
     if(it != mPostVersions.end())
         return it->second;
     else
-        return std::vector<std::pair<time_t,RsGxsMessageId> >();
+        return std::vector<std::pair<rstime_t,RsGxsMessageId> >();
 }
 
 bool RsGxsForumModel::getPostData(const QModelIndex& i,ForumModelPostEntry& fmpe) const
@@ -746,7 +746,7 @@ void RsGxsForumModel::clear()
 	emit forumLoaded();
 }
 
-void RsGxsForumModel::setPosts(const RsGxsForumGroup& group, const std::vector<ForumModelPostEntry>& posts,const std::map<RsGxsMessageId,std::vector<std::pair<time_t,RsGxsMessageId> > >& post_versions)
+void RsGxsForumModel::setPosts(const RsGxsForumGroup& group, const std::vector<ForumModelPostEntry>& posts,const std::map<RsGxsMessageId,std::vector<std::pair<rstime_t,RsGxsMessageId> > >& post_versions)
 {
 	preMods();
 
@@ -812,7 +812,7 @@ void RsGxsForumModel::update_posts(const RsGxsGroupId& group_id)
 
         // 2 - sort messages into a proper hierarchy
 
-		auto post_versions = new std::map<RsGxsMessageId,std::vector<std::pair<time_t, RsGxsMessageId> > >() ;
+		auto post_versions = new std::map<RsGxsMessageId,std::vector<std::pair<rstime_t, RsGxsMessageId> > >() ;
         std::vector<ForumPostEntry> *vect = new std::vector<ForumPostEntry>();
 		RsGxsForumGroup group = groups[0];
 
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
index 47eecaabd..c69013c3e 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
@@ -77,7 +77,7 @@ public:
 
     static const QString FilterString ;
 
-	std::vector<std::pair<time_t,RsGxsMessageId> > getPostVersions(const RsGxsMessageId& mid) const;
+	std::vector<std::pair<rstime_t,RsGxsMessageId> > getPostVersions(const RsGxsMessageId& mid) const;
 
     // This method will asynchroneously update the data
 	void updateForum(const RsGxsGroupId& forumGroup);
@@ -170,11 +170,11 @@ private:
 	static void convertMsgToPostEntry(const RsGxsForumGroup &mForumGroup, const RsMsgMetaData &msg, bool useChildTS, ForumModelPostEntry& fentry);
 
 	void computeMessagesHierarchy(const RsGxsForumGroup& forum_group, const std::vector<RsMsgMetaData> &msgs_array, std::vector<ForumModelPostEntry>& posts, std::map<RsGxsMessageId, std::vector<std::pair<time_t, RsGxsMessageId> > > &mPostVersions);
-	void setPosts(const RsGxsForumGroup& group, const std::vector<ForumModelPostEntry>& posts,const std::map<RsGxsMessageId,std::vector<std::pair<time_t,RsGxsMessageId> > >& post_versions);
+	void setPosts(const RsGxsForumGroup& group, const std::vector<ForumModelPostEntry>& posts,const std::map<RsGxsMessageId,std::vector<std::pair<rstime_t,RsGxsMessageId> > >& post_versions);
 	void initEmptyHierarchy(std::vector<ForumModelPostEntry>& posts);
 
     std::vector<ForumModelPostEntry> mPosts ; // store the list of posts updated from rsForums.
-	std::map<RsGxsMessageId,std::vector<std::pair<time_t,RsGxsMessageId> > > mPostVersions;
+	std::map<RsGxsMessageId,std::vector<std::pair<rstime_t,RsGxsMessageId> > > mPostVersions;
 
     QColor mTextColorRead          ;
     QColor mTextColorUnread        ;
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index 1309848c2..11d04fdd8 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -1193,7 +1193,7 @@ void GxsForumThreadWidget::insertMessage()
 
     // add/show combobox for versions, if applicable, and enable it. If no older versions of the post available, hide the combobox.
 
-    std::vector<std::pair<time_t,RsGxsMessageId> > post_versions = mThreadModel->getPostVersions(mOrigThreadId);
+    std::vector<std::pair<rstime_t,RsGxsMessageId> > post_versions = mThreadModel->getPostVersions(mOrigThreadId);
 
 #ifdef DEBUG_FORUMS
     std::cerr << "Looking into existing versions  for post " << mOrigThreadId << ", thread history: " << post_versions.size() << std::endl;

From 8422d3fc8c6fecaa4cacfd98ba448342c7a6e844 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 14 May 2023 22:19:16 +0200
Subject: [PATCH 289/503] Added copy and save of image to
 AspectRatioPixmapLabel

---
 .../src/util/AspectRatioPixmapLabel.cpp       | 58 ++++++++++++++++++-
 .../src/util/AspectRatioPixmapLabel.h         | 16 +++++
 retroshare-gui/src/util/imageutil.cpp         | 28 ++++++---
 retroshare-gui/src/util/imageutil.h           |  1 +
 4 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/util/AspectRatioPixmapLabel.cpp b/retroshare-gui/src/util/AspectRatioPixmapLabel.cpp
index 08ecf18c6..0ff9d851b 100644
--- a/retroshare-gui/src/util/AspectRatioPixmapLabel.cpp
+++ b/retroshare-gui/src/util/AspectRatioPixmapLabel.cpp
@@ -18,8 +18,14 @@
  *                                                                             *
  *******************************************************************************/
 
+#include <QApplication>
+#include <QClipboard>
+#include <QMenu>
+
 #include "AspectRatioPixmapLabel.h"
 #include <iostream>
+#include "util/imageutil.h"
+#include "gui/common/FilesDefs.h"
 
 AspectRatioPixmapLabel::AspectRatioPixmapLabel(QWidget *parent) :
     QLabel(parent)
@@ -31,7 +37,7 @@ AspectRatioPixmapLabel::AspectRatioPixmapLabel(QWidget *parent) :
 void AspectRatioPixmapLabel::setPixmap ( const QPixmap & p)
 {
     pix = p;
-	QLabel::setPixmap(pix);
+	QLabel::setPixmap(scaledPixmap());
 	//std::cout << "Information size: " << pix.width() << 'x' << pix.height() << std::endl;
 }
 
@@ -57,3 +63,53 @@ void AspectRatioPixmapLabel::resizeEvent(QResizeEvent * e)
 	QLabel::resizeEvent(e);
 	//std::cout << "Information resized: " << e->oldSize().width() << 'x' << e->oldSize().height() << " to " << e->size().width() << 'x' << e->size().height() << std::endl;
 }
+
+void AspectRatioPixmapLabel::addContextMenuAction(QAction *action)
+{
+	mContextMenuActions.push_back(action);
+}
+
+void AspectRatioPixmapLabel::contextMenuEvent(QContextMenuEvent *event)
+{
+	emit calculateContextMenuActions();
+
+	QMenu *contextMenu = new QMenu();
+
+	QAction *actionSaveImage = contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/images/document_save.png"), tr("Save image"), this, SLOT(saveImage()));
+	QAction *actionCopyImage = contextMenu->addAction(tr("Copy image"), this, SLOT(copyImage()));
+
+	if (pix.isNull()) {
+		actionSaveImage->setEnabled(false);
+		actionCopyImage->setEnabled(false);
+	} else {
+		actionSaveImage->setEnabled(true);
+		actionCopyImage->setEnabled(true);
+	}
+
+	QList<QAction*>::iterator it;
+	for (it = mContextMenuActions.begin(); it != mContextMenuActions.end(); ++it) {
+		contextMenu->addAction(*it);
+	}
+
+	contextMenu->exec(event->globalPos());
+
+	delete(contextMenu);
+}
+
+void AspectRatioPixmapLabel::copyImage()
+{
+	if (pix.isNull()) {
+		return;
+	}
+
+	QApplication::clipboard()->setPixmap(pix, QClipboard::Clipboard);
+}
+
+void AspectRatioPixmapLabel::saveImage()
+{
+	if (pix.isNull()) {
+		return;
+	}
+
+	ImageUtil::saveImage(window(), pix.toImage());
+}
diff --git a/retroshare-gui/src/util/AspectRatioPixmapLabel.h b/retroshare-gui/src/util/AspectRatioPixmapLabel.h
index ad7c40e4c..be6e79077 100644
--- a/retroshare-gui/src/util/AspectRatioPixmapLabel.h
+++ b/retroshare-gui/src/util/AspectRatioPixmapLabel.h
@@ -28,17 +28,33 @@
 class AspectRatioPixmapLabel : public QLabel
 {
     Q_OBJECT
+
 public:
 	explicit AspectRatioPixmapLabel(QWidget *parent = nullptr);
 	virtual int heightForWidth( int width ) const override;
 	virtual QSize sizeHint() const override;
     QPixmap scaledPixmap() const;
+
+	// Add QAction to context menu (action won't be deleted)
+	void addContextMenuAction(QAction *action);
+
+Q_SIGNALS:
+	void calculateContextMenuActions();
+
 public slots:
     void setPixmap ( const QPixmap & );
+
 protected:
 	void resizeEvent(QResizeEvent *event) override;
+	virtual void contextMenuEvent(QContextMenuEvent *event);
+
+private slots:
+	void copyImage();
+	void saveImage();
+
 private:
     QPixmap pix;
+	QList<QAction*> mContextMenuActions;
 };
 
 #endif // ASPECTRATIOPIXMAPLABEL_H
diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index 3368db309..612387724 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -115,13 +115,7 @@ void ImageUtil::extractImage(QWidget *window, QTextCursor cursor, QString file)
 		if(!image.isNull())
 		{
 			success = true;
-			if(!file.isEmpty() || misc::getSaveFileName(window, RshareSettings::LASTDIR_IMAGES, "Save Picture File", "Pictures (*.png *.xpm *.jpg)", file))
-			{
-				if(!image.save(file, nullptr, 100))
-					if(!image.save(file + ".png", nullptr, 100))
-						QMessageBox::warning(window, QApplication::translate("ImageUtil", "Save image"), QApplication::translate("ImageUtil", "Cannot save the image, invalid filename")
-											 + "\n" + file);
-			}
+			saveImage(window, image, file);
 		}
 	}
 	if(!success)
@@ -130,6 +124,26 @@ void ImageUtil::extractImage(QWidget *window, QTextCursor cursor, QString file)
 	}
 }
 
+bool ImageUtil::saveImage(QWidget *window, const QImage &image, QString file)
+{
+	bool result = false;
+
+	if (!file.isEmpty() || misc::getSaveFileName(window, RshareSettings::LASTDIR_IMAGES, QApplication::translate("ImageUtil", "Save Picture File"), QApplication::translate("ImageUtil", "Pictures (*.png *.xpm *.jpg)"), file)) {
+		if (image.save(file, nullptr, 100)) {
+			result = true;
+		} else {
+			if (image.save(file + ".png", nullptr, 100)) {
+				result = true;
+			} else {
+				QMessageBox::warning(window, QApplication::translate("ImageUtil", "Save image"), QApplication::translate("ImageUtil", "Cannot save the image, invalid filename")
+									 + "\n" + file);
+			}
+		}
+	}
+
+	return result;
+}
+
 void ImageUtil::copyImage(QWidget *window, QTextCursor cursor)
 {
 	cursor.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, 1);
diff --git a/retroshare-gui/src/util/imageutil.h b/retroshare-gui/src/util/imageutil.h
index 8e7d26987..46e83e728 100644
--- a/retroshare-gui/src/util/imageutil.h
+++ b/retroshare-gui/src/util/imageutil.h
@@ -37,6 +37,7 @@ public:
 	static bool checkImage(const QTextEdit *edit, const QPoint &pos, QString &imageStr, QRect *cursorRectStartOut = NULL, QRect *cursorRectLeftOut = NULL, QRect *cursorRectRightOut = NULL, QRect *cursorRectEndOut = NULL);
 	static void extractImage(QWidget *window, QTextCursor cursor, QString file = "");
 	static void copyImage(QWidget *window, QTextCursor cursor);
+	static bool saveImage(QWidget *window, const QImage &image, QString file = "");
     static bool optimizeSizeHtml(QString &html, const QImage& original, QImage &optimized, int maxPixels = -1, int maxBytes = -1);
     static bool optimizeSizeBytes(QByteArray &bytearray, const QImage &original, QImage &optimized, const char *format, int maxPixels, int maxBytes);
     static bool hasAlphaContent(const QImage& image);

From f9ca6cd3e144081b0a397240aa4e155b3bc1d834 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 9 May 2023 22:13:38 +0200
Subject: [PATCH 290/503] FeedReader: Show error when some post could not be
 created

---
 .../FeedReader/gui/FeedReaderStringDefs.cpp   |   3 +
 plugins/FeedReader/interface/rsFeedReader.h   |   1 +
 plugins/FeedReader/lang/FeedReader_en.ts      |   9 +-
 plugins/FeedReader/services/p3FeedReader.cc   | 244 ++++++++++--------
 plugins/FeedReader/services/p3FeedReader.h    |   2 +-
 .../FeedReader/services/p3FeedReaderThread.cc |  17 +-
 6 files changed, 156 insertions(+), 120 deletions(-)

diff --git a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
index 07f0d44ab..53a62e669 100644
--- a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
+++ b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp
@@ -136,6 +136,9 @@ QString FeedReaderStringDefs::errorString(RsFeedReaderErrorState errorState, con
 	case RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_AUTHOR:
 		errorText = QApplication::translate("FeedReaderStringDefs", "Board has no author");
 		break;
+	case RS_FEED_ERRORSTATE_PROCESS_POST:
+		errorText = QApplication::translate("FeedReaderStringDefs", "Some posts could not be created");
+		break;
 
 	case RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR:
 		errorText = QApplication::translate("FeedReaderStringDefs", "Can't read html");
diff --git a/plugins/FeedReader/interface/rsFeedReader.h b/plugins/FeedReader/interface/rsFeedReader.h
index 044dcdd80..72a900654 100644
--- a/plugins/FeedReader/interface/rsFeedReader.h
+++ b/plugins/FeedReader/interface/rsFeedReader.h
@@ -56,6 +56,7 @@ enum RsFeedReaderErrorState {
 	RS_FEED_ERRORSTATE_PROCESS_POSTED_NOT_FOUND       = 105,
 	RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_ADMIN        = 106,
 	RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_AUTHOR       = 107,
+	RS_FEED_ERRORSTATE_PROCESS_POST                   = 108,
 
 	RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR             = 150,
 	RS_FEED_ERRORSTATE_PROCESS_XPATH_INTERNAL_ERROR   = 151,
diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts
index db5748893..707c8cec9 100644
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@@ -714,12 +714,12 @@
     </message>
     <message>
         <location line="+3"/>
-        <location line="+111"/>
+        <location line="+114"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-94"/>
+        <location line="-97"/>
         <source>Internal download error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -788,6 +788,11 @@
         <source>Board has no author</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Some posts could not be created</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+4"/>
         <source>Can&apos;t read html</source>
diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc
index fbda4d9e1..6612210a7 100644
--- a/plugins/FeedReader/services/p3FeedReader.cc
+++ b/plugins/FeedReader/services/p3FeedReader.cc
@@ -1994,12 +1994,13 @@ void p3FeedReader::onProcessSuccess_filterMsg(uint32_t feedId, std::list<RsFeedR
 	}
 }
 
-void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedReaderMsg*> &msgs, bool single)
+void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedReaderMsg*> &msgs)
 {
 #ifdef FEEDREADER_DEBUG
 	std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - feed " << feedId << " got " << msgs.size() << " messages" << std::endl;
 #endif
 
+	RsFeedReaderErrorState errorState = RS_FEED_ERRORSTATE_OK;
 	std::list<std::string> addedMsgs;
 	std::string forumId;
 	RsGxsId forumAuthorId;
@@ -2025,7 +2026,6 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 		RsFeedReaderFeed *fi = it->second;
 		bool forum = (fi->flag & RS_FEED_FLAG_FORUM) && !fi->preview;
 		bool posted = (fi->flag & RS_FEED_FLAG_POSTED) && !fi->preview;
-		RsFeedReaderErrorState errorState = RS_FEED_ERRORSTATE_OK;
 		feedFlag = fi->flag;
 
 		if (forum && !msgs.empty()) {
@@ -2125,129 +2125,153 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 			std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - feed " << fi->feedId << " (" << fi->name << ") added " << newMsgs << "/" << msgs.size() << " messages" << std::endl;
 #endif
 		}
-
-		if (!single) {
-			fi->workstate = RsFeedReaderFeed::WAITING;
-			fi->content.clear();
-			fi->errorState = errorState;
-			fi->lastUpdate = time(NULL);
-		}
-
-		if (!fi->preview) {
-			IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
-		}
 	}
 
-	if (!forumId.empty() && !forumMsgs.empty()) {
-		if (mForums) {
-			/* a bit tricky */
-			RsGenExchange *genExchange = dynamic_cast<RsGenExchange*>(mForums);
-			if (genExchange) {
-				/* add messages as forum messages */
-				std::list<RsFeedReaderMsg>::iterator msgIt;
-				for (msgIt = forumMsgs.begin(); msgIt != forumMsgs.end(); ++msgIt) {
-					RsFeedReaderMsg &mi = *msgIt;
+	bool postError = false;
 
-					/* convert to forum messages */
-					RsGxsForumMsg forumMsg;
-					forumMsg.mMeta.mGroupId = RsGxsGroupId(forumId);
-					forumMsg.mMeta.mMsgName = mi.title;
-					forumMsg.mMeta.mAuthorId = forumAuthorId;
+	if (errorState == RS_FEED_ERRORSTATE_OK) {
+		if (!forumId.empty() && !forumMsgs.empty()) {
+			if (mForums) {
+				/* a bit tricky */
+				RsGenExchange *genExchange = dynamic_cast<RsGenExchange*>(mForums);
+				if (genExchange) {
+					/* add messages as forum messages */
+					std::list<RsFeedReaderMsg>::iterator msgIt;
+					for (msgIt = forumMsgs.begin(); msgIt != forumMsgs.end(); ++msgIt) {
+						RsFeedReaderMsg &mi = *msgIt;
 
-					std::string description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
-					/* add link */
-					if (!mi.link.empty()) {
-						description += "<br><a href=\"" + mi.link + "\">" + mi.link + "</a>";
-					}
-					forumMsg.mMsg = description;
+						/* convert to forum messages */
+						RsGxsForumMsg forumMsg;
+						forumMsg.mMeta.mGroupId = RsGxsGroupId(forumId);
+						forumMsg.mMeta.mMsgName = mi.title;
+						forumMsg.mMeta.mAuthorId = forumAuthorId;
 
-					uint32_t token;
-					if (mForums->createMsg(token, forumMsg) && waitForToken(mForums, token)) {
-						RsGxsGrpMsgIdPair msgPair;
-						if (mForums->acknowledgeMsg(token, msgPair)) {
-							/* set to new */
-							genExchange->setMsgStatusFlags(token, msgPair, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD);
+						std::string description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
+						/* add link */
+						if (!mi.link.empty()) {
+							description += "<br><a href=\"" + mi.link + "\">" + mi.link + "</a>";
 						}
-					} else {
-#ifdef FEEDREADER_DEBUG
-						std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't add forum message " << mi.title << " for feed " << forumId << std::endl;
-#endif
-					}
-				}
-			} else {
-				std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process forum, member mForums is not derived from RsGenExchange" << std::endl;
-			}
-		} else {
-			std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process forum, member mForums is not set" << std::endl;
-		}
-	}
+						forumMsg.mMsg = description;
 
-	if (!postedId.empty() && !postedMsgs.empty()) {
-		if (mPosted) {
-			/* a bit tricky */
-			RsGenExchange *genExchange = dynamic_cast<RsGenExchange*>(mPosted);
-			if (genExchange) {
-				/* add messages as posted messages */
-				std::list<RsFeedReaderMsg>::iterator msgIt;
-				for (msgIt = postedMsgs.begin(); msgIt != postedMsgs.end(); ++msgIt) {
-					RsFeedReaderMsg &mi = *msgIt;
-
-					/* convert to posted messages */
-					RsPostedPost postedPost;
-					postedPost.mMeta.mGroupId = RsGxsGroupId(postedId);
-					postedPost.mMeta.mMsgName = mi.title;
-					postedPost.mMeta.mAuthorId = postedAuthorId;
-					postedPost.mLink = mi.link;
-
-					std::string description;
-					if (feedFlag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) {
-						if (!mi.postedFirstImage.empty()) {
-							/* use first image as image for posted and description without image as notes */
-							if (feedFlag & RS_FEED_FLAG_POSTED_SHRINK_IMAGE) {
-								// shrink image
-								std::vector<unsigned char> shrinkedImage;
-								if (shrinkImage(FeedReaderShrinkImageTask::POSTED, mi.postedFirstImage, shrinkedImage)) {
-									postedPost.mImage.copy(shrinkedImage.data(), shrinkedImage.size());	
-								}
-							} else {
-								postedPost.mImage.copy(mi.postedFirstImage.data(), mi.postedFirstImage.size());
-							}
-							if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
-								/* ignore description */
-							} else {
-								description = mi.postedDescriptionWithoutFirstImage;
+						uint32_t token;
+						if (mForums->createMsg(token, forumMsg) && waitForToken(mForums, token)) {
+							RsGxsGrpMsgIdPair msgPair;
+							if (mForums->acknowledgeMsg(token, msgPair)) {
+								/* set to new */
+								genExchange->setMsgStatusFlags(token, msgPair, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD);
 							}
 						} else {
-							if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
-								/* ignore messages without image */
-								continue;
-							}
-							description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
-						}
-					} else {
-						description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
-					}
-
-					postedPost.mNotes = description;
-
-					uint32_t token;
-					if (mPosted->createPost(token, postedPost) && waitForToken(mPosted, token)) {
-						RsGxsGrpMsgIdPair msgPair;
-						if (mPosted->acknowledgeMsg(token, msgPair)) {
-							/* set to new */
-							genExchange->setMsgStatusFlags(token, msgPair, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD);
-						}
-					} else {
 #ifdef FEEDREADER_DEBUG
-						std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't add posted message " << mi.title << " for feed " << postedId << std::endl;
+							std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't add forum message " << mi.title << " for feed " << forumId << std::endl;
 #endif
+							postError = true;
+						}
 					}
+				} else {
+					std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process forum, member mForums is not derived from RsGenExchange" << std::endl;
 				}
 			} else {
-				std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not derived from RsGenExchange" << std::endl;
+				std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process forum, member mForums is not set" << std::endl;
 			}
-		} else {
-			std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not set" << std::endl;
+		}
+
+		if (!postedId.empty() && !postedMsgs.empty()) {
+			if (mPosted) {
+				/* a bit tricky */
+				RsGenExchange *genExchange = dynamic_cast<RsGenExchange*>(mPosted);
+				if (genExchange) {
+					/* add messages as posted messages */
+					std::list<RsFeedReaderMsg>::iterator msgIt;
+					for (msgIt = postedMsgs.begin(); msgIt != postedMsgs.end(); ++msgIt) {
+						RsFeedReaderMsg &mi = *msgIt;
+
+						/* convert to posted messages */
+						RsPostedPost postedPost;
+						postedPost.mMeta.mGroupId = RsGxsGroupId(postedId);
+						postedPost.mMeta.mMsgName = mi.title;
+						postedPost.mMeta.mAuthorId = postedAuthorId;
+						postedPost.mLink = mi.link;
+
+						std::string description;
+						if (feedFlag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) {
+							if (!mi.postedFirstImage.empty()) {
+								/* use first image as image for posted and description without image as notes */
+								if (feedFlag & RS_FEED_FLAG_POSTED_SHRINK_IMAGE) {
+									// shrink image
+									std::vector<unsigned char> shrinkedImage;
+									if (shrinkImage(FeedReaderShrinkImageTask::POSTED, mi.postedFirstImage, shrinkedImage)) {
+										postedPost.mImage.copy(shrinkedImage.data(), shrinkedImage.size());
+									}
+								} else {
+									postedPost.mImage.copy(mi.postedFirstImage.data(), mi.postedFirstImage.size());
+								}
+								if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
+									/* ignore description */
+								} else {
+									description = mi.postedDescriptionWithoutFirstImage;
+								}
+							} else {
+								if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
+									/* ignore messages without image */
+									continue;
+								}
+								description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
+							}
+						} else {
+							description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
+						}
+
+						postedPost.mNotes = description;
+
+						uint32_t token;
+						if (mPosted->createPost(token, postedPost) && waitForToken(mPosted, token)) {
+							RsGxsGrpMsgIdPair msgPair;
+							if (mPosted->acknowledgeMsg(token, msgPair)) {
+								/* set to new */
+								genExchange->setMsgStatusFlags(token, msgPair, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD);
+							}
+						} else {
+#ifdef FEEDREADER_DEBUG
+							std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't add posted message " << mi.title << " for feed " << postedId << std::endl;
+#endif
+							postError = true;
+						}
+					}
+				} else {
+					std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not derived from RsGenExchange" << std::endl;
+				}
+			} else {
+				std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not set" << std::endl;
+			}
+		}
+	}
+
+	{
+		RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
+
+		/* find feed */
+		std::map<uint32_t, RsFeedReaderFeed*>::iterator it = mFeeds.find(feedId);
+		if (it == mFeeds.end()) {
+			/* feed not found */
+#ifdef FEEDREADER_DEBUG
+			std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - feed " << feedId << " not found" << std::endl;
+#endif
+			return;
+		}
+
+		RsFeedReaderFeed *fi = it->second;
+
+		if (!fi->preview) {
+			fi->workstate = RsFeedReaderFeed::WAITING;
+			fi->content.clear();
+			if (errorState == RS_FEED_ERRORSTATE_OK && postError) {
+				// post error occured
+				errorState = RS_FEED_ERRORSTATE_PROCESS_POST;
+			}
+			fi->errorState = errorState;
+			fi->lastUpdate = time(NULL);
+
+			IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
 		}
 	}
 
diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h
index edca9ee1e..bc20a8618 100644
--- a/plugins/FeedReader/services/p3FeedReader.h
+++ b/plugins/FeedReader/services/p3FeedReader.h
@@ -95,7 +95,7 @@ public:
 	void onDownloadSuccess(uint32_t feedId, const std::string &content, std::string &icon);
 	void onDownloadError(uint32_t feedId, RsFeedReaderErrorState result, const std::string &errorString);
 	void onProcessSuccess_filterMsg(uint32_t feedId, std::list<RsFeedReaderMsg*> &msgs);
-	void onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedReaderMsg*> &msgs, bool single);
+	void onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedReaderMsg*> &msgs);
 	void onProcessError(uint32_t feedId, RsFeedReaderErrorState result, const std::string &errorString);
 
 	bool getFeedToProcess(RsFeedReaderFeed &feed, uint32_t neededFeedId);
diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 1c8714a05..5ba3ade35 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -107,7 +107,7 @@ void p3FeedReaderThread::threadTick()
 
 									std::list<RsFeedReaderMsg*> msgSingle;
 									msgSingle.push_back(mi);
-									mFeedReader->onProcessSuccess_addMsgs(feed.feedId, msgSingle, true);
+									mFeedReader->onProcessSuccess_addMsgs(feed.feedId, msgSingle);
 
 									/* delete not accepted message */
 									std::list<RsFeedReaderMsg*>::iterator it1;
@@ -122,12 +122,15 @@ void p3FeedReaderThread::threadTick()
 									++it;
 								}
 							}
-							if (isRunning()) {
-								if (result == RS_FEED_ERRORSTATE_OK) {
-									/* third, add messages */
-									mFeedReader->onProcessSuccess_addMsgs(feed.feedId, msgs, false);
-								} else {
-									mFeedReader->onProcessError(feed.feedId, result, errorString);
+
+							if (!feed.preview) {
+								if (isRunning()) {
+									if (result == RS_FEED_ERRORSTATE_OK) {
+										/* third, add messages */
+										mFeedReader->onProcessSuccess_addMsgs(feed.feedId, msgs);
+									} else {
+										mFeedReader->onProcessError(feed.feedId, result, errorString);
+									}
 								}
 							}
 						}

From ad9d566767c3e592f2de9b72e553597a2258b79d Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 9 May 2023 07:49:34 +0200
Subject: [PATCH 291/503] FeedReader: Added processing of enclosure in RSS feed

---
 plugins/FeedReader/gui/AddFeedDialog.cpp      |   4 +-
 plugins/FeedReader/gui/FeedReaderDialog.cpp   |  60 +++++++---
 plugins/FeedReader/gui/FeedReaderDialog.h     |   2 +-
 .../gui/FeedReaderMessageWidget.cpp           | 102 +++++++++++++---
 .../FeedReader/gui/FeedReaderMessageWidget.h  |   2 +
 .../FeedReader/gui/FeedReaderMessageWidget.ui |  73 +++++++++--
 plugins/FeedReader/gui/FeedReaderNotify.cpp   |   4 +-
 plugins/FeedReader/gui/FeedReaderNotify.h     |   4 +-
 plugins/FeedReader/interface/rsFeedReader.h   |  19 ++-
 plugins/FeedReader/services/p3FeedReader.cc   |  94 +++++++++++----
 plugins/FeedReader/services/p3FeedReader.h    |  10 +-
 .../FeedReader/services/p3FeedReaderThread.cc | 113 +++++++++++++++---
 .../FeedReader/services/p3FeedReaderThread.h  |   5 +
 .../FeedReader/services/rsFeedReaderItems.cc  |  16 ++-
 .../FeedReader/services/rsFeedReaderItems.h   |   6 +
 15 files changed, 406 insertions(+), 108 deletions(-)

diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp
index 4e0645607..59baf908a 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.cpp
+++ b/plugins/FeedReader/gui/AddFeedDialog.cpp
@@ -100,7 +100,7 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify,
 	ui->postedOnlyImageCheckBox->setEnabled(false);
 	ui->postedOnlyImageCheckBox->setChecked(false);
 	ui->postedShinkImageCheckBox->setEnabled(false);
-	ui->postedShinkImageCheckBox->setChecked(false);
+	ui->postedShinkImageCheckBox->setChecked(true);
 	ui->useAuthenticationCheckBox->setChecked(false);
 	ui->useStandardStorageTimeCheckBox->setChecked(true);
 	ui->useStandardUpdateInterval->setChecked(true);
@@ -199,11 +199,9 @@ void AddFeedDialog::postedFirstImageToggled()
 {
 	bool checked = ui->postedFirstImageCheckBox->isChecked();
 	ui->postedOnlyImageCheckBox->setEnabled(checked);
-	ui->postedShinkImageCheckBox->setEnabled(checked);
 
 	if (!checked) {
 		ui->postedOnlyImageCheckBox->setChecked(false);
-		ui->postedShinkImageCheckBox->setChecked(false);
 	}
 }
 
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.cpp b/plugins/FeedReader/gui/FeedReaderDialog.cpp
index 7ea17983b..08f390a09 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.cpp
+++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp
@@ -23,6 +23,7 @@
 #include <QInputDialog>
 #include <QPainter>
 #include <QMessageBox>
+#include <QBuffer>
 
 #include "FeedReaderDialog.h"
 #include "FeedReaderMessageWidget.h"
@@ -36,6 +37,7 @@
 #include "gui/notifyqt.h"
 #include "FeedReaderUserNotify.h"
 #include "gui/Posted/PostedCreatePostDialog.h"
+#include "util/imageutil.h"
 
 #include "interface/rsFeedReader.h"
 #include "retroshare/rsiface.h"
@@ -56,6 +58,8 @@
 #define ROLE_FEED_ERROR       Qt::UserRole + 9
 #define ROLE_FEED_DEACTIVATED Qt::UserRole + 10
 
+const int MAXMESSAGESIZE = RsSerialiser::MAX_SERIAL_SIZE - 70000;
+
 FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, FeedReaderNotify *notify, QWidget *parent)
 	: MainPage(parent), mFeedReader(feedReader), mNotify(notify), ui(new Ui::FeedReaderDialog)
 {
@@ -67,7 +71,7 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, FeedReaderNotify *n
 	mMessageWidget = NULL;
 
 	connect(mNotify, &FeedReaderNotify::feedChanged, this, &FeedReaderDialog::feedChanged, Qt::QueuedConnection);
-	connect(mNotify, &FeedReaderNotify::shrinkImage, this, &FeedReaderDialog::shrinkImage, Qt::QueuedConnection);
+	connect(mNotify, &FeedReaderNotify::optimizeImage, this, &FeedReaderDialog::optimizeImage, Qt::QueuedConnection);
 
 	connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 
@@ -606,34 +610,52 @@ void FeedReaderDialog::feedChanged(uint32_t feedId, int type)
 	calculateFeedItems();
 }
 
-void FeedReaderDialog::shrinkImage()
+void FeedReaderDialog::optimizeImage()
 {
 	while (true) {
-		FeedReaderShrinkImageTask *shrinkImageTask = mFeedReader->getShrinkImageTask();
+		FeedReaderOptimizeImageTask *optimizeImageTask = mFeedReader->getOptimizeImageTask();
 
-		if (!shrinkImageTask) {
+		if (!optimizeImageTask) {
 			return;
 		}
 
-		switch (shrinkImageTask->mType) {
-		case FeedReaderShrinkImageTask::POSTED:
-		{
-			QImage image;
-			if (image.loadFromData(shrinkImageTask->mImage.data(), shrinkImageTask->mImage.size())) {
-				QByteArray imageBytes;
-				QImage imageOpt;
-				if (PostedCreatePostDialog::optimizeImage(image, imageBytes, imageOpt)) {
-					shrinkImageTask->mImageResult.assign(imageBytes.begin(), imageBytes.end());
-					shrinkImageTask->mResult = true;
+		optimizeImageTask->mResult = false;
+
+		QImage image;
+		if (image.loadFromData(optimizeImageTask->mImage.data(), optimizeImageTask->mImage.size())) {
+			QByteArray optimizedImageData;
+			std::string optimizedImageMimeType;
+			QImage imageOptDummy;
+
+			switch (optimizeImageTask->mType) {
+			case FeedReaderOptimizeImageTask::POSTED:
+				if (PostedCreatePostDialog::optimizeImage(image, optimizedImageData, imageOptDummy)) {
+					optimizedImageMimeType = "image/jpeg";
+					optimizeImageTask->mResult = true;
+				}
+				break;
+			case FeedReaderOptimizeImageTask::SIZE:
+				if (ImageUtil::optimizeSizeBytes(optimizedImageData, image, imageOptDummy, "JPG", 0, MAXMESSAGESIZE)) {
+					optimizedImageMimeType = "image/jpg";
+					optimizeImageTask->mResult = true;
+				}
+				break;
+			}
+
+			if (optimizeImageTask->mResult) {
+				if (optimizedImageData.size() < (ssize_t) optimizeImageTask->mImage.size()) {
+					/* use optimized image */
+					optimizeImageTask->mImageResult.assign(optimizedImageData.begin(), optimizedImageData.end());
+					optimizeImageTask->mMimeTypeResult = optimizedImageMimeType;
+				} else {
+					/* use original image */
+					optimizeImageTask->mImageResult = optimizeImageTask->mImage;
+					optimizeImageTask->mMimeTypeResult = optimizeImageTask->mMimeType;
 				}
 			}
-			break;
-		}
-		default:
-			shrinkImageTask->mResult = false;
 		}
 
-		mFeedReader->setShrinkImageTaskResult(shrinkImageTask);
+		mFeedReader->setOptimizeImageTaskResult(optimizeImageTask);
 	}
 }
 
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.h b/plugins/FeedReader/gui/FeedReaderDialog.h
index b4854d2f3..12e11ee7f 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.h
+++ b/plugins/FeedReader/gui/FeedReaderDialog.h
@@ -69,7 +69,7 @@ private slots:
 
 	/* FeedReaderNotify */
 	void feedChanged(uint32_t feedId, int type);
-	void shrinkImage();
+	void optimizeImage();
 
 private:
 	uint32_t currentFeedId();
diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
index 5be5d3ebc..59f72103c 100644
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
@@ -25,6 +25,7 @@
 #include <QDesktopServices>
 #include <QTimer>
 #include <QPainter>
+#include <QMimeData>
 
 #include "FeedReaderMessageWidget.h"
 #include "ui_FeedReaderMessageWidget.h"
@@ -38,6 +39,8 @@
 #include "util/QtVersion.h"
 #include "gui/Posted/PostedCreatePostDialog.h"
 #include "gui/gxsforums/CreateGxsForumMsg.h"
+#include "gui/common/FilesDefs.h"
+#include "util/imageutil.h"
 
 #include "retroshare/rsiface.h"
 #include "retroshare/rsgxsforums.h"
@@ -87,6 +90,12 @@ FeedReaderMessageWidget::FeedReaderMessageWidget(uint32_t feedId, RsFeedReader *
 	connect(ui->msgRemoveButton, SIGNAL(clicked()), this, SLOT(removeMsg()));
 	connect(ui->feedProcessButton, SIGNAL(clicked()), this, SLOT(processFeed()));
 
+	/* Set initial size the splitter */
+    QList<int> sizes;
+    sizes << 250 << width(); // Qt calculates the right sizes
+    ui->pictureSplitter->setSizes(sizes);
+	ui->pictureSplitter->hide();
+
 	// create timer for navigation
 	mTimer = new QTimer(this);
 	mTimer->setInterval(300);
@@ -119,6 +128,10 @@ FeedReaderMessageWidget::FeedReaderMessageWidget(uint32_t feedId, RsFeedReader *
 	ui->filterLineEdit->addFilter(QIcon(), tr("Author"), COLUMN_MSG_AUTHOR, tr("Search Author"));
 	ui->filterLineEdit->setCurrentFilter(COLUMN_MSG_TITLE);
 
+	/* add image actions */
+	ui->attachmentLabel->addContextMenuAction(ui->actionAttachmentCopyLinkLocation);
+	connect(ui->actionAttachmentCopyLinkLocation, &QAction::triggered, this, &FeedReaderMessageWidget::attachmentCopyLinkLocation);
+
 	/* load settings */
 	processSettings(true);
 
@@ -179,6 +192,7 @@ void FeedReaderMessageWidget::processSettings(bool load)
 
 		// state of splitter
 		ui->msgSplitter->restoreState(Settings->value("msgSplitter").toByteArray());
+		ui->pictureSplitter->restoreState(Settings->value("pictureSplitter").toByteArray());
 	} else {
 		// save settings
 
@@ -187,6 +201,7 @@ void FeedReaderMessageWidget::processSettings(bool load)
 
 		// state of splitter
 		Settings->setValue("msgSplitter", ui->msgSplitter->saveState());
+		Settings->setValue("pictureSplitter", ui->pictureSplitter->saveState());
 	}
 
 	Settings->endGroup();
@@ -599,6 +614,21 @@ void FeedReaderMessageWidget::msgItemChanged()
 	mTimer->start();
 }
 
+void FeedReaderMessageWidget::clearMessage()
+{
+	ui->msgTitle->clear();
+//		ui->msgLink->clear();
+	ui->msgText->clear();
+	ui->msgTextSplitter->clear();
+	ui->attachmentLabel->clear();
+	ui->linkButton->setEnabled(false);
+	ui->msgText->show();
+	ui->pictureSplitter->hide();
+
+	ui->actionAttachmentCopyLinkLocation->setData(QVariant());
+	ui->actionAttachmentCopyLinkLocation->setEnabled(false);
+}
+
 void FeedReaderMessageWidget::updateCurrentMessage()
 {
 	mTimer->stop();
@@ -608,10 +638,7 @@ void FeedReaderMessageWidget::updateCurrentMessage()
 	std::string msgId = currentMsgId();
 
 	if (mFeedId == 0 || msgId.empty()) {
-		ui->msgTitle->clear();
-//		ui->msgLink->clear();
-		ui->msgText->clear();
-		ui->linkButton->setEnabled(false);
+		clearMessage();
 
 		ui->msgReadButton->setEnabled(false);
 		ui->msgUnreadButton->setEnabled(false);
@@ -622,10 +649,7 @@ void FeedReaderMessageWidget::updateCurrentMessage()
 	QTreeWidgetItem *item = ui->msgTreeWidget->currentItem();
 	if (!item) {
 		/* there is something wrong */
-		ui->msgTitle->clear();
-//		ui->msgLink->clear();
-		ui->msgText->clear();
-		ui->linkButton->setEnabled(false);
+		clearMessage();
 
 		ui->msgReadButton->setEnabled(false);
 		ui->msgUnreadButton->setEnabled(false);
@@ -640,10 +664,7 @@ void FeedReaderMessageWidget::updateCurrentMessage()
 	/* get msg */
 	FeedMsgInfo msgInfo;
 	if (!mFeedReader->getMsgInfo(mFeedId, msgId, msgInfo)) {
-		ui->msgTitle->clear();
-//		ui->msgLink->clear();
-		ui->msgText->clear();
-		ui->linkButton->setEnabled(false);
+		clearMessage();
 		return;
 	}
 
@@ -663,9 +684,41 @@ void FeedReaderMessageWidget::updateCurrentMessage()
 		setMsgAsReadUnread(row, setToReadOnActive);
 	}
 
+	ui->actionAttachmentCopyLinkLocation->setData(QVariant());
+	ui->actionAttachmentCopyLinkLocation->setEnabled(false);
+
+	if (!msgInfo.attachment.empty()) {
+		QByteArray imageData((char*) msgInfo.attachment.data(), msgInfo.attachment.size());
+		QPixmap pixmap;
+		if (pixmap.loadFromData(imageData)) {
+			ui->attachmentLabel->setPixmap(pixmap);
+			ui->pictureSplitter->show();
+			ui->msgText->hide();
+		} else {
+			ui->pictureSplitter->hide();
+			ui->msgText->show();
+		}
+
+		if (!msgInfo.attachmentLink.empty()) {
+			ui->actionAttachmentCopyLinkLocation->setData(QString::fromUtf8(msgInfo.attachmentLink.c_str()));
+			ui->actionAttachmentCopyLinkLocation->setEnabled(true);
+		}
+	} else {
+		ui->pictureSplitter->hide();
+		ui->msgText->show();
+	}
+
 	QString msgTxt = RsHtml().formatText(ui->msgText->document(), QString::fromUtf8((msgInfo.descriptionTransformed.empty() ? msgInfo.description : msgInfo.descriptionTransformed).c_str()), RSHTML_FORMATTEXT_EMBED_LINKS);
 
-	ui->msgText->setHtml(msgTxt);
+	if (ui->pictureSplitter->isVisible()) {
+		ui->msgTextSplitter->setHtml(msgTxt);
+		ui->msgText->clear();
+	} else {
+		ui->msgText->setHtml(msgTxt);
+		ui->msgTextSplitter->clear();
+		ui->attachmentLabel->clear();
+	}
+
 	ui->msgTitle->setText(QString::fromUtf8(msgInfo.title.c_str()));
 
 	ui->linkButton->setEnabled(!msgInfo.link.empty());
@@ -742,11 +795,11 @@ void FeedReaderMessageWidget::toggleMsgText()
 void FeedReaderMessageWidget::toggleMsgText_internal()
 {
 	if (ui->expandButton->isChecked()) {
-		ui->msgText->setVisible(true);
+		ui->horizontalLayoutWidget->setVisible(true);
 		ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
 		ui->expandButton->setToolTip(tr("Hide"));
 	} else  {
-		ui->msgText->setVisible(false);
+		ui->horizontalLayoutWidget->setVisible(false);
 		ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
 		ui->expandButton->setToolTip(tr("Expand"));
 	}
@@ -969,3 +1022,22 @@ void FeedReaderMessageWidget::addToPosted()
 	msgDialog->setLink(QString::fromUtf8(msgInfo.link.c_str()));
 	msgDialog->show();
 }
+
+void FeedReaderMessageWidget::attachmentCopyLinkLocation()
+{
+	QAction *action = dynamic_cast<QAction*>(sender()) ;
+	if (!action) {
+		return;
+	}
+
+	QVariant data = action->data();
+	if (!data.isValid()) {
+		return;
+	}
+
+	if (data.type() != QVariant::String) {
+		return;
+	}
+
+	QApplication::clipboard()->setText(data.toString());
+}
diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.h b/plugins/FeedReader/gui/FeedReaderMessageWidget.h
index 317d61e71..1223b3b4e 100644
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.h
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.h
@@ -77,6 +77,7 @@ private slots:
 	void fillPostedMenu();
 	void addToForum();
 	void addToPosted();
+	void attachmentCopyLinkLocation();
 
 	/* FeedReaderNotify */
 	void feedChanged(uint32_t feedId, int type);
@@ -92,6 +93,7 @@ private:
 	void filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn);
 	void filterItem(QTreeWidgetItem *item);
 	void toggleMsgText_internal();
+	void clearMessage();
 
 	bool mProcessSettings;
 	RSTreeWidgetItemCompareRole *mMsgCompareRole;
diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.ui b/plugins/FeedReader/gui/FeedReaderMessageWidget.ui
index 3542c5375..fada5279e 100644
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.ui
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.ui
@@ -182,7 +182,7 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../../retroshare-gui/src/gui/images.qrc">
+           <iconset>
             <normaloff>:/images/message-state-header.png</normaloff>:/images/message-state-header.png</iconset>
           </property>
          </column>
@@ -245,7 +245,7 @@
             <string/>
            </property>
            <property name="icon">
-            <iconset resource="../../../retroshare-gui/src/gui/images.qrc">
+            <iconset>
              <normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
            </property>
            <property name="checkable">
@@ -260,20 +260,63 @@
        </item>
       </layout>
      </widget>
-     <widget class="RSTextBrowser" name="msgText">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-        <horstretch>0</horstretch>
-        <verstretch>10</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="textInteractionFlags">
-       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-      </property>
+     <widget class="QWidget" name="horizontalLayoutWidget">
+      <layout class="QHBoxLayout" name="pictureHorizontalLayout">
+       <item>
+        <widget class="RSTextBrowser" name="msgText">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>10</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSplitter" name="pictureSplitter">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <widget class="QWidget" name="verticalLayoutWidget">
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="AspectRatioPixmapLabel" name="attachmentLabel">
+             <property name="text">
+              <string notr="true">pictureLabel</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+         <widget class="RSTextBrowser" name="msgTextSplitter">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>10</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="textInteractionFlags">
+           <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+          </property>
+         </widget>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
   </layout>
+  <action name="actionAttachmentCopyLinkLocation">
+   <property name="text">
+    <string>Copy Link Location</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
@@ -297,10 +340,14 @@
    <header location="global">gui/common/ElidedLabel.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>AspectRatioPixmapLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">util/AspectRatioPixmapLabel.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="FeedReader_images.qrc"/>
-  <include location="../../../retroshare-gui/src/gui/images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/plugins/FeedReader/gui/FeedReaderNotify.cpp b/plugins/FeedReader/gui/FeedReaderNotify.cpp
index 33b0c294a..95728b225 100644
--- a/plugins/FeedReader/gui/FeedReaderNotify.cpp
+++ b/plugins/FeedReader/gui/FeedReaderNotify.cpp
@@ -34,7 +34,7 @@ void FeedReaderNotify::notifyMsgChanged(uint32_t feedId, const std::string &msgI
 	emit msgChanged(feedId, QString::fromStdString(msgId), type);
 }
 
-void FeedReaderNotify::notifyShrinkImage()
+void FeedReaderNotify::notifyOptimizeImage()
 {
-	emit shrinkImage();
+	emit optimizeImage();
 }
diff --git a/plugins/FeedReader/gui/FeedReaderNotify.h b/plugins/FeedReader/gui/FeedReaderNotify.h
index 18090e70c..5913f1985 100644
--- a/plugins/FeedReader/gui/FeedReaderNotify.h
+++ b/plugins/FeedReader/gui/FeedReaderNotify.h
@@ -34,12 +34,12 @@ public:
 	/* RsFeedReaderNotify */
 	virtual void notifyFeedChanged(uint32_t feedId, int type);
 	virtual void notifyMsgChanged(uint32_t feedId, const std::string &msgId, int type);
-	virtual void notifyShrinkImage();
+	virtual void notifyOptimizeImage();
 
 signals:
 	void feedChanged(uint32_t feedId, int type);
 	void msgChanged(uint32_t feedId, const QString &msgId, int type);
-	void shrinkImage();
+	void optimizeImage();
 };
 
 #endif
diff --git a/plugins/FeedReader/interface/rsFeedReader.h b/plugins/FeedReader/interface/rsFeedReader.h
index 72a900654..326d3e022 100644
--- a/plugins/FeedReader/interface/rsFeedReader.h
+++ b/plugins/FeedReader/interface/rsFeedReader.h
@@ -185,6 +185,9 @@ public:
 	std::string description;
 	std::string descriptionTransformed;
 	time_t      pubDate;
+	std::string attachmentLink;
+	std::vector<unsigned char> attachment;
+	std::string attachmentMimeType;
 
 	struct {
 		bool isnew : 1;
@@ -193,24 +196,28 @@ public:
 	} flag;
 };
 
-class FeedReaderShrinkImageTask
+class FeedReaderOptimizeImageTask
 {
 public:
 	enum Type {
-		POSTED
+		POSTED,
+		SIZE
 	};
 
 public:
 	Type mType;
 	std::vector<unsigned char> mImage;
+	std::string mMimeType;
 	std::vector<unsigned char> mImageResult;
+	std::string mMimeTypeResult;
 	bool mResult;
 
 public:
-	FeedReaderShrinkImageTask(Type type, const std::vector<unsigned char> &image)
+	FeedReaderOptimizeImageTask(Type type, const std::vector<unsigned char> &image, const std::string &mimeType)
 	{
 		mType = type;
 		mImage = image;
+		mMimeType = mimeType;
 		mResult = false;
 	}
 };
@@ -222,7 +229,7 @@ public:
 
 	virtual void notifyFeedChanged(uint32_t /*feedId*/, int /*type*/) {}
 	virtual void notifyMsgChanged(uint32_t /*feedId*/, const std::string &/*msgId*/, int /*type*/) {}
-	virtual void notifyShrinkImage() {}
+	virtual void notifyOptimizeImage() {}
 };
 
 class RsFeedReader
@@ -268,8 +275,8 @@ public:
 	virtual bool         getForumGroups(std::vector<RsGxsForumGroup> &groups, bool onlyOwn) = 0;
 	virtual bool         getPostedGroups(std::vector<RsPostedGroup> &groups, bool onlyOwn) = 0;
 
-	virtual FeedReaderShrinkImageTask *getShrinkImageTask() = 0;
-	virtual void         setShrinkImageTaskResult(FeedReaderShrinkImageTask *shrinkImageTask) = 0;
+	virtual FeedReaderOptimizeImageTask *getOptimizeImageTask() = 0;
+	virtual void         setOptimizeImageTaskResult(FeedReaderOptimizeImageTask *optimizeImageTask) = 0;
 
 	virtual RsFeedReaderErrorState processXPath(const std::list<std::string> &xpathsToUse, const std::list<std::string> &xpathsToRemove, std::string &description, std::string &errorString) = 0;
 	virtual RsFeedReaderErrorState processXslt(const std::string &xslt, std::string &description, std::string &errorString) = 0;
diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc
index 6612210a7..3e46a027c 100644
--- a/plugins/FeedReader/services/p3FeedReader.cc
+++ b/plugins/FeedReader/services/p3FeedReader.cc
@@ -233,6 +233,13 @@ static void feedMsgToInfo(const RsFeedReaderMsg *msg, FeedMsgInfo &info)
 	info.description = msg->description;
 	info.descriptionTransformed = msg->descriptionTransformed;
 	info.pubDate = msg->pubDate;
+	info.attachmentLink = msg->attachmentLink;
+	if (!msg->attachment.empty()) {
+		p3FeedReaderThread::fromBase64(msg->attachment, info.attachment);
+	} else {
+		info.attachment.clear();
+	}
+	info.attachmentMimeType = msg->attachmentMimeType;
 
 	info.flag.isnew = (msg->flag & RS_FEEDMSG_FLAG_NEW);
 	info.flag.read = (msg->flag & RS_FEEDMSG_FLAG_READ);
@@ -1264,7 +1271,7 @@ bool p3FeedReader::setMessageRead(uint32_t feedId, const std::string &msgId, boo
 	}
 
 	if (changed) {
-		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);
+		IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_OFTEN);
 		if (mNotify) {
 			mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
 			mNotify->notifyMsgChanged(feedId, msgId, NOTIFY_TYPE_MOD);
@@ -1450,19 +1457,19 @@ int p3FeedReader::tick()
 	}
 
 	// check images
-	bool imageToShrink = false;
+	bool imageToOptimze = false;
 	{
 		RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
 
-		imageToShrink = !mImages.empty();
+		imageToOptimze = !mImages.empty();
 	}
 
 	if (mNotify) {
 		for (it = notifyIds.begin(); it != notifyIds.end(); ++it) {
 			mNotify->notifyFeedChanged(*it, NOTIFY_TYPE_MOD);
 		}
-		if (imageToShrink) {
-			mNotify->notifyShrinkImage();
+		if (imageToOptimze) {
+			mNotify->notifyOptimizeImage();
 		}
 	}
 
@@ -2110,6 +2117,9 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 					}
 					miNew->description.clear();
 					miNew->descriptionTransformed.clear();
+					miNew->attachmentLink.clear();
+					miNew->attachment.clear();
+					miNew->attachmentMimeType.clear();
 				} else {
 					miNew->flag = RS_FEEDMSG_FLAG_NEW;
 					addedMsgs.push_back(miNew->msgId);
@@ -2151,6 +2161,25 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 						if (!mi.link.empty()) {
 							description += "<br><a href=\"" + mi.link + "\">" + mi.link + "</a>";
 						}
+
+						if (!mi.attachmentBinary.empty()) {
+							if (p3FeedReaderThread::isContentType(mi.attachmentMimeType, "image/")) {
+								/* add attachement to description */
+
+								// optimize image
+								std::vector<unsigned char> optimizedImage;
+								std::string optimizedMimeType;
+								if (optimizeImage(FeedReaderOptimizeImageTask::SIZE, mi.attachmentBinary, mi.attachmentBinaryMimeType, optimizedImage, optimizedMimeType)) {
+									std::string base64;
+									if (p3FeedReaderThread::toBase64(optimizedImage, base64)) {
+										std::string imageBase64;
+										rs_sprintf(imageBase64, "data:%s;base64,%s", optimizedMimeType.c_str(), base64.c_str());
+										description += "<br><img src=\"" + imageBase64 + "\"/>";
+									}
+								}
+							}
+						}
+
 						forumMsg.mMsg = description;
 
 						uint32_t token;
@@ -2197,10 +2226,11 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 							if (!mi.postedFirstImage.empty()) {
 								/* use first image as image for posted and description without image as notes */
 								if (feedFlag & RS_FEED_FLAG_POSTED_SHRINK_IMAGE) {
-									// shrink image
-									std::vector<unsigned char> shrinkedImage;
-									if (shrinkImage(FeedReaderShrinkImageTask::POSTED, mi.postedFirstImage, shrinkedImage)) {
-										postedPost.mImage.copy(shrinkedImage.data(), shrinkedImage.size());
+									// optimize image
+									std::vector<unsigned char> optimizedImage;
+									std::string optimizedMimeType;
+									if (optimizeImage(FeedReaderOptimizeImageTask::POSTED, mi.postedFirstImage, mi.postedFirstImageMimeType, optimizedImage, optimizedMimeType)) {
+										postedPost.mImage.copy(optimizedImage.data(), optimizedImage.size());
 									}
 								} else {
 									postedPost.mImage.copy(mi.postedFirstImage.data(), mi.postedFirstImage.size());
@@ -2219,6 +2249,23 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
 							}
 						} else {
 							description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
+
+							if (!mi.attachmentBinary.empty()) {
+								if (p3FeedReaderThread::isContentType(mi.attachmentMimeType, "image/")) {
+									/* use attachement as image */
+
+									if (feedFlag & RS_FEED_FLAG_POSTED_SHRINK_IMAGE) {
+										// optimize image
+										std::vector<unsigned char> optimizedImage;
+										std::string optimizedMimeType;
+										if (optimizeImage(FeedReaderOptimizeImageTask::POSTED, mi.attachmentBinary, mi.attachmentBinaryMimeType, optimizedImage, optimizedMimeType)) {
+											postedPost.mImage.copy(optimizedImage.data(), optimizedImage.size());
+										}
+									} else {
+										postedPost.mImage.copy(mi.attachmentBinary.data(), mi.attachmentBinary.size());
+									}
+								}
+							}
 						}
 
 						postedPost.mNotes = description;
@@ -2662,17 +2709,17 @@ bool p3FeedReader::getPostedGroups(std::vector<RsPostedGroup> &groups, bool only
 	return true;
 }
 
-bool p3FeedReader::shrinkImage(FeedReaderShrinkImageTask::Type type, const std::vector<unsigned char> &image, std::vector<unsigned char> &resultImage)
+bool p3FeedReader::optimizeImage(FeedReaderOptimizeImageTask::Type type, const std::vector<unsigned char> &image, const std::string &mimeType, std::vector<unsigned char> &resultImage, std::string &resultMimeType)
 {
 	if (!mNotify) {
 		return false;
 	}
 
-	FeedReaderShrinkImageTask *shrinkImageTask = new FeedReaderShrinkImageTask(type, image);
+	FeedReaderOptimizeImageTask *optimizeImageTask = new FeedReaderOptimizeImageTask(type, image, mimeType);
 	{
 		RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
 
-		mImages.push_back(shrinkImageTask);
+		mImages.push_back(optimizeImageTask);
 	}
 
 	/* Wait until task is complete */
@@ -2686,11 +2733,11 @@ bool p3FeedReader::shrinkImage(FeedReaderShrinkImageTask::Type type, const std::
 
 		if (++nSeconds >= 30) {
 			// timeout
-			std::list<FeedReaderShrinkImageTask*>::iterator it = std::find(mImages.begin(), mImages.end(), shrinkImageTask);
+			std::list<FeedReaderOptimizeImageTask*>::iterator it = std::find(mImages.begin(), mImages.end(), optimizeImageTask);
 			if (it != mImages.end()) {
 				mImages.erase(it);
 
-				delete(shrinkImageTask);
+				delete(optimizeImageTask);
 
 				return false;
 			}
@@ -2701,16 +2748,17 @@ bool p3FeedReader::shrinkImage(FeedReaderShrinkImageTask::Type type, const std::
 		{
 			RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
 
-			std::list<FeedReaderShrinkImageTask*>::iterator it = std::find(mResultImages.begin(), mResultImages.end(), shrinkImageTask);
+			std::list<FeedReaderOptimizeImageTask*>::iterator it = std::find(mResultImages.begin(), mResultImages.end(), optimizeImageTask);
 			if (it != mResultImages.end()) {
 				mResultImages.erase(it);
 
-				bool result = shrinkImageTask->mResult;
+				bool result = optimizeImageTask->mResult;
 				if (result) {
-					resultImage = shrinkImageTask->mImageResult;
+					resultImage = optimizeImageTask->mImageResult;
+					resultMimeType = optimizeImageTask->mMimeTypeResult;
 				}
 
-				delete(shrinkImageTask);
+				delete(optimizeImageTask);
 
 				return result;
 			}
@@ -2720,7 +2768,7 @@ bool p3FeedReader::shrinkImage(FeedReaderShrinkImageTask::Type type, const std::
 	return false;
 }
 
-FeedReaderShrinkImageTask *p3FeedReader::getShrinkImageTask()
+FeedReaderOptimizeImageTask *p3FeedReader::getOptimizeImageTask()
 {
 	RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
 
@@ -2728,19 +2776,19 @@ FeedReaderShrinkImageTask *p3FeedReader::getShrinkImageTask()
 		return NULL;
 	}
 
-	FeedReaderShrinkImageTask *imageResize = mImages.front();
+	FeedReaderOptimizeImageTask *imageResize = mImages.front();
 	mImages.pop_front();
 
 	return imageResize;
 }
 
-void p3FeedReader::setShrinkImageTaskResult(FeedReaderShrinkImageTask *shrinkImageTask)
+void p3FeedReader::setOptimizeImageTaskResult(FeedReaderOptimizeImageTask *optimizeImageTask)
 {
-	if (!shrinkImageTask) {
+	if (!optimizeImageTask) {
 		return;
 	}
 
 	RsStackMutex stack(mImageMutex); /******* LOCK STACK MUTEX *********/
 
-	mResultImages.push_back(shrinkImageTask);
+	mResultImages.push_back(optimizeImageTask);
 }
diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h
index bc20a8618..0df9bf79e 100644
--- a/plugins/FeedReader/services/p3FeedReader.h
+++ b/plugins/FeedReader/services/p3FeedReader.h
@@ -80,8 +80,8 @@ public:
 	virtual bool         getForumGroups(std::vector<RsGxsForumGroup> &groups, bool onlyOwn);
 	virtual bool         getPostedGroups(std::vector<RsPostedGroup> &groups, bool onlyOwn);
 
-	virtual FeedReaderShrinkImageTask *getShrinkImageTask();
-	virtual void         setShrinkImageTaskResult(FeedReaderShrinkImageTask *shrinkedImageTask);
+	virtual FeedReaderOptimizeImageTask *getOptimizeImageTask();
+	virtual void         setOptimizeImageTaskResult(FeedReaderOptimizeImageTask *optimizeImageTask);
 
 	virtual RsFeedReaderErrorState processXPath(const std::list<std::string> &xpathsToUse, const std::list<std::string> &xpathsToRemove, std::string &description, std::string &errorString);
 	virtual RsFeedReaderErrorState processXslt(const std::string &xslt, std::string &description, std::string &errorString);
@@ -107,7 +107,7 @@ public:
 	bool getPostedGroup(const RsGxsGroupId &groupId, RsPostedGroup &postedGroup);
 	bool updatePostedGroup(const RsPostedGroup &postedGroup, const std::string &groupName, const std::string &groupDescription);
 	bool waitForToken(RsGxsIfaceHelper *interface, uint32_t token);
-	bool shrinkImage(FeedReaderShrinkImageTask::Type type, const std::vector<unsigned char> &image, std::vector<unsigned char> &resultImage);
+	bool optimizeImage(FeedReaderOptimizeImageTask::Type type, const std::vector<unsigned char> &image, const std::string &mimeType, std::vector<unsigned char> &resultImage, std::string &resultMimeType);
 
 protected:
 	/****************** p3Config STUFF *******************/
@@ -150,8 +150,8 @@ private:
 	std::list<uint32_t> mProcessFeeds;
 
 	RsMutex mImageMutex;
-	std::list<FeedReaderShrinkImageTask*> mImages;
-	std::list<FeedReaderShrinkImageTask*> mResultImages;
+	std::list<FeedReaderOptimizeImageTask*> mImages;
+	std::list<FeedReaderOptimizeImageTask*> mResultImages;
 
 	RsMutex mPreviewMutex;
 	p3FeedReaderThread *mPreviewDownloadThread;
diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 5ba3ade35..01e449323 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -89,7 +89,7 @@ void p3FeedReaderThread::threadTick()
 						/* first, filter the messages */
 						mFeedReader->onProcessSuccess_filterMsg(feed.feedId, msgs);
 						if (isRunning()) {
-							/* second, process the descriptions */
+							/* second, process the descriptions and attachment */
 							for (it = msgs.begin(); it != msgs.end(); ) {
 								if (!isRunning()) {
 									break;
@@ -153,12 +153,12 @@ void p3FeedReaderThread::threadTick()
 /****************************** Download ***********************************/
 /***************************************************************************/
 
-static bool isContentType(const std::string &contentType, const char *type)
+bool p3FeedReaderThread::isContentType(const std::string &contentType, const char *type)
 {
 	return (strncasecmp(contentType.c_str(), type, strlen(type)) == 0);
 }
 
-static bool toBase64(const std::vector<unsigned char> &data, std::string &base64)
+bool p3FeedReaderThread::toBase64(const std::vector<unsigned char> &data, std::string &base64)
 {
 	bool result = false;
 
@@ -187,6 +187,28 @@ static bool toBase64(const std::vector<unsigned char> &data, std::string &base64
 	return result;
 }
 
+bool p3FeedReaderThread::fromBase64(const std::string &base64, std::vector<unsigned char> &data)
+{
+	bool result = false;
+
+	BIO *b64 = BIO_new(BIO_f_base64());
+	if (b64) {
+		BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
+		BIO *source = BIO_new_mem_buf(base64.c_str(), -1); // read-only source
+		if (source) {
+			BIO_push(b64, source);
+			const int maxlen = base64.length() / 4 * 3 + 1;
+			data.resize(maxlen);
+			const int len = BIO_read(b64, data.data(), maxlen);
+			data.resize(len);
+			result = true;
+		}
+		BIO_free_all(b64);
+	}
+
+	return result;
+}
+
 static std::string getBaseLink(std::string link)
 {
 	size_t found = link.rfind('/');
@@ -254,12 +276,12 @@ static bool getFavicon(CURLWrapper &CURL, const std::string &url, std::string &i
 	if (code == CURLE_OK) {
 		if (CURL.responseCode() == 200) {
 			std::string contentType = CURL.contentType();
-			if (isContentType(contentType, "image/") ||
-				isContentType(contentType, "application/octet-stream") ||
-				isContentType(contentType, "text/plain")) {
+			if (p3FeedReaderThread::isContentType(contentType, "image/") ||
+				p3FeedReaderThread::isContentType(contentType, "application/octet-stream") ||
+				p3FeedReaderThread::isContentType(contentType, "text/plain")) {
 				if (!vicon.empty()) {
 #warning p3FeedReaderThread.cc TODO thunder2: check it
-					result = toBase64(vicon, icon);
+					result = p3FeedReaderThread::toBase64(vicon, icon);
 				}
 			}
 		}
@@ -971,6 +993,19 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
 							item->pubDate = time(NULL);
 						}
 
+						if (feedFormat == FORMAT_RSS) {
+							/* <enclosure url="" type=""></enclosure> */
+							xmlNodePtr enclosure = xml.findNode(node->children, "enclosure", false);
+							if (enclosure) {
+								std::string enclosureMimeType = xml.getAttr(enclosure, "type");
+								std::string enclosureUrl = xml.getAttr(enclosure, "url");
+								if (!enclosureUrl.empty()) {
+									item->attachmentLink = enclosureUrl;
+									item->attachmentMimeType = enclosureMimeType;
+								}
+							}
+						}
+
 						entries.push_back(item);
 					}
 				} else {
@@ -1025,6 +1060,40 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 	RsFeedReaderErrorState result = RS_FEED_ERRORSTATE_OK;
 	std::string proxy = getProxyForFeed(feed);
 
+	/* attachment */
+	if (!msg->attachmentLink.empty()) {
+		if (isContentType(msg->attachmentMimeType, "image/")) {
+			CURLWrapper CURL(proxy);
+			CURLcode code = CURL.downloadBinary(msg->attachmentLink, msg->attachmentBinary);
+			if (code == CURLE_OK && CURL.responseCode() == 200) {
+				std::string contentType = CURL.contentType();
+				if (isContentType(contentType, "image/")) {
+					msg->attachmentBinaryMimeType = contentType;
+
+					bool forum = (feed.flag & RS_FEED_FLAG_FORUM) && !feed.preview;
+					bool posted = (feed.flag & RS_FEED_FLAG_POSTED) && !feed.preview;
+
+					if (!forum && ! posted) {
+						/* no need to optimize image */
+						std::vector<unsigned char> optimizedBinary;
+						std::string optimizedMimeType;
+						if (mFeedReader->optimizeImage(FeedReaderOptimizeImageTask::SIZE, msg->attachmentBinary, msg->attachmentBinaryMimeType, optimizedBinary, optimizedMimeType)) {
+							if (toBase64(optimizedBinary, msg->attachment)) {
+								msg->attachmentMimeType = optimizedMimeType;
+							} else {
+								msg->attachment.clear();
+							}
+						}
+					}
+				} else {
+					msg->attachmentBinary.clear();
+				}
+			} else {
+				msg->attachmentBinary.clear();
+			}
+		}
+	}
+
 	std::string url;
 	if (feed.flag & RS_FEED_FLAG_SAVE_COMPLETE_PAGE) {
 #ifdef FEEDREADER_DEBUG
@@ -1083,6 +1152,10 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 	if (isRunning()) {
 		/* process description */
 		bool processPostedFirstImage = (feed.flag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) ? TRUE : FALSE;
+		if (!msg->attachmentBinary.empty()) {
+			/* use attachment as image */
+			processPostedFirstImage = FALSE;
+		}
 
 		//long todo; // encoding
 		HTMLWrapper html;
@@ -1215,20 +1288,24 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 											if (code == CURLE_OK && CURL.responseCode() == 200) {
 												std::string contentType = CURL.contentType();
 												if (isContentType(contentType, "image/")) {
-													std::string base64;
-													if (toBase64(data, base64)) {
-														std::string imageBase64;
-														rs_sprintf(imageBase64, "data:%s;base64,%s", contentType.c_str(), base64.c_str());
-														if (html.setAttr(node, "src", imageBase64.c_str())) {
-															removeImage = false;
-
-															if (processPostedFirstImage && postedFirstImageNode == NULL) {
-																/* set first image */
-																msg->postedFirstImage = data;
-																postedFirstImageNode = node;
+													std::vector<unsigned char> optimizedData;
+													std::string optimizedMimeType;
+													if (mFeedReader->optimizeImage(FeedReaderOptimizeImageTask::SIZE, data, contentType, optimizedData, optimizedMimeType)) {
+														std::string base64;
+														if (toBase64(optimizedData, base64)) {
+															std::string imageBase64;
+															rs_sprintf(imageBase64, "data:%s;base64,%s", optimizedMimeType.c_str(), base64.c_str());
+															if (html.setAttr(node, "src", imageBase64.c_str())) {
+																removeImage = false;
 															}
 														}
 													}
+													if (processPostedFirstImage && postedFirstImageNode == NULL) {
+														/* set first image */
+														msg->postedFirstImage = data;
+														msg->postedFirstImageMimeType = contentType;
+														postedFirstImageNode = node;
+													}
 												}
 											}
 										}
diff --git a/plugins/FeedReader/services/p3FeedReaderThread.h b/plugins/FeedReader/services/p3FeedReaderThread.h
index 48d920dd6..a9be84010 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.h
+++ b/plugins/FeedReader/services/p3FeedReaderThread.h
@@ -54,6 +54,11 @@ public:
 	static RsFeedReaderErrorState processXslt(const std::string &xslt, HTMLWrapper &html, std::string &errorString);
 
 	static RsFeedReaderErrorState processTransformation(const RsFeedReaderFeed &feed, RsFeedReaderMsg *msg, std::string &errorString);
+
+	static bool isContentType(const std::string &contentType, const char *type);
+	static bool toBase64(const std::vector<unsigned char> &data, std::string &base64);
+	static bool fromBase64(const std::string &base64, std::vector<unsigned char> &data);
+
 private:
 	virtual void threadTick() override; /// @see RsTickingThread
 
diff --git a/plugins/FeedReader/services/rsFeedReaderItems.cc b/plugins/FeedReader/services/rsFeedReaderItems.cc
index 5a2ad4fe1..0d5b1f60b 100644
--- a/plugins/FeedReader/services/rsFeedReaderItems.cc
+++ b/plugins/FeedReader/services/rsFeedReaderItems.cc
@@ -274,6 +274,9 @@ void RsFeedReaderMsg::clear()
 	descriptionTransformed.clear();
 	pubDate = 0;
 	flag = 0;
+	attachmentLink.clear();
+	attachment.clear();
+	attachmentMimeType.clear();
 }
 
 std::ostream &RsFeedReaderMsg::print(std::ostream &out, uint16_t /*indent*/)
@@ -294,6 +297,9 @@ uint32_t RsFeedReaderSerialiser::sizeMsg(RsFeedReaderMsg *item)
 	s += GetTlvStringSize(item->descriptionTransformed);
 	s += sizeof(uint32_t); /* pubDate */
 	s += sizeof(uint32_t); /* flag */
+	s += GetTlvStringSize(item->attachmentLink);
+	s += GetTlvStringSize(item->attachment);
+	s += GetTlvStringSize(item->attachmentMimeType);
 
 	return s;
 }
@@ -317,7 +323,7 @@ bool RsFeedReaderSerialiser::serialiseMsg(RsFeedReaderMsg *item, void *data, uin
 	offset += 8;
 
 	/* add values */
-	ok &= setRawUInt16(data, tlvsize, &offset, 2); /* version */
+	ok &= setRawUInt16(data, tlvsize, &offset, 3); /* version */
 	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_GENID, item->msgId);
 	ok &= setRawUInt32(data, tlvsize, &offset, item->feedId);
 	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_NAME, item->title);
@@ -327,6 +333,9 @@ bool RsFeedReaderSerialiser::serialiseMsg(RsFeedReaderMsg *item, void *data, uin
 	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_COMMENT, item->descriptionTransformed);
 	ok &= setRawUInt32(data, tlvsize, &offset, item->pubDate);
 	ok &= setRawUInt32(data, tlvsize, &offset, item->flag);
+	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_LOCATION, item->attachmentLink);
+	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PIC_AUTH, item->attachment);
+	ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_PIC_TYPE, item->attachmentMimeType);
 
 	if (offset != tlvsize)
 	{
@@ -390,6 +399,11 @@ RsFeedReaderMsg *RsFeedReaderSerialiser::deserialiseMsg(void *data, uint32_t *pk
 	}
 	ok &= getRawUInt32(data, rssize, &offset, (uint32_t*) &(item->pubDate));
 	ok &= getRawUInt32(data, rssize, &offset, &(item->flag));
+	if (version >= 3) {
+		ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_LOCATION, item->attachmentLink);
+		ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PIC_AUTH, item->attachment);
+		ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_PIC_TYPE, item->attachmentMimeType);
+	}
 
 	if (offset != rssize)
 	{
diff --git a/plugins/FeedReader/services/rsFeedReaderItems.h b/plugins/FeedReader/services/rsFeedReaderItems.h
index 3adafd55a..4e343be75 100644
--- a/plugins/FeedReader/services/rsFeedReaderItems.h
+++ b/plugins/FeedReader/services/rsFeedReaderItems.h
@@ -124,9 +124,15 @@ public:
 	std::string descriptionTransformed;
 	time_t      pubDate;
 	uint32_t    flag; // RS_FEEDMSG_FLAG_...
+	std::string attachmentLink;
+	std::string attachment; // binary as base64
+	std::string attachmentMimeType;
 
 	// Only in memory when receiving messages
+	std::vector<unsigned char> attachmentBinary;
+	std::string attachmentBinaryMimeType;
 	std::vector<unsigned char> postedFirstImage;
+	std::string postedFirstImageMimeType;
 	std::string postedDescriptionWithoutFirstImage;
 };
 

From 0f41d8bf46e034eef4572795383956b860bd6e70 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 1 Jun 2023 20:30:19 +0200
Subject: [PATCH 292/503] fixed sorting of files->status in channels all files
 list

---
 .../src/gui/gxschannels/GxsChannelPostFilesModel.cpp     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index 856ef32e1..54b787e65 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -342,10 +342,13 @@ public:
 		case RsGxsChannelPostFilesModel::COLUMN_FILES_FILE:
 		{
 			FileInfo fi1,fi2;
-			rsFiles->FileDetails(f1.mHash,RS_FILE_HINTS_DOWNLOAD,fi1);
-			rsFiles->FileDetails(f2.mHash,RS_FILE_HINTS_DOWNLOAD,fi2);
+            bool r1 = rsFiles->FileDetails(f1.mHash,RS_FILE_HINTS_DOWNLOAD,fi1);
+            bool r2 = rsFiles->FileDetails(f2.mHash,RS_FILE_HINTS_DOWNLOAD,fi2);
 
-			return (ord==Qt::AscendingOrder)?(fi1.transfered<fi2.transfered):(fi1.transfered>fi2.transfered);
+            if(r1 && r2)
+                return (ord==Qt::AscendingOrder)?(fi1.transfered<fi2.transfered):(fi1.transfered>fi2.transfered);
+            else
+                return (ord==Qt::AscendingOrder)?(fi1.downloadStatus<fi2.downloadStatus):(fi1.downloadStatus>fi2.downloadStatus);
 		}
 		}
 

From 3f8e8805a223a77a7337cf6ed2f526f3c820355d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 3 Jun 2023 23:51:31 +0200
Subject: [PATCH 293/503] fixed uninitialized memory read in FileDetail struct
 causing weird dates in search dialog

---
 .../src/gui/FileTransfer/SearchDialog.cpp        | 16 +++++++++-------
 retroshare-gui/src/gui/RSHumanReadableDelegate.h |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 2ecf442e4..7c495dd5b 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -265,6 +265,8 @@ void SearchDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
         f.hash = fe->mResults[i].fHash;
         f.name = fe->mResults[i].fName;
         f.size = fe->mResults[i].fSize;
+        f.mtime  = 0;	// zero what's not available, otherwise we'll get some random values displayed.
+        f.rank = 0;
 
         updateFiles(fe->mRequestId,f);
     }
@@ -1320,8 +1322,8 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s
 
 		item->setText(SR_SIZE_COL, QString::number(file.size));
 		item->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) file.size);
-		item->setText(SR_AGE_COL, QString::number(file.age));
-		item->setData(SR_AGE_COL, ROLE_SORT, file.age);
+        item->setText(SR_AGE_COL, QString::number(file.mtime));
+        item->setData(SR_AGE_COL, ROLE_SORT, file.mtime);
 		item->setTextAlignment( SR_SIZE_COL, Qt::AlignRight );
 		int friendSource = 0;
 		int anonymousSource = 0;
@@ -1396,21 +1398,21 @@ void SearchDialog::resultsToTree(const QString& txt,qulonglong searchId, const s
 
 	std::list<DirDetails>::const_iterator it;
 	for(it = results.begin(); it != results.end(); ++it)
-		if (it->type == DIR_TYPE_FILE) {
+        if (it->type == DIR_TYPE_FILE)
+        {
 			FileDetail fd;
 			fd.id	= it->id;
 			fd.name = it->name;
 			fd.hash = it->hash;
 			fd.path = it->path;
             fd.size = it->size;
-			fd.age 	= it->mtime;
+            fd.mtime= it->mtime;
 			fd.rank = 0;
 
 			insertFile(searchId,fd, FRIEND_SEARCH);
-		} else if (it->type == DIR_TYPE_DIR) {
-//			insertDirectory(txt, searchId, *it, NULL);
+        }
+        else if (it->type == DIR_TYPE_DIR)
 			insertDirectory(txt, searchId, *it);
-		}
 
 	ui.searchResultWidget->setSortingEnabled(true);
 }
diff --git a/retroshare-gui/src/gui/RSHumanReadableDelegate.h b/retroshare-gui/src/gui/RSHumanReadableDelegate.h
index 3e9a3e412..18943c1dc 100644
--- a/retroshare-gui/src/gui/RSHumanReadableDelegate.h
+++ b/retroshare-gui/src/gui/RSHumanReadableDelegate.h
@@ -91,7 +91,8 @@ class RSHumanReadableAgeDelegate: public RSHumanReadableDelegate
 			QStyleOptionViewItem opt(option) ;
 			setPainterOptions(painter,opt,index) ;
 
-			painter->drawText(opt.rect, Qt::AlignCenter, misc::timeRelativeToNow(index.data().toLongLong())) ;
+            if(index.data().toLongLong() > 0)	// no date is present.
+                painter->drawText(opt.rect, Qt::AlignCenter, misc::timeRelativeToNow(index.data().toLongLong())) ;
 		}
 };
 

From 0c9b086bd1b473fd7c3ceeb9a77f301ee4ea0a2a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 4 Jun 2023 15:12:23 +0200
Subject: [PATCH 294/503] added missing handle to modify
 mTrustFriendNodesWithBannedFiles

---
 retroshare-gui/src/gui/settings/TransferPage.cpp | 6 +++++-
 retroshare-gui/src/gui/settings/TransferPage.h   | 3 ++-
 retroshare-gui/src/gui/settings/TransferPage.ui  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index c0cf3608f..af390b0c7 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -53,6 +53,7 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags)
     QObject::connect(ui._diskSpaceLimit_SB,SIGNAL(valueChanged(int)),this,SLOT(updateDiskSizeLimit(int))) ;
     QObject::connect(ui._max_tr_up_per_sec_SB, SIGNAL( valueChanged( int ) ), this, SLOT( updateMaxTRUpRate(int) ) );
 	QObject::connect(ui._filePermDirectDL_CB,SIGNAL(activated(int)),this,SLOT(updateFilePermDirectDL(int)));
+    QObject::connect(ui._trustFriendNodesWithBannedFiles_CB,SIGNAL(toggled(bool)),this,SLOT(toggleTrustFriendNodesWithBannedFiles(bool))) ;
 
 	QObject::connect(ui.incomingButton, SIGNAL(clicked( bool ) ), this , SLOT( setIncomingDirectory() ) );
 	QObject::connect(ui.autoDLColl_CB, SIGNAL(toggled(bool)), this, SLOT(updateAutoDLColl()));
@@ -94,7 +95,10 @@ void TransferPage::updateIgnoreLists()
 	std::cerr << "  suffixes: " ; for(auto it(ls.begin());it!=ls.end();++it) std::cerr << "\"" << *it << "\" " ; std::cerr << std::endl;
 #endif
 }
-
+void TransferPage::toggleTrustFriendNodesWithBannedFiles(bool b)
+{
+    rsFiles->setTrustFriendNodesWithBannedFiles(b);
+}
 void TransferPage::updateMaxTRUpRate(int b)
 {
     rsTurtle->setMaxTRForwardRate(b) ;
diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h
index 1a88d29d5..a2a0a1061 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.h
+++ b/retroshare-gui/src/gui/settings/TransferPage.h
@@ -58,7 +58,8 @@ class TransferPage: public ConfigPage
 		void updateAutoDLColl();
 		void setPartialsDirectory();
 		void toggleAutoCheckDirectories(bool);
-		void updateFontSize();
+        void toggleTrustFriendNodesWithBannedFiles(bool);
+        void updateFontSize();
 
 		void updateAutoCheckDirectories()       ;
 		void updateAutoScanDirectoriesPeriod()  ;
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index b1e7b7630..7ab2b9493 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -547,7 +547,7 @@ p, li { white-space: pre-wrap; }
            </layout>
           </item>
           <item row="1" column="0">
-           <widget class="QCheckBox" name="checkBox">
+           <widget class="QCheckBox" name="_trustFriendNodesWithBannedFiles_CB">
             <property name="text">
              <string>Trust friend nodes with banned files</string>
             </property>

From e8187dbeab08e0db723005c6b1af6e603fa9ee44 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 4 Jun 2023 17:59:17 +0200
Subject: [PATCH 295/503] moved FileDetail structure in SearchDialog where it
 belongs

---
 .../src/gui/FileTransfer/SearchDialog.cpp          | 14 +++++++++++++-
 retroshare-gui/src/gui/FileTransfer/SearchDialog.h |  4 ++--
 retroshare-gui/src/gui/notifyqt.h                  |  1 -
 retroshare-gui/src/main.cpp                        |  2 --
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 7c495dd5b..832970833 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -86,6 +86,18 @@ const int SearchDialog::FILETYPE_IDX_DIRECTORY = 8;
 QMap<int, QString> * SearchDialog::FileTypeExtensionMap = new QMap<int, QString>();
 bool SearchDialog::initialised = false;
 
+struct SearchDialog::FileDetail
+{
+public:
+    RsPeerId id;
+    std::string name;
+    RsFileHash hash;
+    std::string path;
+    uint64_t size;
+    uint32_t mtime;
+    uint32_t rank;
+};
+
 /** Constructor */
 SearchDialog::SearchDialog(QWidget *parent)
 : MainPage(parent),
@@ -968,7 +980,7 @@ void SearchDialog::searchKeywords(const QString& keywords)
 	}
 }
 
-void SearchDialog::updateFiles(qulonglong search_id,FileDetail file)
+void SearchDialog::updateFiles(qulonglong search_id,const FileDetail& file)
 {
 	searchResultsQueue.push_back(std::pair<qulonglong,FileDetail>(search_id,file)) ;
 
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
index 5661f6246..8aa7bac64 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
@@ -43,6 +43,7 @@ class SearchDialog : public MainPage
     Q_PROPERTY(QColor textColorLowSources READ textColorLowSources WRITE setTextColorLowSources)
     Q_PROPERTY(QColor textColorHighSources READ textColorHighSources WRITE setTextColorHighSources)
 
+    struct FileDetail;	// useful structure to store search results.
 public:
 /** Default Constructor */
     SearchDialog(QWidget *parent = 0);
@@ -63,8 +64,7 @@ public:
     void setTextColorLowSources(QColor color) { mTextColorLowSources = color; }
     void setTextColorHighSources(QColor color) { mTextColorHighSources = color; }
 
-public slots:
-		void updateFiles(qulonglong request_id,FileDetail file) ;
+    void updateFiles(qulonglong request_id, const FileDetail& file) ;
 
 private slots:
 
diff --git a/retroshare-gui/src/gui/notifyqt.h b/retroshare-gui/src/gui/notifyqt.h
index 0f9ae11e2..5782ef5b7 100644
--- a/retroshare-gui/src/gui/notifyqt.h
+++ b/retroshare-gui/src/gui/notifyqt.h
@@ -117,7 +117,6 @@ class NotifyQt: public QObject, public NotifyClient
 		void chatStatusChanged(const ChatId&,const QString&) const ;
 		void chatCleared(const ChatId&) const ;
 		void peerHasNewCustomStateString(const QString& /* peer_id */, const QString& /* status_string */) const ;
-		void gotTurtleSearchResult(qulonglong search_id,FileDetail file) const ;
 		void peerHasNewAvatar(const QString& peer_id) const ;
 		void ownAvatarChanged() const ;
 		void ownStatusMessageChanged() const ;
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 3361597c8..e33fe795d 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -536,11 +536,9 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 	// avoid clashes between infos from threads.
 	//
 
-	qRegisterMetaType<FileDetail>("FileDetail") ;
 	qRegisterMetaType<RsPeerId>("RsPeerId") ;
 
 	std::cerr << "connecting signals and slots" << std::endl ;
-//	QObject::connect(notify,SIGNAL(gotTurtleSearchResult(qulonglong,FileDetail)),w->transfersDialog->searchDialog	,SLOT(updateFiles(qulonglong,FileDetail))) ;
 	QObject::connect(notify,SIGNAL(deferredSignatureHandlingRequested()),notify,SLOT(handleSignatureEvent()),Qt::QueuedConnection) ;
 	QObject::connect(notify,SIGNAL(chatLobbyTimeShift(int)),notify,SLOT(handleChatLobbyTimeShift(int)),Qt::QueuedConnection) ;
 	QObject::connect(notify,SIGNAL(diskFull(int,int))						,w                   		,SLOT(displayDiskSpaceWarning(int,int))) ;

From 9bbc832906457c608b4e7be2e20a06b65d49dcf5 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 4 Jun 2023 21:30:26 +0200
Subject: [PATCH 296/503] added missing initialization of "trust friends with
 banned files" checkbox

---
 retroshare-gui/src/gui/settings/TransferPage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index af390b0c7..4b704ddd3 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -46,6 +46,8 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags)
     ui._max_tr_up_per_sec_SB->setMinimum(max_tr_low);
     ui._max_tr_up_per_sec_SB->setMaximum(max_tr_high);
 
+    whileBlocking(ui._trustFriendNodesWithBannedFiles_CB)->setChecked(rsFiles->trustFriendNodesWithBannedFiles());
+
     QObject::connect(ui._queueSize_SB,SIGNAL(valueChanged(int)),this,SLOT(updateQueueSize(int))) ;
     QObject::connect(ui._max_up_SB,SIGNAL(valueChanged(int)),this,SLOT(updateMaxUploadSlots(int))) ;
     QObject::connect(ui._defaultStrategy_CB,SIGNAL(activated(int)),this,SLOT(updateDefaultStrategy(int))) ;

From 438489fb010b18b0700256c2ae0c270e8640235c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 20 Jun 2023 21:27:41 +0200
Subject: [PATCH 297/503] removed question before sending invite, since the
 request is not in auto mode

---
 retroshare-gui/src/gui/msgs/MessageWidget.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index d74505e63..cd06e9805 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -905,10 +905,8 @@ void MessageWidget::sendInvite()
     if(mi.from.type()!=MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
         return;
 
-    if ((QMessageBox::question(this, tr("Send invite?"),tr("Do you really want send a invite with your Certificate?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Cancel))== QMessageBox::Yes)
-    {
-        MessageComposer::sendInvite(mi.from.toGxsId(),false);
-    }
+    //if ((QMessageBox::question(this, tr("Send invite?"),tr("Do you really want to send an invite with your Certificate?"),QMessageBox::Yes, QMessageBox::No))== QMessageBox::Yes)
+    MessageComposer::sendInvite(mi.from.toGxsId(),false);
 }
 
 void MessageWidget::setToolbarButtonStyle(Qt::ToolButtonStyle style)

From c278239f97016d02b7ddd799c0e24ca1b1656637 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 20 Jun 2023 21:57:51 +0200
Subject: [PATCH 298/503] added warning about random FT strategy on windows

---
 .../src/gui/FileTransfer/TransfersDialog.cpp      |  4 ++++
 retroshare-gui/src/gui/settings/TransferPage.cpp  | 15 ++++++++++++---
 retroshare-gui/src/gui/settings/TransferPage.ui   |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index d0b4d5fc7..aa9b50298 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -2244,6 +2244,10 @@ void TransfersDialog::chunkStreaming()
 }
 void TransfersDialog::chunkRandom()
 {
+#ifdef WINDOWS_SYS
+    if(QMessageBox::Yes != QMessageBox::warning(nullptr,tr("Warning"),tr("On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?"),QMessageBox::Yes,QMessageBox::No))
+        return;
+#endif
 	setChunkStrategy(FileChunksInfo::CHUNK_STRATEGY_RANDOM) ;
 }
 void TransfersDialog::chunkProgressive()
diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index 4b704ddd3..dfd8944a2 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -30,6 +30,7 @@
 #include "retroshare/rspeers.h"
 
 #include <QCheckBox>
+#include <QMessageBox>
 #include <QToolTip>
 
 #include <iostream>
@@ -214,11 +215,19 @@ void TransferPage::updateDefaultStrategy(int i)
 		case 0: rsFiles->setDefaultChunkStrategy(FileChunksInfo::CHUNK_STRATEGY_STREAMING) ;
 				  break ;
 
-		case 2: rsFiles->setDefaultChunkStrategy(FileChunksInfo::CHUNK_STRATEGY_RANDOM) ;
-				  break ;
+        case 2:
+#ifdef WINDOWS_SYS
+                if(QMessageBox::Yes != QMessageBox::warning(nullptr,tr("Warning"),tr("On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?"),QMessageBox::Yes,QMessageBox::No))
+                {
+                    ui._defaultStrategy_CB->setCurrentIndex(0);
+                    return;
+                }
+#endif
+                rsFiles->setDefaultChunkStrategy(FileChunksInfo::CHUNK_STRATEGY_RANDOM) ;
+                break ;
 
 		case 1: rsFiles->setDefaultChunkStrategy(FileChunksInfo::CHUNK_STRATEGY_PROGRESSIVE) ;
-				  break ;
+                break ;
 		default: ;
 	}
 }
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index 7ab2b9493..fc2b17b91 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -30,7 +30,7 @@
           <item>
            <widget class="QPushButton" name="editShareButton">
             <property name="text">
-             <string>Edit Share</string>
+             <string>Configure shared directories</string>
             </property>
            </widget>
           </item>

From 463383e25c894f2d4cbca86f459911f9d40dbe16 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 26 Jun 2023 21:07:48 +0200
Subject: [PATCH 299/503] auto-switch to progressive instead of random when the
 user doesnt want random FT strategy. Added more info about this.

---
 retroshare-gui/src/gui/settings/TransferPage.cpp | 4 ++--
 retroshare-gui/src/gui/settings/TransferPage.ui  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index dfd8944a2..915eaa679 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -217,9 +217,9 @@ void TransferPage::updateDefaultStrategy(int i)
 
         case 2:
 #ifdef WINDOWS_SYS
-                if(QMessageBox::Yes != QMessageBox::warning(nullptr,tr("Warning"),tr("On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?"),QMessageBox::Yes,QMessageBox::No))
+                if(QMessageBox::Yes != QMessageBox::warning(nullptr,tr("Warning"),tr("On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use \"progressive\")?"),QMessageBox::Yes,QMessageBox::No))
                 {
-                    ui._defaultStrategy_CB->setCurrentIndex(0);
+                    ui._defaultStrategy_CB->setCurrentIndex(1);
                     return;
                 }
 #endif
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index fc2b17b91..b6d8cd7ff 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -14,7 +14,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -443,7 +443,7 @@ p, li { white-space: pre-wrap; }
                  <bool>true</bool>
                 </property>
                 <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <item>
                  <property name="text">

From afba23882e384a75f534b6fe08538aa22cd9fb54 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 27 Jun 2023 14:00:04 +0200
Subject: [PATCH 300/503] stop GxsGroupFrameDialog from stealing the focus on
 summary update

---
 .../src/gui/gxs/GxsGroupFrameDialog.cpp        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 3b1aad916..ca8521ca5 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -1105,7 +1105,12 @@ void GxsGroupFrameDialog::updateGroupSummary()
 			 * Qt::QueuedConnection is important!
 			 */
 
-			insertGroupsData(*groupInfo);
+            // Here we save the focus, and restore it afterwards: there's no need to grab the focus here and
+            // if we do, it may harm the navitation in forums, channels, boards, etc.
+
+            auto w = QApplication::focusWidget();
+
+            insertGroupsData(*groupInfo);
 			updateSearchResults();
 
 			mStateHelper->setLoading(TOKEN_TYPE_GROUP_SUMMARY, false);
@@ -1132,7 +1137,12 @@ void GxsGroupFrameDialog::updateGroupSummary()
 
             delete groupInfo;
 
-		}, this );
+            // Restore the focus.
+
+            if(w)
+                w->setFocus();
+
+        }, this );
 	});
 }
 
@@ -1165,7 +1175,7 @@ void GxsGroupFrameDialog::updateGroupStatisticsReal(const RsGxsGroupId &groupId)
 			 * Qt::QueuedConnection is important!
 			 */
 
-			QTreeWidgetItem *item = ui->groupTreeWidget->getItemFromId(QString::fromStdString(stats.mGrpId.toStdString()));
+            QTreeWidgetItem *item = ui->groupTreeWidget->getItemFromId(QString::fromStdString(stats.mGrpId.toStdString()));
 			if (!item)
 				return;
 
@@ -1174,7 +1184,7 @@ void GxsGroupFrameDialog::updateGroupStatisticsReal(const RsGxsGroupId &groupId)
 
 			getUserNotify()->updateIcon();
 
-		}, this );
+        }, this );
 	});
 }
 

From ae855098cf4b2408346801db9a530616f5191120 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Tue, 27 Jun 2023 22:16:37 +0530
Subject: [PATCH 301/503] This commit gives the edit account feature in the
 wire.

---
 .../src/gui/TheWire/CustomFrame.cpp           | 21 +++++++
 retroshare-gui/src/gui/TheWire/CustomFrame.h  | 24 ++++++++
 .../src/gui/TheWire/PulseTopLevel.ui          |  1 -
 .../src/gui/TheWire/PulseViewGroup.cpp        | 35 ++++++++++--
 .../src/gui/TheWire/PulseViewGroup.ui         | 55 +++++++++++++++----
 retroshare-gui/src/gui/TheWire/WireDialog.ui  |  2 +-
 .../src/gui/TheWire/WireGroupDialog.cpp       |  2 +-
 .../src/gui/TheWire/WireGroupItem.cpp         |  3 +-
 .../src/gui/TheWire/WireGroupItem.ui          |  4 +-
 9 files changed, 126 insertions(+), 21 deletions(-)
 create mode 100644 retroshare-gui/src/gui/TheWire/CustomFrame.cpp
 create mode 100644 retroshare-gui/src/gui/TheWire/CustomFrame.h

diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
new file mode 100644
index 000000000..20059222d
--- /dev/null
+++ b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
@@ -0,0 +1,21 @@
+#include "CustomFrame.h"
+#include <QPainter>
+
+// Constructor
+CustomFrame::CustomFrame(QWidget *parent) : QFrame(parent)
+{
+    // Any initializations for this frame.
+}
+
+// Overriding the inbuilt paint function
+void CustomFrame::paintEvent(QPaintEvent *event)
+{
+    QFrame::paintEvent(event);
+    QPainter painter(this);
+    painter.drawPixmap(rect(), backgroundImage);
+}
+
+// Function to set the member variable 'backgroundImage'
+void CustomFrame::setPixmap(QPixmap pixmap){
+    backgroundImage = pixmap;
+}
diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.h b/retroshare-gui/src/gui/TheWire/CustomFrame.h
new file mode 100644
index 000000000..ebe2bfa8c
--- /dev/null
+++ b/retroshare-gui/src/gui/TheWire/CustomFrame.h
@@ -0,0 +1,24 @@
+#ifndef CUSTOMFRAMEH_H
+#define CUSTOMFRAMEH_H
+
+#include <QFrame>
+#include <QPixmap>
+
+// This class is made to implement the background image in a Qframe or any widget
+
+class CustomFrame : public QFrame
+{
+    Q_OBJECT
+
+public:
+    explicit CustomFrame(QWidget *parent = nullptr);
+    void setPixmap(QPixmap pixmap);
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+
+private:
+    QPixmap backgroundImage;
+};
+
+#endif //CUSTOMFRAMEH_H
diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
index 077b72473..1959244d3 100644
--- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
@@ -767,7 +767,6 @@
            <property name="font">
             <font>
              <pointsize>12</pointsize>
-             <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
index 8707eaf8c..56c4eabdc 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
@@ -24,11 +24,14 @@
 #include <QBuffer>
 
 #include "PulseViewGroup.h"
+#include "CustomFrame.h"
 
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
 #include "util/DateTime.h"
 
+Q_DECLARE_METATYPE(RsWireGroup)
+
 /** Constructor */
 
 PulseViewGroup::PulseViewGroup(PulseViewHolder *holder, RsWireGroupSPtr group)
@@ -50,8 +53,32 @@ void PulseViewGroup::setup()
 		label_tagline->setText(QString::fromStdString(mGroup->mTagline));
 		label_location->setText(QString::fromStdString(mGroup->mLocation));
 
-		// need to draw mGroup->mMasthead, as background to headshot.
-		// TODO frame_headerBackground->setBackground()
+
+        if (mGroup->mMasthead.mData)
+        {
+            QPixmap pixmap;
+            if (GxsIdDetails::loadPixmapFromData(
+                    mGroup->mMasthead.mData,
+                    mGroup->mMasthead.mSize,
+                    pixmap, GxsIdDetails::ORIGINAL))
+            {
+                QSize frameSize = frame_masthead->size();
+
+                // Scale the pixmap based on the frame size
+                pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+                frame_masthead->setPixmap(pixmap);
+            }
+        }
+        else
+        {
+            // Default pixmap
+            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png");
+            QSize frameSize = frame_masthead->size();
+
+            // Scale the pixmap based on the frame size
+            pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+            frame_masthead->setPixmap(pixmap);
+        }
 
 		if (mGroup->mHeadshot.mData)
 		{
@@ -61,14 +88,14 @@ void PulseViewGroup::setup()
 					mGroup->mHeadshot.mSize,
 					pixmap,GxsIdDetails::ORIGINAL))
 			{
-				pixmap = pixmap.scaled(50,50);
+                pixmap = pixmap.scaled(100,100);
 				label_headshot->setPixmap(pixmap);
 			}
 		}
 		else
 		{
             // default.
-            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png").scaled(50,50);
+            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png").scaled(100,100);
 			label_headshot->setPixmap(pixmap);
 		}
 
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
index 77329e3c2..39183123e 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>745</width>
+    <width>746</width>
     <height>483</height>
    </rect>
   </property>
@@ -48,19 +48,37 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QVBoxLayout" name="plainFrame_VL">
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QFrame" name="frame_headerBackground">
-        <layout class="QHBoxLayout" name="frame_headerBackground_HL">
+              <widget class="CustomFrame" name="frame_masthead">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>700</width>
+          <height>135</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
-          <spacer name="frame_headerBackground_LHSpacer">
+          <spacer name="widget_actions_RHSpacer_2">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>283</width>
-             <height>20</height>
+             <width>277</width>
+             <height>17</height>
             </size>
            </property>
           </spacer>
@@ -79,19 +97,22 @@
              <height>100</height>
             </size>
            </property>
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
            <property name="text">
             <string>headshot</string>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="frame_headerBackground_RHSpacer">
+          <spacer name="widget_actions_LHSpacer_2">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>23</width>
+             <width>281</width>
              <height>20</height>
             </size>
            </property>
@@ -509,7 +530,6 @@
            <property name="font">
             <font>
              <pointsize>12</pointsize>
-             <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
@@ -538,10 +558,25 @@
        </widget>
       </item>
      </layout>
+     <zorder>widget_header</zorder>
+     <zorder>widget_publish</zorder>
+     <zorder>line_1</zorder>
+     <zorder>widget_replies</zorder>
+     <zorder>line_2</zorder>
+     <zorder>widget_actions</zorder>
+     <zorder>frame_masthead</zorder>
     </widget>
    </item>
   </layout>
  </widget>
+  <customwidgets>
+  <customwidget>
+   <class>CustomFrame</class>
+   <extends>QFrame</extends>
+   <header>D:\new\RetroShare\retroshare-gui\src\gui\TheWire\CustomFrame.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.ui b/retroshare-gui/src/gui/TheWire/WireDialog.ui
index b794a96e0..4cdf4a174 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.ui
@@ -434,8 +434,8 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="TheWire_images.qrc"/>
   <include location="../icons.qrc"/>
+  <include location="TheWire_images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
index e13cd4f8f..e832540de 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
@@ -152,7 +152,7 @@ bool WireGroupDialog::service_updateGroup(const RsGroupMetaData &editedMeta)
 	std::cerr << "WireGroupDialog::service_updateGroup() submitting changes";
 	std::cerr << std::endl;
 
-	bool success = rsWire->updateGroup(grp);
+    bool success = rsWire->editWire(grp);
 	// TODO updateGroup should refresh groupId or Data
 	return success;
 }
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
index 8ab62260a..c8abe3886 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
@@ -65,8 +65,7 @@ WireGroupItem::WireGroupItem(WireGroupHolder *holder, const RsWireGroup &grp)
 	setAttribute ( Qt::WA_DeleteOnClose, true );
 	setup();
 
-	// disabled, still not yet functional Edit/Update
-	editButton->setEnabled(false);
+    editButton->setEnabled(true);
 }
 
 RsGxsGroupId &WireGroupItem::groupId()
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.ui b/retroshare-gui/src/gui/TheWire/WireGroupItem.ui
index 2da79ddc6..a53448157 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.ui
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>276</width>
-    <height>114</height>
+    <width>292</width>
+    <height>115</height>
    </rect>
   </property>
   <property name="windowTitle">

From a78212274291fbc4a7b01074baba9a513c4ccb0f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 28 Jun 2023 21:48:07 +0200
Subject: [PATCH 302/503] fixed copy file link in channel post files

---
 .../GxsChannelPostsWidgetWithModel.cpp        | 34 ++++++++++++-------
 .../GxsChannelPostsWidgetWithModel.h          |  1 +
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 35f8df044..a6ce946f5 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -411,7 +411,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
     connect(ui->channelPostFiles_TV->header(),SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(sortColumnPostFiles(int,Qt::SortOrder)));
     connect(ui->channelFiles_TV->header(),SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(sortColumnFiles(int,Qt::SortOrder)));
 
-    connect(ui->channelPostFiles_TV,SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showChannelFilesContextMenu(QPoint)));
+    connect(ui->channelPostFiles_TV,SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showChannelPostFilesContextMenu(QPoint)));
     connect(ui->channelFiles_TV,SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showChannelFilesContextMenu(QPoint)));
 
     connect(ui->postsTree->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)),this,SLOT(showPostDetails()));
@@ -1344,13 +1344,26 @@ void GxsChannelPostsWidgetWithModel::insertChannelDetails(const RsGxsChannelGrou
 
     showPostDetails();
 }
-
-void GxsChannelPostsWidgetWithModel::showChannelFilesContextMenu(QPoint /*p*/)
+void GxsChannelPostsWidgetWithModel::showChannelFilesContextMenu(QPoint p)
 {
-    QMenu contextMnu(this) ;
+    QModelIndex index = ui->channelFiles_TV->indexAt(p);
 
-    QAction *action = contextMnu.addAction(QIcon(), tr("Copy Retroshare link"), this, SLOT(copyChannelFilesLink()));
-    action->setData(QVariant::fromValue(sender()));
+    if(!index.isValid())
+        return;
+
+    QMenu contextMnu(this) ;
+    contextMnu.addAction(QIcon(), tr("Copy Retroshare link"), this, SLOT(copyChannelFilesLink()))->setData(QVariant::fromValue(index));
+    contextMnu.exec(QCursor::pos());
+}
+void GxsChannelPostsWidgetWithModel::showChannelPostFilesContextMenu(QPoint p)
+{
+    QModelIndex index = ui->channelPostFiles_TV->indexAt(p);
+
+    if(!index.isValid())
+        return;
+
+    QMenu contextMnu(this) ;
+    contextMnu.addAction(QIcon(), tr("Copy Retroshare link"), this, SLOT(copyChannelFilesLink()))->setData(QVariant::fromValue(index));
     contextMnu.exec(QCursor::pos());
 }
 
@@ -1358,16 +1371,11 @@ void GxsChannelPostsWidgetWithModel::copyChannelFilesLink()
 {
     // Block the popup if no results available
     QAction *action = dynamic_cast<QAction*>(sender());
-    RSTreeView *tree = dynamic_cast<RSTreeView*>(action->data().value<QWidget*>());
-
-    QModelIndexList sel = tree->selectionModel()->selection().indexes();
-
-    if(sel.empty())
-        return;
 
+    QModelIndex s = action->data().toModelIndex();
     ChannelPostFileInfo file;
 
-    if(!static_cast<RsGxsChannelPostFilesModel*>(tree->model())->getFileData(sel.front(),file))
+    if(!static_cast<const RsGxsChannelPostFilesModel*>(s.model())->getFileData(s,file))
         return;
 
     RetroShareLink link = RetroShareLink::createFile(QString::fromUtf8(file.mName.c_str()), file.mSize, QString::fromStdString(file.mHash.toStdString()));
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index c325c722b..9cfcaae21 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -166,6 +166,7 @@ public slots:
  	void sortColumnPostFiles(int col,Qt::SortOrder so);
     void updateCommentsCount(int n);
     void showChannelFilesContextMenu(QPoint p);
+    void showChannelPostFilesContextMenu(QPoint p);
     void copyChannelFilesLink();
 
 private:

From df68d03953f800899397d670f029f88a4fa094a4 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 30 Jun 2023 17:24:55 +0200
Subject: [PATCH 303/503] fixed item not switching to "Open/Play" when DL is
 finished in channel/post/files

---
 .../GxsChannelFilesStatusWidget.cpp           | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
index 66eb0f793..4d4361876 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
@@ -90,7 +90,15 @@ void GxsChannelFilesStatusWidget::setSize(uint64_t size)
 void GxsChannelFilesStatusWidget::check()
 {
 	FileInfo fileInfo;
-	if (rsFiles->alreadyHaveFile(mFile.mHash, fileInfo)) {
+
+    bool already_has_file = rsFiles->alreadyHaveFile(mFile.mHash, fileInfo);
+    bool detailsOk = false;
+
+    if(!already_has_file)
+        detailsOk = rsFiles->FileDetails(mFile.mHash, RS_FILE_HINTS_DOWNLOAD | RS_FILE_HINTS_SPEC_ONLY, fileInfo);
+
+    if (already_has_file || (detailsOk && fileInfo.downloadStatus == FT_STATE_COMPLETE))
+    {
 		mState = STATE_LOCAL;
 		setSize(fileInfo.size);
 		
@@ -103,27 +111,25 @@ void GxsChannelFilesStatusWidget::check()
 			ui->openFilePushButton->setText(tr("Play"));
 			ui->openFilePushButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/play.png"));
 		}
-		
-	} else {
-		FileInfo fileInfo;
-		bool detailsOk = rsFiles->FileDetails(mFile.mHash, RS_FILE_HINTS_DOWNLOAD | RS_FILE_HINTS_SPEC_ONLY, fileInfo);
-
-		if (detailsOk) {
-			switch (fileInfo.downloadStatus) {
+    }
+    else if (detailsOk)
+    {
+        switch (fileInfo.downloadStatus)
+        {
 			case FT_STATE_WAITING:
 				mState = STATE_WAITING;
 				break;
 			case FT_STATE_DOWNLOADING:
-				if (fileInfo.avail == fileInfo.size) {
+                if (fileInfo.avail == fileInfo.size)
 					mState = STATE_LOCAL;
-				} else {
+                else
 					mState = STATE_DOWNLOAD;
-				}
+
 				setSize(fileInfo.size);
 				ui->progressBar->setValue(fileInfo.avail / mDivisor);
 				break;
-			case FT_STATE_COMPLETE:
-				mState = STATE_DOWNLOAD;
+            case FT_STATE_COMPLETE:		// this should not happen, since the case is handled earlier
+                mState = STATE_ERROR;
 				break;
 			case FT_STATE_QUEUED:
 				mState = STATE_WAITING;
@@ -138,10 +144,9 @@ void GxsChannelFilesStatusWidget::check()
 				mState = STATE_ERROR;
 				break;
 			}
-		} else {
-			mState = STATE_REMOTE;
-		}
-	}
+    }
+    else
+        mState = STATE_REMOTE;
 
 	int repeat = 0;
 	QString statusText;

From fe8c81e84afe1dacb5f2c39752a5174efaa6be82 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 1 Jul 2023 00:00:46 +0200
Subject: [PATCH 304/503] fixed open file / open dir in channel/post/files

---
 .../GxsChannelFilesStatusWidget.cpp           | 108 ++++++++++--------
 .../gxschannels/GxsChannelFilesStatusWidget.h |   1 +
 .../GxsChannelFilesStatusWidget.ui            |   6 +-
 3 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
index 4d4361876..23f5f5b93 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
@@ -50,15 +50,12 @@ GxsChannelFilesStatusWidget::GxsChannelFilesStatusWidget(const RsGxsFile &file,
 	connect(ui->openFilePushButton, SIGNAL(clicked()), this, SLOT(openFile()));
 
 	ui->downloadPushButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/download.png"));
-	ui->openFolderToolButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/arrow.png"));
 
-	QAction *openfolder = new QAction(tr("Open folder"), this);
-	connect(openfolder, SIGNAL(triggered()), this, SLOT(openFolder()));
+    ui->openFolderPushButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/images/folderopen.png"));
+    ui->openFolderPushButton->setToolTip(tr("Open folder"));
+
+    connect(ui->openFolderPushButton, SIGNAL(clicked()), this, SLOT(openFolder()));
 	
-	QMenu *menu = new QMenu();
-	menu->addAction(openfolder);
-	ui->openFolderToolButton->setMenu(menu);
-
 	check();
 }
 
@@ -91,13 +88,7 @@ void GxsChannelFilesStatusWidget::check()
 {
 	FileInfo fileInfo;
 
-    bool already_has_file = rsFiles->alreadyHaveFile(mFile.mHash, fileInfo);
-    bool detailsOk = false;
-
-    if(!already_has_file)
-        detailsOk = rsFiles->FileDetails(mFile.mHash, RS_FILE_HINTS_DOWNLOAD | RS_FILE_HINTS_SPEC_ONLY, fileInfo);
-
-    if (already_has_file || (detailsOk && fileInfo.downloadStatus == FT_STATE_COMPLETE))
+    if(haveFile(fileInfo))
     {
 		mState = STATE_LOCAL;
 		setSize(fileInfo.size);
@@ -112,7 +103,7 @@ void GxsChannelFilesStatusWidget::check()
 			ui->openFilePushButton->setIcon(FilesDefs::getIconFromQtResourcePath(":/icons/png/play.png"));
 		}
     }
-    else if (detailsOk)
+    else
     {
         switch (fileInfo.downloadStatus)
         {
@@ -140,13 +131,11 @@ void GxsChannelFilesStatusWidget::check()
 			case FT_STATE_CHECKING_HASH:
 				mState = STATE_CHECKING;
 				break;
-			case FT_STATE_FAILED:
-				mState = STATE_ERROR;
-				break;
-			}
+        default:
+                mState = STATE_REMOTE;
+                break;
+        }
     }
-    else
-        mState = STATE_REMOTE;
 
 	int repeat = 0;
 	QString statusText;
@@ -161,7 +150,7 @@ void GxsChannelFilesStatusWidget::check()
 		ui->cancelToolButton->hide();
 		ui->progressBar->hide();
 		ui->openFilePushButton->hide();
-		ui->openFolderToolButton->hide();
+        ui->openFolderPushButton->hide();
 
 		statusText = tr("Error");
 
@@ -176,7 +165,7 @@ void GxsChannelFilesStatusWidget::check()
 		ui->cancelToolButton->hide();
 		ui->progressBar->hide();
 		ui->openFilePushButton->hide();
-		ui->openFolderToolButton->hide();
+        ui->openFolderPushButton->hide();
 
 		break;
 
@@ -189,7 +178,7 @@ void GxsChannelFilesStatusWidget::check()
 		ui->cancelToolButton->show();
 		ui->progressBar->show();
 		ui->openFilePushButton->hide();
-		ui->openFolderToolButton->hide();
+        ui->openFolderPushButton->hide();
 
 		break;
 
@@ -202,7 +191,7 @@ void GxsChannelFilesStatusWidget::check()
 		ui->cancelToolButton->show();
 		ui->progressBar->hide();
 		ui->openFilePushButton->hide();
-		ui->openFolderToolButton->hide();
+        ui->openFolderPushButton->hide();
 
 		statusText = tr("Paused");
 
@@ -217,7 +206,7 @@ void GxsChannelFilesStatusWidget::check()
 		ui->cancelToolButton->show();
 		ui->progressBar->hide();
 		ui->openFilePushButton->hide();
-		ui->openFolderToolButton->hide();
+        ui->openFolderPushButton->hide();
 
 		statusText = tr("Waiting");
 
@@ -232,7 +221,7 @@ void GxsChannelFilesStatusWidget::check()
 		ui->cancelToolButton->show();
 		ui->progressBar->hide();
 		ui->openFilePushButton->hide();
-		ui->openFolderToolButton->hide();
+        ui->openFolderPushButton->hide();
 
 		statusText = tr("Checking");
 
@@ -247,7 +236,7 @@ void GxsChannelFilesStatusWidget::check()
 		ui->cancelToolButton->hide();
 		ui->progressBar->hide();
 		ui->openFilePushButton->show();
-		ui->openFolderToolButton->show();
+        ui->openFolderPushButton->show();
 
 		break;
 	}
@@ -329,35 +318,60 @@ void GxsChannelFilesStatusWidget::cancel()
 void GxsChannelFilesStatusWidget::openFolder()
 {
 	FileInfo fileInfo;
-	if (!rsFiles->alreadyHaveFile(mFile.mHash, fileInfo)) {
+    if (!haveFile(fileInfo))
 		return;
-	}
 
-	/* open folder with a suitable application */
-	QDir dir = QFileInfo(QString::fromUtf8(fileInfo.path.c_str())).absoluteDir();
-	if (dir.exists()) {
-		if (!RsUrlHandler::openUrl(QUrl::fromLocalFile(dir.absolutePath()))) {
-            if(!mUsedAsEditor)
-                QMessageBox::warning(this, "", QString("%1 %2").arg(tr("Can't open folder"), dir.absolutePath()));
-            else
-                RsErr() << "Can't open folder " << dir.absolutePath().toStdString() ;
+    QFileInfo finfo;
+    finfo.setFile(QString::fromUtf8(fileInfo.path.c_str()));
 
-        }
-	}
+    /* open folder with a suitable application */
+    if (!RsUrlHandler::openUrl(QUrl::fromLocalFile(finfo.absolutePath()))) {
+        if(!mUsedAsEditor)
+            QMessageBox::warning(this, "", QString("%1 %2").arg(tr("Can't open folder"), finfo.absolutePath()));
+        else
+            RsErr() << "Can't open folder " << finfo.absolutePath().toStdString() ;
+    }
+}
+
+bool GxsChannelFilesStatusWidget::haveFile(FileInfo& info)
+{
+    bool already_has_file = rsFiles->alreadyHaveFile(mFile.mHash, info);
+
+    if(!already_has_file)
+        if(!(rsFiles->FileDetails(mFile.mHash, RS_FILE_HINTS_DOWNLOAD | RS_FILE_HINTS_SPEC_ONLY, info) && info.downloadStatus==FT_STATE_COMPLETE))
+            return false;
+
+    // We need the code below because FileDetails() returns fileInfo.path as the directory when the file in COMPLETE and
+    // as a full path when the file is shared. The former is inconsistent with the documentation in rstypes.h, but I'm not
+    // sure what are the implications of changing the code in libretroshare so that the full path is always returned.
+
+    QFileInfo finfo;
+
+    if(QDir(QString::fromUtf8(info.path.c_str())).exists())
+        finfo.setFile(QString::fromUtf8(info.path.c_str()),QString::fromUtf8(info.fname.c_str()));
+    else if(QFile(QString::fromUtf8(info.path.c_str())).exists())
+        finfo.setFile(QString::fromUtf8(info.path.c_str()));
+    else
+    {
+        RsErr() << "Cannot find file!" << std::endl;
+        return false;
+    }
+
+    info.path = finfo.absoluteFilePath().toStdString();
+    return true;
 }
 
 void GxsChannelFilesStatusWidget::openFile()
 {
 	FileInfo fileInfo;
-	if (!rsFiles->alreadyHaveFile(mFile.mHash, fileInfo)) {
+    if(!haveFile(fileInfo))
 		return;
-	}
 
-	/* open file with a suitable application */
-	QFileInfo qinfo;
-	qinfo.setFile(QString::fromUtf8(fileInfo.path.c_str()));
-	if (qinfo.exists()) {
-		if (!RsUrlHandler::openUrl(QUrl::fromLocalFile(qinfo.absoluteFilePath()))) {
+    QFileInfo finfo;
+    finfo.setFile(QString::fromUtf8(fileInfo.path.c_str()));
+
+    if (finfo.exists()) {
+        if (!RsUrlHandler::openUrl(QUrl::fromLocalFile(finfo.absoluteFilePath()))) {
 			std::cerr << "GxsChannelFilesStatusWidget(): can't open file " << fileInfo.path << std::endl;
 		}
 	}else{
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h
index 7ae09ce6b..0dbb5c072 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h
@@ -53,6 +53,7 @@ private slots:
 
 private:
 	void setSize(uint64_t size);
+    bool haveFile(FileInfo& info);
 
 private:
 	enum State
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui
index 2c51ded6c..e8ee2d512 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>421</width>
-    <height>29</height>
+    <width>473</width>
+    <height>36</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -139,7 +139,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QToolButton" name="openFolderToolButton">
+       <widget class="QToolButton" name="openFolderPushButton">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>

From d95518d17e190b804d3b7e905cff91391c0d69bf Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 1 Jul 2023 18:06:12 +0200
Subject: [PATCH 305/503] fixed DL output path in DL list

---
 retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index aa9b50298..83e3219c3 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -442,7 +442,7 @@ public:
 			{
 				QString strPath = QString::fromUtf8(fileInfo.path.c_str());
 				QString strPathAfterDL = strPath;
-				strPathAfterDL.replace(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str()),"");
+                strPathAfterDL.replace(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str()),"[Download Dir]");
 
 				return QVariant(strPathAfterDL);
 			}

From b4d6a7b4e47aea081b337d6d6a79e14fbaf32e39 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 1 Jul 2023 23:18:51 +0200
Subject: [PATCH 306/503] fixed sorting of files in channels/post/files

---
 .../src/gui/gxschannels/GxsChannelPostFilesModel.cpp       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index 54b787e65..0796b6ce1 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -348,7 +348,14 @@ public:
             if(r1 && r2)
                 return (ord==Qt::AscendingOrder)?(fi1.transfered<fi2.transfered):(fi1.transfered>fi2.transfered);
             else
+            {
+                FileInfo fitmp;
+
+                if(!r1 && rsFiles->alreadyHaveFile(f1.mHash,fitmp)) fi1.downloadStatus = FT_STATE_COMPLETE;
+                if(!r2 && rsFiles->alreadyHaveFile(f2.mHash,fitmp)) fi2.downloadStatus = FT_STATE_COMPLETE;
+
                 return (ord==Qt::AscendingOrder)?(fi1.downloadStatus<fi2.downloadStatus):(fi1.downloadStatus>fi2.downloadStatus);
+            }
 		}
 		}
 

From 3cc077ff381dbf64687ed2d3abf04d0d29921675 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Sun, 2 Jul 2023 10:42:40 +0530
Subject: [PATCH 307/503] Changes to the .pro file for the newly made files.

---
 .../src/gui/TheWire/CustomFrame.cpp           |   19 +
 retroshare-gui/src/gui/TheWire/CustomFrame.h  |   19 +
 .../src/gui/TheWire/PulseViewGroup.cpp        |    2 +-
 .../src/gui/TheWire/PulseViewGroup.ui         |    6 +-
 retroshare-gui/src/retroshare-gui.pro         | 3012 +++++++++--------
 5 files changed, 1551 insertions(+), 1507 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
index 20059222d..e08e03895 100644
--- a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
+++ b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * gui/TheWire/CustomFrame.cpp                                                 *
+ *                                                                             *
+ * Copyright (c) 2012-2020 Robert Fernie   <retroshare.project@gmail.com>      *
+ *                                                                             *
+ * This program is free software: you can redistribute it and/or modify        *
+ * it under the terms of the GNU Affero General Public License as              *
+ * published by the Free Software Foundation, either version 3 of the          *
+ * License, or (at your option) any later version.                             *
+ *                                                                             *
+ * This program is distributed in the hope that it will be useful,             *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
+ * GNU Affero General Public License for more details.                         *
+ *                                                                             *
+ * You should have received a copy of the GNU Affero General Public License    *
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
+ *                                                                             *
+ *******************************************************************************/
 #include "CustomFrame.h"
 #include <QPainter>
 
diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.h b/retroshare-gui/src/gui/TheWire/CustomFrame.h
index ebe2bfa8c..b0abd131b 100644
--- a/retroshare-gui/src/gui/TheWire/CustomFrame.h
+++ b/retroshare-gui/src/gui/TheWire/CustomFrame.h
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * gui/TheWire/CustomFrame.h                                                   *
+ *                                                                             *
+ * Copyright (c) 2012-2020 Robert Fernie   <retroshare.project@gmail.com>      *
+ *                                                                             *
+ * This program is free software: you can redistribute it and/or modify        *
+ * it under the terms of the GNU Affero General Public License as              *
+ * published by the Free Software Foundation, either version 3 of the          *
+ * License, or (at your option) any later version.                             *
+ *                                                                             *
+ * This program is distributed in the hope that it will be useful,             *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
+ * GNU Affero General Public License for more details.                         *
+ *                                                                             *
+ * You should have received a copy of the GNU Affero General Public License    *
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
+ *                                                                             *
+ *******************************************************************************/
 #ifndef CUSTOMFRAMEH_H
 #define CUSTOMFRAMEH_H
 
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
index 56c4eabdc..cf7b4cfca 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
@@ -65,7 +65,7 @@ void PulseViewGroup::setup()
                 QSize frameSize = frame_masthead->size();
 
                 // Scale the pixmap based on the frame size
-                pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+                pixmap = pixmap.scaledToWidth(frameSize.width(), Qt::SmoothTransformation);
                 frame_masthead->setPixmap(pixmap);
             }
         }
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
index 39183123e..96f717656 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
@@ -50,7 +50,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-              <widget class="CustomFrame" name="frame_masthead">
+       <widget class="CustomFrame" name="frame_masthead">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -569,11 +569,11 @@
    </item>
   </layout>
  </widget>
-  <customwidgets>
+ <customwidgets>
   <customwidget>
    <class>CustomFrame</class>
    <extends>QFrame</extends>
-   <header>D:\new\RetroShare\retroshare-gui\src\gui\TheWire\CustomFrame.h</header>
+   <header>gui/TheWire/CustomFrame.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index b8e8365e0..72d7d028e 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -1,1503 +1,1509 @@
-################################################################################
-# uselibresapi.pri                                                             #
-# Copyright (C) 2018, Retroshare team <retroshare.team@gmailcom>               #
-#                                                                              #
-# This program is free software: you can redistribute it and/or modify         #
-# it under the terms of the GNU Affero General Public License as               #
-# published by the Free Software Foundation, either version 3 of the           #
-# License, or (at your option) any later version.                              #
-#                                                                              #
-# This program is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
-# GNU Affero General Public License for more details.                          #
-#                                                                              #
-# You should have received a copy of the GNU Affero General Public License     #
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.       #
-################################################################################
-
-!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
-
-TEMPLATE = app
-QT     += network xml 
-CONFIG += qt gui uic qrc resources idle 
-CONFIG += console
-TARGET = retroshare
-DEFINES += TARGET=\\\"$${TARGET}\\\"
-
-DEPENDPATH  *= $${PWD} $${RS_INCLUDE_DIR}
-INCLUDEPATH *= $${PWD}
-
-!include("../../libretroshare/src/use_libretroshare.pri"):error("Including")
-
-rs_webui {
-rs_jsonapi {
-    HEADERS *= gui/settings/WebuiPage.h
-    SOURCES *= gui/settings/WebuiPage.cpp
-    FORMS *= gui/settings/WebuiPage.ui
-}
-}
-
-rs_jsonapi {
-    HEADERS *= gui/settings/JsonApiPage.h
-    SOURCES *= gui/settings/JsonApiPage.cc
-    FORMS *= gui/settings/JsonApiPage.ui
-}
-
-# Auto detect installed version of cmark
-rs_gui_cmark {
-	DEFINES *= USE_CMARK
-	no_rs_cross_compiling {
-		message("Using compiled cmark")
-		CMARK_SRC_PATH=$$clean_path($${RS_SRC_PATH}/supportlibs/cmark)
-		CMARK_BUILD_PATH=$$clean_path($${RS_BUILD_PATH}/supportlibs/cmark/build)
-		INCLUDEPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
-		DEPENDPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
-		QMAKE_LIBDIR *= $$clean_path($${CMARK_BUILD_PATH}/)
-		# Using sLibs would fail as libcmark.a is generated at compile-time
-		LIBS *= -L$$clean_path($${CMARK_BUILD_PATH}/src/) -lcmark
-
-		DUMMYCMARKINPUT = FORCE
-		CMAKE_GENERATOR_OVERRIDE=""
-		win32-g++|win32-clang-g++:CMAKE_GENERATOR_OVERRIDE="-G \"MSYS Makefiles\""
-		gencmarklib.name = Generating libcmark.
-		gencmarklib.input = DUMMYCMARKINPUT
-		gencmarklib.output = $$clean_path($${CMARK_BUILD_PATH}/src/libcmark.a)
-		gencmarklib.CONFIG += target_predeps combine
-		gencmarklib.variable_out = PRE_TARGETDEPS
-		gencmarklib.commands = \
-		    cd $${RS_SRC_PATH} && ( \
-		    git submodule update --init supportlibs/cmark ; \
-		    cd $${CMARK_SRC_PATH} ; \
-		    true ) && \
-		    mkdir -p $${CMARK_BUILD_PATH} && cd $${CMARK_BUILD_PATH} && \
-		    cmake \
-		        -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
-                        \"-DCMAKE_CXX_FLAGS=$${QMAKE_CXXFLAGS}\" \
-		        $${CMAKE_GENERATOR_OVERRIDE} \
-		        -DCMAKE_INSTALL_PREFIX=. \
-		        -B. \
-		        -H$$shell_path($${CMARK_SRC_PATH}) && \
-		    $(MAKE)
-		QMAKE_EXTRA_COMPILERS += gencmarklib
-	} else {
-		message("Using systems cmark")
-		sLibs *= libcmark
-	}
-}
-
-FORMS   += TorControl/TorControlWindow.ui
-SOURCES += TorControl/TorControlWindow.cpp
-HEADERS += TorControl/TorControlWindow.h
-
-#QMAKE_CFLAGS += -fmudflap 
-#LIBS *= /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflap.a /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflapth.a
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-	# Qt 5
-        QT     += widgets multimedia printsupport
-	linux-* {
-		QT += x11extras
-	}
-} else {
-	# Qt 4
-	CONFIG += uitools
-}
-
-CONFIG += identities
-CONFIG += gxsforums
-CONFIG += gxschannels
-CONFIG += posted
-CONFIG += gxsgui
-CONFIG += gxscircles
-
-# Other Disabled Bits.
-#CONFIG += framecatcher
-
-## To enable unfinished services
-#CONFIG += wikipoos
-#CONFIG += gxsthewire
-#CONFIG += gxsphotoshare
-
-DEFINES += RS_RELEASE_VERSION
-RCC_DIR = temp/qrc
-UI_DIR  = temp/ui
-MOC_DIR = temp/moc
-
-################################# Linux ##########################################
-# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
-linux-* {
-	CONFIG += link_pkgconfig
-
-	#CONFIG += version_detail_bash_script
-	QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
-
-	PKGCONFIG *= x11 xscrnsaver
-
-	LIBS *= -rdynamic 
-	DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
-}
-
-rs_sanitize {
-	LIBS *= -lasan -lubsan
-}
-
-unix {
-	target.path = "$${BIN_DIR}"
-	INSTALLS += target
-
-        data_files.path="$${RS_DATA_DIR}/"
-	data_files.files=sounds qss
-	INSTALLS += data_files
-
-        style_files.path="$${RS_DATA_DIR}/stylesheets"
-	style_files.files=gui/qss/chat/Bubble gui/qss/chat/Bubble_Compact
-	INSTALLS += style_files
-
-	icon_files.path = "$${PREFIX}/share/icons/hicolor"
-	icon_files.files =  ../../data/24x24
-	icon_files.files += ../../data/48x48
-	icon_files.files += ../../data/64x64
-	icon_files.files += ../../data/128x128
-	INSTALLS += icon_files
-
-	desktop_files.path = "$${PREFIX}/share/applications"
-	desktop_files.files = ../../data/retroshare.desktop
-	INSTALLS += desktop_files
-
-	pixmap_files.path = "$${PREFIX}/share/pixmaps"
-	pixmap_files.files = ../../data/retroshare.xpm
-	INSTALLS += pixmap_files
-
-}
-
-linux-g++ {
-	OBJECTS_DIR = temp/linux-g++/obj
-}
-
-linux-g++-64 {
-	OBJECTS_DIR = temp/linux-g++-64/obj
-}
-
-version_detail_bash_script {
-	warning("Version detail script is deprecated.")
-	warning("Remove references to version_detail_bash_script from all of your build scripts!")
-}
-
-#################### Cross compilation for windows under Linux ###################
-
-win32-x-g++ {
-		OBJECTS_DIR = temp/win32-x-g++/obj
-
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libssl.a
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libcrypto.a
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libgpgme.dll.a
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libminiupnpc.a
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libz.a
-		LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
-		LIBS += -lQtUiTools
-		LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
-		LIBS += -lole32 -lwinmm
-
-		DEFINES *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
-
-		INCLUDEPATH += ../../../../gpgme-1.1.8/src/
-		INCLUDEPATH += ../../../../libgpg-error-1.7/src/
-
-		RC_FILE = gui/images/retroshare_win.rc
-}
-
-#################################### Windows #####################################
-
-win32-g++|win32-clang-g++ {
-	CONFIG(debug, debug|release) {
-		# show console output
-		CONFIG += console
-	} else {
-		CONFIG -= console
-	}
-
-	CONFIG(debug, debug|release) {
-	} else {
-		# Tell linker to use ASLR protection
-		QMAKE_LFLAGS += -Wl,-dynamicbase
-		# Tell linker to use DEP protection
-		QMAKE_LFLAGS += -Wl,-nxcompat
-	}
-
-    # Fix linking error (ld.exe: Error: export ordinal too large) due to too
-    # many exported symbols.
-    !libretroshare_shared:QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
-
-	# Switch off optimization for release version
-	QMAKE_CXXFLAGS_RELEASE -= -O2
-	QMAKE_CXXFLAGS_RELEASE += -O0
-	QMAKE_CFLAGS_RELEASE -= -O2
-	QMAKE_CFLAGS_RELEASE += -O0
-
-	# Switch on optimization for debug version
-	#QMAKE_CXXFLAGS_DEBUG += -O2
-	#QMAKE_CFLAGS_DEBUG += -O2
-
-	OBJECTS_DIR = temp/obj
-
-    dLib = ws2_32 gdi32 uuid ole32 iphlpapi crypt32 winmm
-    LIBS *= $$linkDynamicLibs(dLib)
-
-	RC_FILE = gui/images/retroshare_win.rc
-
-	# export symbols for the plugins
-	LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a
-
-	# create lib directory
-	isEmpty(QMAKE_SH) {
-		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib $(MKDIR) lib
-	} else {
-		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib || $(MKDIR) lib
-	}
-
-	greaterThan(QT_MAJOR_VERSION, 4) {
-		# Qt 5
-		RC_INCLUDEPATH += $$_PRO_FILE_PWD_/../../libretroshare/src
-	} else {
-		# Qt 4
-		QMAKE_RC += --include-dir=$$_PRO_FILE_PWD_/../../libretroshare/src
-	}
-}
-
-##################################### MacOS ######################################
-
-macx {
-	# ENABLE THIS OPTION FOR Univeral Binary BUILD.
-	#CONFIG += ppc x86
-	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
-	QMAKE_INFO_PLIST = Info.plist
-	mac_icon.files = $$files($$PWD/rsMacIcon.icns)
-	mac_icon.path = Contents/Resources
-	QMAKE_BUNDLE_DATA += mac_icon
-	dplQSS.files = $$PWD/qss
-	dplQSS.path = Contents/Resources
-	QMAKE_BUNDLE_DATA += dplQSS
-	dplChatStyles.files = \
-		$$PWD/gui/qss/chat/Bubble \
-		$$PWD/gui/qss/chat/Bubble_Compact
-	dplChatStyles.path = Contents/Resources/stylesheets
-	QMAKE_BUNDLE_DATA += dplChatStyles 
-#	mac_webui.files = $$files($$PWD/../../libresapi/src/webui)
-#	mac_webui.path = Contents/Resources
-#	QMAKE_BUNDLE_DATA += mac_webui
-
-	OBJECTS_DIR = temp/obj
-
-	CONFIG += version_detail_bash_script
-	LIBS += -lssl -lcrypto -lz 
-	for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
-	LIBS += -framework CoreFoundation
-	LIBS += -framework Security
-	LIBS += -framework Carbon
-
-	for(lib, LIB_DIR):LIBS += -L"$$lib"
-	for(bin, BIN_DIR):LIBS += -L"$$bin"
-
-	DEPENDPATH += . $$INC_DIR
-	INCLUDEPATH += . $$INC_DIR
-
-	#DEFINES *= MAC_IDLE # for idle feature
-	CONFIG -= uitools
-}
-
-##################################### FreeBSD ######################################
-
-freebsd-* {
-	INCLUDEPATH *= /usr/local/include/gpgme
-	LIBS *= -lssl
-	LIBS *= -lgpgme
-	LIBS *= -lupnp
-	LIBS *= -lgnome-keyring
-
-	LIBS += -lsqlite3
-}
-
-##################################### Haiku ######################################
-
-haiku-* {
-	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
-	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
-
-	LIBS *= ../../libretroshare/src/lib/libretroshare.a
-	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2 -lbsd
-	LIBS *= -lssl -lcrypto -lnetwork
-	LIBS *= -lgpgme
-	LIBS *= -lupnp
-	LIBS *= -lz
-	LIBS *= -lixml
-
-	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-	LIBS += -lsqlite3
-}
-
-##################################### OpenBSD ######################################
-
-openbsd-* {
-	INCLUDEPATH *= /usr/local/include
-
-	LIBS *= -lssl -lcrypto
-	LIBS *= -lgpgme
-	LIBS *= -lupnp
-	LIBS *= -lgnome-keyring
-	LIBS += -lsqlite3
-	LIBS *= -rdynamic
-}
-
-################################### COMMON stuff ##################################
-
-wikipoos {
-	PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-	LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-	LIBS *= -lglib-2.0
-}
-
-################################### HEADERS & SOURCES #############################
-
-# Input
-HEADERS +=  rshare.h \
-            retroshare-gui/configpage.h \
-            retroshare-gui/RsAutoUpdatePage.h \
-            retroshare-gui/mainpage.h \
-            gui/notifyqt.h \
-            control/bandwidthevent.h \
-            control/eventtype.h \
-            gui/QuickStartWizard.h \
-            gui/StartDialog.h \
-            gui/HomePage.h\
-            gui/NetworkDialog.h \
-            gui/GenCertDialog.h \
-            gui/linetypes.h \
-            gui/mainpagestack.h \
-            gui/MainWindow.h \
-            gui/RSHumanReadableDelegate.h \
-            gui/AboutDialog.h \
-            gui/AboutWidget.h \
-            gui/NetworkView.h \
-            gui/FriendsDialog.h \
-            gui/ServicePermissionDialog.h \
-            gui/RemoteDirModel.h \
-            gui/RetroShareLink.h \
-            gui/SearchTreeWidget.h \
-            gui/ShareManager.h \
-#            gui/ShareDialog.h \
-#            gui/SFListDelegate.h \
-            gui/SoundManager.h \
-            gui/HelpDialog.h \
-            gui/LogoBar.h \
-            gui/common/AvatarDialog.h \
-            gui/FileTransfer/SearchDialog.h \
-            gui/FileTransfer/SharedFilesDialog.h \
-            gui/FileTransfer/xprogressbar.h \
-            gui/FileTransfer/DetailsDialog.h \
-            gui/FileTransfer/FileTransferInfoWidget.h \
-            gui/FileTransfer/DLListDelegate.h \
-            gui/FileTransfer/ULListDelegate.h \
-            gui/FileTransfer/TransfersDialog.h \
-            gui/FileTransfer/BannedFilesDialog.h \
-            gui/statistics/TurtleRouterDialog.h \
-            gui/statistics/TurtleRouterStatistics.h \
-            gui/statistics/GxsIdStatistics.h \
-            gui/statistics/dhtgraph.h \
-            gui/statistics/Histogram.h \
-            gui/statistics/BandwidthGraphWindow.h \
-            gui/statistics/turtlegraph.h \
-            gui/statistics/BandwidthStatsWidget.h \
-            gui/statistics/DhtWindow.h \
-            gui/statistics/GlobalRouterStatistics.h \
-            gui/statistics/GxsTransportStatistics.h \
-            gui/statistics/StatisticsWindow.h \
-            gui/statistics/BwCtrlWindow.h \
-            gui/statistics/RttStatistics.h \
-            gui/FileTransfer/TransferUserNotify.h \
-            gui/plugins/PluginInterface.h \
-            gui/im_history/ImHistoryBrowser.h \
-            gui/im_history/IMHistoryItemDelegate.h \
-            gui/im_history/IMHistoryItemPainter.h \
-            lang/languagesupport.h \
-            util/RsProtectedTimer.h \
-            util/stringutil.h \
-            util/RsNetUtil.h \
-            util/DateTime.h \
-            util/RetroStyleLabel.h \
-            util/dllexport.h \
-            util/NonCopyable.h \
-            util/rsutildll.h \
-            util/dllexport.h \
-            util/global.h \
-            util/rsqtutildll.h \
-#            util/Interface.h \
-            util/PixmapMerging.h \
-            util/MouseEventFilter.h \
-            util/EventFilter.h \
-            util/Widget.h \
-            util/RsAction.h \
-            util/RsUserdata.h \
-            util/printpreview.h \
-            util/log.h \
-            util/misc.h \
-            util/HandleRichText.h \
-            util/ObjectPainter.h \
-            util/QtVersion.h \
-            util/RsFile.h \
-            util/qtthreadsutils.h \
-            util/ClickableLabel.h \
-            util/AspectRatioPixmapLabel.h \
-            gui/profile/ProfileWidget.h \
-            gui/profile/ProfileManager.h \
-            gui/profile/StatusMessage.h \
-            gui/chat/PopupChatWindow.h \
-            gui/chat/PopupChatDialog.h \
-            gui/chat/PopupDistantChatDialog.h \
-            gui/chat/ChatTabWidget.h \
-            gui/chat/ChatWidget.h \
-            gui/chat/ChatDialog.h \
-            gui/ChatLobbyWidget.h \
-            gui/chat/ChatLobbyDialog.h \
-            gui/chat/CreateLobbyDialog.h \
-            gui/chat/ChatStyle.h \
-            gui/chat/ChatUserNotify.h \
-            gui/chat/ChatLobbyUserNotify.h \
-            gui/connect/ConfCertDialog.h \
-            gui/connect/PGPKeyDialog.h \
-            gui/connect/FriendRecommendDialog.h \
-            gui/msgs/MessagesDialog.h \
-            gui/msgs/MessageInterface.h \
-            gui/msgs/MessageComposer.h \
-            gui/msgs/MessageWindow.h \
-            gui/msgs/MessageWidget.h \
-            gui/msgs/MessageModel.h \
-            gui/msgs/TagsMenu.h \
-            gui/msgs/textformat.h \
-            gui/msgs/MessageUserNotify.h \
-            gui/images/retroshare_win.rc.h \
-            gui/settings/RSPermissionMatrixWidget.h \
-            gui/settings/rsharesettings.h \
-            gui/settings/RsharePeerSettings.h \
-            gui/settings/rsettings.h \
-            gui/settings/rsettingswin.h \
-            gui/settings/GeneralPage.h \
-            gui/settings/PeoplePage.h \
-            gui/settings/AboutPage.h \
-            gui/settings/ServerPage.h \
-            gui/settings/NotifyPage.h \
-            gui/settings/CryptoPage.h \
-            gui/settings/MessagePage.h \
-            gui/settings/NewTag.h \
-            gui/settings/ForumPage.h \
-            gui/settings/PluginsPage.h \
-            gui/settings/PluginItem.h \
-            gui/settings/AppearancePage.h \
-            gui/settings/FileAssociationsPage.h \
-            gui/settings/SoundPage.h \
-            gui/settings/TransferPage.h \
-            gui/settings/ChatPage.h \
-            gui/settings/ChannelPage.h \
-            gui/settings/PostedPage.h \
-            gui/settings/ServicePermissionsPage.h \
-            gui/settings/AddFileAssociationDialog.h \
-            gui/settings/GroupFrameSettingsWidget.h \
-            gui/toaster/ToasterItem.h \
-            gui/toaster/MessageToaster.h \
-            gui/toaster/OnlineToaster.h \
-            gui/toaster/DownloadToaster.h \
-            gui/toaster/ChatToaster.h \
-            gui/toaster/GroupChatToaster.h \
-            gui/toaster/ChatLobbyToaster.h \
-            gui/toaster/FriendRequestToaster.h \
-            gui/common/RsButtonOnText.h \
-            gui/common/RSGraphWidget.h \
-            gui/common/ElidedLabel.h \
-            gui/common/vmessagebox.h \
-            gui/common/RsUrlHandler.h \
-            gui/common/RsCollectionDialog.h \
-            gui/common/rwindow.h \
-            gui/common/rshtml.h \
-            gui/common/AvatarDefs.h \
-            gui/common/GroupFlagsWidget.h \
-            gui/common/GroupSelectionBox.h \
-            gui/common/GroupChooser.h \
-            gui/common/StatusDefs.h \
-            gui/common/TagDefs.h \
-            gui/common/GroupDefs.h \
-            gui/common/Emoticons.h \
-            gui/common/RSComboBox.h \
-            gui/common/RSListWidgetItem.h \
-            gui/common/RSTextEdit.h \
-            gui/common/RSPlainTextEdit.h \
-            gui/common/RSTreeWidget.h \
-            gui/common/RSTreeWidgetItem.h \
-            gui/common/RSFeedWidget.h \
-            gui/common/RSTabWidget.h \
-            gui/common/RSElidedItemDelegate.h \
-            gui/common/RSItemDelegate.h \
-            gui/common/PeerDefs.h \
-            gui/common/FilesDefs.h \
-            gui/common/PopularityDefs.h \
-            gui/common/RsBanListDefs.h \
-            gui/common/GroupTreeWidget.h \
-            gui/common/RSTreeView.h \
-            gui/common/AvatarWidget.h \
-            gui/common/FriendListModel.h \
-            gui/common/NewFriendList.h \
-            gui/common/FriendSelectionWidget.h \
-            gui/common/FriendSelectionDialog.h \
-            gui/common/HashBox.h \
-            gui/common/LineEditClear.h \
-            gui/common/DropLineEdit.h \
-            gui/common/RSTextBrowser.h \
-            gui/common/RSImageBlockWidget.h \
-            gui/common/FeedNotify.h \
-            gui/common/UserNotify.h \
-            gui/common/HeaderFrame.h \
-            gui/common/MimeTextEdit.h \
-            gui/common/UIStateHelper.h \
-            gui/common/FloatingHelpBrowser.h \
-            gui/common/SubscribeToolButton.h \
-            gui/common/RsBanListToolButton.h \
-            gui/common/FlowLayout.h \
-            gui/common/PictureFlow.h \
-            gui/common/ToasterNotify.h \
-            gui/style/RSStyle.h \
-            gui/style/StyleDialog.h \
-            gui/help/browser/helpbrowser.h \
-            gui/help/browser/helptextbrowser.h \
-            gui/statusbar/peerstatus.h \
-            gui/statusbar/natstatus.h \
-            gui/statusbar/dhtstatus.h \
-            gui/statusbar/torstatus.h \
-            gui/statusbar/ratesstatus.h \
-            gui/statusbar/hashingstatus.h \
-            gui/statusbar/discstatus.h \
-            gui/statusbar/SoundStatus.h \
-            gui/statusbar/OpModeStatus.h \
-            gui/statusbar/ToasterDisable.h \
-            gui/statusbar/SysTrayStatus.h \
-            gui/advsearch/advancedsearchdialog.h \
-            gui/advsearch/expressionwidget.h \
-            gui/advsearch/guiexprelement.h \
-            gui/elastic/graphwidget.h \
-            gui/elastic/edge.h \
-            gui/elastic/arrow.h \
-            gui/elastic/elnode.h \
-            gui/NewsFeed.h \
-            gui/feeds/BoardsCommentsItem.h \
-            gui/feeds/FeedItem.h \
-            gui/feeds/FeedHolder.h \
-            gui/feeds/GxsCircleItem.h \
-            gui/feeds/ChannelsCommentsItem.h \
-            gui/feeds/PeerItem.h \
-            gui/feeds/MsgItem.h \
-            gui/feeds/ChatMsgItem.h \
-            gui/feeds/SubFileItem.h \
-            gui/feeds/AttachFileItem.h \
-            gui/feeds/SecurityItem.h \
-            gui/feeds/SecurityIpItem.h \
-            gui/feeds/NewsFeedUserNotify.h \
-            gui/connect/ConnectFriendWizard.h \
-            gui/connect/ConnectProgressDialog.h \
-            gui/groups/CreateGroup.h \
-            gui/GetStartedDialog.h \
-            gui/statistics/BWGraph.h \
-            util/RsSyntaxHighlighter.h \
-            util/imageutil.h \
-            util/RichTextEdit.h \
-            gui/NetworkDialog/pgpid_item_model.h \
-            gui/NetworkDialog/pgpid_item_proxy.h \
-            gui/common/RsCollection.h \
-            util/retroshareWin32.h
-#            gui/ForumsDialog.h \
-#            gui/forums/ForumDetails.h \
-#            gui/forums/EditForumDetails.h \
-#            gui/forums/CreateForum.h \
-#            gui/forums/CreateForumMsg.h \
-#            gui/forums/ForumUserNotify.h \
-#            gui/feeds/ForumNewItem.h \
-#            gui/feeds/ForumMsgItem.h \
-#            gui/ChannelFeed.h \
-#            gui/feeds/ChanNewItem.h \
-#            gui/feeds/ChanMsgItem.h \
-#            gui/channels/CreateChannel.h \
-#            gui/channels/ChannelDetails.h \
-#            gui/channels/CreateChannelMsg.h \
-#            gui/channels/EditChanDetails.h \
-#            gui/channels/ChannelUserNotify.h \
-
-FORMS +=    gui/StartDialog.ui \
-            gui/HomePage.ui\
-            gui/GenCertDialog.ui \
-            gui/AboutDialog.ui \
-            gui/AboutWidget.ui \
-            gui/QuickStartWizard.ui \
-            gui/NetworkDialog.ui \
-            gui/common/AvatarDialog.ui \
-            gui/FileTransfer/TransfersDialog.ui \
-            gui/FileTransfer/DetailsDialog.ui \
-            gui/FileTransfer/SearchDialog.ui \
-            gui/FileTransfer/SharedFilesDialog.ui \
-            gui/FileTransfer/BannedFilesDialog.ui \
-            gui/MainWindow.ui \
-            gui/NetworkView.ui \
-            gui/FriendsDialog.ui \
-            gui/ShareManager.ui \
-#            gui/ShareDialog.ui \
-            gui/help/browser/helpbrowser.ui \
-            gui/HelpDialog.ui \
-            gui/ServicePermissionDialog.ui \
-            gui/profile/ProfileWidget.ui \
-            gui/profile/StatusMessage.ui \
-            gui/profile/ProfileManager.ui \
-            gui/chat/PopupChatWindow.ui \
-            gui/chat/PopupChatDialog.ui \
-            gui/chat/ChatTabWidget.ui \
-            gui/chat/ChatWidget.ui \
-            gui/chat/ChatLobbyDialog.ui \
-            gui/chat/CreateLobbyDialog.ui \
-            gui/ChatLobbyWidget.ui \
-            gui/connect/ConfCertDialog.ui \
-            gui/connect/PGPKeyDialog.ui \
-            gui/connect/ConnectFriendWizard.ui \
-            gui/connect/ConnectProgressDialog.ui \
-            gui/connect/FriendRecommendDialog.ui \
-            gui/msgs/MessagesDialog.ui \
-            gui/msgs/MessageComposer.ui \
-            gui/msgs/MessageWindow.ui\
-            gui/msgs/MessageWidget.ui\
-            gui/settings/settingsw.ui \
-            gui/settings/GeneralPage.ui \
-            gui/settings/ServerPage.ui \
-            gui/settings/NotifyPage.ui \
-            gui/settings/PeoplePage.ui \
-            gui/settings/CryptoPage.ui \
-            gui/settings/MessagePage.ui \
-            gui/settings/NewTag.ui \
-            gui/settings/ForumPage.ui \
-            gui/settings/AboutPage.ui \
-            gui/settings/PluginsPage.ui \
-            gui/settings/AppearancePage.ui \
-            gui/settings/TransferPage.ui \
-            gui/settings/SoundPage.ui \
-            gui/settings/ChatPage.ui \
-            gui/settings/ChannelPage.ui \
-            gui/settings/PostedPage.ui \
-            gui/settings/ServicePermissionsPage.ui \
-            gui/settings/PluginItem.ui \
-            gui/settings/GroupFrameSettingsWidget.ui \
-            gui/toaster/MessageToaster.ui \
-            gui/toaster/OnlineToaster.ui \
-            gui/toaster/DownloadToaster.ui \
-            gui/toaster/ChatToaster.ui \
-            gui/toaster/GroupChatToaster.ui \
-            gui/toaster/ChatLobbyToaster.ui \
-            gui/toaster/FriendRequestToaster.ui \
-            gui/advsearch/AdvancedSearchDialog.ui \
-            gui/advsearch/expressionwidget.ui \
-            gui/NewsFeed.ui \
-            gui/feeds/BoardsCommentsItem.ui \
-            gui/feeds/GxsCircleItem.ui \
-            gui/feeds/ChannelsCommentsItem.ui \
-            gui/feeds/PeerItem.ui \
-            gui/feeds/MsgItem.ui \
-            gui/feeds/ChatMsgItem.ui \
-            gui/feeds/SubFileItem.ui \
-            gui/feeds/AttachFileItem.ui \
-            gui/feeds/SecurityItem.ui \
-            gui/feeds/SecurityIpItem.ui \
-            gui/im_history/ImHistoryBrowser.ui \
-            gui/groups/CreateGroup.ui \
-            gui/common/GroupTreeWidget.ui \
-            gui/common/AvatarWidget.ui \
-            gui/common/NewFriendList.ui \
-            gui/common/FriendSelectionWidget.ui \
-            gui/common/HashBox.ui \
-            gui/common/RSImageBlockWidget.ui \
-            gui/common/RsCollectionDialog.ui \
-            gui/common/HeaderFrame.ui \
-            gui/common/RSFeedWidget.ui \
-            gui/style/StyleDialog.ui \
-            gui/statistics/BandwidthGraphWindow.ui \
-            gui/statistics/BandwidthStatsWidget.ui \
-            gui/statistics/DhtWindow.ui \
-            gui/statistics/TurtleRouterDialog.ui \
-            gui/statistics/TurtleRouterStatistics.ui \
-            gui/statistics/GxsIdStatistics.ui \
-            gui/statistics/GlobalRouterStatistics.ui \
-            gui/statistics/GxsTransportStatistics.ui \
-            gui/statistics/StatisticsWindow.ui \
-            gui/statistics/BwCtrlWindow.ui \
-            gui/statistics/RttStatistics.ui \
-            gui/GetStartedDialog.ui \
-            util/RichTextEdit.ui
-
-
-#            gui/ForumsDialog.ui \
-#            gui/forums/CreateForum.ui \
-#            gui/forums/CreateForumMsg.ui \
-#            gui/forums/ForumDetails.ui \
-#            gui/forums/EditForumDetails.ui \
-#            gui/feeds/ForumNewItem.ui \
-#            gui/feeds/ForumMsgItem.ui \
-#            gui/ChannelFeed.ui \
-#            gui/channels/CreateChannel.ui \
-#            gui/channels/CreateChannelMsg.ui \
-#            gui/channels/ChannelDetails.ui \
-#            gui/channels/EditChanDetails.ui \
-#            gui/feeds/ChanNewItem.ui \
-#            gui/feeds/ChanMsgItem.ui \
-
-SOURCES +=  main.cpp \
-            rshare.cpp \
-            gui/notifyqt.cpp \
-            gui/AboutDialog.cpp \
-            gui/AboutWidget.cpp \
-            gui/QuickStartWizard.cpp \
-            gui/StartDialog.cpp \
-            gui/HomePage.cpp\
-            gui/GenCertDialog.cpp \
-            gui/NetworkDialog.cpp \
-            gui/mainpagestack.cpp \
-            gui/MainWindow.cpp \
-            gui/NetworkView.cpp \
-            gui/FriendsDialog.cpp \
-            gui/ServicePermissionDialog.cpp \
-            gui/RemoteDirModel.cpp \
-            gui/RsAutoUpdatePage.cpp \
-            gui/RetroShareLink.cpp \
-            gui/SearchTreeWidget.cpp \
-            gui/ShareManager.cpp \
-#            gui/ShareDialog.cpp \
-#            gui/SFListDelegate.cpp \
-            gui/SoundManager.cpp \
-            gui/im_history/ImHistoryBrowser.cpp \
-            gui/im_history/IMHistoryItemDelegate.cpp \
-            gui/im_history/IMHistoryItemPainter.cpp \
-            gui/help/browser/helpbrowser.cpp \
-            gui/help/browser/helptextbrowser.cpp \
-            gui/FileTransfer/SearchDialog.cpp \
-            gui/FileTransfer/SharedFilesDialog.cpp \
-            gui/FileTransfer/TransfersDialog.cpp \
-            gui/FileTransfer/FileTransferInfoWidget.cpp \
-            gui/FileTransfer/DLListDelegate.cpp \
-            gui/FileTransfer/ULListDelegate.cpp \
-            gui/FileTransfer/xprogressbar.cpp \
-            gui/FileTransfer/DetailsDialog.cpp \
-            gui/FileTransfer/TransferUserNotify.cpp \
-            gui/FileTransfer/BannedFilesDialog.cpp \
-            gui/MainPage.cpp \
-            gui/HelpDialog.cpp \
-            gui/LogoBar.cpp \
-            lang/languagesupport.cpp \
-            util/RsProtectedTimer.cpp \
-            util/stringutil.cpp \
-            util/RsNetUtil.cpp \
-            util/DateTime.cpp \
-            util/RetroStyleLabel.cpp \
-            util/WidgetBackgroundImage.cpp \
-#            util/NonCopyable.cpp \
-            util/PixmapMerging.cpp \
-            util/MouseEventFilter.cpp \
-            util/EventFilter.cpp \
-            util/Widget.cpp \
-            util/RsAction.cpp \
-            util/printpreview.cpp \
-            util/log.cpp \
-            util/misc.cpp \
-            util/HandleRichText.cpp \
-            util/ObjectPainter.cpp \
-            util/RsFile.cpp \
-            util/RichTextEdit.cpp \
-            util/ClickableLabel.cpp \
-            util/AspectRatioPixmapLabel.cpp \
-            gui/profile/ProfileWidget.cpp \
-            gui/profile/StatusMessage.cpp \
-            gui/profile/ProfileManager.cpp \
-            gui/chat/PopupChatWindow.cpp \
-            gui/chat/PopupChatDialog.cpp \
-            gui/chat/PopupDistantChatDialog.cpp \
-            gui/chat/ChatTabWidget.cpp \
-            gui/chat/ChatWidget.cpp \
-            gui/chat/ChatDialog.cpp \
-            gui/ChatLobbyWidget.cpp \
-            gui/chat/ChatLobbyDialog.cpp \
-            gui/chat/CreateLobbyDialog.cpp \
-            gui/chat/ChatStyle.cpp \
-            gui/chat/ChatUserNotify.cpp \
-            gui/chat/ChatLobbyUserNotify.cpp \
-            gui/connect/ConfCertDialog.cpp \
-            gui/connect/PGPKeyDialog.cpp \
-            gui/msgs/MessagesDialog.cpp \
-            gui/msgs/MessageComposer.cpp \
-            gui/msgs/MessageWidget.cpp \
-            gui/msgs/MessageWindow.cpp \
-            gui/msgs/MessageModel.cpp \
-            gui/msgs/TagsMenu.cpp \
-            gui/msgs/MessageUserNotify.cpp \
-            gui/common/RsButtonOnText.cpp \
-            gui/common/RSGraphWidget.cpp \
-            gui/common/ElidedLabel.cpp \
-            gui/common/vmessagebox.cpp \
-            gui/common/RsCollectionDialog.cpp \
-            gui/common/RsUrlHandler.cpp \
-            gui/common/rwindow.cpp \
-            gui/common/rshtml.cpp \
-            gui/common/AvatarDefs.cpp \
-            gui/common/AvatarDialog.cpp \
-            gui/common/GroupFlagsWidget.cpp \
-            gui/common/GroupSelectionBox.cpp \
-            gui/common/GroupChooser.cpp \
-            gui/common/StatusDefs.cpp \
-            gui/common/TagDefs.cpp \
-            gui/common/GroupDefs.cpp \
-            gui/common/Emoticons.cpp \
-            gui/common/RSComboBox.cpp \
-            gui/common/RSListWidgetItem.cpp \
-            gui/common/RSTextEdit.cpp \
-            gui/common/RSPlainTextEdit.cpp \
-            gui/common/RSTreeWidget.cpp \
-            gui/common/RSTreeWidgetItem.cpp \
-            gui/common/RSFeedWidget.cpp \
-            gui/common/RSTabWidget.cpp \
-            gui/common/RSElidedItemDelegate.cpp \
-            gui/common/RSItemDelegate.cpp \
-            gui/common/PeerDefs.cpp \
-            gui/common/FilesDefs.cpp \
-            gui/common/PopularityDefs.cpp \
-            gui/common/RsBanListDefs.cpp \
-            gui/common/GroupTreeWidget.cpp \
-            gui/common/RSTreeView.cpp \
-            gui/common/AvatarWidget.cpp \
-            gui/common/FriendListModel.cpp \
-            gui/common/NewFriendList.cpp \
-            gui/common/FriendSelectionWidget.cpp \
-            gui/common/FriendSelectionDialog.cpp \
-            gui/common/HashBox.cpp \
-            gui/common/LineEditClear.cpp \
-            gui/common/DropLineEdit.cpp \
-            gui/common/RSTextBrowser.cpp \
-            gui/common/RSImageBlockWidget.cpp \
-            gui/common/FeedNotify.cpp \
-            gui/common/UserNotify.cpp \
-            gui/common/HeaderFrame.cpp \
-            gui/common/MimeTextEdit.cpp \
-            gui/common/UIStateHelper.cpp \
-            gui/common/FloatingHelpBrowser.cpp \
-            gui/common/SubscribeToolButton.cpp \
-            gui/common/RsBanListToolButton.cpp \
-            gui/common/FlowLayout.cpp \
-            gui/common/PictureFlow.cpp \
-            gui/common/ToasterNotify.cpp \
-            gui/style/RSStyle.cpp \
-            gui/style/StyleDialog.cpp \
-            gui/settings/RSPermissionMatrixWidget.cpp \
-            gui/settings/rsharesettings.cpp \
-            gui/settings/RsharePeerSettings.cpp \
-            gui/settings/rsettings.cpp \
-            gui/settings/rsettingswin.cpp \
-            gui/settings/GeneralPage.cpp \
-            gui/settings/AboutPage.cpp \
-            gui/settings/ServerPage.cpp \
-            gui/settings/NotifyPage.cpp \
-            gui/settings/CryptoPage.cpp \
-            gui/settings/PeoplePage.cpp \
-            gui/settings/MessagePage.cpp \
-            gui/settings/NewTag.cpp \
-            gui/settings/ForumPage.cpp \
-            gui/settings/PluginsPage.cpp \
-            gui/settings/PluginItem.cpp \
-            gui/settings/AppearancePage.cpp \
-            gui/settings/FileAssociationsPage.cpp \
-            gui/settings/SoundPage.cpp \
-            gui/settings/TransferPage.cpp \
-            gui/settings/ChatPage.cpp \
-            gui/settings/ChannelPage.cpp \
-            gui/settings/PostedPage.cpp \
-            gui/settings/ServicePermissionsPage.cpp \
-            gui/settings/AddFileAssociationDialog.cpp \
-            gui/settings/GroupFrameSettingsWidget.cpp \
-            gui/statusbar/peerstatus.cpp \
-            gui/statusbar/natstatus.cpp \
-            gui/statusbar/dhtstatus.cpp \
-            gui/statusbar/torstatus.cpp \
-            gui/statusbar/ratesstatus.cpp \
-            gui/statusbar/hashingstatus.cpp \
-            gui/statusbar/discstatus.cpp \
-            gui/statusbar/SoundStatus.cpp \
-            gui/statusbar/OpModeStatus.cpp \
-            gui/statusbar/ToasterDisable.cpp \
-            gui/statusbar/SysTrayStatus.cpp \
-            gui/toaster/ToasterItem.cpp \
-            gui/toaster/MessageToaster.cpp \
-            gui/toaster/DownloadToaster.cpp \
-            gui/toaster/OnlineToaster.cpp \
-            gui/toaster/ChatToaster.cpp \
-            gui/toaster/GroupChatToaster.cpp \
-            gui/toaster/ChatLobbyToaster.cpp \
-            gui/toaster/FriendRequestToaster.cpp \
-            gui/advsearch/advancedsearchdialog.cpp \
-            gui/advsearch/expressionwidget.cpp \
-            gui/advsearch/guiexprelement.cpp \
-            gui/elastic/graphwidget.cpp \
-            gui/elastic/edge.cpp \
-            gui/elastic/arrow.cpp \
-            gui/elastic/elnode.cpp \
-            gui/NewsFeed.cpp \
-            gui/feeds/BoardsCommentsItem.cpp \
-            gui/feeds/FeedItem.cpp \
-            gui/feeds/FeedHolder.cpp \
-            gui/feeds/GxsCircleItem.cpp \
-            gui/feeds/ChannelsCommentsItem.cpp \
-            gui/feeds/PeerItem.cpp \
-            gui/feeds/MsgItem.cpp \
-            gui/feeds/ChatMsgItem.cpp \
-            gui/feeds/SubFileItem.cpp \
-            gui/feeds/AttachFileItem.cpp \
-            gui/feeds/SecurityItem.cpp \
-            gui/feeds/SecurityIpItem.cpp \
-            gui/feeds/NewsFeedUserNotify.cpp \
-            gui/connect/ConnectFriendWizard.cpp \
-            gui/connect/ConnectProgressDialog.cpp \
-            gui/connect/FriendRecommendDialog.cpp \
-            gui/groups/CreateGroup.cpp \
-            gui/GetStartedDialog.cpp \
-            gui/statistics/BandwidthGraphWindow.cpp \
-            gui/statistics/BandwidthStatsWidget.cpp \
-            gui/statistics/DhtWindow.cpp \
-            gui/statistics/Histogram.cpp \
-            gui/statistics/TurtleRouterDialog.cpp \
-            gui/statistics/TurtleRouterStatistics.cpp \
-            gui/statistics/GxsIdStatistics.cpp \
-            gui/statistics/GlobalRouterStatistics.cpp \
-            gui/statistics/GxsTransportStatistics.cpp \
-            gui/statistics/StatisticsWindow.cpp \
-            gui/statistics/BwCtrlWindow.cpp \
-            gui/statistics/RttStatistics.cpp \
-            gui/statistics/BWGraph.cpp \
-    util/RsSyntaxHighlighter.cpp \
-    util/imageutil.cpp \
-    gui/NetworkDialog/pgpid_item_model.cpp \
-    gui/NetworkDialog/pgpid_item_proxy.cpp \
-    gui/common/RsCollection.cpp \
-    util/retroshareWin32.cpp
-#            gui/ForumsDialog.cpp \
-#            gui/forums/ForumDetails.cpp \
-#            gui/forums/EditForumDetails.cpp \
-#            gui/forums/CreateForum.cpp \
-#            gui/forums/CreateForumMsg.cpp \
-#            gui/forums/ForumUserNotify.cpp \
-#            gui/feeds/ForumNewItem.cpp \
-#            gui/feeds/ForumMsgItem.cpp \
-#            gui/ChannelFeed.cpp \
-#            gui/channels/CreateChannel.cpp \
-#            gui/channels/CreateChannelMsg.cpp \
-#            gui/channels/ChannelDetails.cpp \
-#            gui/channels/EditChanDetails.cpp \
-#            gui/channels/ChannelUserNotify.cpp \
-#            gui/feeds/ChanNewItem.cpp \
-#            gui/feeds/ChanMsgItem.cpp \
-
-RESOURCES += gui/images.qrc gui/icons.qrc lang/lang.qrc gui/help/content/content.qrc gui/emojione.qrc \
-  gui/qss/stylesheet/qdarkstyle/dark/Standard_Dark.qrc \
-  gui/qss/stylesheet/qdarkstyle/light/Standard_Light.qrc
-
-TRANSLATIONS +=  \
-            lang/retroshare_ca_ES.ts \
-            lang/retroshare_cs.ts \
-            lang/retroshare_da.ts \
-            lang/retroshare_de.ts \
-            lang/retroshare_el.ts \
-            lang/retroshare_en.ts \
-            lang/retroshare_es.ts \
-            lang/retroshare_fi.ts \
-            lang/retroshare_fr.ts \
-            lang/retroshare_hu.ts \
-            lang/retroshare_it.ts \
-            lang/retroshare_ja_JP.ts \
-            lang/retroshare_nl.ts \
-            lang/retroshare_ko.ts \
-            lang/retroshare_pl.ts \
-            lang/retroshare_ru.ts \
-            lang/retroshare_sv.ts \
-            lang/retroshare_tr.ts \
-            lang/retroshare_zh_CN.ts
-
-unfinishedtranslations {
-
-       TRANSLATIONS +=  \
-            lang/retroshare_bg.ts \
-            lang/retroshare_af.ts  \
-            lang/retroshare_pt.ts  \
-            lang/retroshare_sl.ts \
-            lang/retroshare_sr.ts \
-            lang/retroshare_zh_TW.ts
-
-}
-
-messenger {
-     SOURCES +=       gui/MessengerWindow.cpp \
-	 				  gui/common/FriendList.cpp
-     HEADERS +=       gui/MessengerWindow.h \
-	 				  gui/common/FriendList.h 
-     FORMS   +=       gui/MessengerWindow.ui \
-	 				  gui/common/FriendList.ui
-
-	 DEFiNES += MESSENGER_WINDOW
-}
-
-# Shifted Qt4.4 dependancies to here.
-#    qmake CONFIG=pluginmgr
-
-pluginmgr {
-
-        SOURCES += gui/PluginsPage.cpp \
-            	gui/PluginManagerWidget.cpp \
-            	gui/PluginManager.cpp
-
-        HEADERS += gui/PluginsPage.h  \
-            	gui/PluginManagerWidget.h \
-            	gui/PluginManager.h
-
-        DEFINES *= PLUGINMGR
-
-}
-
-idle {
-
-HEADERS += idle/idle.h
-
-SOURCES += idle/idle.cpp \
-	   idle/idle_platform.cpp
-}
-
-framecatcher {
-
-HEADERS += util/framecatcher.h
-
-SOURCES += util/framecatcher.cpp
-
-LIBS += -lxine
-
-DEFINES *= CHANNELS_FRAME_CATCHER
-
-}
-
-# Embedded Friend Server
-
-rs_efs {
-	DEFINES *= RS_EMBEDED_FRIEND_SERVER
-        SOURCES += gui/FriendServerControl.cpp
-        HEADERS += gui/FriendServerControl.h
-        FORMS   += gui/FriendServerControl.ui
-}
-
-# BELOW IS GXS Unfinished Services.
-	
-unfinished_services {
-	
-	DEPENDPATH += gui/unfinished \
-	
-	HEADERS += gui/unfinished/ApplicationWindow.h \
-
-#		gui/unfinished/CalDialog.h \
-#		gui/unfinished/ExampleDialog.h \
-#		gui/unfinished/GamesDialog.h \
-#		gui/unfinished/profile/ProfileView.h \
-#		gui/unfinished/profile/ProfileEdit.h
-#		gui/unfinished/StatisticDialog.h \
-#		gui/unfinished/PhotoDialog.h \
-#		gui/unfinished/PhotoShow.h \
-	
-	FORMS += gui/unfinished/ApplicationWindow.ui \
-
-#		gui/unfinished/CalDialog.ui \
-#		gui/unfinished/ExampleDialog.ui \
-#		gui/unfinished/GamesDialog.ui \
-#		gui/unfinished/profile/ProfileView.ui \
-#		gui/unfinished/profile/ProfileEdit.ui
-#		gui/unfinished/StatisticDialog.ui \
-#		gui/unfinished/PhotoDialog.ui \
-#		gui/unfinished/PhotoShow.ui \
-	
-	SOURCES += gui/unfinished/ApplicationWindow.cpp \
-
-#		gui/unfinished/CalDialog.cpp \
-#		gui/unfinished/ExampleDialog.cpp \
-#		gui/unfinished/GamesDialog.cpp \
-#		gui/unfinished/profile/ProfileView.cpp \
-#		gui/unfinished/profile/ProfileEdit.cpp
-#		gui/unfinished/StatisticDialog.cpp \
-#		gui/unfinished/PhotoDialog.cpp \
-#		gui/unfinished/PhotoShow.cpp \
-	
-	DEFINES *= UNFINISHED
-}
-	
-	
-gxsphotoshare {
-	#DEFINES += RS_USE_PHOTOSHARE # to enable in unfinished.
-	DEFINES += RS_USE_PHOTO # enable in MainWindow
-
-	HEADERS += \
-		gui/PhotoShare/AlbumGroupDialog.h \
-		gui/PhotoShare/AlbumExtra.h \
-		gui/PhotoShare/PhotoDrop.h \
-		gui/PhotoShare/AlbumItem.h \
-		gui/PhotoShare/AlbumDialog.h \
-		gui/PhotoShare/PhotoItem.h \
-		gui/PhotoShare/PhotoShareItemHolder.h \
-		gui/PhotoShare/PhotoShare.h \
-		gui/PhotoShare/PhotoSlideShow.h \
-		gui/PhotoShare/PhotoDialog.h
-
-	FORMS += \
-		gui/PhotoShare/AlbumExtra.ui \
-		gui/PhotoShare/PhotoItem.ui \
-		gui/PhotoShare/PhotoDialog.ui \
-		gui/PhotoShare/AlbumItem.ui \
-		gui/PhotoShare/AlbumDialog.ui \
-		gui/PhotoShare/PhotoShare.ui \
-		gui/PhotoShare/PhotoSlideShow.ui
-
-	SOURCES += \
-		gui/PhotoShare/AlbumGroupDialog.cpp \
-		gui/PhotoShare/AlbumExtra.cpp \
-		gui/PhotoShare/PhotoItem.cpp \
-		gui/PhotoShare/PhotoDialog.cpp \
-		gui/PhotoShare/PhotoDrop.cpp \
-		gui/PhotoShare/AlbumItem.cpp \
-		gui/PhotoShare/AlbumDialog.cpp \
-		gui/PhotoShare/PhotoShareItemHolder.cpp \
-		gui/PhotoShare/PhotoShare.cpp \
-		gui/PhotoShare/PhotoSlideShow.cpp
-
-	RESOURCES += gui/PhotoShare/Photo_images.qrc
-
-}
-	
-	
-wikipoos {
-	DEFINES += RS_USE_WIKI
-	
-	DEPENDPATH += ../../supportlibs/pegmarkdown
-	INCLUDEPATH += ../../supportlibs/pegmarkdown
-	
-	HEADERS += gui/WikiPoos/WikiDialog.h \
-		gui/WikiPoos/WikiAddDialog.h \
-		gui/WikiPoos/WikiEditDialog.h \
-		gui/gxs/WikiGroupDialog.h \
-
-	FORMS += gui/WikiPoos/WikiDialog.ui \
-		gui/WikiPoos/WikiAddDialog.ui \
-		gui/WikiPoos/WikiEditDialog.ui \
-	
-	SOURCES += gui/WikiPoos/WikiDialog.cpp \
-		gui/WikiPoos/WikiAddDialog.cpp \
-		gui/WikiPoos/WikiEditDialog.cpp \
-		gui/gxs/WikiGroupDialog.cpp \
-
-	RESOURCES += gui/WikiPoos/Wiki_images.qrc
-
-}
-	
-	
-	
-gxsthewire {
-	
-	DEFINES += RS_USE_WIRE
-
-	HEADERS += gui/TheWire/WireDialog.h \
-		gui/TheWire/WireGroupItem.h \
-		gui/TheWire/WireGroupDialog.h \
-		gui/TheWire/WireGroupExtra.h \
-		gui/TheWire/PulseAddDialog.h \
-		gui/TheWire/PulseViewItem.h \
-		gui/TheWire/PulseTopLevel.h \
-		gui/TheWire/PulseViewGroup.h \
-		gui/TheWire/PulseReply.h \
-		gui/TheWire/PulseReplySeperator.h \
-		gui/TheWire/PulseMessage.h \
-
-	FORMS += gui/TheWire/WireDialog.ui \
-		gui/TheWire/WireGroupItem.ui \
-		gui/TheWire/WireGroupExtra.ui \
-		gui/TheWire/PulseAddDialog.ui \
-		gui/TheWire/PulseTopLevel.ui \
-		gui/TheWire/PulseViewGroup.ui \
-		gui/TheWire/PulseReply.ui \
-		gui/TheWire/PulseReplySeperator.ui \
-		gui/TheWire/PulseMessage.ui \
-	
-	SOURCES += gui/TheWire/WireDialog.cpp \
-		gui/TheWire/WireGroupItem.cpp \
-		gui/TheWire/WireGroupDialog.cpp \
-		gui/TheWire/WireGroupExtra.cpp \
-		gui/TheWire/PulseAddDialog.cpp \
-		gui/TheWire/PulseViewItem.cpp \
-		gui/TheWire/PulseTopLevel.cpp \
-		gui/TheWire/PulseViewGroup.cpp \
-		gui/TheWire/PulseReply.cpp \
-		gui/TheWire/PulseReplySeperator.cpp \
-		gui/TheWire/PulseMessage.cpp \
-
-	RESOURCES += gui/TheWire/TheWire_images.qrc
-}
-
-identities {
-	
-	HEADERS +=  \
-		gui/Identity/IdDialog.h \
-		gui/Identity/IdEditDialog.h \
-		gui/Identity/IdDetailsDialog.h \
-	
-	FORMS += gui/Identity/IdDialog.ui \
-		gui/Identity/IdEditDialog.ui \
-		gui/Identity/IdDetailsDialog.ui \
-
-	SOURCES +=  \
-		gui/Identity/IdDialog.cpp \
-		gui/Identity/IdEditDialog.cpp \
-		gui/Identity/IdDetailsDialog.cpp \
-	
-}
-	
-gxscircles {
-	DEFINES += RS_USE_CIRCLES
-#	DEFINES += RS_USE_NEW_PEOPLE_DIALOG
-
-	HEADERS +=  \
-		gui/Circles/CirclesDialog.h \
-		gui/Circles/CreateCircleDialog.h \
-	
-	FORMS += gui/Circles/CirclesDialog.ui \
-		gui/Circles/CreateCircleDialog.ui \
-	
-	SOURCES +=  \
-		gui/Circles/CirclesDialog.cpp \
-		gui/Circles/CreateCircleDialog.cpp \
-
-	HEADERS += gui/People/PeopleDialog.h
-	HEADERS += gui/People/CircleWidget.h
-	HEADERS += gui/People/IdentityWidget.h
-
-	FORMS   += gui/People/PeopleDialog.ui 
-	FORMS   += gui/People/CircleWidget.ui
-	FORMS   += gui/People/IdentityWidget.ui
-
-	SOURCES += gui/People/PeopleDialog.cpp 
-	SOURCES += gui/People/CircleWidget.cpp
-	SOURCES += gui/People/IdentityWidget.cpp
-
-#HEADERS += gui/People/IdentityItem.h
-#HEADERS += gui/People/CircleItem.h
-#HEADERS += gui/People/GroupListView.h
-#SOURCES += gui/People/GroupListView.cpp
-#SOURCES += gui/People/IdentityItem.cpp
-#SOURCES += gui/People/CircleItem.cpp
-
-
-}
-	
-	
-gxsforums {
-
-	HEADERS += gui/gxsforums/GxsForumsDialog.h \
-		gui/gxsforums/GxsForumGroupDialog.h \
-		gui/gxsforums/CreateGxsForumMsg.h \
-		gui/gxsforums/GxsForumThreadWidget.h \
-		gui/gxsforums/GxsForumModel.h \
-		gui/gxsforums/GxsForumUserNotify.h \
-		gui/feeds/GxsForumGroupItem.h \
-		gui/feeds/GxsForumMsgItem.h
-
-	FORMS += gui/gxsforums/CreateGxsForumMsg.ui \
-		gui/gxsforums/GxsForumThreadWidget.ui \
-		gui/feeds/GxsForumGroupItem.ui \
-		gui/feeds/GxsForumMsgItem.ui
-
-	SOURCES += gui/gxsforums/GxsForumsDialog.cpp \
-		gui/gxsforums/GxsForumGroupDialog.cpp \
-		gui/gxsforums/CreateGxsForumMsg.cpp \
-		gui/gxsforums/GxsForumThreadWidget.cpp \
-		gui/gxsforums/GxsForumModel.cpp \
-		gui/gxsforums/GxsForumUserNotify.cpp \
-		gui/feeds/GxsForumGroupItem.cpp \
-		gui/feeds/GxsForumMsgItem.cpp
-}
-	
-	
-gxschannels {
-	
-	HEADERS += gui/gxschannels/GxsChannelDialog.h \
-		gui/gxschannels/GxsChannelGroupDialog.h \
-		gui/gxschannels/CreateGxsChannelMsg.h \
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.h \
-		gui/gxschannels/GxsChannelPostsModel.h \
-		gui/gxschannels/GxsChannelPostFilesModel.h \
-		gui/gxschannels/GxsChannelPostThumbnail.h \
-		gui/gxschannels/GxsChannelFilesStatusWidget.h \
-		gui/feeds/GxsChannelGroupItem.h \
-		gui/feeds/GxsChannelPostItem.h \
-		gui/gxschannels/GxsChannelUserNotify.h
-	
-	FORMS += \
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.ui \
-		gui/gxschannels/GxsChannelFilesStatusWidget.ui \
-		gui/gxschannels/CreateGxsChannelMsg.ui \
-		gui/feeds/GxsChannelGroupItem.ui \
-		gui/feeds/GxsChannelPostItem.ui
-	
-	SOURCES += gui/gxschannels/GxsChannelDialog.cpp \
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp \
-		gui/gxschannels/GxsChannelPostsModel.cpp \
-		gui/gxschannels/GxsChannelPostFilesModel.cpp \
-		gui/gxschannels/GxsChannelFilesStatusWidget.cpp \
-                gui/gxschannels/GxsChannelPostThumbnail.cpp \
-		gui/gxschannels/GxsChannelGroupDialog.cpp \
-		gui/gxschannels/CreateGxsChannelMsg.cpp \
-		gui/feeds/GxsChannelGroupItem.cpp \
-		gui/feeds/GxsChannelPostItem.cpp \
-		gui/gxschannels/GxsChannelUserNotify.cpp
-}
-	
-	
-posted {
-	
-	HEADERS += gui/Posted/PostedDialog.h \
-		gui/Posted/PostedListWidgetWithModel.h \
-		gui/Posted/PostedPostsModel.h \
-		gui/Posted/BoardPostDisplayWidget.h \
-		gui/Posted/PostedItem.h \
-		gui/Posted/PostedCardView.h \
-		gui/Posted/PostedGroupDialog.h \
-		gui/feeds/PostedGroupItem.h \
-		gui/Posted/PostedCreatePostDialog.h \
-		gui/Posted/PhotoView.h \
-		gui/Posted/PostedUserNotify.h
-
-		#gui/Posted/PostedCreateCommentDialog.h \
-		#gui/Posted/PostedComments.h \
-	
-	FORMS += gui/Posted/PostedListWidgetWithModel.ui \
-		gui/feeds/PostedGroupItem.ui \
-		gui/Posted/BoardPostDisplayWidget_compact.ui \
-		gui/Posted/BoardPostDisplayWidget_card.ui \
-		gui/Posted/PostedItem.ui \
-		gui/Posted/PostedCardView.ui \
-		gui/Posted/PostedCreatePostDialog.ui \
-		gui/Posted/PhotoView.ui \
-		#gui/Posted/PostedDialog.ui \
-		#gui/Posted/PostedComments.ui \
-		#gui/Posted/PostedCreateCommentDialog.ui
-	
-	SOURCES += gui/Posted/PostedDialog.cpp \
-		gui/Posted/PostedListWidgetWithModel.cpp \
-		gui/Posted/BoardPostDisplayWidget.cpp \
-		gui/Posted/PostedPostsModel.cpp \
-		gui/feeds/PostedGroupItem.cpp \
-		gui/Posted/PostedItem.cpp \
-		gui/Posted/PostedCardView.cpp \
-		gui/Posted/PostedGroupDialog.cpp \
-		gui/Posted/PostedCreatePostDialog.cpp \
-		gui/Posted/PhotoView.cpp \
-		gui/Posted/PostedUserNotify.cpp
-
-		#gui/Posted/PostedDialog.cpp \
-		#gui/Posted/PostedComments.cpp \
-		#gui/Posted/PostedCreateCommentDialog.cpp
-	
-	RESOURCES += gui/Posted/Posted_images.qrc
-}
-	
-gxsgui {
-	
-	HEADERS += gui/gxs/GxsGroupDialog.h \
-		gui/gxs/GxsIdDetails.h \
-		gui/gxs/GxsIdChooser.h \
-		gui/gxs/GxsIdLabel.h \
-		gui/gxs/GxsCircleChooser.h \
-		gui/gxs/GxsCircleLabel.h \
-		gui/gxs/GxsIdTreeWidgetItem.h \
-		gui/gxs/GxsCommentTreeWidget.h \
-		gui/gxs/GxsCommentContainer.h \
-		gui/gxs/GxsCommentDialog.h \
-		gui/gxs/GxsCreateCommentDialog.h \
-		gui/gxs/GxsGroupFrameDialog.h \
-		gui/gxs/GxsMessageFrameWidget.h \
-		gui/gxs/GxsMessageFramePostWidget.h \
-		gui/gxs/GxsGroupFeedItem.h \
-		gui/gxs/GxsFeedItem.h \
-		gui/gxs/GxsGroupShareKey.h \
-		gui/gxs/GxsUserNotify.h \
-		gui/gxs/GxsFeedWidget.h \
-		util/TokenQueue.h \
-		util/RsGxsUpdateBroadcast.h \
-	
-#		gui/gxs/GxsMsgDialog.h \
-	
-	FORMS += gui/gxs/GxsGroupDialog.ui \
-		gui/gxs/GxsCommentContainer.ui \
-		gui/gxs/GxsCommentDialog.ui \
-		gui/gxs/GxsCreateCommentDialog.ui \
-		gui/gxs/GxsGroupFrameDialog.ui\
-		gui/gxs/GxsGroupShareKey.ui 
-#		gui/gxs/GxsMsgDialog.ui \
-#		gui/gxs/GxsCommentTreeWidget.ui 
-	
-	SOURCES += gui/gxs/GxsGroupDialog.cpp \
-		gui/gxs/GxsIdDetails.cpp \
-		gui/gxs/GxsIdChooser.cpp \
-		gui/gxs/GxsIdLabel.cpp \
-		gui/gxs/GxsCircleChooser.cpp \
-		gui/gxs/GxsGroupShareKey.cpp \
-		gui/gxs/GxsCircleLabel.cpp \
-		gui/gxs/GxsIdTreeWidgetItem.cpp \
-		gui/gxs/GxsCommentTreeWidget.cpp \
-		gui/gxs/GxsCommentContainer.cpp \
-		gui/gxs/GxsCommentDialog.cpp \
-		gui/gxs/GxsCreateCommentDialog.cpp \
-		gui/gxs/GxsGroupFrameDialog.cpp \
-		gui/gxs/GxsMessageFrameWidget.cpp \
-		gui/gxs/GxsMessageFramePostWidget.cpp \
-		gui/gxs/GxsGroupFeedItem.cpp \
-		gui/gxs/GxsFeedItem.cpp \
-		gui/gxs/GxsUserNotify.cpp \
-		gui/gxs/GxsFeedWidget.cpp \
-		util/TokenQueue.cpp \
-		util/RsGxsUpdateBroadcast.cpp \
-	
-#		gui/gxs/GxsMsgDialog.cpp \
-	
-	
-}
-
-
-wikipoos {
-	HEADERS += \
-		gui/gxs/RsGxsUpdateBroadcastBase.h \
-		gui/gxs/RsGxsUpdateBroadcastWidget.h \
-		gui/gxs/RsGxsUpdateBroadcastPage.h 
-
-	SOURCES += \
-		gui/gxs/RsGxsUpdateBroadcastBase.cpp \
-		gui/gxs/RsGxsUpdateBroadcastWidget.cpp \
-		gui/gxs/RsGxsUpdateBroadcastPage.cpp \
-}
-
-################################################################
-#Define qmake_info.h file so GUI can get wath was used to compil
-#         This must be at end to get all informations
-################################################################
-RS_QMAKE_DEFINES=\\\"$${DEFINES}\\\"
-RS_QMAKE_CONFIG=\\\"$${CONFIG}\\\"
-
-INCLUDEPATH += $$OUT_PWD/include
-info_file.input = $$PWD/qmake_info.h.in
-info_file.output = $$OUT_PWD/include/qmake_info.h
-
-QMAKE_SUBSTITUTES += info_file
-OTHER_FILES += \
-    qmake_info.h.in
+################################################################################
+# uselibresapi.pri                                                             #
+# Copyright (C) 2018, Retroshare team <retroshare.team@gmailcom>               #
+#                                                                              #
+# This program is free software: you can redistribute it and/or modify         #
+# it under the terms of the GNU Affero General Public License as               #
+# published by the Free Software Foundation, either version 3 of the           #
+# License, or (at your option) any later version.                              #
+#                                                                              #
+# This program is distributed in the hope that it will be useful,              #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU Affero General Public License for more details.                          #
+#                                                                              #
+# You should have received a copy of the GNU Affero General Public License     #
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.       #
+################################################################################
+
+!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
+
+TEMPLATE = app
+QT     += network xml 
+CONFIG += qt gui uic qrc resources idle 
+CONFIG += console
+TARGET = retroshare
+DEFINES += TARGET=\\\"$${TARGET}\\\"
+
+DEPENDPATH  *= $${PWD} $${RS_INCLUDE_DIR}
+INCLUDEPATH *= $${PWD}
+
+!include("../../libretroshare/src/use_libretroshare.pri"):error("Including")
+
+rs_webui {
+rs_jsonapi {
+    HEADERS *= gui/settings/WebuiPage.h
+    SOURCES *= gui/settings/WebuiPage.cpp
+    FORMS *= gui/settings/WebuiPage.ui
+}
+}
+
+rs_jsonapi {
+    HEADERS *= gui/settings/JsonApiPage.h
+    SOURCES *= gui/settings/JsonApiPage.cc
+    FORMS *= gui/settings/JsonApiPage.ui
+}
+
+# Auto detect installed version of cmark
+rs_gui_cmark {
+	DEFINES *= USE_CMARK
+	no_rs_cross_compiling {
+		message("Using compiled cmark")
+		CMARK_SRC_PATH=$$clean_path($${RS_SRC_PATH}/supportlibs/cmark)
+		CMARK_BUILD_PATH=$$clean_path($${RS_BUILD_PATH}/supportlibs/cmark/build)
+		INCLUDEPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
+		DEPENDPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
+		QMAKE_LIBDIR *= $$clean_path($${CMARK_BUILD_PATH}/)
+		# Using sLibs would fail as libcmark.a is generated at compile-time
+		LIBS *= -L$$clean_path($${CMARK_BUILD_PATH}/src/) -lcmark
+
+		DUMMYCMARKINPUT = FORCE
+		CMAKE_GENERATOR_OVERRIDE=""
+		win32-g++|win32-clang-g++:CMAKE_GENERATOR_OVERRIDE="-G \"MSYS Makefiles\""
+		gencmarklib.name = Generating libcmark.
+		gencmarklib.input = DUMMYCMARKINPUT
+		gencmarklib.output = $$clean_path($${CMARK_BUILD_PATH}/src/libcmark.a)
+		gencmarklib.CONFIG += target_predeps combine
+		gencmarklib.variable_out = PRE_TARGETDEPS
+		gencmarklib.commands = \
+		    cd $${RS_SRC_PATH} && ( \
+		    git submodule update --init supportlibs/cmark ; \
+		    cd $${CMARK_SRC_PATH} ; \
+		    true ) && \
+		    mkdir -p $${CMARK_BUILD_PATH} && cd $${CMARK_BUILD_PATH} && \
+		    cmake \
+		        -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
+                        \"-DCMAKE_CXX_FLAGS=$${QMAKE_CXXFLAGS}\" \
+		        $${CMAKE_GENERATOR_OVERRIDE} \
+		        -DCMAKE_INSTALL_PREFIX=. \
+		        -B. \
+		        -H$$shell_path($${CMARK_SRC_PATH}) && \
+		    $(MAKE)
+		QMAKE_EXTRA_COMPILERS += gencmarklib
+	} else {
+		message("Using systems cmark")
+		sLibs *= libcmark
+	}
+}
+
+FORMS   += TorControl/TorControlWindow.ui
+SOURCES += TorControl/TorControlWindow.cpp \
+    gui/TheWire/CustomFrame.cpp \
+    gui/TheWire/CustomFrame.cpp
+HEADERS += TorControl/TorControlWindow.h \
+    gui/TheWire/CustomFrame.h \
+    gui/TheWire/CustomFrame.h
+
+#QMAKE_CFLAGS += -fmudflap 
+#LIBS *= /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflap.a /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflapth.a
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+	# Qt 5
+        QT     += widgets multimedia printsupport
+	linux-* {
+		QT += x11extras
+	}
+} else {
+	# Qt 4
+	CONFIG += uitools
+}
+
+CONFIG += identities
+CONFIG += gxsforums
+CONFIG += gxschannels
+CONFIG += posted
+CONFIG += gxsgui
+CONFIG += gxscircles
+
+# Other Disabled Bits.
+#CONFIG += framecatcher
+
+## To enable unfinished services
+#CONFIG += wikipoos
+#CONFIG += gxsthewire
+#CONFIG += gxsphotoshare
+
+DEFINES += RS_RELEASE_VERSION
+RCC_DIR = temp/qrc
+UI_DIR  = temp/ui
+MOC_DIR = temp/moc
+
+################################# Linux ##########################################
+# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
+linux-* {
+	CONFIG += link_pkgconfig
+
+	#CONFIG += version_detail_bash_script
+	QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
+
+	PKGCONFIG *= x11 xscrnsaver
+
+	LIBS *= -rdynamic 
+	DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
+}
+
+rs_sanitize {
+	LIBS *= -lasan -lubsan
+}
+
+unix {
+	target.path = "$${BIN_DIR}"
+	INSTALLS += target
+
+        data_files.path="$${RS_DATA_DIR}/"
+	data_files.files=sounds qss
+	INSTALLS += data_files
+
+        style_files.path="$${RS_DATA_DIR}/stylesheets"
+	style_files.files=gui/qss/chat/Bubble gui/qss/chat/Bubble_Compact
+	INSTALLS += style_files
+
+	icon_files.path = "$${PREFIX}/share/icons/hicolor"
+	icon_files.files =  ../../data/24x24
+	icon_files.files += ../../data/48x48
+	icon_files.files += ../../data/64x64
+	icon_files.files += ../../data/128x128
+	INSTALLS += icon_files
+
+	desktop_files.path = "$${PREFIX}/share/applications"
+	desktop_files.files = ../../data/retroshare.desktop
+	INSTALLS += desktop_files
+
+	pixmap_files.path = "$${PREFIX}/share/pixmaps"
+	pixmap_files.files = ../../data/retroshare.xpm
+	INSTALLS += pixmap_files
+
+}
+
+linux-g++ {
+	OBJECTS_DIR = temp/linux-g++/obj
+}
+
+linux-g++-64 {
+	OBJECTS_DIR = temp/linux-g++-64/obj
+}
+
+version_detail_bash_script {
+	warning("Version detail script is deprecated.")
+	warning("Remove references to version_detail_bash_script from all of your build scripts!")
+}
+
+#################### Cross compilation for windows under Linux ###################
+
+win32-x-g++ {
+		OBJECTS_DIR = temp/win32-x-g++/obj
+
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libssl.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libcrypto.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libgpgme.dll.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libminiupnpc.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libz.a
+		LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
+		LIBS += -lQtUiTools
+		LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
+		LIBS += -lole32 -lwinmm
+
+		DEFINES *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
+
+		INCLUDEPATH += ../../../../gpgme-1.1.8/src/
+		INCLUDEPATH += ../../../../libgpg-error-1.7/src/
+
+		RC_FILE = gui/images/retroshare_win.rc
+}
+
+#################################### Windows #####################################
+
+win32-g++|win32-clang-g++ {
+	CONFIG(debug, debug|release) {
+		# show console output
+		CONFIG += console
+	} else {
+		CONFIG -= console
+	}
+
+	CONFIG(debug, debug|release) {
+	} else {
+		# Tell linker to use ASLR protection
+		QMAKE_LFLAGS += -Wl,-dynamicbase
+		# Tell linker to use DEP protection
+		QMAKE_LFLAGS += -Wl,-nxcompat
+	}
+
+    # Fix linking error (ld.exe: Error: export ordinal too large) due to too
+    # many exported symbols.
+    !libretroshare_shared:QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
+
+	# Switch off optimization for release version
+	QMAKE_CXXFLAGS_RELEASE -= -O2
+	QMAKE_CXXFLAGS_RELEASE += -O0
+	QMAKE_CFLAGS_RELEASE -= -O2
+	QMAKE_CFLAGS_RELEASE += -O0
+
+	# Switch on optimization for debug version
+	#QMAKE_CXXFLAGS_DEBUG += -O2
+	#QMAKE_CFLAGS_DEBUG += -O2
+
+	OBJECTS_DIR = temp/obj
+
+    dLib = ws2_32 gdi32 uuid ole32 iphlpapi crypt32 winmm
+    LIBS *= $$linkDynamicLibs(dLib)
+
+	RC_FILE = gui/images/retroshare_win.rc
+
+	# export symbols for the plugins
+	LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a
+
+	# create lib directory
+	isEmpty(QMAKE_SH) {
+		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib $(MKDIR) lib
+	} else {
+		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib || $(MKDIR) lib
+	}
+
+	greaterThan(QT_MAJOR_VERSION, 4) {
+		# Qt 5
+		RC_INCLUDEPATH += $$_PRO_FILE_PWD_/../../libretroshare/src
+	} else {
+		# Qt 4
+		QMAKE_RC += --include-dir=$$_PRO_FILE_PWD_/../../libretroshare/src
+	}
+}
+
+##################################### MacOS ######################################
+
+macx {
+	# ENABLE THIS OPTION FOR Univeral Binary BUILD.
+	#CONFIG += ppc x86
+	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+	QMAKE_INFO_PLIST = Info.plist
+	mac_icon.files = $$files($$PWD/rsMacIcon.icns)
+	mac_icon.path = Contents/Resources
+	QMAKE_BUNDLE_DATA += mac_icon
+	dplQSS.files = $$PWD/qss
+	dplQSS.path = Contents/Resources
+	QMAKE_BUNDLE_DATA += dplQSS
+	dplChatStyles.files = \
+		$$PWD/gui/qss/chat/Bubble \
+		$$PWD/gui/qss/chat/Bubble_Compact
+	dplChatStyles.path = Contents/Resources/stylesheets
+	QMAKE_BUNDLE_DATA += dplChatStyles 
+#	mac_webui.files = $$files($$PWD/../../libresapi/src/webui)
+#	mac_webui.path = Contents/Resources
+#	QMAKE_BUNDLE_DATA += mac_webui
+
+	OBJECTS_DIR = temp/obj
+
+	CONFIG += version_detail_bash_script
+	LIBS += -lssl -lcrypto -lz 
+	for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
+	LIBS += -framework CoreFoundation
+	LIBS += -framework Security
+	LIBS += -framework Carbon
+
+	for(lib, LIB_DIR):LIBS += -L"$$lib"
+	for(bin, BIN_DIR):LIBS += -L"$$bin"
+
+	DEPENDPATH += . $$INC_DIR
+	INCLUDEPATH += . $$INC_DIR
+
+	#DEFINES *= MAC_IDLE # for idle feature
+	CONFIG -= uitools
+}
+
+##################################### FreeBSD ######################################
+
+freebsd-* {
+	INCLUDEPATH *= /usr/local/include/gpgme
+	LIBS *= -lssl
+	LIBS *= -lgpgme
+	LIBS *= -lupnp
+	LIBS *= -lgnome-keyring
+
+	LIBS += -lsqlite3
+}
+
+##################################### Haiku ######################################
+
+haiku-* {
+	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
+
+	LIBS *= ../../libretroshare/src/lib/libretroshare.a
+	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2 -lbsd
+	LIBS *= -lssl -lcrypto -lnetwork
+	LIBS *= -lgpgme
+	LIBS *= -lupnp
+	LIBS *= -lz
+	LIBS *= -lixml
+
+	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	LIBS += -lsqlite3
+}
+
+##################################### OpenBSD ######################################
+
+openbsd-* {
+	INCLUDEPATH *= /usr/local/include
+
+	LIBS *= -lssl -lcrypto
+	LIBS *= -lgpgme
+	LIBS *= -lupnp
+	LIBS *= -lgnome-keyring
+	LIBS += -lsqlite3
+	LIBS *= -rdynamic
+}
+
+################################### COMMON stuff ##################################
+
+wikipoos {
+	PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	LIBS *= -lglib-2.0
+}
+
+################################### HEADERS & SOURCES #############################
+
+# Input
+HEADERS +=  rshare.h \
+            retroshare-gui/configpage.h \
+            retroshare-gui/RsAutoUpdatePage.h \
+            retroshare-gui/mainpage.h \
+            gui/notifyqt.h \
+            control/bandwidthevent.h \
+            control/eventtype.h \
+            gui/QuickStartWizard.h \
+            gui/StartDialog.h \
+            gui/HomePage.h\
+            gui/NetworkDialog.h \
+            gui/GenCertDialog.h \
+            gui/linetypes.h \
+            gui/mainpagestack.h \
+            gui/MainWindow.h \
+            gui/RSHumanReadableDelegate.h \
+            gui/AboutDialog.h \
+            gui/AboutWidget.h \
+            gui/NetworkView.h \
+            gui/FriendsDialog.h \
+            gui/ServicePermissionDialog.h \
+            gui/RemoteDirModel.h \
+            gui/RetroShareLink.h \
+            gui/SearchTreeWidget.h \
+            gui/ShareManager.h \
+#            gui/ShareDialog.h \
+#            gui/SFListDelegate.h \
+            gui/SoundManager.h \
+            gui/HelpDialog.h \
+            gui/LogoBar.h \
+            gui/common/AvatarDialog.h \
+            gui/FileTransfer/SearchDialog.h \
+            gui/FileTransfer/SharedFilesDialog.h \
+            gui/FileTransfer/xprogressbar.h \
+            gui/FileTransfer/DetailsDialog.h \
+            gui/FileTransfer/FileTransferInfoWidget.h \
+            gui/FileTransfer/DLListDelegate.h \
+            gui/FileTransfer/ULListDelegate.h \
+            gui/FileTransfer/TransfersDialog.h \
+            gui/FileTransfer/BannedFilesDialog.h \
+            gui/statistics/TurtleRouterDialog.h \
+            gui/statistics/TurtleRouterStatistics.h \
+            gui/statistics/GxsIdStatistics.h \
+            gui/statistics/dhtgraph.h \
+            gui/statistics/Histogram.h \
+            gui/statistics/BandwidthGraphWindow.h \
+            gui/statistics/turtlegraph.h \
+            gui/statistics/BandwidthStatsWidget.h \
+            gui/statistics/DhtWindow.h \
+            gui/statistics/GlobalRouterStatistics.h \
+            gui/statistics/GxsTransportStatistics.h \
+            gui/statistics/StatisticsWindow.h \
+            gui/statistics/BwCtrlWindow.h \
+            gui/statistics/RttStatistics.h \
+            gui/FileTransfer/TransferUserNotify.h \
+            gui/plugins/PluginInterface.h \
+            gui/im_history/ImHistoryBrowser.h \
+            gui/im_history/IMHistoryItemDelegate.h \
+            gui/im_history/IMHistoryItemPainter.h \
+            lang/languagesupport.h \
+            util/RsProtectedTimer.h \
+            util/stringutil.h \
+            util/RsNetUtil.h \
+            util/DateTime.h \
+            util/RetroStyleLabel.h \
+            util/dllexport.h \
+            util/NonCopyable.h \
+            util/rsutildll.h \
+            util/dllexport.h \
+            util/global.h \
+            util/rsqtutildll.h \
+#            util/Interface.h \
+            util/PixmapMerging.h \
+            util/MouseEventFilter.h \
+            util/EventFilter.h \
+            util/Widget.h \
+            util/RsAction.h \
+            util/RsUserdata.h \
+            util/printpreview.h \
+            util/log.h \
+            util/misc.h \
+            util/HandleRichText.h \
+            util/ObjectPainter.h \
+            util/QtVersion.h \
+            util/RsFile.h \
+            util/qtthreadsutils.h \
+            util/ClickableLabel.h \
+            util/AspectRatioPixmapLabel.h \
+            gui/profile/ProfileWidget.h \
+            gui/profile/ProfileManager.h \
+            gui/profile/StatusMessage.h \
+            gui/chat/PopupChatWindow.h \
+            gui/chat/PopupChatDialog.h \
+            gui/chat/PopupDistantChatDialog.h \
+            gui/chat/ChatTabWidget.h \
+            gui/chat/ChatWidget.h \
+            gui/chat/ChatDialog.h \
+            gui/ChatLobbyWidget.h \
+            gui/chat/ChatLobbyDialog.h \
+            gui/chat/CreateLobbyDialog.h \
+            gui/chat/ChatStyle.h \
+            gui/chat/ChatUserNotify.h \
+            gui/chat/ChatLobbyUserNotify.h \
+            gui/connect/ConfCertDialog.h \
+            gui/connect/PGPKeyDialog.h \
+            gui/connect/FriendRecommendDialog.h \
+            gui/msgs/MessagesDialog.h \
+            gui/msgs/MessageInterface.h \
+            gui/msgs/MessageComposer.h \
+            gui/msgs/MessageWindow.h \
+            gui/msgs/MessageWidget.h \
+            gui/msgs/MessageModel.h \
+            gui/msgs/TagsMenu.h \
+            gui/msgs/textformat.h \
+            gui/msgs/MessageUserNotify.h \
+            gui/images/retroshare_win.rc.h \
+            gui/settings/RSPermissionMatrixWidget.h \
+            gui/settings/rsharesettings.h \
+            gui/settings/RsharePeerSettings.h \
+            gui/settings/rsettings.h \
+            gui/settings/rsettingswin.h \
+            gui/settings/GeneralPage.h \
+            gui/settings/PeoplePage.h \
+            gui/settings/AboutPage.h \
+            gui/settings/ServerPage.h \
+            gui/settings/NotifyPage.h \
+            gui/settings/CryptoPage.h \
+            gui/settings/MessagePage.h \
+            gui/settings/NewTag.h \
+            gui/settings/ForumPage.h \
+            gui/settings/PluginsPage.h \
+            gui/settings/PluginItem.h \
+            gui/settings/AppearancePage.h \
+            gui/settings/FileAssociationsPage.h \
+            gui/settings/SoundPage.h \
+            gui/settings/TransferPage.h \
+            gui/settings/ChatPage.h \
+            gui/settings/ChannelPage.h \
+            gui/settings/PostedPage.h \
+            gui/settings/ServicePermissionsPage.h \
+            gui/settings/AddFileAssociationDialog.h \
+            gui/settings/GroupFrameSettingsWidget.h \
+            gui/toaster/ToasterItem.h \
+            gui/toaster/MessageToaster.h \
+            gui/toaster/OnlineToaster.h \
+            gui/toaster/DownloadToaster.h \
+            gui/toaster/ChatToaster.h \
+            gui/toaster/GroupChatToaster.h \
+            gui/toaster/ChatLobbyToaster.h \
+            gui/toaster/FriendRequestToaster.h \
+            gui/common/RsButtonOnText.h \
+            gui/common/RSGraphWidget.h \
+            gui/common/ElidedLabel.h \
+            gui/common/vmessagebox.h \
+            gui/common/RsUrlHandler.h \
+            gui/common/RsCollectionDialog.h \
+            gui/common/rwindow.h \
+            gui/common/rshtml.h \
+            gui/common/AvatarDefs.h \
+            gui/common/GroupFlagsWidget.h \
+            gui/common/GroupSelectionBox.h \
+            gui/common/GroupChooser.h \
+            gui/common/StatusDefs.h \
+            gui/common/TagDefs.h \
+            gui/common/GroupDefs.h \
+            gui/common/Emoticons.h \
+            gui/common/RSComboBox.h \
+            gui/common/RSListWidgetItem.h \
+            gui/common/RSTextEdit.h \
+            gui/common/RSPlainTextEdit.h \
+            gui/common/RSTreeWidget.h \
+            gui/common/RSTreeWidgetItem.h \
+            gui/common/RSFeedWidget.h \
+            gui/common/RSTabWidget.h \
+            gui/common/RSElidedItemDelegate.h \
+            gui/common/RSItemDelegate.h \
+            gui/common/PeerDefs.h \
+            gui/common/FilesDefs.h \
+            gui/common/PopularityDefs.h \
+            gui/common/RsBanListDefs.h \
+            gui/common/GroupTreeWidget.h \
+            gui/common/RSTreeView.h \
+            gui/common/AvatarWidget.h \
+            gui/common/FriendListModel.h \
+            gui/common/NewFriendList.h \
+            gui/common/FriendSelectionWidget.h \
+            gui/common/FriendSelectionDialog.h \
+            gui/common/HashBox.h \
+            gui/common/LineEditClear.h \
+            gui/common/DropLineEdit.h \
+            gui/common/RSTextBrowser.h \
+            gui/common/RSImageBlockWidget.h \
+            gui/common/FeedNotify.h \
+            gui/common/UserNotify.h \
+            gui/common/HeaderFrame.h \
+            gui/common/MimeTextEdit.h \
+            gui/common/UIStateHelper.h \
+            gui/common/FloatingHelpBrowser.h \
+            gui/common/SubscribeToolButton.h \
+            gui/common/RsBanListToolButton.h \
+            gui/common/FlowLayout.h \
+            gui/common/PictureFlow.h \
+            gui/common/ToasterNotify.h \
+            gui/style/RSStyle.h \
+            gui/style/StyleDialog.h \
+            gui/help/browser/helpbrowser.h \
+            gui/help/browser/helptextbrowser.h \
+            gui/statusbar/peerstatus.h \
+            gui/statusbar/natstatus.h \
+            gui/statusbar/dhtstatus.h \
+            gui/statusbar/torstatus.h \
+            gui/statusbar/ratesstatus.h \
+            gui/statusbar/hashingstatus.h \
+            gui/statusbar/discstatus.h \
+            gui/statusbar/SoundStatus.h \
+            gui/statusbar/OpModeStatus.h \
+            gui/statusbar/ToasterDisable.h \
+            gui/statusbar/SysTrayStatus.h \
+            gui/advsearch/advancedsearchdialog.h \
+            gui/advsearch/expressionwidget.h \
+            gui/advsearch/guiexprelement.h \
+            gui/elastic/graphwidget.h \
+            gui/elastic/edge.h \
+            gui/elastic/arrow.h \
+            gui/elastic/elnode.h \
+            gui/NewsFeed.h \
+            gui/feeds/BoardsCommentsItem.h \
+            gui/feeds/FeedItem.h \
+            gui/feeds/FeedHolder.h \
+            gui/feeds/GxsCircleItem.h \
+            gui/feeds/ChannelsCommentsItem.h \
+            gui/feeds/PeerItem.h \
+            gui/feeds/MsgItem.h \
+            gui/feeds/ChatMsgItem.h \
+            gui/feeds/SubFileItem.h \
+            gui/feeds/AttachFileItem.h \
+            gui/feeds/SecurityItem.h \
+            gui/feeds/SecurityIpItem.h \
+            gui/feeds/NewsFeedUserNotify.h \
+            gui/connect/ConnectFriendWizard.h \
+            gui/connect/ConnectProgressDialog.h \
+            gui/groups/CreateGroup.h \
+            gui/GetStartedDialog.h \
+            gui/statistics/BWGraph.h \
+            util/RsSyntaxHighlighter.h \
+            util/imageutil.h \
+            util/RichTextEdit.h \
+            gui/NetworkDialog/pgpid_item_model.h \
+            gui/NetworkDialog/pgpid_item_proxy.h \
+            gui/common/RsCollection.h \
+            util/retroshareWin32.h
+#            gui/ForumsDialog.h \
+#            gui/forums/ForumDetails.h \
+#            gui/forums/EditForumDetails.h \
+#            gui/forums/CreateForum.h \
+#            gui/forums/CreateForumMsg.h \
+#            gui/forums/ForumUserNotify.h \
+#            gui/feeds/ForumNewItem.h \
+#            gui/feeds/ForumMsgItem.h \
+#            gui/ChannelFeed.h \
+#            gui/feeds/ChanNewItem.h \
+#            gui/feeds/ChanMsgItem.h \
+#            gui/channels/CreateChannel.h \
+#            gui/channels/ChannelDetails.h \
+#            gui/channels/CreateChannelMsg.h \
+#            gui/channels/EditChanDetails.h \
+#            gui/channels/ChannelUserNotify.h \
+
+FORMS +=    gui/StartDialog.ui \
+            gui/HomePage.ui\
+            gui/GenCertDialog.ui \
+            gui/AboutDialog.ui \
+            gui/AboutWidget.ui \
+            gui/QuickStartWizard.ui \
+            gui/NetworkDialog.ui \
+            gui/common/AvatarDialog.ui \
+            gui/FileTransfer/TransfersDialog.ui \
+            gui/FileTransfer/DetailsDialog.ui \
+            gui/FileTransfer/SearchDialog.ui \
+            gui/FileTransfer/SharedFilesDialog.ui \
+            gui/FileTransfer/BannedFilesDialog.ui \
+            gui/MainWindow.ui \
+            gui/NetworkView.ui \
+            gui/FriendsDialog.ui \
+            gui/ShareManager.ui \
+#            gui/ShareDialog.ui \
+            gui/help/browser/helpbrowser.ui \
+            gui/HelpDialog.ui \
+            gui/ServicePermissionDialog.ui \
+            gui/profile/ProfileWidget.ui \
+            gui/profile/StatusMessage.ui \
+            gui/profile/ProfileManager.ui \
+            gui/chat/PopupChatWindow.ui \
+            gui/chat/PopupChatDialog.ui \
+            gui/chat/ChatTabWidget.ui \
+            gui/chat/ChatWidget.ui \
+            gui/chat/ChatLobbyDialog.ui \
+            gui/chat/CreateLobbyDialog.ui \
+            gui/ChatLobbyWidget.ui \
+            gui/connect/ConfCertDialog.ui \
+            gui/connect/PGPKeyDialog.ui \
+            gui/connect/ConnectFriendWizard.ui \
+            gui/connect/ConnectProgressDialog.ui \
+            gui/connect/FriendRecommendDialog.ui \
+            gui/msgs/MessagesDialog.ui \
+            gui/msgs/MessageComposer.ui \
+            gui/msgs/MessageWindow.ui\
+            gui/msgs/MessageWidget.ui\
+            gui/settings/settingsw.ui \
+            gui/settings/GeneralPage.ui \
+            gui/settings/ServerPage.ui \
+            gui/settings/NotifyPage.ui \
+            gui/settings/PeoplePage.ui \
+            gui/settings/CryptoPage.ui \
+            gui/settings/MessagePage.ui \
+            gui/settings/NewTag.ui \
+            gui/settings/ForumPage.ui \
+            gui/settings/AboutPage.ui \
+            gui/settings/PluginsPage.ui \
+            gui/settings/AppearancePage.ui \
+            gui/settings/TransferPage.ui \
+            gui/settings/SoundPage.ui \
+            gui/settings/ChatPage.ui \
+            gui/settings/ChannelPage.ui \
+            gui/settings/PostedPage.ui \
+            gui/settings/ServicePermissionsPage.ui \
+            gui/settings/PluginItem.ui \
+            gui/settings/GroupFrameSettingsWidget.ui \
+            gui/toaster/MessageToaster.ui \
+            gui/toaster/OnlineToaster.ui \
+            gui/toaster/DownloadToaster.ui \
+            gui/toaster/ChatToaster.ui \
+            gui/toaster/GroupChatToaster.ui \
+            gui/toaster/ChatLobbyToaster.ui \
+            gui/toaster/FriendRequestToaster.ui \
+            gui/advsearch/AdvancedSearchDialog.ui \
+            gui/advsearch/expressionwidget.ui \
+            gui/NewsFeed.ui \
+            gui/feeds/BoardsCommentsItem.ui \
+            gui/feeds/GxsCircleItem.ui \
+            gui/feeds/ChannelsCommentsItem.ui \
+            gui/feeds/PeerItem.ui \
+            gui/feeds/MsgItem.ui \
+            gui/feeds/ChatMsgItem.ui \
+            gui/feeds/SubFileItem.ui \
+            gui/feeds/AttachFileItem.ui \
+            gui/feeds/SecurityItem.ui \
+            gui/feeds/SecurityIpItem.ui \
+            gui/im_history/ImHistoryBrowser.ui \
+            gui/groups/CreateGroup.ui \
+            gui/common/GroupTreeWidget.ui \
+            gui/common/AvatarWidget.ui \
+            gui/common/NewFriendList.ui \
+            gui/common/FriendSelectionWidget.ui \
+            gui/common/HashBox.ui \
+            gui/common/RSImageBlockWidget.ui \
+            gui/common/RsCollectionDialog.ui \
+            gui/common/HeaderFrame.ui \
+            gui/common/RSFeedWidget.ui \
+            gui/style/StyleDialog.ui \
+            gui/statistics/BandwidthGraphWindow.ui \
+            gui/statistics/BandwidthStatsWidget.ui \
+            gui/statistics/DhtWindow.ui \
+            gui/statistics/TurtleRouterDialog.ui \
+            gui/statistics/TurtleRouterStatistics.ui \
+            gui/statistics/GxsIdStatistics.ui \
+            gui/statistics/GlobalRouterStatistics.ui \
+            gui/statistics/GxsTransportStatistics.ui \
+            gui/statistics/StatisticsWindow.ui \
+            gui/statistics/BwCtrlWindow.ui \
+            gui/statistics/RttStatistics.ui \
+            gui/GetStartedDialog.ui \
+            util/RichTextEdit.ui
+
+
+#            gui/ForumsDialog.ui \
+#            gui/forums/CreateForum.ui \
+#            gui/forums/CreateForumMsg.ui \
+#            gui/forums/ForumDetails.ui \
+#            gui/forums/EditForumDetails.ui \
+#            gui/feeds/ForumNewItem.ui \
+#            gui/feeds/ForumMsgItem.ui \
+#            gui/ChannelFeed.ui \
+#            gui/channels/CreateChannel.ui \
+#            gui/channels/CreateChannelMsg.ui \
+#            gui/channels/ChannelDetails.ui \
+#            gui/channels/EditChanDetails.ui \
+#            gui/feeds/ChanNewItem.ui \
+#            gui/feeds/ChanMsgItem.ui \
+
+SOURCES +=  main.cpp \
+            rshare.cpp \
+            gui/notifyqt.cpp \
+            gui/AboutDialog.cpp \
+            gui/AboutWidget.cpp \
+            gui/QuickStartWizard.cpp \
+            gui/StartDialog.cpp \
+            gui/HomePage.cpp\
+            gui/GenCertDialog.cpp \
+            gui/NetworkDialog.cpp \
+            gui/mainpagestack.cpp \
+            gui/MainWindow.cpp \
+            gui/NetworkView.cpp \
+            gui/FriendsDialog.cpp \
+            gui/ServicePermissionDialog.cpp \
+            gui/RemoteDirModel.cpp \
+            gui/RsAutoUpdatePage.cpp \
+            gui/RetroShareLink.cpp \
+            gui/SearchTreeWidget.cpp \
+            gui/ShareManager.cpp \
+#            gui/ShareDialog.cpp \
+#            gui/SFListDelegate.cpp \
+            gui/SoundManager.cpp \
+            gui/im_history/ImHistoryBrowser.cpp \
+            gui/im_history/IMHistoryItemDelegate.cpp \
+            gui/im_history/IMHistoryItemPainter.cpp \
+            gui/help/browser/helpbrowser.cpp \
+            gui/help/browser/helptextbrowser.cpp \
+            gui/FileTransfer/SearchDialog.cpp \
+            gui/FileTransfer/SharedFilesDialog.cpp \
+            gui/FileTransfer/TransfersDialog.cpp \
+            gui/FileTransfer/FileTransferInfoWidget.cpp \
+            gui/FileTransfer/DLListDelegate.cpp \
+            gui/FileTransfer/ULListDelegate.cpp \
+            gui/FileTransfer/xprogressbar.cpp \
+            gui/FileTransfer/DetailsDialog.cpp \
+            gui/FileTransfer/TransferUserNotify.cpp \
+            gui/FileTransfer/BannedFilesDialog.cpp \
+            gui/MainPage.cpp \
+            gui/HelpDialog.cpp \
+            gui/LogoBar.cpp \
+            lang/languagesupport.cpp \
+            util/RsProtectedTimer.cpp \
+            util/stringutil.cpp \
+            util/RsNetUtil.cpp \
+            util/DateTime.cpp \
+            util/RetroStyleLabel.cpp \
+            util/WidgetBackgroundImage.cpp \
+#            util/NonCopyable.cpp \
+            util/PixmapMerging.cpp \
+            util/MouseEventFilter.cpp \
+            util/EventFilter.cpp \
+            util/Widget.cpp \
+            util/RsAction.cpp \
+            util/printpreview.cpp \
+            util/log.cpp \
+            util/misc.cpp \
+            util/HandleRichText.cpp \
+            util/ObjectPainter.cpp \
+            util/RsFile.cpp \
+            util/RichTextEdit.cpp \
+            util/ClickableLabel.cpp \
+            util/AspectRatioPixmapLabel.cpp \
+            gui/profile/ProfileWidget.cpp \
+            gui/profile/StatusMessage.cpp \
+            gui/profile/ProfileManager.cpp \
+            gui/chat/PopupChatWindow.cpp \
+            gui/chat/PopupChatDialog.cpp \
+            gui/chat/PopupDistantChatDialog.cpp \
+            gui/chat/ChatTabWidget.cpp \
+            gui/chat/ChatWidget.cpp \
+            gui/chat/ChatDialog.cpp \
+            gui/ChatLobbyWidget.cpp \
+            gui/chat/ChatLobbyDialog.cpp \
+            gui/chat/CreateLobbyDialog.cpp \
+            gui/chat/ChatStyle.cpp \
+            gui/chat/ChatUserNotify.cpp \
+            gui/chat/ChatLobbyUserNotify.cpp \
+            gui/connect/ConfCertDialog.cpp \
+            gui/connect/PGPKeyDialog.cpp \
+            gui/msgs/MessagesDialog.cpp \
+            gui/msgs/MessageComposer.cpp \
+            gui/msgs/MessageWidget.cpp \
+            gui/msgs/MessageWindow.cpp \
+            gui/msgs/MessageModel.cpp \
+            gui/msgs/TagsMenu.cpp \
+            gui/msgs/MessageUserNotify.cpp \
+            gui/common/RsButtonOnText.cpp \
+            gui/common/RSGraphWidget.cpp \
+            gui/common/ElidedLabel.cpp \
+            gui/common/vmessagebox.cpp \
+            gui/common/RsCollectionDialog.cpp \
+            gui/common/RsUrlHandler.cpp \
+            gui/common/rwindow.cpp \
+            gui/common/rshtml.cpp \
+            gui/common/AvatarDefs.cpp \
+            gui/common/AvatarDialog.cpp \
+            gui/common/GroupFlagsWidget.cpp \
+            gui/common/GroupSelectionBox.cpp \
+            gui/common/GroupChooser.cpp \
+            gui/common/StatusDefs.cpp \
+            gui/common/TagDefs.cpp \
+            gui/common/GroupDefs.cpp \
+            gui/common/Emoticons.cpp \
+            gui/common/RSComboBox.cpp \
+            gui/common/RSListWidgetItem.cpp \
+            gui/common/RSTextEdit.cpp \
+            gui/common/RSPlainTextEdit.cpp \
+            gui/common/RSTreeWidget.cpp \
+            gui/common/RSTreeWidgetItem.cpp \
+            gui/common/RSFeedWidget.cpp \
+            gui/common/RSTabWidget.cpp \
+            gui/common/RSElidedItemDelegate.cpp \
+            gui/common/RSItemDelegate.cpp \
+            gui/common/PeerDefs.cpp \
+            gui/common/FilesDefs.cpp \
+            gui/common/PopularityDefs.cpp \
+            gui/common/RsBanListDefs.cpp \
+            gui/common/GroupTreeWidget.cpp \
+            gui/common/RSTreeView.cpp \
+            gui/common/AvatarWidget.cpp \
+            gui/common/FriendListModel.cpp \
+            gui/common/NewFriendList.cpp \
+            gui/common/FriendSelectionWidget.cpp \
+            gui/common/FriendSelectionDialog.cpp \
+            gui/common/HashBox.cpp \
+            gui/common/LineEditClear.cpp \
+            gui/common/DropLineEdit.cpp \
+            gui/common/RSTextBrowser.cpp \
+            gui/common/RSImageBlockWidget.cpp \
+            gui/common/FeedNotify.cpp \
+            gui/common/UserNotify.cpp \
+            gui/common/HeaderFrame.cpp \
+            gui/common/MimeTextEdit.cpp \
+            gui/common/UIStateHelper.cpp \
+            gui/common/FloatingHelpBrowser.cpp \
+            gui/common/SubscribeToolButton.cpp \
+            gui/common/RsBanListToolButton.cpp \
+            gui/common/FlowLayout.cpp \
+            gui/common/PictureFlow.cpp \
+            gui/common/ToasterNotify.cpp \
+            gui/style/RSStyle.cpp \
+            gui/style/StyleDialog.cpp \
+            gui/settings/RSPermissionMatrixWidget.cpp \
+            gui/settings/rsharesettings.cpp \
+            gui/settings/RsharePeerSettings.cpp \
+            gui/settings/rsettings.cpp \
+            gui/settings/rsettingswin.cpp \
+            gui/settings/GeneralPage.cpp \
+            gui/settings/AboutPage.cpp \
+            gui/settings/ServerPage.cpp \
+            gui/settings/NotifyPage.cpp \
+            gui/settings/CryptoPage.cpp \
+            gui/settings/PeoplePage.cpp \
+            gui/settings/MessagePage.cpp \
+            gui/settings/NewTag.cpp \
+            gui/settings/ForumPage.cpp \
+            gui/settings/PluginsPage.cpp \
+            gui/settings/PluginItem.cpp \
+            gui/settings/AppearancePage.cpp \
+            gui/settings/FileAssociationsPage.cpp \
+            gui/settings/SoundPage.cpp \
+            gui/settings/TransferPage.cpp \
+            gui/settings/ChatPage.cpp \
+            gui/settings/ChannelPage.cpp \
+            gui/settings/PostedPage.cpp \
+            gui/settings/ServicePermissionsPage.cpp \
+            gui/settings/AddFileAssociationDialog.cpp \
+            gui/settings/GroupFrameSettingsWidget.cpp \
+            gui/statusbar/peerstatus.cpp \
+            gui/statusbar/natstatus.cpp \
+            gui/statusbar/dhtstatus.cpp \
+            gui/statusbar/torstatus.cpp \
+            gui/statusbar/ratesstatus.cpp \
+            gui/statusbar/hashingstatus.cpp \
+            gui/statusbar/discstatus.cpp \
+            gui/statusbar/SoundStatus.cpp \
+            gui/statusbar/OpModeStatus.cpp \
+            gui/statusbar/ToasterDisable.cpp \
+            gui/statusbar/SysTrayStatus.cpp \
+            gui/toaster/ToasterItem.cpp \
+            gui/toaster/MessageToaster.cpp \
+            gui/toaster/DownloadToaster.cpp \
+            gui/toaster/OnlineToaster.cpp \
+            gui/toaster/ChatToaster.cpp \
+            gui/toaster/GroupChatToaster.cpp \
+            gui/toaster/ChatLobbyToaster.cpp \
+            gui/toaster/FriendRequestToaster.cpp \
+            gui/advsearch/advancedsearchdialog.cpp \
+            gui/advsearch/expressionwidget.cpp \
+            gui/advsearch/guiexprelement.cpp \
+            gui/elastic/graphwidget.cpp \
+            gui/elastic/edge.cpp \
+            gui/elastic/arrow.cpp \
+            gui/elastic/elnode.cpp \
+            gui/NewsFeed.cpp \
+            gui/feeds/BoardsCommentsItem.cpp \
+            gui/feeds/FeedItem.cpp \
+            gui/feeds/FeedHolder.cpp \
+            gui/feeds/GxsCircleItem.cpp \
+            gui/feeds/ChannelsCommentsItem.cpp \
+            gui/feeds/PeerItem.cpp \
+            gui/feeds/MsgItem.cpp \
+            gui/feeds/ChatMsgItem.cpp \
+            gui/feeds/SubFileItem.cpp \
+            gui/feeds/AttachFileItem.cpp \
+            gui/feeds/SecurityItem.cpp \
+            gui/feeds/SecurityIpItem.cpp \
+            gui/feeds/NewsFeedUserNotify.cpp \
+            gui/connect/ConnectFriendWizard.cpp \
+            gui/connect/ConnectProgressDialog.cpp \
+            gui/connect/FriendRecommendDialog.cpp \
+            gui/groups/CreateGroup.cpp \
+            gui/GetStartedDialog.cpp \
+            gui/statistics/BandwidthGraphWindow.cpp \
+            gui/statistics/BandwidthStatsWidget.cpp \
+            gui/statistics/DhtWindow.cpp \
+            gui/statistics/Histogram.cpp \
+            gui/statistics/TurtleRouterDialog.cpp \
+            gui/statistics/TurtleRouterStatistics.cpp \
+            gui/statistics/GxsIdStatistics.cpp \
+            gui/statistics/GlobalRouterStatistics.cpp \
+            gui/statistics/GxsTransportStatistics.cpp \
+            gui/statistics/StatisticsWindow.cpp \
+            gui/statistics/BwCtrlWindow.cpp \
+            gui/statistics/RttStatistics.cpp \
+            gui/statistics/BWGraph.cpp \
+    util/RsSyntaxHighlighter.cpp \
+    util/imageutil.cpp \
+    gui/NetworkDialog/pgpid_item_model.cpp \
+    gui/NetworkDialog/pgpid_item_proxy.cpp \
+    gui/common/RsCollection.cpp \
+    util/retroshareWin32.cpp
+#            gui/ForumsDialog.cpp \
+#            gui/forums/ForumDetails.cpp \
+#            gui/forums/EditForumDetails.cpp \
+#            gui/forums/CreateForum.cpp \
+#            gui/forums/CreateForumMsg.cpp \
+#            gui/forums/ForumUserNotify.cpp \
+#            gui/feeds/ForumNewItem.cpp \
+#            gui/feeds/ForumMsgItem.cpp \
+#            gui/ChannelFeed.cpp \
+#            gui/channels/CreateChannel.cpp \
+#            gui/channels/CreateChannelMsg.cpp \
+#            gui/channels/ChannelDetails.cpp \
+#            gui/channels/EditChanDetails.cpp \
+#            gui/channels/ChannelUserNotify.cpp \
+#            gui/feeds/ChanNewItem.cpp \
+#            gui/feeds/ChanMsgItem.cpp \
+
+RESOURCES += gui/images.qrc gui/icons.qrc lang/lang.qrc gui/help/content/content.qrc gui/emojione.qrc \
+  gui/qss/stylesheet/qdarkstyle/dark/Standard_Dark.qrc \
+  gui/qss/stylesheet/qdarkstyle/light/Standard_Light.qrc
+
+TRANSLATIONS +=  \
+            lang/retroshare_ca_ES.ts \
+            lang/retroshare_cs.ts \
+            lang/retroshare_da.ts \
+            lang/retroshare_de.ts \
+            lang/retroshare_el.ts \
+            lang/retroshare_en.ts \
+            lang/retroshare_es.ts \
+            lang/retroshare_fi.ts \
+            lang/retroshare_fr.ts \
+            lang/retroshare_hu.ts \
+            lang/retroshare_it.ts \
+            lang/retroshare_ja_JP.ts \
+            lang/retroshare_nl.ts \
+            lang/retroshare_ko.ts \
+            lang/retroshare_pl.ts \
+            lang/retroshare_ru.ts \
+            lang/retroshare_sv.ts \
+            lang/retroshare_tr.ts \
+            lang/retroshare_zh_CN.ts
+
+unfinishedtranslations {
+
+       TRANSLATIONS +=  \
+            lang/retroshare_bg.ts \
+            lang/retroshare_af.ts  \
+            lang/retroshare_pt.ts  \
+            lang/retroshare_sl.ts \
+            lang/retroshare_sr.ts \
+            lang/retroshare_zh_TW.ts
+
+}
+
+messenger {
+     SOURCES +=       gui/MessengerWindow.cpp \
+	 				  gui/common/FriendList.cpp
+     HEADERS +=       gui/MessengerWindow.h \
+	 				  gui/common/FriendList.h 
+     FORMS   +=       gui/MessengerWindow.ui \
+	 				  gui/common/FriendList.ui
+
+	 DEFiNES += MESSENGER_WINDOW
+}
+
+# Shifted Qt4.4 dependancies to here.
+#    qmake CONFIG=pluginmgr
+
+pluginmgr {
+
+        SOURCES += gui/PluginsPage.cpp \
+            	gui/PluginManagerWidget.cpp \
+            	gui/PluginManager.cpp
+
+        HEADERS += gui/PluginsPage.h  \
+            	gui/PluginManagerWidget.h \
+            	gui/PluginManager.h
+
+        DEFINES *= PLUGINMGR
+
+}
+
+idle {
+
+HEADERS += idle/idle.h
+
+SOURCES += idle/idle.cpp \
+	   idle/idle_platform.cpp
+}
+
+framecatcher {
+
+HEADERS += util/framecatcher.h
+
+SOURCES += util/framecatcher.cpp
+
+LIBS += -lxine
+
+DEFINES *= CHANNELS_FRAME_CATCHER
+
+}
+
+# Embedded Friend Server
+
+rs_efs {
+	DEFINES *= RS_EMBEDED_FRIEND_SERVER
+        SOURCES += gui/FriendServerControl.cpp
+        HEADERS += gui/FriendServerControl.h
+        FORMS   += gui/FriendServerControl.ui
+}
+
+# BELOW IS GXS Unfinished Services.
+	
+unfinished_services {
+	
+	DEPENDPATH += gui/unfinished \
+	
+	HEADERS += gui/unfinished/ApplicationWindow.h \
+
+#		gui/unfinished/CalDialog.h \
+#		gui/unfinished/ExampleDialog.h \
+#		gui/unfinished/GamesDialog.h \
+#		gui/unfinished/profile/ProfileView.h \
+#		gui/unfinished/profile/ProfileEdit.h
+#		gui/unfinished/StatisticDialog.h \
+#		gui/unfinished/PhotoDialog.h \
+#		gui/unfinished/PhotoShow.h \
+	
+	FORMS += gui/unfinished/ApplicationWindow.ui \
+
+#		gui/unfinished/CalDialog.ui \
+#		gui/unfinished/ExampleDialog.ui \
+#		gui/unfinished/GamesDialog.ui \
+#		gui/unfinished/profile/ProfileView.ui \
+#		gui/unfinished/profile/ProfileEdit.ui
+#		gui/unfinished/StatisticDialog.ui \
+#		gui/unfinished/PhotoDialog.ui \
+#		gui/unfinished/PhotoShow.ui \
+	
+	SOURCES += gui/unfinished/ApplicationWindow.cpp \
+
+#		gui/unfinished/CalDialog.cpp \
+#		gui/unfinished/ExampleDialog.cpp \
+#		gui/unfinished/GamesDialog.cpp \
+#		gui/unfinished/profile/ProfileView.cpp \
+#		gui/unfinished/profile/ProfileEdit.cpp
+#		gui/unfinished/StatisticDialog.cpp \
+#		gui/unfinished/PhotoDialog.cpp \
+#		gui/unfinished/PhotoShow.cpp \
+	
+	DEFINES *= UNFINISHED
+}
+	
+	
+gxsphotoshare {
+	#DEFINES += RS_USE_PHOTOSHARE # to enable in unfinished.
+	DEFINES += RS_USE_PHOTO # enable in MainWindow
+
+	HEADERS += \
+		gui/PhotoShare/AlbumGroupDialog.h \
+		gui/PhotoShare/AlbumExtra.h \
+		gui/PhotoShare/PhotoDrop.h \
+		gui/PhotoShare/AlbumItem.h \
+		gui/PhotoShare/AlbumDialog.h \
+		gui/PhotoShare/PhotoItem.h \
+		gui/PhotoShare/PhotoShareItemHolder.h \
+		gui/PhotoShare/PhotoShare.h \
+		gui/PhotoShare/PhotoSlideShow.h \
+		gui/PhotoShare/PhotoDialog.h
+
+	FORMS += \
+		gui/PhotoShare/AlbumExtra.ui \
+		gui/PhotoShare/PhotoItem.ui \
+		gui/PhotoShare/PhotoDialog.ui \
+		gui/PhotoShare/AlbumItem.ui \
+		gui/PhotoShare/AlbumDialog.ui \
+		gui/PhotoShare/PhotoShare.ui \
+		gui/PhotoShare/PhotoSlideShow.ui
+
+	SOURCES += \
+		gui/PhotoShare/AlbumGroupDialog.cpp \
+		gui/PhotoShare/AlbumExtra.cpp \
+		gui/PhotoShare/PhotoItem.cpp \
+		gui/PhotoShare/PhotoDialog.cpp \
+		gui/PhotoShare/PhotoDrop.cpp \
+		gui/PhotoShare/AlbumItem.cpp \
+		gui/PhotoShare/AlbumDialog.cpp \
+		gui/PhotoShare/PhotoShareItemHolder.cpp \
+		gui/PhotoShare/PhotoShare.cpp \
+		gui/PhotoShare/PhotoSlideShow.cpp
+
+	RESOURCES += gui/PhotoShare/Photo_images.qrc
+
+}
+	
+	
+wikipoos {
+	DEFINES += RS_USE_WIKI
+	
+	DEPENDPATH += ../../supportlibs/pegmarkdown
+	INCLUDEPATH += ../../supportlibs/pegmarkdown
+	
+	HEADERS += gui/WikiPoos/WikiDialog.h \
+		gui/WikiPoos/WikiAddDialog.h \
+		gui/WikiPoos/WikiEditDialog.h \
+		gui/gxs/WikiGroupDialog.h \
+
+	FORMS += gui/WikiPoos/WikiDialog.ui \
+		gui/WikiPoos/WikiAddDialog.ui \
+		gui/WikiPoos/WikiEditDialog.ui \
+	
+	SOURCES += gui/WikiPoos/WikiDialog.cpp \
+		gui/WikiPoos/WikiAddDialog.cpp \
+		gui/WikiPoos/WikiEditDialog.cpp \
+		gui/gxs/WikiGroupDialog.cpp \
+
+	RESOURCES += gui/WikiPoos/Wiki_images.qrc
+
+}
+	
+	
+	
+gxsthewire {
+	
+	DEFINES += RS_USE_WIRE
+
+	HEADERS += gui/TheWire/WireDialog.h \
+		gui/TheWire/WireGroupItem.h \
+		gui/TheWire/WireGroupDialog.h \
+		gui/TheWire/WireGroupExtra.h \
+		gui/TheWire/PulseAddDialog.h \
+		gui/TheWire/PulseViewItem.h \
+		gui/TheWire/PulseTopLevel.h \
+		gui/TheWire/PulseViewGroup.h \
+		gui/TheWire/PulseReply.h \
+		gui/TheWire/PulseReplySeperator.h \
+		gui/TheWire/PulseMessage.h \
+                gui/TheWire/CustomFrame.h \
+
+	FORMS += gui/TheWire/WireDialog.ui \
+		gui/TheWire/WireGroupItem.ui \
+		gui/TheWire/WireGroupExtra.ui \
+		gui/TheWire/PulseAddDialog.ui \
+		gui/TheWire/PulseTopLevel.ui \
+		gui/TheWire/PulseViewGroup.ui \
+		gui/TheWire/PulseReply.ui \
+		gui/TheWire/PulseReplySeperator.ui \
+		gui/TheWire/PulseMessage.ui \
+	
+	SOURCES += gui/TheWire/WireDialog.cpp \
+		gui/TheWire/WireGroupItem.cpp \
+		gui/TheWire/WireGroupDialog.cpp \
+		gui/TheWire/WireGroupExtra.cpp \
+		gui/TheWire/PulseAddDialog.cpp \
+		gui/TheWire/PulseViewItem.cpp \
+		gui/TheWire/PulseTopLevel.cpp \
+		gui/TheWire/PulseViewGroup.cpp \
+		gui/TheWire/PulseReply.cpp \
+		gui/TheWire/PulseReplySeperator.cpp \
+		gui/TheWire/PulseMessage.cpp \
+                gui/TheWire/CustomFrame.cpp \
+
+	RESOURCES += gui/TheWire/TheWire_images.qrc
+}
+
+identities {
+	
+	HEADERS +=  \
+		gui/Identity/IdDialog.h \
+		gui/Identity/IdEditDialog.h \
+		gui/Identity/IdDetailsDialog.h \
+	
+	FORMS += gui/Identity/IdDialog.ui \
+		gui/Identity/IdEditDialog.ui \
+		gui/Identity/IdDetailsDialog.ui \
+
+	SOURCES +=  \
+		gui/Identity/IdDialog.cpp \
+		gui/Identity/IdEditDialog.cpp \
+		gui/Identity/IdDetailsDialog.cpp \
+	
+}
+	
+gxscircles {
+	DEFINES += RS_USE_CIRCLES
+#	DEFINES += RS_USE_NEW_PEOPLE_DIALOG
+
+	HEADERS +=  \
+		gui/Circles/CirclesDialog.h \
+		gui/Circles/CreateCircleDialog.h \
+	
+	FORMS += gui/Circles/CirclesDialog.ui \
+		gui/Circles/CreateCircleDialog.ui \
+	
+	SOURCES +=  \
+		gui/Circles/CirclesDialog.cpp \
+		gui/Circles/CreateCircleDialog.cpp \
+
+	HEADERS += gui/People/PeopleDialog.h
+	HEADERS += gui/People/CircleWidget.h
+	HEADERS += gui/People/IdentityWidget.h
+
+	FORMS   += gui/People/PeopleDialog.ui 
+	FORMS   += gui/People/CircleWidget.ui
+	FORMS   += gui/People/IdentityWidget.ui
+
+	SOURCES += gui/People/PeopleDialog.cpp 
+	SOURCES += gui/People/CircleWidget.cpp
+	SOURCES += gui/People/IdentityWidget.cpp
+
+#HEADERS += gui/People/IdentityItem.h
+#HEADERS += gui/People/CircleItem.h
+#HEADERS += gui/People/GroupListView.h
+#SOURCES += gui/People/GroupListView.cpp
+#SOURCES += gui/People/IdentityItem.cpp
+#SOURCES += gui/People/CircleItem.cpp
+
+
+}
+	
+	
+gxsforums {
+
+	HEADERS += gui/gxsforums/GxsForumsDialog.h \
+		gui/gxsforums/GxsForumGroupDialog.h \
+		gui/gxsforums/CreateGxsForumMsg.h \
+		gui/gxsforums/GxsForumThreadWidget.h \
+		gui/gxsforums/GxsForumModel.h \
+		gui/gxsforums/GxsForumUserNotify.h \
+		gui/feeds/GxsForumGroupItem.h \
+		gui/feeds/GxsForumMsgItem.h
+
+	FORMS += gui/gxsforums/CreateGxsForumMsg.ui \
+		gui/gxsforums/GxsForumThreadWidget.ui \
+		gui/feeds/GxsForumGroupItem.ui \
+		gui/feeds/GxsForumMsgItem.ui
+
+	SOURCES += gui/gxsforums/GxsForumsDialog.cpp \
+		gui/gxsforums/GxsForumGroupDialog.cpp \
+		gui/gxsforums/CreateGxsForumMsg.cpp \
+		gui/gxsforums/GxsForumThreadWidget.cpp \
+		gui/gxsforums/GxsForumModel.cpp \
+		gui/gxsforums/GxsForumUserNotify.cpp \
+		gui/feeds/GxsForumGroupItem.cpp \
+		gui/feeds/GxsForumMsgItem.cpp
+}
+	
+	
+gxschannels {
+	
+	HEADERS += gui/gxschannels/GxsChannelDialog.h \
+		gui/gxschannels/GxsChannelGroupDialog.h \
+		gui/gxschannels/CreateGxsChannelMsg.h \
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.h \
+		gui/gxschannels/GxsChannelPostsModel.h \
+		gui/gxschannels/GxsChannelPostFilesModel.h \
+		gui/gxschannels/GxsChannelPostThumbnail.h \
+		gui/gxschannels/GxsChannelFilesStatusWidget.h \
+		gui/feeds/GxsChannelGroupItem.h \
+		gui/feeds/GxsChannelPostItem.h \
+		gui/gxschannels/GxsChannelUserNotify.h
+	
+	FORMS += \
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.ui \
+		gui/gxschannels/GxsChannelFilesStatusWidget.ui \
+		gui/gxschannels/CreateGxsChannelMsg.ui \
+		gui/feeds/GxsChannelGroupItem.ui \
+		gui/feeds/GxsChannelPostItem.ui
+	
+	SOURCES += gui/gxschannels/GxsChannelDialog.cpp \
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp \
+		gui/gxschannels/GxsChannelPostsModel.cpp \
+		gui/gxschannels/GxsChannelPostFilesModel.cpp \
+		gui/gxschannels/GxsChannelFilesStatusWidget.cpp \
+                gui/gxschannels/GxsChannelPostThumbnail.cpp \
+		gui/gxschannels/GxsChannelGroupDialog.cpp \
+		gui/gxschannels/CreateGxsChannelMsg.cpp \
+		gui/feeds/GxsChannelGroupItem.cpp \
+		gui/feeds/GxsChannelPostItem.cpp \
+		gui/gxschannels/GxsChannelUserNotify.cpp
+}
+	
+	
+posted {
+	
+	HEADERS += gui/Posted/PostedDialog.h \
+		gui/Posted/PostedListWidgetWithModel.h \
+		gui/Posted/PostedPostsModel.h \
+		gui/Posted/BoardPostDisplayWidget.h \
+		gui/Posted/PostedItem.h \
+		gui/Posted/PostedCardView.h \
+		gui/Posted/PostedGroupDialog.h \
+		gui/feeds/PostedGroupItem.h \
+		gui/Posted/PostedCreatePostDialog.h \
+		gui/Posted/PhotoView.h \
+		gui/Posted/PostedUserNotify.h
+
+		#gui/Posted/PostedCreateCommentDialog.h \
+		#gui/Posted/PostedComments.h \
+	
+	FORMS += gui/Posted/PostedListWidgetWithModel.ui \
+		gui/feeds/PostedGroupItem.ui \
+		gui/Posted/BoardPostDisplayWidget_compact.ui \
+		gui/Posted/BoardPostDisplayWidget_card.ui \
+		gui/Posted/PostedItem.ui \
+		gui/Posted/PostedCardView.ui \
+		gui/Posted/PostedCreatePostDialog.ui \
+		gui/Posted/PhotoView.ui \
+		#gui/Posted/PostedDialog.ui \
+		#gui/Posted/PostedComments.ui \
+		#gui/Posted/PostedCreateCommentDialog.ui
+	
+	SOURCES += gui/Posted/PostedDialog.cpp \
+		gui/Posted/PostedListWidgetWithModel.cpp \
+		gui/Posted/BoardPostDisplayWidget.cpp \
+		gui/Posted/PostedPostsModel.cpp \
+		gui/feeds/PostedGroupItem.cpp \
+		gui/Posted/PostedItem.cpp \
+		gui/Posted/PostedCardView.cpp \
+		gui/Posted/PostedGroupDialog.cpp \
+		gui/Posted/PostedCreatePostDialog.cpp \
+		gui/Posted/PhotoView.cpp \
+		gui/Posted/PostedUserNotify.cpp
+
+		#gui/Posted/PostedDialog.cpp \
+		#gui/Posted/PostedComments.cpp \
+		#gui/Posted/PostedCreateCommentDialog.cpp
+	
+	RESOURCES += gui/Posted/Posted_images.qrc
+}
+	
+gxsgui {
+	
+	HEADERS += gui/gxs/GxsGroupDialog.h \
+		gui/gxs/GxsIdDetails.h \
+		gui/gxs/GxsIdChooser.h \
+		gui/gxs/GxsIdLabel.h \
+		gui/gxs/GxsCircleChooser.h \
+		gui/gxs/GxsCircleLabel.h \
+		gui/gxs/GxsIdTreeWidgetItem.h \
+		gui/gxs/GxsCommentTreeWidget.h \
+		gui/gxs/GxsCommentContainer.h \
+		gui/gxs/GxsCommentDialog.h \
+		gui/gxs/GxsCreateCommentDialog.h \
+		gui/gxs/GxsGroupFrameDialog.h \
+		gui/gxs/GxsMessageFrameWidget.h \
+		gui/gxs/GxsMessageFramePostWidget.h \
+		gui/gxs/GxsGroupFeedItem.h \
+		gui/gxs/GxsFeedItem.h \
+		gui/gxs/GxsGroupShareKey.h \
+		gui/gxs/GxsUserNotify.h \
+		gui/gxs/GxsFeedWidget.h \
+		util/TokenQueue.h \
+		util/RsGxsUpdateBroadcast.h \
+	
+#		gui/gxs/GxsMsgDialog.h \
+	
+	FORMS += gui/gxs/GxsGroupDialog.ui \
+		gui/gxs/GxsCommentContainer.ui \
+		gui/gxs/GxsCommentDialog.ui \
+		gui/gxs/GxsCreateCommentDialog.ui \
+		gui/gxs/GxsGroupFrameDialog.ui\
+		gui/gxs/GxsGroupShareKey.ui 
+#		gui/gxs/GxsMsgDialog.ui \
+#		gui/gxs/GxsCommentTreeWidget.ui 
+	
+	SOURCES += gui/gxs/GxsGroupDialog.cpp \
+		gui/gxs/GxsIdDetails.cpp \
+		gui/gxs/GxsIdChooser.cpp \
+		gui/gxs/GxsIdLabel.cpp \
+		gui/gxs/GxsCircleChooser.cpp \
+		gui/gxs/GxsGroupShareKey.cpp \
+		gui/gxs/GxsCircleLabel.cpp \
+		gui/gxs/GxsIdTreeWidgetItem.cpp \
+		gui/gxs/GxsCommentTreeWidget.cpp \
+		gui/gxs/GxsCommentContainer.cpp \
+		gui/gxs/GxsCommentDialog.cpp \
+		gui/gxs/GxsCreateCommentDialog.cpp \
+		gui/gxs/GxsGroupFrameDialog.cpp \
+		gui/gxs/GxsMessageFrameWidget.cpp \
+		gui/gxs/GxsMessageFramePostWidget.cpp \
+		gui/gxs/GxsGroupFeedItem.cpp \
+		gui/gxs/GxsFeedItem.cpp \
+		gui/gxs/GxsUserNotify.cpp \
+		gui/gxs/GxsFeedWidget.cpp \
+		util/TokenQueue.cpp \
+		util/RsGxsUpdateBroadcast.cpp \
+	
+#		gui/gxs/GxsMsgDialog.cpp \
+	
+	
+}
+
+
+wikipoos {
+	HEADERS += \
+		gui/gxs/RsGxsUpdateBroadcastBase.h \
+		gui/gxs/RsGxsUpdateBroadcastWidget.h \
+		gui/gxs/RsGxsUpdateBroadcastPage.h 
+
+	SOURCES += \
+		gui/gxs/RsGxsUpdateBroadcastBase.cpp \
+		gui/gxs/RsGxsUpdateBroadcastWidget.cpp \
+		gui/gxs/RsGxsUpdateBroadcastPage.cpp \
+}
+
+################################################################
+#Define qmake_info.h file so GUI can get wath was used to compil
+#         This must be at end to get all informations
+################################################################
+RS_QMAKE_DEFINES=\\\"$${DEFINES}\\\"
+RS_QMAKE_CONFIG=\\\"$${CONFIG}\\\"
+
+INCLUDEPATH += $$OUT_PWD/include
+info_file.input = $$PWD/qmake_info.h.in
+info_file.output = $$OUT_PWD/include/qmake_info.h
+
+QMAKE_SUBSTITUTES += info_file
+OTHER_FILES += \
+    qmake_info.h.in

From 680c1942df28e98905943464d7b1e91059e864aa Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Sun, 2 Jul 2023 11:29:02 +0530
Subject: [PATCH 308/503] Revert "Changes to the .pro file for the newly made
 files."

This reverts commit 3cc077ff381dbf64687ed2d3abf04d0d29921675.

bad commit
---
 .../src/gui/TheWire/CustomFrame.cpp           |   19 -
 retroshare-gui/src/gui/TheWire/CustomFrame.h  |   19 -
 .../src/gui/TheWire/PulseViewGroup.cpp        |    2 +-
 .../src/gui/TheWire/PulseViewGroup.ui         |    6 +-
 retroshare-gui/src/retroshare-gui.pro         | 3012 ++++++++---------
 5 files changed, 1507 insertions(+), 1551 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
index e08e03895..20059222d 100644
--- a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
+++ b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * gui/TheWire/CustomFrame.cpp                                                 *
- *                                                                             *
- * Copyright (c) 2012-2020 Robert Fernie   <retroshare.project@gmail.com>      *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License as              *
- * published by the Free Software Foundation, either version 3 of the          *
- * License, or (at your option) any later version.                             *
- *                                                                             *
- * This program is distributed in the hope that it will be useful,             *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
- * GNU Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
 #include "CustomFrame.h"
 #include <QPainter>
 
diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.h b/retroshare-gui/src/gui/TheWire/CustomFrame.h
index b0abd131b..ebe2bfa8c 100644
--- a/retroshare-gui/src/gui/TheWire/CustomFrame.h
+++ b/retroshare-gui/src/gui/TheWire/CustomFrame.h
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * gui/TheWire/CustomFrame.h                                                   *
- *                                                                             *
- * Copyright (c) 2012-2020 Robert Fernie   <retroshare.project@gmail.com>      *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License as              *
- * published by the Free Software Foundation, either version 3 of the          *
- * License, or (at your option) any later version.                             *
- *                                                                             *
- * This program is distributed in the hope that it will be useful,             *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
- * GNU Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
 #ifndef CUSTOMFRAMEH_H
 #define CUSTOMFRAMEH_H
 
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
index cf7b4cfca..56c4eabdc 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
@@ -65,7 +65,7 @@ void PulseViewGroup::setup()
                 QSize frameSize = frame_masthead->size();
 
                 // Scale the pixmap based on the frame size
-                pixmap = pixmap.scaledToWidth(frameSize.width(), Qt::SmoothTransformation);
+                pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
                 frame_masthead->setPixmap(pixmap);
             }
         }
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
index 96f717656..39183123e 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
@@ -50,7 +50,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="CustomFrame" name="frame_masthead">
+              <widget class="CustomFrame" name="frame_masthead">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -569,11 +569,11 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
+  <customwidgets>
   <customwidget>
    <class>CustomFrame</class>
    <extends>QFrame</extends>
-   <header>gui/TheWire/CustomFrame.h</header>
+   <header>D:\new\RetroShare\retroshare-gui\src\gui\TheWire\CustomFrame.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 72d7d028e..b8e8365e0 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -1,1509 +1,1503 @@
-################################################################################
-# uselibresapi.pri                                                             #
-# Copyright (C) 2018, Retroshare team <retroshare.team@gmailcom>               #
-#                                                                              #
-# This program is free software: you can redistribute it and/or modify         #
-# it under the terms of the GNU Affero General Public License as               #
-# published by the Free Software Foundation, either version 3 of the           #
-# License, or (at your option) any later version.                              #
-#                                                                              #
-# This program is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
-# GNU Affero General Public License for more details.                          #
-#                                                                              #
-# You should have received a copy of the GNU Affero General Public License     #
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.       #
-################################################################################
-
-!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
-
-TEMPLATE = app
-QT     += network xml 
-CONFIG += qt gui uic qrc resources idle 
-CONFIG += console
-TARGET = retroshare
-DEFINES += TARGET=\\\"$${TARGET}\\\"
-
-DEPENDPATH  *= $${PWD} $${RS_INCLUDE_DIR}
-INCLUDEPATH *= $${PWD}
-
-!include("../../libretroshare/src/use_libretroshare.pri"):error("Including")
-
-rs_webui {
-rs_jsonapi {
-    HEADERS *= gui/settings/WebuiPage.h
-    SOURCES *= gui/settings/WebuiPage.cpp
-    FORMS *= gui/settings/WebuiPage.ui
-}
-}
-
-rs_jsonapi {
-    HEADERS *= gui/settings/JsonApiPage.h
-    SOURCES *= gui/settings/JsonApiPage.cc
-    FORMS *= gui/settings/JsonApiPage.ui
-}
-
-# Auto detect installed version of cmark
-rs_gui_cmark {
-	DEFINES *= USE_CMARK
-	no_rs_cross_compiling {
-		message("Using compiled cmark")
-		CMARK_SRC_PATH=$$clean_path($${RS_SRC_PATH}/supportlibs/cmark)
-		CMARK_BUILD_PATH=$$clean_path($${RS_BUILD_PATH}/supportlibs/cmark/build)
-		INCLUDEPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
-		DEPENDPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
-		QMAKE_LIBDIR *= $$clean_path($${CMARK_BUILD_PATH}/)
-		# Using sLibs would fail as libcmark.a is generated at compile-time
-		LIBS *= -L$$clean_path($${CMARK_BUILD_PATH}/src/) -lcmark
-
-		DUMMYCMARKINPUT = FORCE
-		CMAKE_GENERATOR_OVERRIDE=""
-		win32-g++|win32-clang-g++:CMAKE_GENERATOR_OVERRIDE="-G \"MSYS Makefiles\""
-		gencmarklib.name = Generating libcmark.
-		gencmarklib.input = DUMMYCMARKINPUT
-		gencmarklib.output = $$clean_path($${CMARK_BUILD_PATH}/src/libcmark.a)
-		gencmarklib.CONFIG += target_predeps combine
-		gencmarklib.variable_out = PRE_TARGETDEPS
-		gencmarklib.commands = \
-		    cd $${RS_SRC_PATH} && ( \
-		    git submodule update --init supportlibs/cmark ; \
-		    cd $${CMARK_SRC_PATH} ; \
-		    true ) && \
-		    mkdir -p $${CMARK_BUILD_PATH} && cd $${CMARK_BUILD_PATH} && \
-		    cmake \
-		        -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
-                        \"-DCMAKE_CXX_FLAGS=$${QMAKE_CXXFLAGS}\" \
-		        $${CMAKE_GENERATOR_OVERRIDE} \
-		        -DCMAKE_INSTALL_PREFIX=. \
-		        -B. \
-		        -H$$shell_path($${CMARK_SRC_PATH}) && \
-		    $(MAKE)
-		QMAKE_EXTRA_COMPILERS += gencmarklib
-	} else {
-		message("Using systems cmark")
-		sLibs *= libcmark
-	}
-}
-
-FORMS   += TorControl/TorControlWindow.ui
-SOURCES += TorControl/TorControlWindow.cpp \
-    gui/TheWire/CustomFrame.cpp \
-    gui/TheWire/CustomFrame.cpp
-HEADERS += TorControl/TorControlWindow.h \
-    gui/TheWire/CustomFrame.h \
-    gui/TheWire/CustomFrame.h
-
-#QMAKE_CFLAGS += -fmudflap 
-#LIBS *= /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflap.a /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflapth.a
-
-greaterThan(QT_MAJOR_VERSION, 4) {
-	# Qt 5
-        QT     += widgets multimedia printsupport
-	linux-* {
-		QT += x11extras
-	}
-} else {
-	# Qt 4
-	CONFIG += uitools
-}
-
-CONFIG += identities
-CONFIG += gxsforums
-CONFIG += gxschannels
-CONFIG += posted
-CONFIG += gxsgui
-CONFIG += gxscircles
-
-# Other Disabled Bits.
-#CONFIG += framecatcher
-
-## To enable unfinished services
-#CONFIG += wikipoos
-#CONFIG += gxsthewire
-#CONFIG += gxsphotoshare
-
-DEFINES += RS_RELEASE_VERSION
-RCC_DIR = temp/qrc
-UI_DIR  = temp/ui
-MOC_DIR = temp/moc
-
-################################# Linux ##########################################
-# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
-linux-* {
-	CONFIG += link_pkgconfig
-
-	#CONFIG += version_detail_bash_script
-	QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
-
-	PKGCONFIG *= x11 xscrnsaver
-
-	LIBS *= -rdynamic 
-	DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
-}
-
-rs_sanitize {
-	LIBS *= -lasan -lubsan
-}
-
-unix {
-	target.path = "$${BIN_DIR}"
-	INSTALLS += target
-
-        data_files.path="$${RS_DATA_DIR}/"
-	data_files.files=sounds qss
-	INSTALLS += data_files
-
-        style_files.path="$${RS_DATA_DIR}/stylesheets"
-	style_files.files=gui/qss/chat/Bubble gui/qss/chat/Bubble_Compact
-	INSTALLS += style_files
-
-	icon_files.path = "$${PREFIX}/share/icons/hicolor"
-	icon_files.files =  ../../data/24x24
-	icon_files.files += ../../data/48x48
-	icon_files.files += ../../data/64x64
-	icon_files.files += ../../data/128x128
-	INSTALLS += icon_files
-
-	desktop_files.path = "$${PREFIX}/share/applications"
-	desktop_files.files = ../../data/retroshare.desktop
-	INSTALLS += desktop_files
-
-	pixmap_files.path = "$${PREFIX}/share/pixmaps"
-	pixmap_files.files = ../../data/retroshare.xpm
-	INSTALLS += pixmap_files
-
-}
-
-linux-g++ {
-	OBJECTS_DIR = temp/linux-g++/obj
-}
-
-linux-g++-64 {
-	OBJECTS_DIR = temp/linux-g++-64/obj
-}
-
-version_detail_bash_script {
-	warning("Version detail script is deprecated.")
-	warning("Remove references to version_detail_bash_script from all of your build scripts!")
-}
-
-#################### Cross compilation for windows under Linux ###################
-
-win32-x-g++ {
-		OBJECTS_DIR = temp/win32-x-g++/obj
-
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libssl.a
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libcrypto.a
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libgpgme.dll.a
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libminiupnpc.a
-		LIBS += ../../../../lib/win32-x-g++-v0.5/libz.a
-		LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
-		LIBS += -lQtUiTools
-		LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
-		LIBS += -lole32 -lwinmm
-
-		DEFINES *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
-
-		INCLUDEPATH += ../../../../gpgme-1.1.8/src/
-		INCLUDEPATH += ../../../../libgpg-error-1.7/src/
-
-		RC_FILE = gui/images/retroshare_win.rc
-}
-
-#################################### Windows #####################################
-
-win32-g++|win32-clang-g++ {
-	CONFIG(debug, debug|release) {
-		# show console output
-		CONFIG += console
-	} else {
-		CONFIG -= console
-	}
-
-	CONFIG(debug, debug|release) {
-	} else {
-		# Tell linker to use ASLR protection
-		QMAKE_LFLAGS += -Wl,-dynamicbase
-		# Tell linker to use DEP protection
-		QMAKE_LFLAGS += -Wl,-nxcompat
-	}
-
-    # Fix linking error (ld.exe: Error: export ordinal too large) due to too
-    # many exported symbols.
-    !libretroshare_shared:QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
-
-	# Switch off optimization for release version
-	QMAKE_CXXFLAGS_RELEASE -= -O2
-	QMAKE_CXXFLAGS_RELEASE += -O0
-	QMAKE_CFLAGS_RELEASE -= -O2
-	QMAKE_CFLAGS_RELEASE += -O0
-
-	# Switch on optimization for debug version
-	#QMAKE_CXXFLAGS_DEBUG += -O2
-	#QMAKE_CFLAGS_DEBUG += -O2
-
-	OBJECTS_DIR = temp/obj
-
-    dLib = ws2_32 gdi32 uuid ole32 iphlpapi crypt32 winmm
-    LIBS *= $$linkDynamicLibs(dLib)
-
-	RC_FILE = gui/images/retroshare_win.rc
-
-	# export symbols for the plugins
-	LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a
-
-	# create lib directory
-	isEmpty(QMAKE_SH) {
-		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib $(MKDIR) lib
-	} else {
-		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib || $(MKDIR) lib
-	}
-
-	greaterThan(QT_MAJOR_VERSION, 4) {
-		# Qt 5
-		RC_INCLUDEPATH += $$_PRO_FILE_PWD_/../../libretroshare/src
-	} else {
-		# Qt 4
-		QMAKE_RC += --include-dir=$$_PRO_FILE_PWD_/../../libretroshare/src
-	}
-}
-
-##################################### MacOS ######################################
-
-macx {
-	# ENABLE THIS OPTION FOR Univeral Binary BUILD.
-	#CONFIG += ppc x86
-	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
-	QMAKE_INFO_PLIST = Info.plist
-	mac_icon.files = $$files($$PWD/rsMacIcon.icns)
-	mac_icon.path = Contents/Resources
-	QMAKE_BUNDLE_DATA += mac_icon
-	dplQSS.files = $$PWD/qss
-	dplQSS.path = Contents/Resources
-	QMAKE_BUNDLE_DATA += dplQSS
-	dplChatStyles.files = \
-		$$PWD/gui/qss/chat/Bubble \
-		$$PWD/gui/qss/chat/Bubble_Compact
-	dplChatStyles.path = Contents/Resources/stylesheets
-	QMAKE_BUNDLE_DATA += dplChatStyles 
-#	mac_webui.files = $$files($$PWD/../../libresapi/src/webui)
-#	mac_webui.path = Contents/Resources
-#	QMAKE_BUNDLE_DATA += mac_webui
-
-	OBJECTS_DIR = temp/obj
-
-	CONFIG += version_detail_bash_script
-	LIBS += -lssl -lcrypto -lz 
-	for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
-	LIBS += -framework CoreFoundation
-	LIBS += -framework Security
-	LIBS += -framework Carbon
-
-	for(lib, LIB_DIR):LIBS += -L"$$lib"
-	for(bin, BIN_DIR):LIBS += -L"$$bin"
-
-	DEPENDPATH += . $$INC_DIR
-	INCLUDEPATH += . $$INC_DIR
-
-	#DEFINES *= MAC_IDLE # for idle feature
-	CONFIG -= uitools
-}
-
-##################################### FreeBSD ######################################
-
-freebsd-* {
-	INCLUDEPATH *= /usr/local/include/gpgme
-	LIBS *= -lssl
-	LIBS *= -lgpgme
-	LIBS *= -lupnp
-	LIBS *= -lgnome-keyring
-
-	LIBS += -lsqlite3
-}
-
-##################################### Haiku ######################################
-
-haiku-* {
-	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
-	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
-
-	LIBS *= ../../libretroshare/src/lib/libretroshare.a
-	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2 -lbsd
-	LIBS *= -lssl -lcrypto -lnetwork
-	LIBS *= -lgpgme
-	LIBS *= -lupnp
-	LIBS *= -lz
-	LIBS *= -lixml
-
-	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-	LIBS += -lsqlite3
-}
-
-##################################### OpenBSD ######################################
-
-openbsd-* {
-	INCLUDEPATH *= /usr/local/include
-
-	LIBS *= -lssl -lcrypto
-	LIBS *= -lgpgme
-	LIBS *= -lupnp
-	LIBS *= -lgnome-keyring
-	LIBS += -lsqlite3
-	LIBS *= -rdynamic
-}
-
-################################### COMMON stuff ##################################
-
-wikipoos {
-	PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-	LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-	LIBS *= -lglib-2.0
-}
-
-################################### HEADERS & SOURCES #############################
-
-# Input
-HEADERS +=  rshare.h \
-            retroshare-gui/configpage.h \
-            retroshare-gui/RsAutoUpdatePage.h \
-            retroshare-gui/mainpage.h \
-            gui/notifyqt.h \
-            control/bandwidthevent.h \
-            control/eventtype.h \
-            gui/QuickStartWizard.h \
-            gui/StartDialog.h \
-            gui/HomePage.h\
-            gui/NetworkDialog.h \
-            gui/GenCertDialog.h \
-            gui/linetypes.h \
-            gui/mainpagestack.h \
-            gui/MainWindow.h \
-            gui/RSHumanReadableDelegate.h \
-            gui/AboutDialog.h \
-            gui/AboutWidget.h \
-            gui/NetworkView.h \
-            gui/FriendsDialog.h \
-            gui/ServicePermissionDialog.h \
-            gui/RemoteDirModel.h \
-            gui/RetroShareLink.h \
-            gui/SearchTreeWidget.h \
-            gui/ShareManager.h \
-#            gui/ShareDialog.h \
-#            gui/SFListDelegate.h \
-            gui/SoundManager.h \
-            gui/HelpDialog.h \
-            gui/LogoBar.h \
-            gui/common/AvatarDialog.h \
-            gui/FileTransfer/SearchDialog.h \
-            gui/FileTransfer/SharedFilesDialog.h \
-            gui/FileTransfer/xprogressbar.h \
-            gui/FileTransfer/DetailsDialog.h \
-            gui/FileTransfer/FileTransferInfoWidget.h \
-            gui/FileTransfer/DLListDelegate.h \
-            gui/FileTransfer/ULListDelegate.h \
-            gui/FileTransfer/TransfersDialog.h \
-            gui/FileTransfer/BannedFilesDialog.h \
-            gui/statistics/TurtleRouterDialog.h \
-            gui/statistics/TurtleRouterStatistics.h \
-            gui/statistics/GxsIdStatistics.h \
-            gui/statistics/dhtgraph.h \
-            gui/statistics/Histogram.h \
-            gui/statistics/BandwidthGraphWindow.h \
-            gui/statistics/turtlegraph.h \
-            gui/statistics/BandwidthStatsWidget.h \
-            gui/statistics/DhtWindow.h \
-            gui/statistics/GlobalRouterStatistics.h \
-            gui/statistics/GxsTransportStatistics.h \
-            gui/statistics/StatisticsWindow.h \
-            gui/statistics/BwCtrlWindow.h \
-            gui/statistics/RttStatistics.h \
-            gui/FileTransfer/TransferUserNotify.h \
-            gui/plugins/PluginInterface.h \
-            gui/im_history/ImHistoryBrowser.h \
-            gui/im_history/IMHistoryItemDelegate.h \
-            gui/im_history/IMHistoryItemPainter.h \
-            lang/languagesupport.h \
-            util/RsProtectedTimer.h \
-            util/stringutil.h \
-            util/RsNetUtil.h \
-            util/DateTime.h \
-            util/RetroStyleLabel.h \
-            util/dllexport.h \
-            util/NonCopyable.h \
-            util/rsutildll.h \
-            util/dllexport.h \
-            util/global.h \
-            util/rsqtutildll.h \
-#            util/Interface.h \
-            util/PixmapMerging.h \
-            util/MouseEventFilter.h \
-            util/EventFilter.h \
-            util/Widget.h \
-            util/RsAction.h \
-            util/RsUserdata.h \
-            util/printpreview.h \
-            util/log.h \
-            util/misc.h \
-            util/HandleRichText.h \
-            util/ObjectPainter.h \
-            util/QtVersion.h \
-            util/RsFile.h \
-            util/qtthreadsutils.h \
-            util/ClickableLabel.h \
-            util/AspectRatioPixmapLabel.h \
-            gui/profile/ProfileWidget.h \
-            gui/profile/ProfileManager.h \
-            gui/profile/StatusMessage.h \
-            gui/chat/PopupChatWindow.h \
-            gui/chat/PopupChatDialog.h \
-            gui/chat/PopupDistantChatDialog.h \
-            gui/chat/ChatTabWidget.h \
-            gui/chat/ChatWidget.h \
-            gui/chat/ChatDialog.h \
-            gui/ChatLobbyWidget.h \
-            gui/chat/ChatLobbyDialog.h \
-            gui/chat/CreateLobbyDialog.h \
-            gui/chat/ChatStyle.h \
-            gui/chat/ChatUserNotify.h \
-            gui/chat/ChatLobbyUserNotify.h \
-            gui/connect/ConfCertDialog.h \
-            gui/connect/PGPKeyDialog.h \
-            gui/connect/FriendRecommendDialog.h \
-            gui/msgs/MessagesDialog.h \
-            gui/msgs/MessageInterface.h \
-            gui/msgs/MessageComposer.h \
-            gui/msgs/MessageWindow.h \
-            gui/msgs/MessageWidget.h \
-            gui/msgs/MessageModel.h \
-            gui/msgs/TagsMenu.h \
-            gui/msgs/textformat.h \
-            gui/msgs/MessageUserNotify.h \
-            gui/images/retroshare_win.rc.h \
-            gui/settings/RSPermissionMatrixWidget.h \
-            gui/settings/rsharesettings.h \
-            gui/settings/RsharePeerSettings.h \
-            gui/settings/rsettings.h \
-            gui/settings/rsettingswin.h \
-            gui/settings/GeneralPage.h \
-            gui/settings/PeoplePage.h \
-            gui/settings/AboutPage.h \
-            gui/settings/ServerPage.h \
-            gui/settings/NotifyPage.h \
-            gui/settings/CryptoPage.h \
-            gui/settings/MessagePage.h \
-            gui/settings/NewTag.h \
-            gui/settings/ForumPage.h \
-            gui/settings/PluginsPage.h \
-            gui/settings/PluginItem.h \
-            gui/settings/AppearancePage.h \
-            gui/settings/FileAssociationsPage.h \
-            gui/settings/SoundPage.h \
-            gui/settings/TransferPage.h \
-            gui/settings/ChatPage.h \
-            gui/settings/ChannelPage.h \
-            gui/settings/PostedPage.h \
-            gui/settings/ServicePermissionsPage.h \
-            gui/settings/AddFileAssociationDialog.h \
-            gui/settings/GroupFrameSettingsWidget.h \
-            gui/toaster/ToasterItem.h \
-            gui/toaster/MessageToaster.h \
-            gui/toaster/OnlineToaster.h \
-            gui/toaster/DownloadToaster.h \
-            gui/toaster/ChatToaster.h \
-            gui/toaster/GroupChatToaster.h \
-            gui/toaster/ChatLobbyToaster.h \
-            gui/toaster/FriendRequestToaster.h \
-            gui/common/RsButtonOnText.h \
-            gui/common/RSGraphWidget.h \
-            gui/common/ElidedLabel.h \
-            gui/common/vmessagebox.h \
-            gui/common/RsUrlHandler.h \
-            gui/common/RsCollectionDialog.h \
-            gui/common/rwindow.h \
-            gui/common/rshtml.h \
-            gui/common/AvatarDefs.h \
-            gui/common/GroupFlagsWidget.h \
-            gui/common/GroupSelectionBox.h \
-            gui/common/GroupChooser.h \
-            gui/common/StatusDefs.h \
-            gui/common/TagDefs.h \
-            gui/common/GroupDefs.h \
-            gui/common/Emoticons.h \
-            gui/common/RSComboBox.h \
-            gui/common/RSListWidgetItem.h \
-            gui/common/RSTextEdit.h \
-            gui/common/RSPlainTextEdit.h \
-            gui/common/RSTreeWidget.h \
-            gui/common/RSTreeWidgetItem.h \
-            gui/common/RSFeedWidget.h \
-            gui/common/RSTabWidget.h \
-            gui/common/RSElidedItemDelegate.h \
-            gui/common/RSItemDelegate.h \
-            gui/common/PeerDefs.h \
-            gui/common/FilesDefs.h \
-            gui/common/PopularityDefs.h \
-            gui/common/RsBanListDefs.h \
-            gui/common/GroupTreeWidget.h \
-            gui/common/RSTreeView.h \
-            gui/common/AvatarWidget.h \
-            gui/common/FriendListModel.h \
-            gui/common/NewFriendList.h \
-            gui/common/FriendSelectionWidget.h \
-            gui/common/FriendSelectionDialog.h \
-            gui/common/HashBox.h \
-            gui/common/LineEditClear.h \
-            gui/common/DropLineEdit.h \
-            gui/common/RSTextBrowser.h \
-            gui/common/RSImageBlockWidget.h \
-            gui/common/FeedNotify.h \
-            gui/common/UserNotify.h \
-            gui/common/HeaderFrame.h \
-            gui/common/MimeTextEdit.h \
-            gui/common/UIStateHelper.h \
-            gui/common/FloatingHelpBrowser.h \
-            gui/common/SubscribeToolButton.h \
-            gui/common/RsBanListToolButton.h \
-            gui/common/FlowLayout.h \
-            gui/common/PictureFlow.h \
-            gui/common/ToasterNotify.h \
-            gui/style/RSStyle.h \
-            gui/style/StyleDialog.h \
-            gui/help/browser/helpbrowser.h \
-            gui/help/browser/helptextbrowser.h \
-            gui/statusbar/peerstatus.h \
-            gui/statusbar/natstatus.h \
-            gui/statusbar/dhtstatus.h \
-            gui/statusbar/torstatus.h \
-            gui/statusbar/ratesstatus.h \
-            gui/statusbar/hashingstatus.h \
-            gui/statusbar/discstatus.h \
-            gui/statusbar/SoundStatus.h \
-            gui/statusbar/OpModeStatus.h \
-            gui/statusbar/ToasterDisable.h \
-            gui/statusbar/SysTrayStatus.h \
-            gui/advsearch/advancedsearchdialog.h \
-            gui/advsearch/expressionwidget.h \
-            gui/advsearch/guiexprelement.h \
-            gui/elastic/graphwidget.h \
-            gui/elastic/edge.h \
-            gui/elastic/arrow.h \
-            gui/elastic/elnode.h \
-            gui/NewsFeed.h \
-            gui/feeds/BoardsCommentsItem.h \
-            gui/feeds/FeedItem.h \
-            gui/feeds/FeedHolder.h \
-            gui/feeds/GxsCircleItem.h \
-            gui/feeds/ChannelsCommentsItem.h \
-            gui/feeds/PeerItem.h \
-            gui/feeds/MsgItem.h \
-            gui/feeds/ChatMsgItem.h \
-            gui/feeds/SubFileItem.h \
-            gui/feeds/AttachFileItem.h \
-            gui/feeds/SecurityItem.h \
-            gui/feeds/SecurityIpItem.h \
-            gui/feeds/NewsFeedUserNotify.h \
-            gui/connect/ConnectFriendWizard.h \
-            gui/connect/ConnectProgressDialog.h \
-            gui/groups/CreateGroup.h \
-            gui/GetStartedDialog.h \
-            gui/statistics/BWGraph.h \
-            util/RsSyntaxHighlighter.h \
-            util/imageutil.h \
-            util/RichTextEdit.h \
-            gui/NetworkDialog/pgpid_item_model.h \
-            gui/NetworkDialog/pgpid_item_proxy.h \
-            gui/common/RsCollection.h \
-            util/retroshareWin32.h
-#            gui/ForumsDialog.h \
-#            gui/forums/ForumDetails.h \
-#            gui/forums/EditForumDetails.h \
-#            gui/forums/CreateForum.h \
-#            gui/forums/CreateForumMsg.h \
-#            gui/forums/ForumUserNotify.h \
-#            gui/feeds/ForumNewItem.h \
-#            gui/feeds/ForumMsgItem.h \
-#            gui/ChannelFeed.h \
-#            gui/feeds/ChanNewItem.h \
-#            gui/feeds/ChanMsgItem.h \
-#            gui/channels/CreateChannel.h \
-#            gui/channels/ChannelDetails.h \
-#            gui/channels/CreateChannelMsg.h \
-#            gui/channels/EditChanDetails.h \
-#            gui/channels/ChannelUserNotify.h \
-
-FORMS +=    gui/StartDialog.ui \
-            gui/HomePage.ui\
-            gui/GenCertDialog.ui \
-            gui/AboutDialog.ui \
-            gui/AboutWidget.ui \
-            gui/QuickStartWizard.ui \
-            gui/NetworkDialog.ui \
-            gui/common/AvatarDialog.ui \
-            gui/FileTransfer/TransfersDialog.ui \
-            gui/FileTransfer/DetailsDialog.ui \
-            gui/FileTransfer/SearchDialog.ui \
-            gui/FileTransfer/SharedFilesDialog.ui \
-            gui/FileTransfer/BannedFilesDialog.ui \
-            gui/MainWindow.ui \
-            gui/NetworkView.ui \
-            gui/FriendsDialog.ui \
-            gui/ShareManager.ui \
-#            gui/ShareDialog.ui \
-            gui/help/browser/helpbrowser.ui \
-            gui/HelpDialog.ui \
-            gui/ServicePermissionDialog.ui \
-            gui/profile/ProfileWidget.ui \
-            gui/profile/StatusMessage.ui \
-            gui/profile/ProfileManager.ui \
-            gui/chat/PopupChatWindow.ui \
-            gui/chat/PopupChatDialog.ui \
-            gui/chat/ChatTabWidget.ui \
-            gui/chat/ChatWidget.ui \
-            gui/chat/ChatLobbyDialog.ui \
-            gui/chat/CreateLobbyDialog.ui \
-            gui/ChatLobbyWidget.ui \
-            gui/connect/ConfCertDialog.ui \
-            gui/connect/PGPKeyDialog.ui \
-            gui/connect/ConnectFriendWizard.ui \
-            gui/connect/ConnectProgressDialog.ui \
-            gui/connect/FriendRecommendDialog.ui \
-            gui/msgs/MessagesDialog.ui \
-            gui/msgs/MessageComposer.ui \
-            gui/msgs/MessageWindow.ui\
-            gui/msgs/MessageWidget.ui\
-            gui/settings/settingsw.ui \
-            gui/settings/GeneralPage.ui \
-            gui/settings/ServerPage.ui \
-            gui/settings/NotifyPage.ui \
-            gui/settings/PeoplePage.ui \
-            gui/settings/CryptoPage.ui \
-            gui/settings/MessagePage.ui \
-            gui/settings/NewTag.ui \
-            gui/settings/ForumPage.ui \
-            gui/settings/AboutPage.ui \
-            gui/settings/PluginsPage.ui \
-            gui/settings/AppearancePage.ui \
-            gui/settings/TransferPage.ui \
-            gui/settings/SoundPage.ui \
-            gui/settings/ChatPage.ui \
-            gui/settings/ChannelPage.ui \
-            gui/settings/PostedPage.ui \
-            gui/settings/ServicePermissionsPage.ui \
-            gui/settings/PluginItem.ui \
-            gui/settings/GroupFrameSettingsWidget.ui \
-            gui/toaster/MessageToaster.ui \
-            gui/toaster/OnlineToaster.ui \
-            gui/toaster/DownloadToaster.ui \
-            gui/toaster/ChatToaster.ui \
-            gui/toaster/GroupChatToaster.ui \
-            gui/toaster/ChatLobbyToaster.ui \
-            gui/toaster/FriendRequestToaster.ui \
-            gui/advsearch/AdvancedSearchDialog.ui \
-            gui/advsearch/expressionwidget.ui \
-            gui/NewsFeed.ui \
-            gui/feeds/BoardsCommentsItem.ui \
-            gui/feeds/GxsCircleItem.ui \
-            gui/feeds/ChannelsCommentsItem.ui \
-            gui/feeds/PeerItem.ui \
-            gui/feeds/MsgItem.ui \
-            gui/feeds/ChatMsgItem.ui \
-            gui/feeds/SubFileItem.ui \
-            gui/feeds/AttachFileItem.ui \
-            gui/feeds/SecurityItem.ui \
-            gui/feeds/SecurityIpItem.ui \
-            gui/im_history/ImHistoryBrowser.ui \
-            gui/groups/CreateGroup.ui \
-            gui/common/GroupTreeWidget.ui \
-            gui/common/AvatarWidget.ui \
-            gui/common/NewFriendList.ui \
-            gui/common/FriendSelectionWidget.ui \
-            gui/common/HashBox.ui \
-            gui/common/RSImageBlockWidget.ui \
-            gui/common/RsCollectionDialog.ui \
-            gui/common/HeaderFrame.ui \
-            gui/common/RSFeedWidget.ui \
-            gui/style/StyleDialog.ui \
-            gui/statistics/BandwidthGraphWindow.ui \
-            gui/statistics/BandwidthStatsWidget.ui \
-            gui/statistics/DhtWindow.ui \
-            gui/statistics/TurtleRouterDialog.ui \
-            gui/statistics/TurtleRouterStatistics.ui \
-            gui/statistics/GxsIdStatistics.ui \
-            gui/statistics/GlobalRouterStatistics.ui \
-            gui/statistics/GxsTransportStatistics.ui \
-            gui/statistics/StatisticsWindow.ui \
-            gui/statistics/BwCtrlWindow.ui \
-            gui/statistics/RttStatistics.ui \
-            gui/GetStartedDialog.ui \
-            util/RichTextEdit.ui
-
-
-#            gui/ForumsDialog.ui \
-#            gui/forums/CreateForum.ui \
-#            gui/forums/CreateForumMsg.ui \
-#            gui/forums/ForumDetails.ui \
-#            gui/forums/EditForumDetails.ui \
-#            gui/feeds/ForumNewItem.ui \
-#            gui/feeds/ForumMsgItem.ui \
-#            gui/ChannelFeed.ui \
-#            gui/channels/CreateChannel.ui \
-#            gui/channels/CreateChannelMsg.ui \
-#            gui/channels/ChannelDetails.ui \
-#            gui/channels/EditChanDetails.ui \
-#            gui/feeds/ChanNewItem.ui \
-#            gui/feeds/ChanMsgItem.ui \
-
-SOURCES +=  main.cpp \
-            rshare.cpp \
-            gui/notifyqt.cpp \
-            gui/AboutDialog.cpp \
-            gui/AboutWidget.cpp \
-            gui/QuickStartWizard.cpp \
-            gui/StartDialog.cpp \
-            gui/HomePage.cpp\
-            gui/GenCertDialog.cpp \
-            gui/NetworkDialog.cpp \
-            gui/mainpagestack.cpp \
-            gui/MainWindow.cpp \
-            gui/NetworkView.cpp \
-            gui/FriendsDialog.cpp \
-            gui/ServicePermissionDialog.cpp \
-            gui/RemoteDirModel.cpp \
-            gui/RsAutoUpdatePage.cpp \
-            gui/RetroShareLink.cpp \
-            gui/SearchTreeWidget.cpp \
-            gui/ShareManager.cpp \
-#            gui/ShareDialog.cpp \
-#            gui/SFListDelegate.cpp \
-            gui/SoundManager.cpp \
-            gui/im_history/ImHistoryBrowser.cpp \
-            gui/im_history/IMHistoryItemDelegate.cpp \
-            gui/im_history/IMHistoryItemPainter.cpp \
-            gui/help/browser/helpbrowser.cpp \
-            gui/help/browser/helptextbrowser.cpp \
-            gui/FileTransfer/SearchDialog.cpp \
-            gui/FileTransfer/SharedFilesDialog.cpp \
-            gui/FileTransfer/TransfersDialog.cpp \
-            gui/FileTransfer/FileTransferInfoWidget.cpp \
-            gui/FileTransfer/DLListDelegate.cpp \
-            gui/FileTransfer/ULListDelegate.cpp \
-            gui/FileTransfer/xprogressbar.cpp \
-            gui/FileTransfer/DetailsDialog.cpp \
-            gui/FileTransfer/TransferUserNotify.cpp \
-            gui/FileTransfer/BannedFilesDialog.cpp \
-            gui/MainPage.cpp \
-            gui/HelpDialog.cpp \
-            gui/LogoBar.cpp \
-            lang/languagesupport.cpp \
-            util/RsProtectedTimer.cpp \
-            util/stringutil.cpp \
-            util/RsNetUtil.cpp \
-            util/DateTime.cpp \
-            util/RetroStyleLabel.cpp \
-            util/WidgetBackgroundImage.cpp \
-#            util/NonCopyable.cpp \
-            util/PixmapMerging.cpp \
-            util/MouseEventFilter.cpp \
-            util/EventFilter.cpp \
-            util/Widget.cpp \
-            util/RsAction.cpp \
-            util/printpreview.cpp \
-            util/log.cpp \
-            util/misc.cpp \
-            util/HandleRichText.cpp \
-            util/ObjectPainter.cpp \
-            util/RsFile.cpp \
-            util/RichTextEdit.cpp \
-            util/ClickableLabel.cpp \
-            util/AspectRatioPixmapLabel.cpp \
-            gui/profile/ProfileWidget.cpp \
-            gui/profile/StatusMessage.cpp \
-            gui/profile/ProfileManager.cpp \
-            gui/chat/PopupChatWindow.cpp \
-            gui/chat/PopupChatDialog.cpp \
-            gui/chat/PopupDistantChatDialog.cpp \
-            gui/chat/ChatTabWidget.cpp \
-            gui/chat/ChatWidget.cpp \
-            gui/chat/ChatDialog.cpp \
-            gui/ChatLobbyWidget.cpp \
-            gui/chat/ChatLobbyDialog.cpp \
-            gui/chat/CreateLobbyDialog.cpp \
-            gui/chat/ChatStyle.cpp \
-            gui/chat/ChatUserNotify.cpp \
-            gui/chat/ChatLobbyUserNotify.cpp \
-            gui/connect/ConfCertDialog.cpp \
-            gui/connect/PGPKeyDialog.cpp \
-            gui/msgs/MessagesDialog.cpp \
-            gui/msgs/MessageComposer.cpp \
-            gui/msgs/MessageWidget.cpp \
-            gui/msgs/MessageWindow.cpp \
-            gui/msgs/MessageModel.cpp \
-            gui/msgs/TagsMenu.cpp \
-            gui/msgs/MessageUserNotify.cpp \
-            gui/common/RsButtonOnText.cpp \
-            gui/common/RSGraphWidget.cpp \
-            gui/common/ElidedLabel.cpp \
-            gui/common/vmessagebox.cpp \
-            gui/common/RsCollectionDialog.cpp \
-            gui/common/RsUrlHandler.cpp \
-            gui/common/rwindow.cpp \
-            gui/common/rshtml.cpp \
-            gui/common/AvatarDefs.cpp \
-            gui/common/AvatarDialog.cpp \
-            gui/common/GroupFlagsWidget.cpp \
-            gui/common/GroupSelectionBox.cpp \
-            gui/common/GroupChooser.cpp \
-            gui/common/StatusDefs.cpp \
-            gui/common/TagDefs.cpp \
-            gui/common/GroupDefs.cpp \
-            gui/common/Emoticons.cpp \
-            gui/common/RSComboBox.cpp \
-            gui/common/RSListWidgetItem.cpp \
-            gui/common/RSTextEdit.cpp \
-            gui/common/RSPlainTextEdit.cpp \
-            gui/common/RSTreeWidget.cpp \
-            gui/common/RSTreeWidgetItem.cpp \
-            gui/common/RSFeedWidget.cpp \
-            gui/common/RSTabWidget.cpp \
-            gui/common/RSElidedItemDelegate.cpp \
-            gui/common/RSItemDelegate.cpp \
-            gui/common/PeerDefs.cpp \
-            gui/common/FilesDefs.cpp \
-            gui/common/PopularityDefs.cpp \
-            gui/common/RsBanListDefs.cpp \
-            gui/common/GroupTreeWidget.cpp \
-            gui/common/RSTreeView.cpp \
-            gui/common/AvatarWidget.cpp \
-            gui/common/FriendListModel.cpp \
-            gui/common/NewFriendList.cpp \
-            gui/common/FriendSelectionWidget.cpp \
-            gui/common/FriendSelectionDialog.cpp \
-            gui/common/HashBox.cpp \
-            gui/common/LineEditClear.cpp \
-            gui/common/DropLineEdit.cpp \
-            gui/common/RSTextBrowser.cpp \
-            gui/common/RSImageBlockWidget.cpp \
-            gui/common/FeedNotify.cpp \
-            gui/common/UserNotify.cpp \
-            gui/common/HeaderFrame.cpp \
-            gui/common/MimeTextEdit.cpp \
-            gui/common/UIStateHelper.cpp \
-            gui/common/FloatingHelpBrowser.cpp \
-            gui/common/SubscribeToolButton.cpp \
-            gui/common/RsBanListToolButton.cpp \
-            gui/common/FlowLayout.cpp \
-            gui/common/PictureFlow.cpp \
-            gui/common/ToasterNotify.cpp \
-            gui/style/RSStyle.cpp \
-            gui/style/StyleDialog.cpp \
-            gui/settings/RSPermissionMatrixWidget.cpp \
-            gui/settings/rsharesettings.cpp \
-            gui/settings/RsharePeerSettings.cpp \
-            gui/settings/rsettings.cpp \
-            gui/settings/rsettingswin.cpp \
-            gui/settings/GeneralPage.cpp \
-            gui/settings/AboutPage.cpp \
-            gui/settings/ServerPage.cpp \
-            gui/settings/NotifyPage.cpp \
-            gui/settings/CryptoPage.cpp \
-            gui/settings/PeoplePage.cpp \
-            gui/settings/MessagePage.cpp \
-            gui/settings/NewTag.cpp \
-            gui/settings/ForumPage.cpp \
-            gui/settings/PluginsPage.cpp \
-            gui/settings/PluginItem.cpp \
-            gui/settings/AppearancePage.cpp \
-            gui/settings/FileAssociationsPage.cpp \
-            gui/settings/SoundPage.cpp \
-            gui/settings/TransferPage.cpp \
-            gui/settings/ChatPage.cpp \
-            gui/settings/ChannelPage.cpp \
-            gui/settings/PostedPage.cpp \
-            gui/settings/ServicePermissionsPage.cpp \
-            gui/settings/AddFileAssociationDialog.cpp \
-            gui/settings/GroupFrameSettingsWidget.cpp \
-            gui/statusbar/peerstatus.cpp \
-            gui/statusbar/natstatus.cpp \
-            gui/statusbar/dhtstatus.cpp \
-            gui/statusbar/torstatus.cpp \
-            gui/statusbar/ratesstatus.cpp \
-            gui/statusbar/hashingstatus.cpp \
-            gui/statusbar/discstatus.cpp \
-            gui/statusbar/SoundStatus.cpp \
-            gui/statusbar/OpModeStatus.cpp \
-            gui/statusbar/ToasterDisable.cpp \
-            gui/statusbar/SysTrayStatus.cpp \
-            gui/toaster/ToasterItem.cpp \
-            gui/toaster/MessageToaster.cpp \
-            gui/toaster/DownloadToaster.cpp \
-            gui/toaster/OnlineToaster.cpp \
-            gui/toaster/ChatToaster.cpp \
-            gui/toaster/GroupChatToaster.cpp \
-            gui/toaster/ChatLobbyToaster.cpp \
-            gui/toaster/FriendRequestToaster.cpp \
-            gui/advsearch/advancedsearchdialog.cpp \
-            gui/advsearch/expressionwidget.cpp \
-            gui/advsearch/guiexprelement.cpp \
-            gui/elastic/graphwidget.cpp \
-            gui/elastic/edge.cpp \
-            gui/elastic/arrow.cpp \
-            gui/elastic/elnode.cpp \
-            gui/NewsFeed.cpp \
-            gui/feeds/BoardsCommentsItem.cpp \
-            gui/feeds/FeedItem.cpp \
-            gui/feeds/FeedHolder.cpp \
-            gui/feeds/GxsCircleItem.cpp \
-            gui/feeds/ChannelsCommentsItem.cpp \
-            gui/feeds/PeerItem.cpp \
-            gui/feeds/MsgItem.cpp \
-            gui/feeds/ChatMsgItem.cpp \
-            gui/feeds/SubFileItem.cpp \
-            gui/feeds/AttachFileItem.cpp \
-            gui/feeds/SecurityItem.cpp \
-            gui/feeds/SecurityIpItem.cpp \
-            gui/feeds/NewsFeedUserNotify.cpp \
-            gui/connect/ConnectFriendWizard.cpp \
-            gui/connect/ConnectProgressDialog.cpp \
-            gui/connect/FriendRecommendDialog.cpp \
-            gui/groups/CreateGroup.cpp \
-            gui/GetStartedDialog.cpp \
-            gui/statistics/BandwidthGraphWindow.cpp \
-            gui/statistics/BandwidthStatsWidget.cpp \
-            gui/statistics/DhtWindow.cpp \
-            gui/statistics/Histogram.cpp \
-            gui/statistics/TurtleRouterDialog.cpp \
-            gui/statistics/TurtleRouterStatistics.cpp \
-            gui/statistics/GxsIdStatistics.cpp \
-            gui/statistics/GlobalRouterStatistics.cpp \
-            gui/statistics/GxsTransportStatistics.cpp \
-            gui/statistics/StatisticsWindow.cpp \
-            gui/statistics/BwCtrlWindow.cpp \
-            gui/statistics/RttStatistics.cpp \
-            gui/statistics/BWGraph.cpp \
-    util/RsSyntaxHighlighter.cpp \
-    util/imageutil.cpp \
-    gui/NetworkDialog/pgpid_item_model.cpp \
-    gui/NetworkDialog/pgpid_item_proxy.cpp \
-    gui/common/RsCollection.cpp \
-    util/retroshareWin32.cpp
-#            gui/ForumsDialog.cpp \
-#            gui/forums/ForumDetails.cpp \
-#            gui/forums/EditForumDetails.cpp \
-#            gui/forums/CreateForum.cpp \
-#            gui/forums/CreateForumMsg.cpp \
-#            gui/forums/ForumUserNotify.cpp \
-#            gui/feeds/ForumNewItem.cpp \
-#            gui/feeds/ForumMsgItem.cpp \
-#            gui/ChannelFeed.cpp \
-#            gui/channels/CreateChannel.cpp \
-#            gui/channels/CreateChannelMsg.cpp \
-#            gui/channels/ChannelDetails.cpp \
-#            gui/channels/EditChanDetails.cpp \
-#            gui/channels/ChannelUserNotify.cpp \
-#            gui/feeds/ChanNewItem.cpp \
-#            gui/feeds/ChanMsgItem.cpp \
-
-RESOURCES += gui/images.qrc gui/icons.qrc lang/lang.qrc gui/help/content/content.qrc gui/emojione.qrc \
-  gui/qss/stylesheet/qdarkstyle/dark/Standard_Dark.qrc \
-  gui/qss/stylesheet/qdarkstyle/light/Standard_Light.qrc
-
-TRANSLATIONS +=  \
-            lang/retroshare_ca_ES.ts \
-            lang/retroshare_cs.ts \
-            lang/retroshare_da.ts \
-            lang/retroshare_de.ts \
-            lang/retroshare_el.ts \
-            lang/retroshare_en.ts \
-            lang/retroshare_es.ts \
-            lang/retroshare_fi.ts \
-            lang/retroshare_fr.ts \
-            lang/retroshare_hu.ts \
-            lang/retroshare_it.ts \
-            lang/retroshare_ja_JP.ts \
-            lang/retroshare_nl.ts \
-            lang/retroshare_ko.ts \
-            lang/retroshare_pl.ts \
-            lang/retroshare_ru.ts \
-            lang/retroshare_sv.ts \
-            lang/retroshare_tr.ts \
-            lang/retroshare_zh_CN.ts
-
-unfinishedtranslations {
-
-       TRANSLATIONS +=  \
-            lang/retroshare_bg.ts \
-            lang/retroshare_af.ts  \
-            lang/retroshare_pt.ts  \
-            lang/retroshare_sl.ts \
-            lang/retroshare_sr.ts \
-            lang/retroshare_zh_TW.ts
-
-}
-
-messenger {
-     SOURCES +=       gui/MessengerWindow.cpp \
-	 				  gui/common/FriendList.cpp
-     HEADERS +=       gui/MessengerWindow.h \
-	 				  gui/common/FriendList.h 
-     FORMS   +=       gui/MessengerWindow.ui \
-	 				  gui/common/FriendList.ui
-
-	 DEFiNES += MESSENGER_WINDOW
-}
-
-# Shifted Qt4.4 dependancies to here.
-#    qmake CONFIG=pluginmgr
-
-pluginmgr {
-
-        SOURCES += gui/PluginsPage.cpp \
-            	gui/PluginManagerWidget.cpp \
-            	gui/PluginManager.cpp
-
-        HEADERS += gui/PluginsPage.h  \
-            	gui/PluginManagerWidget.h \
-            	gui/PluginManager.h
-
-        DEFINES *= PLUGINMGR
-
-}
-
-idle {
-
-HEADERS += idle/idle.h
-
-SOURCES += idle/idle.cpp \
-	   idle/idle_platform.cpp
-}
-
-framecatcher {
-
-HEADERS += util/framecatcher.h
-
-SOURCES += util/framecatcher.cpp
-
-LIBS += -lxine
-
-DEFINES *= CHANNELS_FRAME_CATCHER
-
-}
-
-# Embedded Friend Server
-
-rs_efs {
-	DEFINES *= RS_EMBEDED_FRIEND_SERVER
-        SOURCES += gui/FriendServerControl.cpp
-        HEADERS += gui/FriendServerControl.h
-        FORMS   += gui/FriendServerControl.ui
-}
-
-# BELOW IS GXS Unfinished Services.
-	
-unfinished_services {
-	
-	DEPENDPATH += gui/unfinished \
-	
-	HEADERS += gui/unfinished/ApplicationWindow.h \
-
-#		gui/unfinished/CalDialog.h \
-#		gui/unfinished/ExampleDialog.h \
-#		gui/unfinished/GamesDialog.h \
-#		gui/unfinished/profile/ProfileView.h \
-#		gui/unfinished/profile/ProfileEdit.h
-#		gui/unfinished/StatisticDialog.h \
-#		gui/unfinished/PhotoDialog.h \
-#		gui/unfinished/PhotoShow.h \
-	
-	FORMS += gui/unfinished/ApplicationWindow.ui \
-
-#		gui/unfinished/CalDialog.ui \
-#		gui/unfinished/ExampleDialog.ui \
-#		gui/unfinished/GamesDialog.ui \
-#		gui/unfinished/profile/ProfileView.ui \
-#		gui/unfinished/profile/ProfileEdit.ui
-#		gui/unfinished/StatisticDialog.ui \
-#		gui/unfinished/PhotoDialog.ui \
-#		gui/unfinished/PhotoShow.ui \
-	
-	SOURCES += gui/unfinished/ApplicationWindow.cpp \
-
-#		gui/unfinished/CalDialog.cpp \
-#		gui/unfinished/ExampleDialog.cpp \
-#		gui/unfinished/GamesDialog.cpp \
-#		gui/unfinished/profile/ProfileView.cpp \
-#		gui/unfinished/profile/ProfileEdit.cpp
-#		gui/unfinished/StatisticDialog.cpp \
-#		gui/unfinished/PhotoDialog.cpp \
-#		gui/unfinished/PhotoShow.cpp \
-	
-	DEFINES *= UNFINISHED
-}
-	
-	
-gxsphotoshare {
-	#DEFINES += RS_USE_PHOTOSHARE # to enable in unfinished.
-	DEFINES += RS_USE_PHOTO # enable in MainWindow
-
-	HEADERS += \
-		gui/PhotoShare/AlbumGroupDialog.h \
-		gui/PhotoShare/AlbumExtra.h \
-		gui/PhotoShare/PhotoDrop.h \
-		gui/PhotoShare/AlbumItem.h \
-		gui/PhotoShare/AlbumDialog.h \
-		gui/PhotoShare/PhotoItem.h \
-		gui/PhotoShare/PhotoShareItemHolder.h \
-		gui/PhotoShare/PhotoShare.h \
-		gui/PhotoShare/PhotoSlideShow.h \
-		gui/PhotoShare/PhotoDialog.h
-
-	FORMS += \
-		gui/PhotoShare/AlbumExtra.ui \
-		gui/PhotoShare/PhotoItem.ui \
-		gui/PhotoShare/PhotoDialog.ui \
-		gui/PhotoShare/AlbumItem.ui \
-		gui/PhotoShare/AlbumDialog.ui \
-		gui/PhotoShare/PhotoShare.ui \
-		gui/PhotoShare/PhotoSlideShow.ui
-
-	SOURCES += \
-		gui/PhotoShare/AlbumGroupDialog.cpp \
-		gui/PhotoShare/AlbumExtra.cpp \
-		gui/PhotoShare/PhotoItem.cpp \
-		gui/PhotoShare/PhotoDialog.cpp \
-		gui/PhotoShare/PhotoDrop.cpp \
-		gui/PhotoShare/AlbumItem.cpp \
-		gui/PhotoShare/AlbumDialog.cpp \
-		gui/PhotoShare/PhotoShareItemHolder.cpp \
-		gui/PhotoShare/PhotoShare.cpp \
-		gui/PhotoShare/PhotoSlideShow.cpp
-
-	RESOURCES += gui/PhotoShare/Photo_images.qrc
-
-}
-	
-	
-wikipoos {
-	DEFINES += RS_USE_WIKI
-	
-	DEPENDPATH += ../../supportlibs/pegmarkdown
-	INCLUDEPATH += ../../supportlibs/pegmarkdown
-	
-	HEADERS += gui/WikiPoos/WikiDialog.h \
-		gui/WikiPoos/WikiAddDialog.h \
-		gui/WikiPoos/WikiEditDialog.h \
-		gui/gxs/WikiGroupDialog.h \
-
-	FORMS += gui/WikiPoos/WikiDialog.ui \
-		gui/WikiPoos/WikiAddDialog.ui \
-		gui/WikiPoos/WikiEditDialog.ui \
-	
-	SOURCES += gui/WikiPoos/WikiDialog.cpp \
-		gui/WikiPoos/WikiAddDialog.cpp \
-		gui/WikiPoos/WikiEditDialog.cpp \
-		gui/gxs/WikiGroupDialog.cpp \
-
-	RESOURCES += gui/WikiPoos/Wiki_images.qrc
-
-}
-	
-	
-	
-gxsthewire {
-	
-	DEFINES += RS_USE_WIRE
-
-	HEADERS += gui/TheWire/WireDialog.h \
-		gui/TheWire/WireGroupItem.h \
-		gui/TheWire/WireGroupDialog.h \
-		gui/TheWire/WireGroupExtra.h \
-		gui/TheWire/PulseAddDialog.h \
-		gui/TheWire/PulseViewItem.h \
-		gui/TheWire/PulseTopLevel.h \
-		gui/TheWire/PulseViewGroup.h \
-		gui/TheWire/PulseReply.h \
-		gui/TheWire/PulseReplySeperator.h \
-		gui/TheWire/PulseMessage.h \
-                gui/TheWire/CustomFrame.h \
-
-	FORMS += gui/TheWire/WireDialog.ui \
-		gui/TheWire/WireGroupItem.ui \
-		gui/TheWire/WireGroupExtra.ui \
-		gui/TheWire/PulseAddDialog.ui \
-		gui/TheWire/PulseTopLevel.ui \
-		gui/TheWire/PulseViewGroup.ui \
-		gui/TheWire/PulseReply.ui \
-		gui/TheWire/PulseReplySeperator.ui \
-		gui/TheWire/PulseMessage.ui \
-	
-	SOURCES += gui/TheWire/WireDialog.cpp \
-		gui/TheWire/WireGroupItem.cpp \
-		gui/TheWire/WireGroupDialog.cpp \
-		gui/TheWire/WireGroupExtra.cpp \
-		gui/TheWire/PulseAddDialog.cpp \
-		gui/TheWire/PulseViewItem.cpp \
-		gui/TheWire/PulseTopLevel.cpp \
-		gui/TheWire/PulseViewGroup.cpp \
-		gui/TheWire/PulseReply.cpp \
-		gui/TheWire/PulseReplySeperator.cpp \
-		gui/TheWire/PulseMessage.cpp \
-                gui/TheWire/CustomFrame.cpp \
-
-	RESOURCES += gui/TheWire/TheWire_images.qrc
-}
-
-identities {
-	
-	HEADERS +=  \
-		gui/Identity/IdDialog.h \
-		gui/Identity/IdEditDialog.h \
-		gui/Identity/IdDetailsDialog.h \
-	
-	FORMS += gui/Identity/IdDialog.ui \
-		gui/Identity/IdEditDialog.ui \
-		gui/Identity/IdDetailsDialog.ui \
-
-	SOURCES +=  \
-		gui/Identity/IdDialog.cpp \
-		gui/Identity/IdEditDialog.cpp \
-		gui/Identity/IdDetailsDialog.cpp \
-	
-}
-	
-gxscircles {
-	DEFINES += RS_USE_CIRCLES
-#	DEFINES += RS_USE_NEW_PEOPLE_DIALOG
-
-	HEADERS +=  \
-		gui/Circles/CirclesDialog.h \
-		gui/Circles/CreateCircleDialog.h \
-	
-	FORMS += gui/Circles/CirclesDialog.ui \
-		gui/Circles/CreateCircleDialog.ui \
-	
-	SOURCES +=  \
-		gui/Circles/CirclesDialog.cpp \
-		gui/Circles/CreateCircleDialog.cpp \
-
-	HEADERS += gui/People/PeopleDialog.h
-	HEADERS += gui/People/CircleWidget.h
-	HEADERS += gui/People/IdentityWidget.h
-
-	FORMS   += gui/People/PeopleDialog.ui 
-	FORMS   += gui/People/CircleWidget.ui
-	FORMS   += gui/People/IdentityWidget.ui
-
-	SOURCES += gui/People/PeopleDialog.cpp 
-	SOURCES += gui/People/CircleWidget.cpp
-	SOURCES += gui/People/IdentityWidget.cpp
-
-#HEADERS += gui/People/IdentityItem.h
-#HEADERS += gui/People/CircleItem.h
-#HEADERS += gui/People/GroupListView.h
-#SOURCES += gui/People/GroupListView.cpp
-#SOURCES += gui/People/IdentityItem.cpp
-#SOURCES += gui/People/CircleItem.cpp
-
-
-}
-	
-	
-gxsforums {
-
-	HEADERS += gui/gxsforums/GxsForumsDialog.h \
-		gui/gxsforums/GxsForumGroupDialog.h \
-		gui/gxsforums/CreateGxsForumMsg.h \
-		gui/gxsforums/GxsForumThreadWidget.h \
-		gui/gxsforums/GxsForumModel.h \
-		gui/gxsforums/GxsForumUserNotify.h \
-		gui/feeds/GxsForumGroupItem.h \
-		gui/feeds/GxsForumMsgItem.h
-
-	FORMS += gui/gxsforums/CreateGxsForumMsg.ui \
-		gui/gxsforums/GxsForumThreadWidget.ui \
-		gui/feeds/GxsForumGroupItem.ui \
-		gui/feeds/GxsForumMsgItem.ui
-
-	SOURCES += gui/gxsforums/GxsForumsDialog.cpp \
-		gui/gxsforums/GxsForumGroupDialog.cpp \
-		gui/gxsforums/CreateGxsForumMsg.cpp \
-		gui/gxsforums/GxsForumThreadWidget.cpp \
-		gui/gxsforums/GxsForumModel.cpp \
-		gui/gxsforums/GxsForumUserNotify.cpp \
-		gui/feeds/GxsForumGroupItem.cpp \
-		gui/feeds/GxsForumMsgItem.cpp
-}
-	
-	
-gxschannels {
-	
-	HEADERS += gui/gxschannels/GxsChannelDialog.h \
-		gui/gxschannels/GxsChannelGroupDialog.h \
-		gui/gxschannels/CreateGxsChannelMsg.h \
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.h \
-		gui/gxschannels/GxsChannelPostsModel.h \
-		gui/gxschannels/GxsChannelPostFilesModel.h \
-		gui/gxschannels/GxsChannelPostThumbnail.h \
-		gui/gxschannels/GxsChannelFilesStatusWidget.h \
-		gui/feeds/GxsChannelGroupItem.h \
-		gui/feeds/GxsChannelPostItem.h \
-		gui/gxschannels/GxsChannelUserNotify.h
-	
-	FORMS += \
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.ui \
-		gui/gxschannels/GxsChannelFilesStatusWidget.ui \
-		gui/gxschannels/CreateGxsChannelMsg.ui \
-		gui/feeds/GxsChannelGroupItem.ui \
-		gui/feeds/GxsChannelPostItem.ui
-	
-	SOURCES += gui/gxschannels/GxsChannelDialog.cpp \
-		gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp \
-		gui/gxschannels/GxsChannelPostsModel.cpp \
-		gui/gxschannels/GxsChannelPostFilesModel.cpp \
-		gui/gxschannels/GxsChannelFilesStatusWidget.cpp \
-                gui/gxschannels/GxsChannelPostThumbnail.cpp \
-		gui/gxschannels/GxsChannelGroupDialog.cpp \
-		gui/gxschannels/CreateGxsChannelMsg.cpp \
-		gui/feeds/GxsChannelGroupItem.cpp \
-		gui/feeds/GxsChannelPostItem.cpp \
-		gui/gxschannels/GxsChannelUserNotify.cpp
-}
-	
-	
-posted {
-	
-	HEADERS += gui/Posted/PostedDialog.h \
-		gui/Posted/PostedListWidgetWithModel.h \
-		gui/Posted/PostedPostsModel.h \
-		gui/Posted/BoardPostDisplayWidget.h \
-		gui/Posted/PostedItem.h \
-		gui/Posted/PostedCardView.h \
-		gui/Posted/PostedGroupDialog.h \
-		gui/feeds/PostedGroupItem.h \
-		gui/Posted/PostedCreatePostDialog.h \
-		gui/Posted/PhotoView.h \
-		gui/Posted/PostedUserNotify.h
-
-		#gui/Posted/PostedCreateCommentDialog.h \
-		#gui/Posted/PostedComments.h \
-	
-	FORMS += gui/Posted/PostedListWidgetWithModel.ui \
-		gui/feeds/PostedGroupItem.ui \
-		gui/Posted/BoardPostDisplayWidget_compact.ui \
-		gui/Posted/BoardPostDisplayWidget_card.ui \
-		gui/Posted/PostedItem.ui \
-		gui/Posted/PostedCardView.ui \
-		gui/Posted/PostedCreatePostDialog.ui \
-		gui/Posted/PhotoView.ui \
-		#gui/Posted/PostedDialog.ui \
-		#gui/Posted/PostedComments.ui \
-		#gui/Posted/PostedCreateCommentDialog.ui
-	
-	SOURCES += gui/Posted/PostedDialog.cpp \
-		gui/Posted/PostedListWidgetWithModel.cpp \
-		gui/Posted/BoardPostDisplayWidget.cpp \
-		gui/Posted/PostedPostsModel.cpp \
-		gui/feeds/PostedGroupItem.cpp \
-		gui/Posted/PostedItem.cpp \
-		gui/Posted/PostedCardView.cpp \
-		gui/Posted/PostedGroupDialog.cpp \
-		gui/Posted/PostedCreatePostDialog.cpp \
-		gui/Posted/PhotoView.cpp \
-		gui/Posted/PostedUserNotify.cpp
-
-		#gui/Posted/PostedDialog.cpp \
-		#gui/Posted/PostedComments.cpp \
-		#gui/Posted/PostedCreateCommentDialog.cpp
-	
-	RESOURCES += gui/Posted/Posted_images.qrc
-}
-	
-gxsgui {
-	
-	HEADERS += gui/gxs/GxsGroupDialog.h \
-		gui/gxs/GxsIdDetails.h \
-		gui/gxs/GxsIdChooser.h \
-		gui/gxs/GxsIdLabel.h \
-		gui/gxs/GxsCircleChooser.h \
-		gui/gxs/GxsCircleLabel.h \
-		gui/gxs/GxsIdTreeWidgetItem.h \
-		gui/gxs/GxsCommentTreeWidget.h \
-		gui/gxs/GxsCommentContainer.h \
-		gui/gxs/GxsCommentDialog.h \
-		gui/gxs/GxsCreateCommentDialog.h \
-		gui/gxs/GxsGroupFrameDialog.h \
-		gui/gxs/GxsMessageFrameWidget.h \
-		gui/gxs/GxsMessageFramePostWidget.h \
-		gui/gxs/GxsGroupFeedItem.h \
-		gui/gxs/GxsFeedItem.h \
-		gui/gxs/GxsGroupShareKey.h \
-		gui/gxs/GxsUserNotify.h \
-		gui/gxs/GxsFeedWidget.h \
-		util/TokenQueue.h \
-		util/RsGxsUpdateBroadcast.h \
-	
-#		gui/gxs/GxsMsgDialog.h \
-	
-	FORMS += gui/gxs/GxsGroupDialog.ui \
-		gui/gxs/GxsCommentContainer.ui \
-		gui/gxs/GxsCommentDialog.ui \
-		gui/gxs/GxsCreateCommentDialog.ui \
-		gui/gxs/GxsGroupFrameDialog.ui\
-		gui/gxs/GxsGroupShareKey.ui 
-#		gui/gxs/GxsMsgDialog.ui \
-#		gui/gxs/GxsCommentTreeWidget.ui 
-	
-	SOURCES += gui/gxs/GxsGroupDialog.cpp \
-		gui/gxs/GxsIdDetails.cpp \
-		gui/gxs/GxsIdChooser.cpp \
-		gui/gxs/GxsIdLabel.cpp \
-		gui/gxs/GxsCircleChooser.cpp \
-		gui/gxs/GxsGroupShareKey.cpp \
-		gui/gxs/GxsCircleLabel.cpp \
-		gui/gxs/GxsIdTreeWidgetItem.cpp \
-		gui/gxs/GxsCommentTreeWidget.cpp \
-		gui/gxs/GxsCommentContainer.cpp \
-		gui/gxs/GxsCommentDialog.cpp \
-		gui/gxs/GxsCreateCommentDialog.cpp \
-		gui/gxs/GxsGroupFrameDialog.cpp \
-		gui/gxs/GxsMessageFrameWidget.cpp \
-		gui/gxs/GxsMessageFramePostWidget.cpp \
-		gui/gxs/GxsGroupFeedItem.cpp \
-		gui/gxs/GxsFeedItem.cpp \
-		gui/gxs/GxsUserNotify.cpp \
-		gui/gxs/GxsFeedWidget.cpp \
-		util/TokenQueue.cpp \
-		util/RsGxsUpdateBroadcast.cpp \
-	
-#		gui/gxs/GxsMsgDialog.cpp \
-	
-	
-}
-
-
-wikipoos {
-	HEADERS += \
-		gui/gxs/RsGxsUpdateBroadcastBase.h \
-		gui/gxs/RsGxsUpdateBroadcastWidget.h \
-		gui/gxs/RsGxsUpdateBroadcastPage.h 
-
-	SOURCES += \
-		gui/gxs/RsGxsUpdateBroadcastBase.cpp \
-		gui/gxs/RsGxsUpdateBroadcastWidget.cpp \
-		gui/gxs/RsGxsUpdateBroadcastPage.cpp \
-}
-
-################################################################
-#Define qmake_info.h file so GUI can get wath was used to compil
-#         This must be at end to get all informations
-################################################################
-RS_QMAKE_DEFINES=\\\"$${DEFINES}\\\"
-RS_QMAKE_CONFIG=\\\"$${CONFIG}\\\"
-
-INCLUDEPATH += $$OUT_PWD/include
-info_file.input = $$PWD/qmake_info.h.in
-info_file.output = $$OUT_PWD/include/qmake_info.h
-
-QMAKE_SUBSTITUTES += info_file
-OTHER_FILES += \
-    qmake_info.h.in
+################################################################################
+# uselibresapi.pri                                                             #
+# Copyright (C) 2018, Retroshare team <retroshare.team@gmailcom>               #
+#                                                                              #
+# This program is free software: you can redistribute it and/or modify         #
+# it under the terms of the GNU Affero General Public License as               #
+# published by the Free Software Foundation, either version 3 of the           #
+# License, or (at your option) any later version.                              #
+#                                                                              #
+# This program is distributed in the hope that it will be useful,              #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU Affero General Public License for more details.                          #
+#                                                                              #
+# You should have received a copy of the GNU Affero General Public License     #
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.       #
+################################################################################
+
+!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
+
+TEMPLATE = app
+QT     += network xml 
+CONFIG += qt gui uic qrc resources idle 
+CONFIG += console
+TARGET = retroshare
+DEFINES += TARGET=\\\"$${TARGET}\\\"
+
+DEPENDPATH  *= $${PWD} $${RS_INCLUDE_DIR}
+INCLUDEPATH *= $${PWD}
+
+!include("../../libretroshare/src/use_libretroshare.pri"):error("Including")
+
+rs_webui {
+rs_jsonapi {
+    HEADERS *= gui/settings/WebuiPage.h
+    SOURCES *= gui/settings/WebuiPage.cpp
+    FORMS *= gui/settings/WebuiPage.ui
+}
+}
+
+rs_jsonapi {
+    HEADERS *= gui/settings/JsonApiPage.h
+    SOURCES *= gui/settings/JsonApiPage.cc
+    FORMS *= gui/settings/JsonApiPage.ui
+}
+
+# Auto detect installed version of cmark
+rs_gui_cmark {
+	DEFINES *= USE_CMARK
+	no_rs_cross_compiling {
+		message("Using compiled cmark")
+		CMARK_SRC_PATH=$$clean_path($${RS_SRC_PATH}/supportlibs/cmark)
+		CMARK_BUILD_PATH=$$clean_path($${RS_BUILD_PATH}/supportlibs/cmark/build)
+		INCLUDEPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
+		DEPENDPATH *= $$clean_path($${CMARK_SRC_PATH}/src/)
+		QMAKE_LIBDIR *= $$clean_path($${CMARK_BUILD_PATH}/)
+		# Using sLibs would fail as libcmark.a is generated at compile-time
+		LIBS *= -L$$clean_path($${CMARK_BUILD_PATH}/src/) -lcmark
+
+		DUMMYCMARKINPUT = FORCE
+		CMAKE_GENERATOR_OVERRIDE=""
+		win32-g++|win32-clang-g++:CMAKE_GENERATOR_OVERRIDE="-G \"MSYS Makefiles\""
+		gencmarklib.name = Generating libcmark.
+		gencmarklib.input = DUMMYCMARKINPUT
+		gencmarklib.output = $$clean_path($${CMARK_BUILD_PATH}/src/libcmark.a)
+		gencmarklib.CONFIG += target_predeps combine
+		gencmarklib.variable_out = PRE_TARGETDEPS
+		gencmarklib.commands = \
+		    cd $${RS_SRC_PATH} && ( \
+		    git submodule update --init supportlibs/cmark ; \
+		    cd $${CMARK_SRC_PATH} ; \
+		    true ) && \
+		    mkdir -p $${CMARK_BUILD_PATH} && cd $${CMARK_BUILD_PATH} && \
+		    cmake \
+		        -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
+                        \"-DCMAKE_CXX_FLAGS=$${QMAKE_CXXFLAGS}\" \
+		        $${CMAKE_GENERATOR_OVERRIDE} \
+		        -DCMAKE_INSTALL_PREFIX=. \
+		        -B. \
+		        -H$$shell_path($${CMARK_SRC_PATH}) && \
+		    $(MAKE)
+		QMAKE_EXTRA_COMPILERS += gencmarklib
+	} else {
+		message("Using systems cmark")
+		sLibs *= libcmark
+	}
+}
+
+FORMS   += TorControl/TorControlWindow.ui
+SOURCES += TorControl/TorControlWindow.cpp
+HEADERS += TorControl/TorControlWindow.h
+
+#QMAKE_CFLAGS += -fmudflap 
+#LIBS *= /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflap.a /usr/lib/gcc/x86_64-linux-gnu/4.4/libmudflapth.a
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+	# Qt 5
+        QT     += widgets multimedia printsupport
+	linux-* {
+		QT += x11extras
+	}
+} else {
+	# Qt 4
+	CONFIG += uitools
+}
+
+CONFIG += identities
+CONFIG += gxsforums
+CONFIG += gxschannels
+CONFIG += posted
+CONFIG += gxsgui
+CONFIG += gxscircles
+
+# Other Disabled Bits.
+#CONFIG += framecatcher
+
+## To enable unfinished services
+#CONFIG += wikipoos
+#CONFIG += gxsthewire
+#CONFIG += gxsphotoshare
+
+DEFINES += RS_RELEASE_VERSION
+RCC_DIR = temp/qrc
+UI_DIR  = temp/ui
+MOC_DIR = temp/moc
+
+################################# Linux ##########################################
+# Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
+linux-* {
+	CONFIG += link_pkgconfig
+
+	#CONFIG += version_detail_bash_script
+	QMAKE_CXXFLAGS *= -D_FILE_OFFSET_BITS=64
+
+	PKGCONFIG *= x11 xscrnsaver
+
+	LIBS *= -rdynamic 
+	DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
+}
+
+rs_sanitize {
+	LIBS *= -lasan -lubsan
+}
+
+unix {
+	target.path = "$${BIN_DIR}"
+	INSTALLS += target
+
+        data_files.path="$${RS_DATA_DIR}/"
+	data_files.files=sounds qss
+	INSTALLS += data_files
+
+        style_files.path="$${RS_DATA_DIR}/stylesheets"
+	style_files.files=gui/qss/chat/Bubble gui/qss/chat/Bubble_Compact
+	INSTALLS += style_files
+
+	icon_files.path = "$${PREFIX}/share/icons/hicolor"
+	icon_files.files =  ../../data/24x24
+	icon_files.files += ../../data/48x48
+	icon_files.files += ../../data/64x64
+	icon_files.files += ../../data/128x128
+	INSTALLS += icon_files
+
+	desktop_files.path = "$${PREFIX}/share/applications"
+	desktop_files.files = ../../data/retroshare.desktop
+	INSTALLS += desktop_files
+
+	pixmap_files.path = "$${PREFIX}/share/pixmaps"
+	pixmap_files.files = ../../data/retroshare.xpm
+	INSTALLS += pixmap_files
+
+}
+
+linux-g++ {
+	OBJECTS_DIR = temp/linux-g++/obj
+}
+
+linux-g++-64 {
+	OBJECTS_DIR = temp/linux-g++-64/obj
+}
+
+version_detail_bash_script {
+	warning("Version detail script is deprecated.")
+	warning("Remove references to version_detail_bash_script from all of your build scripts!")
+}
+
+#################### Cross compilation for windows under Linux ###################
+
+win32-x-g++ {
+		OBJECTS_DIR = temp/win32-x-g++/obj
+
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libssl.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libcrypto.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libgpgme.dll.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libminiupnpc.a
+		LIBS += ../../../../lib/win32-x-g++-v0.5/libz.a
+		LIBS += -L${HOME}/.wine/drive_c/pthreads/lib -lpthreadGCE2
+		LIBS += -lQtUiTools
+		LIBS += -lws2_32 -luuid -lole32 -liphlpapi -lcrypt32 -gdi32
+		LIBS += -lole32 -lwinmm
+
+		DEFINES *= WINDOWS_SYS WIN32 WIN32_CROSS_UBUNTU
+
+		INCLUDEPATH += ../../../../gpgme-1.1.8/src/
+		INCLUDEPATH += ../../../../libgpg-error-1.7/src/
+
+		RC_FILE = gui/images/retroshare_win.rc
+}
+
+#################################### Windows #####################################
+
+win32-g++|win32-clang-g++ {
+	CONFIG(debug, debug|release) {
+		# show console output
+		CONFIG += console
+	} else {
+		CONFIG -= console
+	}
+
+	CONFIG(debug, debug|release) {
+	} else {
+		# Tell linker to use ASLR protection
+		QMAKE_LFLAGS += -Wl,-dynamicbase
+		# Tell linker to use DEP protection
+		QMAKE_LFLAGS += -Wl,-nxcompat
+	}
+
+    # Fix linking error (ld.exe: Error: export ordinal too large) due to too
+    # many exported symbols.
+    !libretroshare_shared:QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
+
+	# Switch off optimization for release version
+	QMAKE_CXXFLAGS_RELEASE -= -O2
+	QMAKE_CXXFLAGS_RELEASE += -O0
+	QMAKE_CFLAGS_RELEASE -= -O2
+	QMAKE_CFLAGS_RELEASE += -O0
+
+	# Switch on optimization for debug version
+	#QMAKE_CXXFLAGS_DEBUG += -O2
+	#QMAKE_CFLAGS_DEBUG += -O2
+
+	OBJECTS_DIR = temp/obj
+
+    dLib = ws2_32 gdi32 uuid ole32 iphlpapi crypt32 winmm
+    LIBS *= $$linkDynamicLibs(dLib)
+
+	RC_FILE = gui/images/retroshare_win.rc
+
+	# export symbols for the plugins
+	LIBS += -Wl,--export-all-symbols,--out-implib,lib/libretroshare-gui.a
+
+	# create lib directory
+	isEmpty(QMAKE_SH) {
+		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib $(MKDIR) lib
+	} else {
+		QMAKE_PRE_LINK = $(CHK_DIR_EXISTS) lib || $(MKDIR) lib
+	}
+
+	greaterThan(QT_MAJOR_VERSION, 4) {
+		# Qt 5
+		RC_INCLUDEPATH += $$_PRO_FILE_PWD_/../../libretroshare/src
+	} else {
+		# Qt 4
+		QMAKE_RC += --include-dir=$$_PRO_FILE_PWD_/../../libretroshare/src
+	}
+}
+
+##################################### MacOS ######################################
+
+macx {
+	# ENABLE THIS OPTION FOR Univeral Binary BUILD.
+	#CONFIG += ppc x86
+	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+	QMAKE_INFO_PLIST = Info.plist
+	mac_icon.files = $$files($$PWD/rsMacIcon.icns)
+	mac_icon.path = Contents/Resources
+	QMAKE_BUNDLE_DATA += mac_icon
+	dplQSS.files = $$PWD/qss
+	dplQSS.path = Contents/Resources
+	QMAKE_BUNDLE_DATA += dplQSS
+	dplChatStyles.files = \
+		$$PWD/gui/qss/chat/Bubble \
+		$$PWD/gui/qss/chat/Bubble_Compact
+	dplChatStyles.path = Contents/Resources/stylesheets
+	QMAKE_BUNDLE_DATA += dplChatStyles 
+#	mac_webui.files = $$files($$PWD/../../libresapi/src/webui)
+#	mac_webui.path = Contents/Resources
+#	QMAKE_BUNDLE_DATA += mac_webui
+
+	OBJECTS_DIR = temp/obj
+
+	CONFIG += version_detail_bash_script
+	LIBS += -lssl -lcrypto -lz 
+	for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
+	LIBS += -framework CoreFoundation
+	LIBS += -framework Security
+	LIBS += -framework Carbon
+
+	for(lib, LIB_DIR):LIBS += -L"$$lib"
+	for(bin, BIN_DIR):LIBS += -L"$$bin"
+
+	DEPENDPATH += . $$INC_DIR
+	INCLUDEPATH += . $$INC_DIR
+
+	#DEFINES *= MAC_IDLE # for idle feature
+	CONFIG -= uitools
+}
+
+##################################### FreeBSD ######################################
+
+freebsd-* {
+	INCLUDEPATH *= /usr/local/include/gpgme
+	LIBS *= -lssl
+	LIBS *= -lgpgme
+	LIBS *= -lupnp
+	LIBS *= -lgnome-keyring
+
+	LIBS += -lsqlite3
+}
+
+##################################### Haiku ######################################
+
+haiku-* {
+	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
+
+	LIBS *= ../../libretroshare/src/lib/libretroshare.a
+	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2 -lbsd
+	LIBS *= -lssl -lcrypto -lnetwork
+	LIBS *= -lgpgme
+	LIBS *= -lupnp
+	LIBS *= -lz
+	LIBS *= -lixml
+
+	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	LIBS += -lsqlite3
+}
+
+##################################### OpenBSD ######################################
+
+openbsd-* {
+	INCLUDEPATH *= /usr/local/include
+
+	LIBS *= -lssl -lcrypto
+	LIBS *= -lgpgme
+	LIBS *= -lupnp
+	LIBS *= -lgnome-keyring
+	LIBS += -lsqlite3
+	LIBS *= -rdynamic
+}
+
+################################### COMMON stuff ##################################
+
+wikipoos {
+	PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	LIBS *= -lglib-2.0
+}
+
+################################### HEADERS & SOURCES #############################
+
+# Input
+HEADERS +=  rshare.h \
+            retroshare-gui/configpage.h \
+            retroshare-gui/RsAutoUpdatePage.h \
+            retroshare-gui/mainpage.h \
+            gui/notifyqt.h \
+            control/bandwidthevent.h \
+            control/eventtype.h \
+            gui/QuickStartWizard.h \
+            gui/StartDialog.h \
+            gui/HomePage.h\
+            gui/NetworkDialog.h \
+            gui/GenCertDialog.h \
+            gui/linetypes.h \
+            gui/mainpagestack.h \
+            gui/MainWindow.h \
+            gui/RSHumanReadableDelegate.h \
+            gui/AboutDialog.h \
+            gui/AboutWidget.h \
+            gui/NetworkView.h \
+            gui/FriendsDialog.h \
+            gui/ServicePermissionDialog.h \
+            gui/RemoteDirModel.h \
+            gui/RetroShareLink.h \
+            gui/SearchTreeWidget.h \
+            gui/ShareManager.h \
+#            gui/ShareDialog.h \
+#            gui/SFListDelegate.h \
+            gui/SoundManager.h \
+            gui/HelpDialog.h \
+            gui/LogoBar.h \
+            gui/common/AvatarDialog.h \
+            gui/FileTransfer/SearchDialog.h \
+            gui/FileTransfer/SharedFilesDialog.h \
+            gui/FileTransfer/xprogressbar.h \
+            gui/FileTransfer/DetailsDialog.h \
+            gui/FileTransfer/FileTransferInfoWidget.h \
+            gui/FileTransfer/DLListDelegate.h \
+            gui/FileTransfer/ULListDelegate.h \
+            gui/FileTransfer/TransfersDialog.h \
+            gui/FileTransfer/BannedFilesDialog.h \
+            gui/statistics/TurtleRouterDialog.h \
+            gui/statistics/TurtleRouterStatistics.h \
+            gui/statistics/GxsIdStatistics.h \
+            gui/statistics/dhtgraph.h \
+            gui/statistics/Histogram.h \
+            gui/statistics/BandwidthGraphWindow.h \
+            gui/statistics/turtlegraph.h \
+            gui/statistics/BandwidthStatsWidget.h \
+            gui/statistics/DhtWindow.h \
+            gui/statistics/GlobalRouterStatistics.h \
+            gui/statistics/GxsTransportStatistics.h \
+            gui/statistics/StatisticsWindow.h \
+            gui/statistics/BwCtrlWindow.h \
+            gui/statistics/RttStatistics.h \
+            gui/FileTransfer/TransferUserNotify.h \
+            gui/plugins/PluginInterface.h \
+            gui/im_history/ImHistoryBrowser.h \
+            gui/im_history/IMHistoryItemDelegate.h \
+            gui/im_history/IMHistoryItemPainter.h \
+            lang/languagesupport.h \
+            util/RsProtectedTimer.h \
+            util/stringutil.h \
+            util/RsNetUtil.h \
+            util/DateTime.h \
+            util/RetroStyleLabel.h \
+            util/dllexport.h \
+            util/NonCopyable.h \
+            util/rsutildll.h \
+            util/dllexport.h \
+            util/global.h \
+            util/rsqtutildll.h \
+#            util/Interface.h \
+            util/PixmapMerging.h \
+            util/MouseEventFilter.h \
+            util/EventFilter.h \
+            util/Widget.h \
+            util/RsAction.h \
+            util/RsUserdata.h \
+            util/printpreview.h \
+            util/log.h \
+            util/misc.h \
+            util/HandleRichText.h \
+            util/ObjectPainter.h \
+            util/QtVersion.h \
+            util/RsFile.h \
+            util/qtthreadsutils.h \
+            util/ClickableLabel.h \
+            util/AspectRatioPixmapLabel.h \
+            gui/profile/ProfileWidget.h \
+            gui/profile/ProfileManager.h \
+            gui/profile/StatusMessage.h \
+            gui/chat/PopupChatWindow.h \
+            gui/chat/PopupChatDialog.h \
+            gui/chat/PopupDistantChatDialog.h \
+            gui/chat/ChatTabWidget.h \
+            gui/chat/ChatWidget.h \
+            gui/chat/ChatDialog.h \
+            gui/ChatLobbyWidget.h \
+            gui/chat/ChatLobbyDialog.h \
+            gui/chat/CreateLobbyDialog.h \
+            gui/chat/ChatStyle.h \
+            gui/chat/ChatUserNotify.h \
+            gui/chat/ChatLobbyUserNotify.h \
+            gui/connect/ConfCertDialog.h \
+            gui/connect/PGPKeyDialog.h \
+            gui/connect/FriendRecommendDialog.h \
+            gui/msgs/MessagesDialog.h \
+            gui/msgs/MessageInterface.h \
+            gui/msgs/MessageComposer.h \
+            gui/msgs/MessageWindow.h \
+            gui/msgs/MessageWidget.h \
+            gui/msgs/MessageModel.h \
+            gui/msgs/TagsMenu.h \
+            gui/msgs/textformat.h \
+            gui/msgs/MessageUserNotify.h \
+            gui/images/retroshare_win.rc.h \
+            gui/settings/RSPermissionMatrixWidget.h \
+            gui/settings/rsharesettings.h \
+            gui/settings/RsharePeerSettings.h \
+            gui/settings/rsettings.h \
+            gui/settings/rsettingswin.h \
+            gui/settings/GeneralPage.h \
+            gui/settings/PeoplePage.h \
+            gui/settings/AboutPage.h \
+            gui/settings/ServerPage.h \
+            gui/settings/NotifyPage.h \
+            gui/settings/CryptoPage.h \
+            gui/settings/MessagePage.h \
+            gui/settings/NewTag.h \
+            gui/settings/ForumPage.h \
+            gui/settings/PluginsPage.h \
+            gui/settings/PluginItem.h \
+            gui/settings/AppearancePage.h \
+            gui/settings/FileAssociationsPage.h \
+            gui/settings/SoundPage.h \
+            gui/settings/TransferPage.h \
+            gui/settings/ChatPage.h \
+            gui/settings/ChannelPage.h \
+            gui/settings/PostedPage.h \
+            gui/settings/ServicePermissionsPage.h \
+            gui/settings/AddFileAssociationDialog.h \
+            gui/settings/GroupFrameSettingsWidget.h \
+            gui/toaster/ToasterItem.h \
+            gui/toaster/MessageToaster.h \
+            gui/toaster/OnlineToaster.h \
+            gui/toaster/DownloadToaster.h \
+            gui/toaster/ChatToaster.h \
+            gui/toaster/GroupChatToaster.h \
+            gui/toaster/ChatLobbyToaster.h \
+            gui/toaster/FriendRequestToaster.h \
+            gui/common/RsButtonOnText.h \
+            gui/common/RSGraphWidget.h \
+            gui/common/ElidedLabel.h \
+            gui/common/vmessagebox.h \
+            gui/common/RsUrlHandler.h \
+            gui/common/RsCollectionDialog.h \
+            gui/common/rwindow.h \
+            gui/common/rshtml.h \
+            gui/common/AvatarDefs.h \
+            gui/common/GroupFlagsWidget.h \
+            gui/common/GroupSelectionBox.h \
+            gui/common/GroupChooser.h \
+            gui/common/StatusDefs.h \
+            gui/common/TagDefs.h \
+            gui/common/GroupDefs.h \
+            gui/common/Emoticons.h \
+            gui/common/RSComboBox.h \
+            gui/common/RSListWidgetItem.h \
+            gui/common/RSTextEdit.h \
+            gui/common/RSPlainTextEdit.h \
+            gui/common/RSTreeWidget.h \
+            gui/common/RSTreeWidgetItem.h \
+            gui/common/RSFeedWidget.h \
+            gui/common/RSTabWidget.h \
+            gui/common/RSElidedItemDelegate.h \
+            gui/common/RSItemDelegate.h \
+            gui/common/PeerDefs.h \
+            gui/common/FilesDefs.h \
+            gui/common/PopularityDefs.h \
+            gui/common/RsBanListDefs.h \
+            gui/common/GroupTreeWidget.h \
+            gui/common/RSTreeView.h \
+            gui/common/AvatarWidget.h \
+            gui/common/FriendListModel.h \
+            gui/common/NewFriendList.h \
+            gui/common/FriendSelectionWidget.h \
+            gui/common/FriendSelectionDialog.h \
+            gui/common/HashBox.h \
+            gui/common/LineEditClear.h \
+            gui/common/DropLineEdit.h \
+            gui/common/RSTextBrowser.h \
+            gui/common/RSImageBlockWidget.h \
+            gui/common/FeedNotify.h \
+            gui/common/UserNotify.h \
+            gui/common/HeaderFrame.h \
+            gui/common/MimeTextEdit.h \
+            gui/common/UIStateHelper.h \
+            gui/common/FloatingHelpBrowser.h \
+            gui/common/SubscribeToolButton.h \
+            gui/common/RsBanListToolButton.h \
+            gui/common/FlowLayout.h \
+            gui/common/PictureFlow.h \
+            gui/common/ToasterNotify.h \
+            gui/style/RSStyle.h \
+            gui/style/StyleDialog.h \
+            gui/help/browser/helpbrowser.h \
+            gui/help/browser/helptextbrowser.h \
+            gui/statusbar/peerstatus.h \
+            gui/statusbar/natstatus.h \
+            gui/statusbar/dhtstatus.h \
+            gui/statusbar/torstatus.h \
+            gui/statusbar/ratesstatus.h \
+            gui/statusbar/hashingstatus.h \
+            gui/statusbar/discstatus.h \
+            gui/statusbar/SoundStatus.h \
+            gui/statusbar/OpModeStatus.h \
+            gui/statusbar/ToasterDisable.h \
+            gui/statusbar/SysTrayStatus.h \
+            gui/advsearch/advancedsearchdialog.h \
+            gui/advsearch/expressionwidget.h \
+            gui/advsearch/guiexprelement.h \
+            gui/elastic/graphwidget.h \
+            gui/elastic/edge.h \
+            gui/elastic/arrow.h \
+            gui/elastic/elnode.h \
+            gui/NewsFeed.h \
+            gui/feeds/BoardsCommentsItem.h \
+            gui/feeds/FeedItem.h \
+            gui/feeds/FeedHolder.h \
+            gui/feeds/GxsCircleItem.h \
+            gui/feeds/ChannelsCommentsItem.h \
+            gui/feeds/PeerItem.h \
+            gui/feeds/MsgItem.h \
+            gui/feeds/ChatMsgItem.h \
+            gui/feeds/SubFileItem.h \
+            gui/feeds/AttachFileItem.h \
+            gui/feeds/SecurityItem.h \
+            gui/feeds/SecurityIpItem.h \
+            gui/feeds/NewsFeedUserNotify.h \
+            gui/connect/ConnectFriendWizard.h \
+            gui/connect/ConnectProgressDialog.h \
+            gui/groups/CreateGroup.h \
+            gui/GetStartedDialog.h \
+            gui/statistics/BWGraph.h \
+            util/RsSyntaxHighlighter.h \
+            util/imageutil.h \
+            util/RichTextEdit.h \
+            gui/NetworkDialog/pgpid_item_model.h \
+            gui/NetworkDialog/pgpid_item_proxy.h \
+            gui/common/RsCollection.h \
+            util/retroshareWin32.h
+#            gui/ForumsDialog.h \
+#            gui/forums/ForumDetails.h \
+#            gui/forums/EditForumDetails.h \
+#            gui/forums/CreateForum.h \
+#            gui/forums/CreateForumMsg.h \
+#            gui/forums/ForumUserNotify.h \
+#            gui/feeds/ForumNewItem.h \
+#            gui/feeds/ForumMsgItem.h \
+#            gui/ChannelFeed.h \
+#            gui/feeds/ChanNewItem.h \
+#            gui/feeds/ChanMsgItem.h \
+#            gui/channels/CreateChannel.h \
+#            gui/channels/ChannelDetails.h \
+#            gui/channels/CreateChannelMsg.h \
+#            gui/channels/EditChanDetails.h \
+#            gui/channels/ChannelUserNotify.h \
+
+FORMS +=    gui/StartDialog.ui \
+            gui/HomePage.ui\
+            gui/GenCertDialog.ui \
+            gui/AboutDialog.ui \
+            gui/AboutWidget.ui \
+            gui/QuickStartWizard.ui \
+            gui/NetworkDialog.ui \
+            gui/common/AvatarDialog.ui \
+            gui/FileTransfer/TransfersDialog.ui \
+            gui/FileTransfer/DetailsDialog.ui \
+            gui/FileTransfer/SearchDialog.ui \
+            gui/FileTransfer/SharedFilesDialog.ui \
+            gui/FileTransfer/BannedFilesDialog.ui \
+            gui/MainWindow.ui \
+            gui/NetworkView.ui \
+            gui/FriendsDialog.ui \
+            gui/ShareManager.ui \
+#            gui/ShareDialog.ui \
+            gui/help/browser/helpbrowser.ui \
+            gui/HelpDialog.ui \
+            gui/ServicePermissionDialog.ui \
+            gui/profile/ProfileWidget.ui \
+            gui/profile/StatusMessage.ui \
+            gui/profile/ProfileManager.ui \
+            gui/chat/PopupChatWindow.ui \
+            gui/chat/PopupChatDialog.ui \
+            gui/chat/ChatTabWidget.ui \
+            gui/chat/ChatWidget.ui \
+            gui/chat/ChatLobbyDialog.ui \
+            gui/chat/CreateLobbyDialog.ui \
+            gui/ChatLobbyWidget.ui \
+            gui/connect/ConfCertDialog.ui \
+            gui/connect/PGPKeyDialog.ui \
+            gui/connect/ConnectFriendWizard.ui \
+            gui/connect/ConnectProgressDialog.ui \
+            gui/connect/FriendRecommendDialog.ui \
+            gui/msgs/MessagesDialog.ui \
+            gui/msgs/MessageComposer.ui \
+            gui/msgs/MessageWindow.ui\
+            gui/msgs/MessageWidget.ui\
+            gui/settings/settingsw.ui \
+            gui/settings/GeneralPage.ui \
+            gui/settings/ServerPage.ui \
+            gui/settings/NotifyPage.ui \
+            gui/settings/PeoplePage.ui \
+            gui/settings/CryptoPage.ui \
+            gui/settings/MessagePage.ui \
+            gui/settings/NewTag.ui \
+            gui/settings/ForumPage.ui \
+            gui/settings/AboutPage.ui \
+            gui/settings/PluginsPage.ui \
+            gui/settings/AppearancePage.ui \
+            gui/settings/TransferPage.ui \
+            gui/settings/SoundPage.ui \
+            gui/settings/ChatPage.ui \
+            gui/settings/ChannelPage.ui \
+            gui/settings/PostedPage.ui \
+            gui/settings/ServicePermissionsPage.ui \
+            gui/settings/PluginItem.ui \
+            gui/settings/GroupFrameSettingsWidget.ui \
+            gui/toaster/MessageToaster.ui \
+            gui/toaster/OnlineToaster.ui \
+            gui/toaster/DownloadToaster.ui \
+            gui/toaster/ChatToaster.ui \
+            gui/toaster/GroupChatToaster.ui \
+            gui/toaster/ChatLobbyToaster.ui \
+            gui/toaster/FriendRequestToaster.ui \
+            gui/advsearch/AdvancedSearchDialog.ui \
+            gui/advsearch/expressionwidget.ui \
+            gui/NewsFeed.ui \
+            gui/feeds/BoardsCommentsItem.ui \
+            gui/feeds/GxsCircleItem.ui \
+            gui/feeds/ChannelsCommentsItem.ui \
+            gui/feeds/PeerItem.ui \
+            gui/feeds/MsgItem.ui \
+            gui/feeds/ChatMsgItem.ui \
+            gui/feeds/SubFileItem.ui \
+            gui/feeds/AttachFileItem.ui \
+            gui/feeds/SecurityItem.ui \
+            gui/feeds/SecurityIpItem.ui \
+            gui/im_history/ImHistoryBrowser.ui \
+            gui/groups/CreateGroup.ui \
+            gui/common/GroupTreeWidget.ui \
+            gui/common/AvatarWidget.ui \
+            gui/common/NewFriendList.ui \
+            gui/common/FriendSelectionWidget.ui \
+            gui/common/HashBox.ui \
+            gui/common/RSImageBlockWidget.ui \
+            gui/common/RsCollectionDialog.ui \
+            gui/common/HeaderFrame.ui \
+            gui/common/RSFeedWidget.ui \
+            gui/style/StyleDialog.ui \
+            gui/statistics/BandwidthGraphWindow.ui \
+            gui/statistics/BandwidthStatsWidget.ui \
+            gui/statistics/DhtWindow.ui \
+            gui/statistics/TurtleRouterDialog.ui \
+            gui/statistics/TurtleRouterStatistics.ui \
+            gui/statistics/GxsIdStatistics.ui \
+            gui/statistics/GlobalRouterStatistics.ui \
+            gui/statistics/GxsTransportStatistics.ui \
+            gui/statistics/StatisticsWindow.ui \
+            gui/statistics/BwCtrlWindow.ui \
+            gui/statistics/RttStatistics.ui \
+            gui/GetStartedDialog.ui \
+            util/RichTextEdit.ui
+
+
+#            gui/ForumsDialog.ui \
+#            gui/forums/CreateForum.ui \
+#            gui/forums/CreateForumMsg.ui \
+#            gui/forums/ForumDetails.ui \
+#            gui/forums/EditForumDetails.ui \
+#            gui/feeds/ForumNewItem.ui \
+#            gui/feeds/ForumMsgItem.ui \
+#            gui/ChannelFeed.ui \
+#            gui/channels/CreateChannel.ui \
+#            gui/channels/CreateChannelMsg.ui \
+#            gui/channels/ChannelDetails.ui \
+#            gui/channels/EditChanDetails.ui \
+#            gui/feeds/ChanNewItem.ui \
+#            gui/feeds/ChanMsgItem.ui \
+
+SOURCES +=  main.cpp \
+            rshare.cpp \
+            gui/notifyqt.cpp \
+            gui/AboutDialog.cpp \
+            gui/AboutWidget.cpp \
+            gui/QuickStartWizard.cpp \
+            gui/StartDialog.cpp \
+            gui/HomePage.cpp\
+            gui/GenCertDialog.cpp \
+            gui/NetworkDialog.cpp \
+            gui/mainpagestack.cpp \
+            gui/MainWindow.cpp \
+            gui/NetworkView.cpp \
+            gui/FriendsDialog.cpp \
+            gui/ServicePermissionDialog.cpp \
+            gui/RemoteDirModel.cpp \
+            gui/RsAutoUpdatePage.cpp \
+            gui/RetroShareLink.cpp \
+            gui/SearchTreeWidget.cpp \
+            gui/ShareManager.cpp \
+#            gui/ShareDialog.cpp \
+#            gui/SFListDelegate.cpp \
+            gui/SoundManager.cpp \
+            gui/im_history/ImHistoryBrowser.cpp \
+            gui/im_history/IMHistoryItemDelegate.cpp \
+            gui/im_history/IMHistoryItemPainter.cpp \
+            gui/help/browser/helpbrowser.cpp \
+            gui/help/browser/helptextbrowser.cpp \
+            gui/FileTransfer/SearchDialog.cpp \
+            gui/FileTransfer/SharedFilesDialog.cpp \
+            gui/FileTransfer/TransfersDialog.cpp \
+            gui/FileTransfer/FileTransferInfoWidget.cpp \
+            gui/FileTransfer/DLListDelegate.cpp \
+            gui/FileTransfer/ULListDelegate.cpp \
+            gui/FileTransfer/xprogressbar.cpp \
+            gui/FileTransfer/DetailsDialog.cpp \
+            gui/FileTransfer/TransferUserNotify.cpp \
+            gui/FileTransfer/BannedFilesDialog.cpp \
+            gui/MainPage.cpp \
+            gui/HelpDialog.cpp \
+            gui/LogoBar.cpp \
+            lang/languagesupport.cpp \
+            util/RsProtectedTimer.cpp \
+            util/stringutil.cpp \
+            util/RsNetUtil.cpp \
+            util/DateTime.cpp \
+            util/RetroStyleLabel.cpp \
+            util/WidgetBackgroundImage.cpp \
+#            util/NonCopyable.cpp \
+            util/PixmapMerging.cpp \
+            util/MouseEventFilter.cpp \
+            util/EventFilter.cpp \
+            util/Widget.cpp \
+            util/RsAction.cpp \
+            util/printpreview.cpp \
+            util/log.cpp \
+            util/misc.cpp \
+            util/HandleRichText.cpp \
+            util/ObjectPainter.cpp \
+            util/RsFile.cpp \
+            util/RichTextEdit.cpp \
+            util/ClickableLabel.cpp \
+            util/AspectRatioPixmapLabel.cpp \
+            gui/profile/ProfileWidget.cpp \
+            gui/profile/StatusMessage.cpp \
+            gui/profile/ProfileManager.cpp \
+            gui/chat/PopupChatWindow.cpp \
+            gui/chat/PopupChatDialog.cpp \
+            gui/chat/PopupDistantChatDialog.cpp \
+            gui/chat/ChatTabWidget.cpp \
+            gui/chat/ChatWidget.cpp \
+            gui/chat/ChatDialog.cpp \
+            gui/ChatLobbyWidget.cpp \
+            gui/chat/ChatLobbyDialog.cpp \
+            gui/chat/CreateLobbyDialog.cpp \
+            gui/chat/ChatStyle.cpp \
+            gui/chat/ChatUserNotify.cpp \
+            gui/chat/ChatLobbyUserNotify.cpp \
+            gui/connect/ConfCertDialog.cpp \
+            gui/connect/PGPKeyDialog.cpp \
+            gui/msgs/MessagesDialog.cpp \
+            gui/msgs/MessageComposer.cpp \
+            gui/msgs/MessageWidget.cpp \
+            gui/msgs/MessageWindow.cpp \
+            gui/msgs/MessageModel.cpp \
+            gui/msgs/TagsMenu.cpp \
+            gui/msgs/MessageUserNotify.cpp \
+            gui/common/RsButtonOnText.cpp \
+            gui/common/RSGraphWidget.cpp \
+            gui/common/ElidedLabel.cpp \
+            gui/common/vmessagebox.cpp \
+            gui/common/RsCollectionDialog.cpp \
+            gui/common/RsUrlHandler.cpp \
+            gui/common/rwindow.cpp \
+            gui/common/rshtml.cpp \
+            gui/common/AvatarDefs.cpp \
+            gui/common/AvatarDialog.cpp \
+            gui/common/GroupFlagsWidget.cpp \
+            gui/common/GroupSelectionBox.cpp \
+            gui/common/GroupChooser.cpp \
+            gui/common/StatusDefs.cpp \
+            gui/common/TagDefs.cpp \
+            gui/common/GroupDefs.cpp \
+            gui/common/Emoticons.cpp \
+            gui/common/RSComboBox.cpp \
+            gui/common/RSListWidgetItem.cpp \
+            gui/common/RSTextEdit.cpp \
+            gui/common/RSPlainTextEdit.cpp \
+            gui/common/RSTreeWidget.cpp \
+            gui/common/RSTreeWidgetItem.cpp \
+            gui/common/RSFeedWidget.cpp \
+            gui/common/RSTabWidget.cpp \
+            gui/common/RSElidedItemDelegate.cpp \
+            gui/common/RSItemDelegate.cpp \
+            gui/common/PeerDefs.cpp \
+            gui/common/FilesDefs.cpp \
+            gui/common/PopularityDefs.cpp \
+            gui/common/RsBanListDefs.cpp \
+            gui/common/GroupTreeWidget.cpp \
+            gui/common/RSTreeView.cpp \
+            gui/common/AvatarWidget.cpp \
+            gui/common/FriendListModel.cpp \
+            gui/common/NewFriendList.cpp \
+            gui/common/FriendSelectionWidget.cpp \
+            gui/common/FriendSelectionDialog.cpp \
+            gui/common/HashBox.cpp \
+            gui/common/LineEditClear.cpp \
+            gui/common/DropLineEdit.cpp \
+            gui/common/RSTextBrowser.cpp \
+            gui/common/RSImageBlockWidget.cpp \
+            gui/common/FeedNotify.cpp \
+            gui/common/UserNotify.cpp \
+            gui/common/HeaderFrame.cpp \
+            gui/common/MimeTextEdit.cpp \
+            gui/common/UIStateHelper.cpp \
+            gui/common/FloatingHelpBrowser.cpp \
+            gui/common/SubscribeToolButton.cpp \
+            gui/common/RsBanListToolButton.cpp \
+            gui/common/FlowLayout.cpp \
+            gui/common/PictureFlow.cpp \
+            gui/common/ToasterNotify.cpp \
+            gui/style/RSStyle.cpp \
+            gui/style/StyleDialog.cpp \
+            gui/settings/RSPermissionMatrixWidget.cpp \
+            gui/settings/rsharesettings.cpp \
+            gui/settings/RsharePeerSettings.cpp \
+            gui/settings/rsettings.cpp \
+            gui/settings/rsettingswin.cpp \
+            gui/settings/GeneralPage.cpp \
+            gui/settings/AboutPage.cpp \
+            gui/settings/ServerPage.cpp \
+            gui/settings/NotifyPage.cpp \
+            gui/settings/CryptoPage.cpp \
+            gui/settings/PeoplePage.cpp \
+            gui/settings/MessagePage.cpp \
+            gui/settings/NewTag.cpp \
+            gui/settings/ForumPage.cpp \
+            gui/settings/PluginsPage.cpp \
+            gui/settings/PluginItem.cpp \
+            gui/settings/AppearancePage.cpp \
+            gui/settings/FileAssociationsPage.cpp \
+            gui/settings/SoundPage.cpp \
+            gui/settings/TransferPage.cpp \
+            gui/settings/ChatPage.cpp \
+            gui/settings/ChannelPage.cpp \
+            gui/settings/PostedPage.cpp \
+            gui/settings/ServicePermissionsPage.cpp \
+            gui/settings/AddFileAssociationDialog.cpp \
+            gui/settings/GroupFrameSettingsWidget.cpp \
+            gui/statusbar/peerstatus.cpp \
+            gui/statusbar/natstatus.cpp \
+            gui/statusbar/dhtstatus.cpp \
+            gui/statusbar/torstatus.cpp \
+            gui/statusbar/ratesstatus.cpp \
+            gui/statusbar/hashingstatus.cpp \
+            gui/statusbar/discstatus.cpp \
+            gui/statusbar/SoundStatus.cpp \
+            gui/statusbar/OpModeStatus.cpp \
+            gui/statusbar/ToasterDisable.cpp \
+            gui/statusbar/SysTrayStatus.cpp \
+            gui/toaster/ToasterItem.cpp \
+            gui/toaster/MessageToaster.cpp \
+            gui/toaster/DownloadToaster.cpp \
+            gui/toaster/OnlineToaster.cpp \
+            gui/toaster/ChatToaster.cpp \
+            gui/toaster/GroupChatToaster.cpp \
+            gui/toaster/ChatLobbyToaster.cpp \
+            gui/toaster/FriendRequestToaster.cpp \
+            gui/advsearch/advancedsearchdialog.cpp \
+            gui/advsearch/expressionwidget.cpp \
+            gui/advsearch/guiexprelement.cpp \
+            gui/elastic/graphwidget.cpp \
+            gui/elastic/edge.cpp \
+            gui/elastic/arrow.cpp \
+            gui/elastic/elnode.cpp \
+            gui/NewsFeed.cpp \
+            gui/feeds/BoardsCommentsItem.cpp \
+            gui/feeds/FeedItem.cpp \
+            gui/feeds/FeedHolder.cpp \
+            gui/feeds/GxsCircleItem.cpp \
+            gui/feeds/ChannelsCommentsItem.cpp \
+            gui/feeds/PeerItem.cpp \
+            gui/feeds/MsgItem.cpp \
+            gui/feeds/ChatMsgItem.cpp \
+            gui/feeds/SubFileItem.cpp \
+            gui/feeds/AttachFileItem.cpp \
+            gui/feeds/SecurityItem.cpp \
+            gui/feeds/SecurityIpItem.cpp \
+            gui/feeds/NewsFeedUserNotify.cpp \
+            gui/connect/ConnectFriendWizard.cpp \
+            gui/connect/ConnectProgressDialog.cpp \
+            gui/connect/FriendRecommendDialog.cpp \
+            gui/groups/CreateGroup.cpp \
+            gui/GetStartedDialog.cpp \
+            gui/statistics/BandwidthGraphWindow.cpp \
+            gui/statistics/BandwidthStatsWidget.cpp \
+            gui/statistics/DhtWindow.cpp \
+            gui/statistics/Histogram.cpp \
+            gui/statistics/TurtleRouterDialog.cpp \
+            gui/statistics/TurtleRouterStatistics.cpp \
+            gui/statistics/GxsIdStatistics.cpp \
+            gui/statistics/GlobalRouterStatistics.cpp \
+            gui/statistics/GxsTransportStatistics.cpp \
+            gui/statistics/StatisticsWindow.cpp \
+            gui/statistics/BwCtrlWindow.cpp \
+            gui/statistics/RttStatistics.cpp \
+            gui/statistics/BWGraph.cpp \
+    util/RsSyntaxHighlighter.cpp \
+    util/imageutil.cpp \
+    gui/NetworkDialog/pgpid_item_model.cpp \
+    gui/NetworkDialog/pgpid_item_proxy.cpp \
+    gui/common/RsCollection.cpp \
+    util/retroshareWin32.cpp
+#            gui/ForumsDialog.cpp \
+#            gui/forums/ForumDetails.cpp \
+#            gui/forums/EditForumDetails.cpp \
+#            gui/forums/CreateForum.cpp \
+#            gui/forums/CreateForumMsg.cpp \
+#            gui/forums/ForumUserNotify.cpp \
+#            gui/feeds/ForumNewItem.cpp \
+#            gui/feeds/ForumMsgItem.cpp \
+#            gui/ChannelFeed.cpp \
+#            gui/channels/CreateChannel.cpp \
+#            gui/channels/CreateChannelMsg.cpp \
+#            gui/channels/ChannelDetails.cpp \
+#            gui/channels/EditChanDetails.cpp \
+#            gui/channels/ChannelUserNotify.cpp \
+#            gui/feeds/ChanNewItem.cpp \
+#            gui/feeds/ChanMsgItem.cpp \
+
+RESOURCES += gui/images.qrc gui/icons.qrc lang/lang.qrc gui/help/content/content.qrc gui/emojione.qrc \
+  gui/qss/stylesheet/qdarkstyle/dark/Standard_Dark.qrc \
+  gui/qss/stylesheet/qdarkstyle/light/Standard_Light.qrc
+
+TRANSLATIONS +=  \
+            lang/retroshare_ca_ES.ts \
+            lang/retroshare_cs.ts \
+            lang/retroshare_da.ts \
+            lang/retroshare_de.ts \
+            lang/retroshare_el.ts \
+            lang/retroshare_en.ts \
+            lang/retroshare_es.ts \
+            lang/retroshare_fi.ts \
+            lang/retroshare_fr.ts \
+            lang/retroshare_hu.ts \
+            lang/retroshare_it.ts \
+            lang/retroshare_ja_JP.ts \
+            lang/retroshare_nl.ts \
+            lang/retroshare_ko.ts \
+            lang/retroshare_pl.ts \
+            lang/retroshare_ru.ts \
+            lang/retroshare_sv.ts \
+            lang/retroshare_tr.ts \
+            lang/retroshare_zh_CN.ts
+
+unfinishedtranslations {
+
+       TRANSLATIONS +=  \
+            lang/retroshare_bg.ts \
+            lang/retroshare_af.ts  \
+            lang/retroshare_pt.ts  \
+            lang/retroshare_sl.ts \
+            lang/retroshare_sr.ts \
+            lang/retroshare_zh_TW.ts
+
+}
+
+messenger {
+     SOURCES +=       gui/MessengerWindow.cpp \
+	 				  gui/common/FriendList.cpp
+     HEADERS +=       gui/MessengerWindow.h \
+	 				  gui/common/FriendList.h 
+     FORMS   +=       gui/MessengerWindow.ui \
+	 				  gui/common/FriendList.ui
+
+	 DEFiNES += MESSENGER_WINDOW
+}
+
+# Shifted Qt4.4 dependancies to here.
+#    qmake CONFIG=pluginmgr
+
+pluginmgr {
+
+        SOURCES += gui/PluginsPage.cpp \
+            	gui/PluginManagerWidget.cpp \
+            	gui/PluginManager.cpp
+
+        HEADERS += gui/PluginsPage.h  \
+            	gui/PluginManagerWidget.h \
+            	gui/PluginManager.h
+
+        DEFINES *= PLUGINMGR
+
+}
+
+idle {
+
+HEADERS += idle/idle.h
+
+SOURCES += idle/idle.cpp \
+	   idle/idle_platform.cpp
+}
+
+framecatcher {
+
+HEADERS += util/framecatcher.h
+
+SOURCES += util/framecatcher.cpp
+
+LIBS += -lxine
+
+DEFINES *= CHANNELS_FRAME_CATCHER
+
+}
+
+# Embedded Friend Server
+
+rs_efs {
+	DEFINES *= RS_EMBEDED_FRIEND_SERVER
+        SOURCES += gui/FriendServerControl.cpp
+        HEADERS += gui/FriendServerControl.h
+        FORMS   += gui/FriendServerControl.ui
+}
+
+# BELOW IS GXS Unfinished Services.
+	
+unfinished_services {
+	
+	DEPENDPATH += gui/unfinished \
+	
+	HEADERS += gui/unfinished/ApplicationWindow.h \
+
+#		gui/unfinished/CalDialog.h \
+#		gui/unfinished/ExampleDialog.h \
+#		gui/unfinished/GamesDialog.h \
+#		gui/unfinished/profile/ProfileView.h \
+#		gui/unfinished/profile/ProfileEdit.h
+#		gui/unfinished/StatisticDialog.h \
+#		gui/unfinished/PhotoDialog.h \
+#		gui/unfinished/PhotoShow.h \
+	
+	FORMS += gui/unfinished/ApplicationWindow.ui \
+
+#		gui/unfinished/CalDialog.ui \
+#		gui/unfinished/ExampleDialog.ui \
+#		gui/unfinished/GamesDialog.ui \
+#		gui/unfinished/profile/ProfileView.ui \
+#		gui/unfinished/profile/ProfileEdit.ui
+#		gui/unfinished/StatisticDialog.ui \
+#		gui/unfinished/PhotoDialog.ui \
+#		gui/unfinished/PhotoShow.ui \
+	
+	SOURCES += gui/unfinished/ApplicationWindow.cpp \
+
+#		gui/unfinished/CalDialog.cpp \
+#		gui/unfinished/ExampleDialog.cpp \
+#		gui/unfinished/GamesDialog.cpp \
+#		gui/unfinished/profile/ProfileView.cpp \
+#		gui/unfinished/profile/ProfileEdit.cpp
+#		gui/unfinished/StatisticDialog.cpp \
+#		gui/unfinished/PhotoDialog.cpp \
+#		gui/unfinished/PhotoShow.cpp \
+	
+	DEFINES *= UNFINISHED
+}
+	
+	
+gxsphotoshare {
+	#DEFINES += RS_USE_PHOTOSHARE # to enable in unfinished.
+	DEFINES += RS_USE_PHOTO # enable in MainWindow
+
+	HEADERS += \
+		gui/PhotoShare/AlbumGroupDialog.h \
+		gui/PhotoShare/AlbumExtra.h \
+		gui/PhotoShare/PhotoDrop.h \
+		gui/PhotoShare/AlbumItem.h \
+		gui/PhotoShare/AlbumDialog.h \
+		gui/PhotoShare/PhotoItem.h \
+		gui/PhotoShare/PhotoShareItemHolder.h \
+		gui/PhotoShare/PhotoShare.h \
+		gui/PhotoShare/PhotoSlideShow.h \
+		gui/PhotoShare/PhotoDialog.h
+
+	FORMS += \
+		gui/PhotoShare/AlbumExtra.ui \
+		gui/PhotoShare/PhotoItem.ui \
+		gui/PhotoShare/PhotoDialog.ui \
+		gui/PhotoShare/AlbumItem.ui \
+		gui/PhotoShare/AlbumDialog.ui \
+		gui/PhotoShare/PhotoShare.ui \
+		gui/PhotoShare/PhotoSlideShow.ui
+
+	SOURCES += \
+		gui/PhotoShare/AlbumGroupDialog.cpp \
+		gui/PhotoShare/AlbumExtra.cpp \
+		gui/PhotoShare/PhotoItem.cpp \
+		gui/PhotoShare/PhotoDialog.cpp \
+		gui/PhotoShare/PhotoDrop.cpp \
+		gui/PhotoShare/AlbumItem.cpp \
+		gui/PhotoShare/AlbumDialog.cpp \
+		gui/PhotoShare/PhotoShareItemHolder.cpp \
+		gui/PhotoShare/PhotoShare.cpp \
+		gui/PhotoShare/PhotoSlideShow.cpp
+
+	RESOURCES += gui/PhotoShare/Photo_images.qrc
+
+}
+	
+	
+wikipoos {
+	DEFINES += RS_USE_WIKI
+	
+	DEPENDPATH += ../../supportlibs/pegmarkdown
+	INCLUDEPATH += ../../supportlibs/pegmarkdown
+	
+	HEADERS += gui/WikiPoos/WikiDialog.h \
+		gui/WikiPoos/WikiAddDialog.h \
+		gui/WikiPoos/WikiEditDialog.h \
+		gui/gxs/WikiGroupDialog.h \
+
+	FORMS += gui/WikiPoos/WikiDialog.ui \
+		gui/WikiPoos/WikiAddDialog.ui \
+		gui/WikiPoos/WikiEditDialog.ui \
+	
+	SOURCES += gui/WikiPoos/WikiDialog.cpp \
+		gui/WikiPoos/WikiAddDialog.cpp \
+		gui/WikiPoos/WikiEditDialog.cpp \
+		gui/gxs/WikiGroupDialog.cpp \
+
+	RESOURCES += gui/WikiPoos/Wiki_images.qrc
+
+}
+	
+	
+	
+gxsthewire {
+	
+	DEFINES += RS_USE_WIRE
+
+	HEADERS += gui/TheWire/WireDialog.h \
+		gui/TheWire/WireGroupItem.h \
+		gui/TheWire/WireGroupDialog.h \
+		gui/TheWire/WireGroupExtra.h \
+		gui/TheWire/PulseAddDialog.h \
+		gui/TheWire/PulseViewItem.h \
+		gui/TheWire/PulseTopLevel.h \
+		gui/TheWire/PulseViewGroup.h \
+		gui/TheWire/PulseReply.h \
+		gui/TheWire/PulseReplySeperator.h \
+		gui/TheWire/PulseMessage.h \
+
+	FORMS += gui/TheWire/WireDialog.ui \
+		gui/TheWire/WireGroupItem.ui \
+		gui/TheWire/WireGroupExtra.ui \
+		gui/TheWire/PulseAddDialog.ui \
+		gui/TheWire/PulseTopLevel.ui \
+		gui/TheWire/PulseViewGroup.ui \
+		gui/TheWire/PulseReply.ui \
+		gui/TheWire/PulseReplySeperator.ui \
+		gui/TheWire/PulseMessage.ui \
+	
+	SOURCES += gui/TheWire/WireDialog.cpp \
+		gui/TheWire/WireGroupItem.cpp \
+		gui/TheWire/WireGroupDialog.cpp \
+		gui/TheWire/WireGroupExtra.cpp \
+		gui/TheWire/PulseAddDialog.cpp \
+		gui/TheWire/PulseViewItem.cpp \
+		gui/TheWire/PulseTopLevel.cpp \
+		gui/TheWire/PulseViewGroup.cpp \
+		gui/TheWire/PulseReply.cpp \
+		gui/TheWire/PulseReplySeperator.cpp \
+		gui/TheWire/PulseMessage.cpp \
+
+	RESOURCES += gui/TheWire/TheWire_images.qrc
+}
+
+identities {
+	
+	HEADERS +=  \
+		gui/Identity/IdDialog.h \
+		gui/Identity/IdEditDialog.h \
+		gui/Identity/IdDetailsDialog.h \
+	
+	FORMS += gui/Identity/IdDialog.ui \
+		gui/Identity/IdEditDialog.ui \
+		gui/Identity/IdDetailsDialog.ui \
+
+	SOURCES +=  \
+		gui/Identity/IdDialog.cpp \
+		gui/Identity/IdEditDialog.cpp \
+		gui/Identity/IdDetailsDialog.cpp \
+	
+}
+	
+gxscircles {
+	DEFINES += RS_USE_CIRCLES
+#	DEFINES += RS_USE_NEW_PEOPLE_DIALOG
+
+	HEADERS +=  \
+		gui/Circles/CirclesDialog.h \
+		gui/Circles/CreateCircleDialog.h \
+	
+	FORMS += gui/Circles/CirclesDialog.ui \
+		gui/Circles/CreateCircleDialog.ui \
+	
+	SOURCES +=  \
+		gui/Circles/CirclesDialog.cpp \
+		gui/Circles/CreateCircleDialog.cpp \
+
+	HEADERS += gui/People/PeopleDialog.h
+	HEADERS += gui/People/CircleWidget.h
+	HEADERS += gui/People/IdentityWidget.h
+
+	FORMS   += gui/People/PeopleDialog.ui 
+	FORMS   += gui/People/CircleWidget.ui
+	FORMS   += gui/People/IdentityWidget.ui
+
+	SOURCES += gui/People/PeopleDialog.cpp 
+	SOURCES += gui/People/CircleWidget.cpp
+	SOURCES += gui/People/IdentityWidget.cpp
+
+#HEADERS += gui/People/IdentityItem.h
+#HEADERS += gui/People/CircleItem.h
+#HEADERS += gui/People/GroupListView.h
+#SOURCES += gui/People/GroupListView.cpp
+#SOURCES += gui/People/IdentityItem.cpp
+#SOURCES += gui/People/CircleItem.cpp
+
+
+}
+	
+	
+gxsforums {
+
+	HEADERS += gui/gxsforums/GxsForumsDialog.h \
+		gui/gxsforums/GxsForumGroupDialog.h \
+		gui/gxsforums/CreateGxsForumMsg.h \
+		gui/gxsforums/GxsForumThreadWidget.h \
+		gui/gxsforums/GxsForumModel.h \
+		gui/gxsforums/GxsForumUserNotify.h \
+		gui/feeds/GxsForumGroupItem.h \
+		gui/feeds/GxsForumMsgItem.h
+
+	FORMS += gui/gxsforums/CreateGxsForumMsg.ui \
+		gui/gxsforums/GxsForumThreadWidget.ui \
+		gui/feeds/GxsForumGroupItem.ui \
+		gui/feeds/GxsForumMsgItem.ui
+
+	SOURCES += gui/gxsforums/GxsForumsDialog.cpp \
+		gui/gxsforums/GxsForumGroupDialog.cpp \
+		gui/gxsforums/CreateGxsForumMsg.cpp \
+		gui/gxsforums/GxsForumThreadWidget.cpp \
+		gui/gxsforums/GxsForumModel.cpp \
+		gui/gxsforums/GxsForumUserNotify.cpp \
+		gui/feeds/GxsForumGroupItem.cpp \
+		gui/feeds/GxsForumMsgItem.cpp
+}
+	
+	
+gxschannels {
+	
+	HEADERS += gui/gxschannels/GxsChannelDialog.h \
+		gui/gxschannels/GxsChannelGroupDialog.h \
+		gui/gxschannels/CreateGxsChannelMsg.h \
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.h \
+		gui/gxschannels/GxsChannelPostsModel.h \
+		gui/gxschannels/GxsChannelPostFilesModel.h \
+		gui/gxschannels/GxsChannelPostThumbnail.h \
+		gui/gxschannels/GxsChannelFilesStatusWidget.h \
+		gui/feeds/GxsChannelGroupItem.h \
+		gui/feeds/GxsChannelPostItem.h \
+		gui/gxschannels/GxsChannelUserNotify.h
+	
+	FORMS += \
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.ui \
+		gui/gxschannels/GxsChannelFilesStatusWidget.ui \
+		gui/gxschannels/CreateGxsChannelMsg.ui \
+		gui/feeds/GxsChannelGroupItem.ui \
+		gui/feeds/GxsChannelPostItem.ui
+	
+	SOURCES += gui/gxschannels/GxsChannelDialog.cpp \
+		gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp \
+		gui/gxschannels/GxsChannelPostsModel.cpp \
+		gui/gxschannels/GxsChannelPostFilesModel.cpp \
+		gui/gxschannels/GxsChannelFilesStatusWidget.cpp \
+                gui/gxschannels/GxsChannelPostThumbnail.cpp \
+		gui/gxschannels/GxsChannelGroupDialog.cpp \
+		gui/gxschannels/CreateGxsChannelMsg.cpp \
+		gui/feeds/GxsChannelGroupItem.cpp \
+		gui/feeds/GxsChannelPostItem.cpp \
+		gui/gxschannels/GxsChannelUserNotify.cpp
+}
+	
+	
+posted {
+	
+	HEADERS += gui/Posted/PostedDialog.h \
+		gui/Posted/PostedListWidgetWithModel.h \
+		gui/Posted/PostedPostsModel.h \
+		gui/Posted/BoardPostDisplayWidget.h \
+		gui/Posted/PostedItem.h \
+		gui/Posted/PostedCardView.h \
+		gui/Posted/PostedGroupDialog.h \
+		gui/feeds/PostedGroupItem.h \
+		gui/Posted/PostedCreatePostDialog.h \
+		gui/Posted/PhotoView.h \
+		gui/Posted/PostedUserNotify.h
+
+		#gui/Posted/PostedCreateCommentDialog.h \
+		#gui/Posted/PostedComments.h \
+	
+	FORMS += gui/Posted/PostedListWidgetWithModel.ui \
+		gui/feeds/PostedGroupItem.ui \
+		gui/Posted/BoardPostDisplayWidget_compact.ui \
+		gui/Posted/BoardPostDisplayWidget_card.ui \
+		gui/Posted/PostedItem.ui \
+		gui/Posted/PostedCardView.ui \
+		gui/Posted/PostedCreatePostDialog.ui \
+		gui/Posted/PhotoView.ui \
+		#gui/Posted/PostedDialog.ui \
+		#gui/Posted/PostedComments.ui \
+		#gui/Posted/PostedCreateCommentDialog.ui
+	
+	SOURCES += gui/Posted/PostedDialog.cpp \
+		gui/Posted/PostedListWidgetWithModel.cpp \
+		gui/Posted/BoardPostDisplayWidget.cpp \
+		gui/Posted/PostedPostsModel.cpp \
+		gui/feeds/PostedGroupItem.cpp \
+		gui/Posted/PostedItem.cpp \
+		gui/Posted/PostedCardView.cpp \
+		gui/Posted/PostedGroupDialog.cpp \
+		gui/Posted/PostedCreatePostDialog.cpp \
+		gui/Posted/PhotoView.cpp \
+		gui/Posted/PostedUserNotify.cpp
+
+		#gui/Posted/PostedDialog.cpp \
+		#gui/Posted/PostedComments.cpp \
+		#gui/Posted/PostedCreateCommentDialog.cpp
+	
+	RESOURCES += gui/Posted/Posted_images.qrc
+}
+	
+gxsgui {
+	
+	HEADERS += gui/gxs/GxsGroupDialog.h \
+		gui/gxs/GxsIdDetails.h \
+		gui/gxs/GxsIdChooser.h \
+		gui/gxs/GxsIdLabel.h \
+		gui/gxs/GxsCircleChooser.h \
+		gui/gxs/GxsCircleLabel.h \
+		gui/gxs/GxsIdTreeWidgetItem.h \
+		gui/gxs/GxsCommentTreeWidget.h \
+		gui/gxs/GxsCommentContainer.h \
+		gui/gxs/GxsCommentDialog.h \
+		gui/gxs/GxsCreateCommentDialog.h \
+		gui/gxs/GxsGroupFrameDialog.h \
+		gui/gxs/GxsMessageFrameWidget.h \
+		gui/gxs/GxsMessageFramePostWidget.h \
+		gui/gxs/GxsGroupFeedItem.h \
+		gui/gxs/GxsFeedItem.h \
+		gui/gxs/GxsGroupShareKey.h \
+		gui/gxs/GxsUserNotify.h \
+		gui/gxs/GxsFeedWidget.h \
+		util/TokenQueue.h \
+		util/RsGxsUpdateBroadcast.h \
+	
+#		gui/gxs/GxsMsgDialog.h \
+	
+	FORMS += gui/gxs/GxsGroupDialog.ui \
+		gui/gxs/GxsCommentContainer.ui \
+		gui/gxs/GxsCommentDialog.ui \
+		gui/gxs/GxsCreateCommentDialog.ui \
+		gui/gxs/GxsGroupFrameDialog.ui\
+		gui/gxs/GxsGroupShareKey.ui 
+#		gui/gxs/GxsMsgDialog.ui \
+#		gui/gxs/GxsCommentTreeWidget.ui 
+	
+	SOURCES += gui/gxs/GxsGroupDialog.cpp \
+		gui/gxs/GxsIdDetails.cpp \
+		gui/gxs/GxsIdChooser.cpp \
+		gui/gxs/GxsIdLabel.cpp \
+		gui/gxs/GxsCircleChooser.cpp \
+		gui/gxs/GxsGroupShareKey.cpp \
+		gui/gxs/GxsCircleLabel.cpp \
+		gui/gxs/GxsIdTreeWidgetItem.cpp \
+		gui/gxs/GxsCommentTreeWidget.cpp \
+		gui/gxs/GxsCommentContainer.cpp \
+		gui/gxs/GxsCommentDialog.cpp \
+		gui/gxs/GxsCreateCommentDialog.cpp \
+		gui/gxs/GxsGroupFrameDialog.cpp \
+		gui/gxs/GxsMessageFrameWidget.cpp \
+		gui/gxs/GxsMessageFramePostWidget.cpp \
+		gui/gxs/GxsGroupFeedItem.cpp \
+		gui/gxs/GxsFeedItem.cpp \
+		gui/gxs/GxsUserNotify.cpp \
+		gui/gxs/GxsFeedWidget.cpp \
+		util/TokenQueue.cpp \
+		util/RsGxsUpdateBroadcast.cpp \
+	
+#		gui/gxs/GxsMsgDialog.cpp \
+	
+	
+}
+
+
+wikipoos {
+	HEADERS += \
+		gui/gxs/RsGxsUpdateBroadcastBase.h \
+		gui/gxs/RsGxsUpdateBroadcastWidget.h \
+		gui/gxs/RsGxsUpdateBroadcastPage.h 
+
+	SOURCES += \
+		gui/gxs/RsGxsUpdateBroadcastBase.cpp \
+		gui/gxs/RsGxsUpdateBroadcastWidget.cpp \
+		gui/gxs/RsGxsUpdateBroadcastPage.cpp \
+}
+
+################################################################
+#Define qmake_info.h file so GUI can get wath was used to compil
+#         This must be at end to get all informations
+################################################################
+RS_QMAKE_DEFINES=\\\"$${DEFINES}\\\"
+RS_QMAKE_CONFIG=\\\"$${CONFIG}\\\"
+
+INCLUDEPATH += $$OUT_PWD/include
+info_file.input = $$PWD/qmake_info.h.in
+info_file.output = $$OUT_PWD/include/qmake_info.h
+
+QMAKE_SUBSTITUTES += info_file
+OTHER_FILES += \
+    qmake_info.h.in

From 59c6eabad9b0ee34d31c2b4b262fa4d17c041a96 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Sun, 2 Jul 2023 12:48:38 +0530
Subject: [PATCH 309/503] Revert "Changes to the .pro file for the newly made
 files."

This reverts commit 3cc077ff381dbf64687ed2d3abf04d0d29921675.

This commit adds the new files to the .pro file.
---
 .../src/gui/TheWire/CustomFrame.cpp           |  20 +++
 retroshare-gui/src/gui/TheWire/CustomFrame.h  |  20 +++
 .../src/gui/TheWire/PulseViewGroup.cpp        | 125 +++++++++---------
 retroshare-gui/src/retroshare-gui.pro         |   2 +
 4 files changed, 105 insertions(+), 62 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
index 20059222d..4f1308df5 100644
--- a/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
+++ b/retroshare-gui/src/gui/TheWire/CustomFrame.cpp
@@ -1,3 +1,23 @@
+/*******************************************************************************
+ * gui/TheWire/CustomFrame.cpp                                                 *
+ *                                                                             *
+ * Copyright (c) 2012-2020 Robert Fernie   <retroshare.project@gmail.com>      *
+ *                                                                             *
+ * This program is free software: you can redistribute it and/or modify        *
+ * it under the terms of the GNU Affero General Public License as              *
+ * published by the Free Software Foundation, either version 3 of the          *
+ * License, or (at your option) any later version.                             *
+ *                                                                             *
+ * This program is distributed in the hope that it will be useful,             *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
+ * GNU Affero General Public License for more details.                         *
+ *                                                                             *
+ * You should have received a copy of the GNU Affero General Public License    *
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
+ *                                                                             *
+ *******************************************************************************/
+
 #include "CustomFrame.h"
 #include <QPainter>
 
diff --git a/retroshare-gui/src/gui/TheWire/CustomFrame.h b/retroshare-gui/src/gui/TheWire/CustomFrame.h
index ebe2bfa8c..e75a6087a 100644
--- a/retroshare-gui/src/gui/TheWire/CustomFrame.h
+++ b/retroshare-gui/src/gui/TheWire/CustomFrame.h
@@ -1,3 +1,23 @@
+/*******************************************************************************
+ * gui/TheWire/CustomFrame.h                                                   *
+ *                                                                             *
+ * Copyright (c) 2012-2020 Robert Fernie   <retroshare.project@gmail.com>      *
+ *                                                                             *
+ * This program is free software: you can redistribute it and/or modify        *
+ * it under the terms of the GNU Affero General Public License as              *
+ * published by the Free Software Foundation, either version 3 of the          *
+ * License, or (at your option) any later version.                             *
+ *                                                                             *
+ * This program is distributed in the hope that it will be useful,             *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
+ * GNU Affero General Public License for more details.                         *
+ *                                                                             *
+ * You should have received a copy of the GNU Affero General Public License    *
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
+ *                                                                             *
+ *******************************************************************************/
+
 #ifndef CUSTOMFRAMEH_H
 #define CUSTOMFRAMEH_H
 
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
index 56c4eabdc..4ef0b6512 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
@@ -37,21 +37,21 @@ Q_DECLARE_METATYPE(RsWireGroup)
 PulseViewGroup::PulseViewGroup(PulseViewHolder *holder, RsWireGroupSPtr group)
 :PulseViewItem(holder), mGroup(group)
 {
-	setupUi(this);
-	setAttribute ( Qt::WA_DeleteOnClose, true );
-	setup();
+    setupUi(this);
+    setAttribute ( Qt::WA_DeleteOnClose, true );
+    setup();
 }
 
 void PulseViewGroup::setup()
 {
-	if (mGroup) {
-		connect(followButton, SIGNAL(clicked()), this, SLOT(actionFollow()));
+    if (mGroup) {
+        connect(followButton, SIGNAL(clicked()), this, SLOT(actionFollow()));
 
-		label_groupName->setText("@" + QString::fromStdString(mGroup->mMeta.mGroupName));
-		label_authorName->setText(BoldString(QString::fromStdString(mGroup->mMeta.mAuthorId.toStdString())));
-		label_date->setText(DateTime::formatDateTime(mGroup->mMeta.mPublishTs));
-		label_tagline->setText(QString::fromStdString(mGroup->mTagline));
-		label_location->setText(QString::fromStdString(mGroup->mLocation));
+        label_groupName->setText("@" + QString::fromStdString(mGroup->mMeta.mGroupName));
+        label_authorName->setText(BoldString(QString::fromStdString(mGroup->mMeta.mAuthorId.toStdString())));
+        label_date->setText(DateTime::formatDateTime(mGroup->mMeta.mPublishTs));
+        label_tagline->setText(QString::fromStdString(mGroup->mTagline));
+        label_location->setText(QString::fromStdString(mGroup->mLocation));
 
 
         if (mGroup->mMasthead.mData)
@@ -65,72 +65,73 @@ void PulseViewGroup::setup()
                 QSize frameSize = frame_masthead->size();
 
                 // Scale the pixmap based on the frame size
-                pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+                pixmap = pixmap.scaledToWidth(frameSize.width(), Qt::SmoothTransformation);
                 frame_masthead->setPixmap(pixmap);
             }
         }
+// Uncomment the below code for default background
+//        else
+//        {
+//            // Default pixmap
+//            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png");
+//            QSize frameSize = frame_masthead->size();
+
+//            // Scale the pixmap based on the frame size
+//            pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+//            frame_masthead->setPixmap(pixmap);
+//        }
+
+        if (mGroup->mHeadshot.mData)
+        {
+            QPixmap pixmap;
+            if (GxsIdDetails::loadPixmapFromData(
+                    mGroup->mHeadshot.mData,
+                    mGroup->mHeadshot.mSize,
+                    pixmap,GxsIdDetails::ORIGINAL))
+            {
+                pixmap = pixmap.scaled(100,100);
+                label_headshot->setPixmap(pixmap);
+            }
+        }
         else
         {
-            // Default pixmap
-            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png");
-            QSize frameSize = frame_masthead->size();
-
-            // Scale the pixmap based on the frame size
-            pixmap = pixmap.scaled(frameSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-            frame_masthead->setPixmap(pixmap);
-        }
-
-		if (mGroup->mHeadshot.mData)
-		{
-			QPixmap pixmap;
-			if (GxsIdDetails::loadPixmapFromData(
-					mGroup->mHeadshot.mData,
-					mGroup->mHeadshot.mSize,
-					pixmap,GxsIdDetails::ORIGINAL))
-			{
-                pixmap = pixmap.scaled(100,100);
-				label_headshot->setPixmap(pixmap);
-			}
-		}
-		else
-		{
             // default.
             QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png").scaled(100,100);
-			label_headshot->setPixmap(pixmap);
-		}
+            label_headshot->setPixmap(pixmap);
+        }
 
-		if (mGroup->mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
-		{
-			uint32_t pulses = mGroup->mGroupPulses + mGroup->mGroupReplies;
-			uint32_t replies = mGroup->mRefReplies;
-			uint32_t republishes = mGroup->mRefRepublishes;
-			uint32_t likes = mGroup->mRefLikes;
+        if (mGroup->mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
+        {
+            uint32_t pulses = mGroup->mGroupPulses + mGroup->mGroupReplies;
+            uint32_t replies = mGroup->mRefReplies;
+            uint32_t republishes = mGroup->mRefRepublishes;
+            uint32_t likes = mGroup->mRefLikes;
 
-			label_extra_pulses->setText(BoldString(ToNumberUnits(pulses)));
-			label_extra_replies->setText(BoldString(ToNumberUnits(replies)));
-			label_extra_republishes->setText(BoldString(ToNumberUnits(republishes)));
-			label_extra_likes->setText(BoldString(ToNumberUnits(likes)));
+            label_extra_pulses->setText(BoldString(ToNumberUnits(pulses)));
+            label_extra_replies->setText(BoldString(ToNumberUnits(replies)));
+            label_extra_republishes->setText(BoldString(ToNumberUnits(republishes)));
+            label_extra_likes->setText(BoldString(ToNumberUnits(likes)));
 
-			// hide follow.
-			widget_actions->setVisible(false);
-		}
-		else
-		{
-			// hide stats.
-			widget_replies->setVisible(false);
-		}
-	}
+            // hide follow.
+            widget_actions->setVisible(false);
+        }
+        else
+        {
+            // hide stats.
+            widget_replies->setVisible(false);
+        }
+    }
 }
 
 void PulseViewGroup::actionFollow()
 {
-	RsGxsGroupId groupId = mGroup->mMeta.mGroupId;
-	std::cerr << "PulseViewGroup::actionFollow() following ";
-	std::cerr << groupId;
-	std::cerr << std::endl;
+    RsGxsGroupId groupId = mGroup->mMeta.mGroupId;
+    std::cerr << "PulseViewGroup::actionFollow() following ";
+    std::cerr << groupId;
+    std::cerr << std::endl;
 
-	if (mHolder) {
-		mHolder->PVHfollow(groupId);
-	}
+    if (mHolder) {
+        mHolder->PVHfollow(groupId);
+    }
 }
 
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index b8e8365e0..93734b454 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -1220,6 +1220,7 @@ gxsthewire {
 		gui/TheWire/PulseReply.h \
 		gui/TheWire/PulseReplySeperator.h \
 		gui/TheWire/PulseMessage.h \
+                gui/TheWire/CustomFrame.h \
 
 	FORMS += gui/TheWire/WireDialog.ui \
 		gui/TheWire/WireGroupItem.ui \
@@ -1242,6 +1243,7 @@ gxsthewire {
 		gui/TheWire/PulseReply.cpp \
 		gui/TheWire/PulseReplySeperator.cpp \
 		gui/TheWire/PulseMessage.cpp \
+                gui/TheWire/CustomFrame.cpp \
 
 	RESOURCES += gui/TheWire/TheWire_images.qrc
 }

From cbe4fca9ae866bf590ff5e4a6b79b16e3b3ef25a Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Sat, 15 Jul 2023 19:36:48 +0530
Subject: [PATCH 310/503] just making the actual path to relative path.

---
 retroshare-gui/src/gui/TheWire/PulseViewGroup.ui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
index 39183123e..6f6aff965 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
@@ -50,7 +50,7 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-              <widget class="CustomFrame" name="frame_masthead">
+       <widget class="CustomFrame" name="frame_masthead">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -569,11 +569,11 @@
    </item>
   </layout>
  </widget>
-  <customwidgets>
+ <customwidgets>
   <customwidget>
    <class>CustomFrame</class>
    <extends>QFrame</extends>
-   <header>D:\new\RetroShare\retroshare-gui\src\gui\TheWire\CustomFrame.h</header>
+   <header>gui\TheWire\CustomFrame.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

From 13ff7f4e653d663198d06cc603a104af54c101c4 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 18 Jul 2023 14:34:08 +0200
Subject: [PATCH 311/503] Fixed Linux compile of TheWire

---
 retroshare-gui/src/gui/TheWire/PulseViewGroup.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
index 6f6aff965..96f717656 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
@@ -573,7 +573,7 @@
   <customwidget>
    <class>CustomFrame</class>
    <extends>QFrame</extends>
-   <header>gui\TheWire\CustomFrame.h</header>
+   <header>gui/TheWire/CustomFrame.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

From 030bc46d2679376868353cc0cc310927ac503d93 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 18 Jul 2023 15:15:21 +0200
Subject: [PATCH 312/503] fixed sorting of TO column in Sent mails

---
 retroshare-gui/src/gui/msgs/MessageModel.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index a19087dc0..771fd6874 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -459,14 +459,6 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
 
 	case COLUMN_THREAD_SPAM:  return QVariant((fmpe.msgflags & RS_MSG_SPAM)? 1:0);
 
-    case COLUMN_THREAD_TO: {
-            QString name;
-
-            if(GxsIdTreeItemDelegate::computeName(RsGxsId(fmpe.to.toStdString()),name))
-                return name;
-            return ""; //Not Found
-        }
-
     case COLUMN_THREAD_AUTHOR:{
 			QString name;
 
@@ -474,8 +466,10 @@ QVariant RsMessageModel::sortRole(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
 				return name;
 			return ""; //Not Found
 		}
-	default:
-		return displayRole(fmpe,column);
+
+    case COLUMN_THREAD_TO:    // fallthrough. In this case, the "to" field is not filled because the msg potentially has multiple destinations.
+    default:
+        return displayRole(fmpe,column);
 	}
 }
 

From 10feb45bce53890e9a66b92cdec1ec219d16e385 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 18 Jul 2023 20:03:46 +0200
Subject: [PATCH 313/503] fixed Board posts links copy on right-click

---
 retroshare-gui/src/gui/common/ElidedLabel.cpp | 6 +++++-
 retroshare-gui/src/gui/common/ElidedLabel.h   | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/common/ElidedLabel.cpp b/retroshare-gui/src/gui/common/ElidedLabel.cpp
index 31351b08d..bd86be9bd 100644
--- a/retroshare-gui/src/gui/common/ElidedLabel.cpp
+++ b/retroshare-gui/src/gui/common/ElidedLabel.cpp
@@ -258,7 +258,11 @@ void ElidedLabel::mousePressEvent(QMouseEvent *ev)
 		return; // eat event
 	}
 	QLabel::mousePressEvent(ev);
-	emit clicked(ev->pos());
+
+    if(ev->buttons()==Qt::RightButton)
+        emit rightClicked(ev->pos());
+    else
+        emit clicked(ev->pos());
 }
 
 void ElidedLabel::setTextColor(const QColor &color)
diff --git a/retroshare-gui/src/gui/common/ElidedLabel.h b/retroshare-gui/src/gui/common/ElidedLabel.h
index 9290a61d1..2faa2f0ef 100644
--- a/retroshare-gui/src/gui/common/ElidedLabel.h
+++ b/retroshare-gui/src/gui/common/ElidedLabel.h
@@ -77,7 +77,8 @@ protected:
 
 signals:
 	void elisionChanged(bool elided);
-	void clicked(QPoint pos);
+    void rightClicked(QPoint pos);
+    void clicked(QPoint pos);
 
 private:
 	bool mElided;

From 7a4558a3dac121ff430fc0af91185d290c9ca2d7 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 24 Jul 2023 18:35:05 +0200
Subject: [PATCH 314/503] added missing change in previous commit

---
 retroshare-gui/src/gui/common/ElidedLabel.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/common/ElidedLabel.cpp b/retroshare-gui/src/gui/common/ElidedLabel.cpp
index bd86be9bd..2486d0cae 100644
--- a/retroshare-gui/src/gui/common/ElidedLabel.cpp
+++ b/retroshare-gui/src/gui/common/ElidedLabel.cpp
@@ -259,10 +259,10 @@ void ElidedLabel::mousePressEvent(QMouseEvent *ev)
 	}
 	QLabel::mousePressEvent(ev);
 
-    if(ev->buttons()==Qt::RightButton)
-        emit rightClicked(ev->pos());
-    else
+    if(ev->buttons()==Qt::LeftButton)
         emit clicked(ev->pos());
+    else if(ev->buttons()==Qt::RightButton)
+        emit rightClicked(ev->pos());
 }
 
 void ElidedLabel::setTextColor(const QColor &color)

From 15128192003722a3686c1b6f27132ba064cd1705 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 24 Jul 2023 18:35:21 +0200
Subject: [PATCH 315/503] fixed compilation on arch

---
 retroshare-gui/src/gui/statistics/Histogram.cpp | 4 ++--
 retroshare-gui/src/gui/statistics/Histogram.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/statistics/Histogram.cpp b/retroshare-gui/src/gui/statistics/Histogram.cpp
index 5884d8306..77e272b31 100644
--- a/retroshare-gui/src/gui/statistics/Histogram.cpp
+++ b/retroshare-gui/src/gui/statistics/Histogram.cpp
@@ -39,9 +39,9 @@ void Histogram::draw(QPainter */*painter*/) const
 
 void Histogram::insert(double val)
 {
-    long int bin = (uint32_t)floor((val - mStart)/(mEnd - mStart) * mBins.size());
+    long int bin = (long int)floor((val - mStart)/(mEnd - mStart) * mBins.size());
 
-    if(bin >= 0 && bin < mBins.size())
+    if(bin >= 0 && bin < (long int)mBins.size())
 		++mBins[bin];
 }
 
diff --git a/retroshare-gui/src/gui/statistics/Histogram.h b/retroshare-gui/src/gui/statistics/Histogram.h
index 91ec84b5d..3931b15db 100644
--- a/retroshare-gui/src/gui/statistics/Histogram.h
+++ b/retroshare-gui/src/gui/statistics/Histogram.h
@@ -20,7 +20,7 @@
 
 #include <vector>
 #include <iostream>
-#include <stdint.h>
+#include <cstdint>
 
 class QPainter;
 

From 74049d1b22f673349427ccec985bb098cd510340 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 24 Jul 2023 23:19:17 +0200
Subject: [PATCH 316/503] Added crop picture feature for wire background
 picture

* Added crop picture feature for wire background picture
* Fix smooth transformation for pixmaps
* Added stylesheet for label_masthead
* Edit profile on profile page feature
* New svg icons for wire
---
 .../src/gui/TheWire/PulseViewGroup.cpp        |  39 +++-
 .../src/gui/TheWire/PulseViewGroup.h          |   3 +
 .../src/gui/TheWire/PulseViewGroup.ui         | 168 +++++++++---------
 .../src/gui/TheWire/WireGroupExtra.cpp        |  34 +++-
 .../src/gui/TheWire/WireGroupExtra.h          |   3 +-
 .../src/gui/TheWire/WireGroupExtra.ui         | 151 ++++++++++++----
 .../src/gui/TheWire/WireGroupItem.cpp         |   4 +-
 .../src/gui/icons/svg/wire-notify.svg         |  55 ++++++
 retroshare-gui/src/gui/icons/svg/wire.svg     |  56 ++++++
 .../src/gui/qss/stylesheet/Standard_Dark.qss  |   7 +
 .../src/gui/qss/stylesheet/Standard_Light.qss |   5 +
 retroshare-gui/src/qss/retroclassic.qss       |   6 +
 12 files changed, 399 insertions(+), 132 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/svg/wire-notify.svg
 create mode 100644 retroshare-gui/src/gui/icons/svg/wire.svg

diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
index 4ef0b6512..475c74034 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
@@ -26,6 +26,7 @@
 #include "PulseViewGroup.h"
 #include "CustomFrame.h"
 
+#include "WireGroupDialog.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
 #include "util/DateTime.h"
@@ -40,6 +41,9 @@ PulseViewGroup::PulseViewGroup(PulseViewHolder *holder, RsWireGroupSPtr group)
     setupUi(this);
     setAttribute ( Qt::WA_DeleteOnClose, true );
     setup();
+
+	connect(editButton, SIGNAL(clicked()), this, SLOT(editProfile()));
+
 }
 
 void PulseViewGroup::setup()
@@ -89,14 +93,14 @@ void PulseViewGroup::setup()
                     mGroup->mHeadshot.mSize,
                     pixmap,GxsIdDetails::ORIGINAL))
             {
-                pixmap = pixmap.scaled(100,100);
+                pixmap = pixmap.scaled(100,100, Qt::KeepAspectRatio, Qt::SmoothTransformation);
                 label_headshot->setPixmap(pixmap);
             }
         }
         else
         {
             // default.
-            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/png/posted.png").scaled(100,100);
+            QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(100,100, Qt::KeepAspectRatio, Qt::SmoothTransformation);
             label_headshot->setPixmap(pixmap);
         }
 
@@ -121,6 +125,23 @@ void PulseViewGroup::setup()
             widget_replies->setVisible(false);
         }
     }
+
+	setGroupSet();
+}
+
+void PulseViewGroup::setGroupSet()
+{
+	if (mGroup->mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) {
+		editButton->show();
+	}
+	else if (mGroup->mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
+	{
+		editButton->hide();
+	}
+	else
+	{
+		editButton->hide();
+	}
 }
 
 void PulseViewGroup::actionFollow()
@@ -135,3 +156,17 @@ void PulseViewGroup::actionFollow()
     }
 }
 
+void PulseViewGroup::editProfile()
+{
+	RsGxsGroupId groupId = mGroup->mMeta.mGroupId;
+	if (groupId.isNull())
+	{
+		std::cerr << "PulseViewGroup::editProfile() No Group selected";
+		std::cerr << std::endl;
+		return;
+	}
+
+	WireGroupDialog wireEdit(GxsGroupDialog::MODE_EDIT, groupId, this);
+	wireEdit.exec ();
+}
+
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.h b/retroshare-gui/src/gui/TheWire/PulseViewGroup.h
index 4d00090ca..62da0a228 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.h
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.h
@@ -35,10 +35,13 @@ public:
 
 private slots:
 	void actionFollow();
+	void editProfile();
 
 protected:
 	void setup();
 
+private:
+	void setGroupSet();
 
 protected:
 	RsWireGroupSPtr mGroup;
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
index 96f717656..79d9964f6 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
@@ -136,38 +136,6 @@
          </size>
         </property>
         <layout class="QGridLayout" name="widget_header_GL">
-         <item row="0" column="1" rowspan="3">
-          <spacer name="widget_header_HSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>518</width>
-             <height>58</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_groupName">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>20</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="0">
           <widget class="QLabel" name="label_authorName">
            <property name="sizePolicy">
@@ -203,6 +171,45 @@
            </property>
           </spacer>
          </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_groupName">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>20</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1" rowspan="3">
+          <spacer name="widget_header_HSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>518</width>
+             <height>58</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="0" column="2" rowspan="3">
+          <widget class="QPushButton" name="editButton">
+           <property name="text">
+            <string>Edit profile</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
@@ -227,41 +234,6 @@
          </size>
         </property>
         <layout class="QGridLayout" name="widget_publish_GL">
-         <item row="1" column="2">
-          <widget class="QLabel" name="label_date">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>20</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <spacer name="widget_publish_LHSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_location">
            <property name="sizePolicy">
@@ -281,19 +253,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="3">
-          <spacer name="widget_publish_RHSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>2000</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
          <item row="0" column="0" colspan="4">
           <widget class="QLabel" name="label_tagline">
            <property name="sizePolicy">
@@ -313,6 +272,54 @@
            </property>
           </widget>
          </item>
+         <item row="1" column="2">
+          <widget class="QLabel" name="label_date">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>20</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <spacer name="widget_publish_RHSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>2000</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="1" column="1">
+          <spacer name="widget_publish_LHSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
       </item>
@@ -530,6 +537,7 @@
            <property name="font">
             <font>
              <pointsize>12</pointsize>
+             <weight>75</weight>
              <bold>true</bold>
             </font>
            </property>
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupExtra.cpp b/retroshare-gui/src/gui/TheWire/WireGroupExtra.cpp
index b6a1c5440..8ed6d4d4b 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupExtra.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupExtra.cpp
@@ -34,13 +34,19 @@ WireGroupExtra::~WireGroupExtra()
 
 void WireGroupExtra::setUp()
 {
-    connect(ui.pushButton_masthead, SIGNAL(clicked() ), this , SLOT(addMasthead()));
-}
+	connect(ui.pushButton_masthead, SIGNAL(clicked() ), this , SLOT(addMasthead()));
 
+	int desired_height = ui.pushButton_masthead->height() + ui.removeButton->height() + ui.lineEdit_Tagline->height();
+	int desired_width =  3/1.0 * desired_height + ui.lineEdit_Tagline->width(); 
+
+	ui.label_masthead->setFixedSize(desired_width, desired_height);
+
+	setMasthead(QPixmap());
+}
 
 void WireGroupExtra::addMasthead()
 {
-    QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load Masthead"), 400, 100);
+    QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load Masthead"), 800, 600);
 
     if (img.isNull())
         return;
@@ -48,7 +54,6 @@ void WireGroupExtra::addMasthead()
     setMasthead(img);
 }
 
-
 void WireGroupExtra::setTagline(const std::string &str)
 {
 	ui.lineEdit_Tagline->setText(QString::fromStdString(str));
@@ -61,8 +66,21 @@ void WireGroupExtra::setLocation(const std::string &str)
 
 void WireGroupExtra::setMasthead(const QPixmap &pixmap)
 {
-    mMasthead = pixmap;
-    ui.label_masthead->setPixmap(mMasthead);
+	mMasthead = pixmap;
+
+	if (!mMasthead.isNull()) {
+		ui.label_masthead->setPicture(mMasthead);
+		ui.label_masthead->setToolTip(tr("Use the mouse to zoom and adjust the image for your background."));
+	} else {
+		ui.label_masthead->setPicture(QPixmap());
+		ui.label_masthead->setText(tr("MastHead background Image"));
+	}
+}
+
+void WireGroupExtra::on_removeButton_clicked()
+{
+	ui.label_masthead->setPicture(QPixmap());
+	ui.label_masthead->setText(tr("MastHead background Image"));
 }
 
 std::string WireGroupExtra::getTagline()
@@ -77,7 +95,5 @@ std::string WireGroupExtra::getLocation()
 
 QPixmap WireGroupExtra::getMasthead()
 {
-	return mMasthead;
+	return ui.label_masthead->extractCroppedScaledPicture();
 }
-
-
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupExtra.h b/retroshare-gui/src/gui/TheWire/WireGroupExtra.h
index ce606feb3..429be088b 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupExtra.h
+++ b/retroshare-gui/src/gui/TheWire/WireGroupExtra.h
@@ -34,7 +34,6 @@ public:
 
 	void setMasthead(const QPixmap &pixmap);
 	QPixmap getMasthead();
-
 	void setTagline(const std::string &str);
 	void setLocation(const std::string &str);
 
@@ -43,7 +42,7 @@ public:
 
 private slots:
 	void addMasthead();
-
+	void on_removeButton_clicked();
 private:
 	void setUp();
 private:
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupExtra.ui b/retroshare-gui/src/gui/TheWire/WireGroupExtra.ui
index fb1da5e73..4c03b8fe8 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupExtra.ui
+++ b/retroshare-gui/src/gui/TheWire/WireGroupExtra.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>516</width>
-    <height>199</height>
+    <height>133</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,50 +19,127 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item row="0" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Masthead</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" rowspan="2">
-    <widget class="QLabel" name="label_masthead">
-     <property name="text">
-      <string>MastHead background Image</string>
-     </property>
-    </widget>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="5" column="1">
+      <widget class="QLineEdit" name="lineEdit_Location"/>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="captionLabel">
+       <property name="text">
+        <string>Tagline:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="lineEdit_Tagline"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QPushButton" name="removeButton">
+       <property name="text">
+        <string>Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_12">
+       <property name="text">
+        <string>Location:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" colspan="2">
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>10</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="0">
+      <widget class="QPushButton" name="pushButton_masthead">
+       <property name="text">
+        <string>Select Image</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <spacer name="verticalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="1" column="1" rowspan="3">
+      <widget class="ZoomableLabel" name="label_masthead">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Plain</enum>
+       </property>
+       <property name="lineWidth">
+        <number>1</number>
+       </property>
+       <property name="text">
+        <string>MastHead background Image</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::PlainText</enum>
+       </property>
+       <property name="scaledContents">
+        <bool>false</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="1" column="0">
-    <widget class="QPushButton" name="pushButton_masthead">
-     <property name="text">
-      <string>Select Image</string>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="captionLabel">
-     <property name="text">
-      <string>Tagline:</string>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
      </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="lineEdit_Tagline"/>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_12">
-     <property name="text">
-      <string>Location:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLineEdit" name="lineEdit_Location"/>
+    </spacer>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ZoomableLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/gxschannels/GxsChannelPostThumbnail.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
index c8abe3886..199800581 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
@@ -92,14 +92,14 @@ void WireGroupItem::setup()
 				QImage circleImage = getCirclePhoto(orginalImage,orginalImage.size().width());
 				pixmap.convertFromImage(circleImage);
 
-				pixmap = pixmap.scaled(40,40);
+				pixmap = pixmap.scaled(40,40, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 				label_headshot->setPixmap(pixmap);
 		}
 	}
 	else
 	{
 		// default.
-        QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(32,32);
+        QPixmap pixmap = FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png").scaled(32,32, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 		label_headshot->setPixmap(pixmap);
 	}
 	
diff --git a/retroshare-gui/src/gui/icons/svg/wire-notify.svg b/retroshare-gui/src/gui/icons/svg/wire-notify.svg
new file mode 100644
index 000000000..7f380879c
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/wire-notify.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   id="svg4155"
+   version="1.1"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xml:space="preserve"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="wire-notify.svg"
+   inkscape:export-xdpi="144"
+   inkscape:export-ydpi="144"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     id="namedview4157"
+     showgrid="false"
+     inkscape:zoom="5.11875"
+     inkscape:cx="35.457875"
+     inkscape:cy="40.927961"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4163"
+     inkscape:pagecheckerboard="0" /><g
+     id="g4163"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+       inkscape:connector-curvature="0"
+       id="path4167"
+       style="fill:#ff990d;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /><path
+       style="fill:#ffffff;stroke:none;stroke-width:0.422421"
+       d="M 11.504608,50.061515 C 0.95186111,41.31166 9.91073,20.329766 22.487548,19.224797 v -0.42242 C 17.439916,16.700874 12.842245,14.816835 7.2804,14.578167 v -0.422421 c 13.723057,-5.705639 29.505712,-3.76208 38.535802,9.293259 3.987608,5.764904 3.334546,11.659532 5.649411,17.741673 1.140537,2.997245 4.589603,4.725495 6.08286,7.603575 -3.166889,0 -6.579204,-0.36248 -9.715677,0.08867 -3.52489,0.506989 -6.021355,2.241745 -9.715678,1.085368 -3.080123,-0.964134 -5.266278,-3.193206 -6.292,-6.243084 -0.395597,-1.176357 -0.200734,-3.00565 -1.144042,-3.90904 -1.225443,-1.173527 -4.184247,-0.416634 -5.659003,-0.09678 -5.829027,1.264221 -10.644877,5.188552 -13.517465,10.342128 z"
+       id="path1245" /></g></svg>
diff --git a/retroshare-gui/src/gui/icons/svg/wire.svg b/retroshare-gui/src/gui/icons/svg/wire.svg
new file mode 100644
index 000000000..9a8029016
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/wire.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   id="svg4155"
+   version="1.1"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xml:space="preserve"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="wire.svg"
+   inkscape:export-xdpi="144"
+   inkscape:export-ydpi="144"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     id="namedview4157"
+     showgrid="false"
+     inkscape:zoom="5.11875"
+     inkscape:cx="35.457875"
+     inkscape:cy="40.927961"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4163"
+     inkscape:pagecheckerboard="0" /><g
+     id="g4163"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+       inkscape:connector-curvature="0"
+       id="path4167"
+       style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /><path
+       style="fill:#ffffff;stroke:none;stroke-width:0.422421"
+       d="M 11.504608,50.061515 C 0.95186111,41.31166 9.91073,20.329766 22.487548,19.224797 v -0.42242 C 17.439916,16.700874 12.842245,14.816835 7.2804,14.578167 v -0.422421 c 13.723057,-5.705639 29.505712,-3.76208 38.535802,9.293259 3.987608,5.764904 3.334546,11.659532 5.649411,17.741673 1.140537,2.997245 4.589603,4.725495 6.08286,7.603575 -3.166889,0 -6.579204,-0.36248 -9.715677,0.08867 -3.52489,0.506989 -6.021355,2.241745 -9.715678,1.085368 -3.080123,-0.964134 -5.266278,-3.193206 -6.292,-6.243084 -0.395597,-1.176357 -0.200734,-3.00565 -1.144042,-3.90904 -1.225443,-1.173527 -4.184247,-0.416634 -5.659003,-0.09678 -5.829027,1.264221 -10.644877,5.188552 -13.517465,10.342128 z"
+       id="path1245" /></g></svg>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
index ee320a012..7497440c5 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
@@ -2552,3 +2552,10 @@ OpModeStatus[opMode="Minimal"] {
 [WrongValue="true"] {
 	background-color: #702020;
 }
+
+/**** The Wire ****/
+
+QLabel#label_masthead{
+	border: 2px solid #CCCCCC;
+	border-radius: 4px;
+}
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
index 923477e11..061ca0518 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
@@ -2687,6 +2687,11 @@ PulseReply QLabel#label_groupName{
 	color: #5b7083;
 }
 
+QLabel#label_masthead{
+	border: 2px solid #CCCCCC;
+	border-radius: 4px;
+}
+
 /**** PhotoShare ****/
 AlbumItem QFrame#albumFrame {
 	border: 2px solid #CCCCCC;
diff --git a/retroshare-gui/src/qss/retroclassic.qss b/retroshare-gui/src/qss/retroclassic.qss
index 02da3c18f..df8802f3a 100644
--- a/retroshare-gui/src/qss/retroclassic.qss
+++ b/retroshare-gui/src/qss/retroclassic.qss
@@ -178,3 +178,9 @@ IdDialog QWidget#idTreeWidget {
 	selection-background-color: #9FCBFF;
 	show-decoration-selected: 1;
 }
+
+/* Wire */
+QLabel#label_masthead{
+	border: 2px solid #CCCCCC;
+	border-radius: 4px;
+}

From ade297f257e93e52fac5c5b55d320b5b979ec9ea Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 24 Jul 2023 23:45:12 +0200
Subject: [PATCH 317/503] attempt at fixing unread msg count to display before
 GXS service tab is displayed

---
 retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp | 6 +++---
 retroshare-gui/src/gui/gxs/GxsUserNotify.h         | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index ca8521ca5..9d8d66d61 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -1176,10 +1176,10 @@ void GxsGroupFrameDialog::updateGroupStatisticsReal(const RsGxsGroupId &groupId)
 			 */
 
             QTreeWidgetItem *item = ui->groupTreeWidget->getItemFromId(QString::fromStdString(stats.mGrpId.toStdString()));
-			if (!item)
-				return;
 
-			ui->groupTreeWidget->setUnreadCount(item, mCountChildMsgs ? (stats.mNumThreadMsgsUnread + stats.mNumChildMsgsUnread) : stats.mNumThreadMsgsUnread);
+            if (item)
+                ui->groupTreeWidget->setUnreadCount(item, mCountChildMsgs ? (stats.mNumThreadMsgsUnread + stats.mNumChildMsgsUnread) : stats.mNumThreadMsgsUnread);
+
             mCachedGroupStats[groupId] = stats;
 
 			getUserNotify()->updateIcon();
diff --git a/retroshare-gui/src/gui/gxs/GxsUserNotify.h b/retroshare-gui/src/gui/gxs/GxsUserNotify.h
index cfbec97be..66890a1c3 100644
--- a/retroshare-gui/src/gui/gxs/GxsUserNotify.h
+++ b/retroshare-gui/src/gui/gxs/GxsUserNotify.h
@@ -46,7 +46,6 @@ protected:
 	bool mCountChildMsgs; // Count new child messages?
 
 private:
-	RsGxsUpdateBroadcastBase *mBase;
     const GxsGroupFrameDialog      *mGroupFrameDialog;
 
 	unsigned int mNewThreadMessageCount;

From 311ac03790ff79dd1a78b337d94601c7f6184808 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 25 Jul 2023 20:33:09 +0200
Subject: [PATCH 318/503] Update wire-notify.svg

---
 retroshare-gui/src/gui/icons/svg/wire-notify.svg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/retroshare-gui/src/gui/icons/svg/wire-notify.svg b/retroshare-gui/src/gui/icons/svg/wire-notify.svg
index 7f380879c..7d4d6ccce 100644
--- a/retroshare-gui/src/gui/icons/svg/wire-notify.svg
+++ b/retroshare-gui/src/gui/icons/svg/wire-notify.svg
@@ -13,6 +13,7 @@
    inkscape:export-xdpi="144"
    inkscape:export-ydpi="144"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

From 583431852cf108e4153be733d5e10adf6f3fc878 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 30 Jul 2023 18:47:56 +0200
Subject: [PATCH 319/503] fixed copy comment in channels/post/comment (and GXS
 comments in general)

---
 retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index 0b65b7c3d..517543b9a 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -464,11 +464,7 @@ void GxsCommentTreeWidget::replyToComment()
 void GxsCommentTreeWidget::copyComment()
 {
     QString txt = dynamic_cast<QAction*>(sender())->data().toString();
-
-	QMimeData *mimeData = new QMimeData();
-    mimeData->setHtml("<html>"+txt+"</html>");
-	QClipboard *clipboard = QApplication::clipboard();
-	clipboard->setMimeData(mimeData, QClipboard::Clipboard);
+    QApplication::clipboard()->setText(txt) ;
 }
 
 void GxsCommentTreeWidget::setup(RsGxsCommentService *comment_service)

From 24dd71d15fd7baee250fcd7f374e94f3e9e85c60 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 30 Jul 2023 20:51:51 +0200
Subject: [PATCH 320/503] fixed open file / preview file in TransfersDialog

---
 .../src/gui/FileTransfer/TransfersDialog.cpp  | 45 +++++++------------
 .../src/gui/FileTransfer/TransfersDialog.h    |  1 +
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 83e3219c3..6fc45a070 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -2074,22 +2074,23 @@ void TransfersDialog::dlOpenFolder()
 		break;
 	}
 
+    openFolder(info);
+}
+
+void TransfersDialog::openFolder(const FileInfo& info)
+{
 	/* make path for downloaded or downloading files */
-	QFileInfo qinfo;
-	std::string path;
-	if (info.downloadStatus == FT_STATE_COMPLETE) {
-		path = info.path;
-	} else {
-		path = rsFiles->getPartialsDirectory();
-	}
+    QDir directory;
+
+    if (info.downloadStatus == FT_STATE_COMPLETE)
+        directory = QFileInfo(QString::fromStdString(info.path)).absoluteDir().path();
+     else
+        directory = QDir(QString::fromStdString(rsFiles->getPartialsDirectory()));
 
 	/* open folder with a suitable application */
-	qinfo.setFile(QString::fromUtf8(path.c_str()));
-	if (qinfo.exists() && qinfo.isDir()) {
-		if (!RsUrlHandler::openUrl(QUrl::fromLocalFile(qinfo.absoluteFilePath()))) {
-			std::cerr << "dlOpenFolder(): can't open folder " << path << std::endl;
-		}
-	}
+
+    if (directory.exists() && !RsUrlHandler::openUrl(QUrl::fromLocalFile(directory.path())))
+            std::cerr << "dlOpenFolder(): can't open folder " << directory.path().toStdString() << std::endl;
 }
 
 void TransfersDialog::ulOpenFolder()
@@ -2104,19 +2105,7 @@ void TransfersDialog::ulOpenFolder()
         break;
     }
 
-    /* make path for uploading files */
-    QFileInfo qinfo;
-    std::string path;
-    path = info.path.substr(0,info.path.length()-info.fname.length());
-
-    /* open folder with a suitable application */
-    qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.isDir()) {
-        if (!RsUrlHandler::openUrl(QUrl::fromLocalFile(qinfo.absoluteFilePath()))) {
-            std::cerr << "ulOpenFolder(): can't open folder " << path << std::endl;
-        }
-    }
-
+    openFolder(info);
 }
 
 void TransfersDialog::dlPreviewFile()
@@ -2139,7 +2128,7 @@ void TransfersDialog::dlPreviewFile()
 	/* make path for downloaded or downloading files */
 	QFileInfo fileInfo;
 	if (info.downloadStatus == FT_STATE_COMPLETE) {
-		fileInfo = QFileInfo(QString::fromUtf8(info.path.c_str()), QString::fromUtf8(info.fname.c_str()));
+        fileInfo = QFileInfo(QString::fromUtf8(info.path.c_str()));
 	} else {
         fileInfo = QFileInfo(QString::fromUtf8(rsFiles->getPartialsDirectory().c_str()), QString::fromUtf8(info.hash.toStdString().c_str()));
 
@@ -2204,7 +2193,7 @@ void TransfersDialog::dlOpenFile()
 	/* make path for downloaded or downloading files */
 	std::string path;
 	if (info.downloadStatus == FT_STATE_COMPLETE) {
-		path = info.path + "/" + info.fname;
+        path = info.path ;
 
 		/* open file with a suitable application */
 		QFileInfo qinfo;
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h
index 87396fc81..19e2df363 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.h
@@ -173,6 +173,7 @@ signals:
     void playFiles(QStringList files);
 
 private:
+    void openFolder(const FileInfo& info);
 
     RsDownloadListModel *DLListModel;
     QSortFilterProxyModel *DLLFilterModel;

From 5ca3b15188d93d3c4d7425ab8db95da4ae7f863f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 3 Aug 2023 18:41:31 +0200
Subject: [PATCH 321/503] added "copy http link" action to board posts when
 possible

---
 .../gui/Posted/PostedListWidgetWithModel.cpp  | 38 +++++++++++++++++++
 .../gui/Posted/PostedListWidgetWithModel.h    |  1 +
 2 files changed, 39 insertions(+)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 5c63ce2e9..af9d64118 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -22,6 +22,7 @@
 #include <QMenu>
 #include <QSignalMapper>
 #include <QPainter>
+#include <QClipboard>
 #include <QMessageBox>
 
 #include "retroshare/rsgxscircles.h"
@@ -72,6 +73,7 @@ static const int POSTED_TABS_POSTS  = 1;
 //
 #define IMAGE_COPYLINK     ":/images/copyrslink.png"
 #define IMAGE_AUTHOR       ":/images/user/personal64.png"
+#define IMAGE_COPYHTTP     ":/images/emblem-web.png"
 
 Q_DECLARE_METATYPE(RsPostedPost);
 
@@ -340,7 +342,18 @@ void PostedListWidgetWithModel::postContextMenu(const QPoint& point)
 
     // 2 - generate the menu for that post.
 
+    RsPostedPost post = index.data(Qt::UserRole).value<RsPostedPost>() ;
+
     menu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyMessageLink()))->setData(index);
+
+    QByteArray urlarray(post.mLink.c_str());
+    QUrl url = QUrl::fromEncoded(urlarray.trimmed());
+
+    std::cerr << "Using link: \"" << post.mLink << "\"" << std::endl;
+
+    if(url.scheme()=="http" || url.scheme()=="https")
+        menu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_COPYHTTP), tr("Copy http Link"), this, SLOT(copyHttpLink()))->setData(index);
+
     menu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_AUTHOR), tr("Show author in People tab"), this, SLOT(showAuthorInPeople()))->setData(index);
 
 #ifdef TODO
@@ -456,6 +469,31 @@ void PostedListWidgetWithModel::showAuthorInPeople()
     MainWindow::showWindow(MainWindow::People);
     idDialog->navigate(RsGxsId(post.mMeta.mAuthorId));
 }
+void PostedListWidgetWithModel::copyHttpLink()
+{
+    try
+    {
+        if (groupId().isNull())
+            throw std::runtime_error("No channel currently selected!");
+
+        QModelIndex index = qobject_cast<QAction*>(QObject::sender())->data().toModelIndex();
+
+        if(!index.isValid())
+            throw std::runtime_error("No post under mouse!");
+
+        RsPostedPost post = index.data(Qt::UserRole).value<RsPostedPost>() ;
+
+        if(post.mMeta.mMsgId.isNull())
+            throw std::runtime_error("Post has empty MsgId!");
+
+        QApplication::clipboard()->setText(QString::fromStdString(post.mLink)) ;
+        QMessageBox::information(NULL,tr("information"),tr("The Retrohare link was copied to your clipboard.")) ;
+    }
+    catch(std::exception& e)
+    {
+        QMessageBox::critical(NULL,tr("Link creation error"),tr("Link could not be created: ")+e.what());
+    }
+}
 void PostedListWidgetWithModel::copyMessageLink()
 {
     try
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
index e6b98120a..cb7dcfd39 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.h
@@ -147,6 +147,7 @@ private slots:
 	void settingsChanged();
 	void postPostLoad();
 	void copyMessageLink();
+    void copyHttpLink();
     void nextPosts();
     void prevPosts();
 	void filterItems(QString s);

From 46e8db7d6df1578cba9b3dae1cf50daa00766196 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 3 Aug 2023 20:22:30 +0200
Subject: [PATCH 322/503] fixing crash when deleting forum feed items while
 loading

---
 retroshare-gui/src/gui/Posted/PostedItem.cpp  |  2 +-
 .../src/gui/feeds/GxsForumMsgItem.cpp         | 23 +++++++++++++++++++
 .../src/gui/feeds/GxsForumMsgItem.h           |  4 ++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
index 06b585614..8f1cddf7d 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
@@ -74,7 +74,7 @@ BasePostedItem::BasePostedItem( FeedHolder *feedHolder, uint32_t feedId
 
 BasePostedItem::~BasePostedItem()
 {
-	auto timeout = std::chrono::steady_clock::now() + std::chrono::milliseconds(200);
+    auto timeout = std::chrono::steady_clock::now() + std::chrono::milliseconds(200);
 	while( (mIsLoadingGroup || mIsLoadingMessage || mIsLoadingComment)
 	       && std::chrono::steady_clock::now() < timeout)
 	{
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
index eedb4ae20..81b026d27 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
@@ -83,6 +83,19 @@ GxsForumMsgItem::GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const
 
 GxsForumMsgItem::~GxsForumMsgItem()
 {
+    auto timeout = std::chrono::steady_clock::now() + std::chrono::milliseconds(300);
+
+    while( (mLoadingGroup || mLoadingMessage || mLoadingSetAsRead || mLoadingParentMessage)
+           && std::chrono::steady_clock::now() < timeout)
+    {
+        RsDbg() << __PRETTY_FUNCTION__ << " is Waiting for "
+                << (mLoadingGroup ? "Group " : "")
+                << (mLoadingMessage ? "Message " : "")
+                << (mLoadingParentMessage ? "Parent message " : "")
+                << (mLoadingSetAsRead ? "Set as read" : "")
+                << "loading." << std::endl;
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    }
 	delete(ui);
 }
 
@@ -167,6 +180,8 @@ QString GxsForumMsgItem::groupName()
 
 void GxsForumMsgItem::loadGroup()
 {
+    mLoadingGroup = true;
+
 	RsThread::async([this]()
 	{
 		// 1 - get group data
@@ -199,6 +214,7 @@ void GxsForumMsgItem::loadGroup()
 			 * after a blocking call to RetroShare API complete */
 
 			setGroup(group);
+            mLoadingGroup = false;
 
 		}, this );
 	});
@@ -210,6 +226,7 @@ void GxsForumMsgItem::loadMessage()
     std::cerr << "GxsForumMsgItem::loadMessage(): messageId=" << messageId() << " groupId=" << groupId() ;
 	std::cerr << std::endl;
 #endif
+    mLoadingMessage = true;
 
 	RsThread::async([this]()
 	{
@@ -244,6 +261,7 @@ void GxsForumMsgItem::loadMessage()
 			 * after a blocking call to RetroShare API complete */
 
 			setMessage(msg);
+            mLoadingMessage = false;
 
 		}, this );
 	});
@@ -255,6 +273,7 @@ void GxsForumMsgItem::loadParentMessage(const RsGxsMessageId& parent_msg)
 	std::cerr << "GxsForumMsgItem::loadParentMessage()";
 	std::cerr << std::endl;
 #endif
+    mLoadingParentMessage = true;
 
 	RsThread::async([parent_msg,this]()
 	{
@@ -291,6 +310,8 @@ void GxsForumMsgItem::loadParentMessage(const RsGxsMessageId& parent_msg)
 			mParentMessage = msg;
             fillParentMessage();
 
+            mLoadingParentMessage = false;
+
 		}, this );
 	});
 }
@@ -480,6 +501,7 @@ void GxsForumMsgItem::setAsRead(bool doUpdate)
     }
 
     mCloseOnRead = false;
+    mLoadingSetAsRead = true;
 
     RsThread::async( [this, doUpdate]() {
         RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), messageId());
@@ -489,6 +511,7 @@ void GxsForumMsgItem::setAsRead(bool doUpdate)
         if (doUpdate) {
             RsQThreadUtils::postToObject( [this]() {
                 setReadStatus(false, true);
+                mLoadingSetAsRead = false;
             } );
         }
     });
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h
index 34166ee59..ec933d96e 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.h
@@ -87,6 +87,10 @@ private:
 private:
 	bool mInFill;
 	bool mCloseOnRead;
+    bool mLoadingMessage;
+    bool mLoadingParentMessage;
+    bool mLoadingGroup;
+    bool mLoadingSetAsRead;
 
 	RsGxsForumGroup mGroup;
 	RsGxsForumMsg mMessage;

From e54322521ef75b6b2234d6bd2960e534f6aabe6c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 4 Aug 2023 13:52:27 +0200
Subject: [PATCH 323/503] fixed popularity and items at friends in Board
 details dialog

---
 retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp | 1 +
 retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index af9d64118..1798bb4bc 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -861,6 +861,7 @@ void PostedListWidgetWithModel::insertBoardDetails(const RsPostedGroup& group)
 		ui->subscribeToolButton->setText(tr("Subscribe"));
 
 	ui->infoPosts->setText(QString::number(group.mMeta.mVisibleMsgCount));
+    ui->poplabel->setText(QString::number(group.mMeta.mPop));
 
     if(group.mMeta.mLastPost==0)
         ui->infoLastPost->setText(tr("Never"));
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
index 2bafbc8a2..ee65ef923 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
@@ -54,7 +54,7 @@
              <string notr="true">&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:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="textInteractionFlags">
@@ -85,7 +85,7 @@ p, li { white-space: pre-wrap; }
                </font>
               </property>
               <property name="text">
-               <string>Contributions:</string>
+               <string>Items (at friends):</string>
               </property>
              </widget>
             </item>
@@ -615,8 +615,8 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="Posted_images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>

From 3fa0b8f6d4543e9fc46a4ccb974575979a9350ce Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 4 Aug 2023 13:57:34 +0200
Subject: [PATCH 324/503] fixed tooltip for popularity and items in boards

---
 retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
index ee65ef923..8074388dc 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
@@ -84,6 +84,9 @@ p, li { white-space: pre-wrap; }
                 <bold>true</bold>
                </font>
               </property>
+              <property name="toolTip">
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
               <property name="text">
                <string>Items (at friends):</string>
               </property>
@@ -179,6 +182,9 @@ p, li { white-space: pre-wrap; }
                 <bold>true</bold>
                </font>
               </property>
+              <property name="toolTip">
+               <string>Number of subscribed friend nodes</string>
+              </property>
               <property name="text">
                <string>Popularity:</string>
               </property>

From a382d58b68b4127e7e81a326d3b1a51b7775e03d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 6 Aug 2023 23:12:06 +0200
Subject: [PATCH 325/503] fixed icon in To column of Sent box

---
 .../src/gui/gxs/GxsIdTreeWidgetItem.cpp       | 22 +++++++++++--------
 retroshare-gui/src/gui/icons.qrc              |  1 +
 retroshare-gui/src/gui/msgs/MessageModel.cpp  | 13 ++++++++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
index 97f128447..e56a1011b 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
@@ -193,17 +193,21 @@ void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 	QStyleOptionViewItem ownOption (option);
 	initStyleOption(&ownOption, index);
 
-	RsGxsId id(index.data(Qt::UserRole).toString().toStdString());
-	QString cmt;
+    QString dt = index.data(Qt::UserRole).toString();
+    RsGxsId id(index.data(Qt::UserRole).toString().toStdString());
 
-	if(id.isNull())
+    if(dt == "")
+        ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/svg/people2.svg");
+    else if(id.isNull())
+    {
+        if (ownOption.icon.isNull())
+            ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/notification.svg");
+    }
+    else
 	{
-		if (ownOption.icon.isNull())
-			ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/notification.svg");
-	}
-	else
-	{
-		if(! computeNameIconAndComment(id,ownOption.text,ownOption.icon,cmt))
+        QString cmt;
+
+        if(! computeNameIconAndComment(id,ownOption.text,ownOption.icon,cmt))
 		{
 			if(mReloadPeriod > 3)
 			{
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index c92057c29..ff3771075 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -15,6 +15,7 @@
         <file>icons/svg/display_options.svg</file>
         <file>icons/svg/listlayout.svg</file>
         <file>icons/svg/gridlayout.svg</file>
+        <file>icons/svg/people2.svg</file>
         <file>icons/stars/star0.png</file>
         <file>icons/stars/star1.png</file>
         <file>icons/stars/star2.png</file>
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 771fd6874..09508cad6 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -579,7 +579,18 @@ QVariant RsMessageModel::userRole(const Rs::Msgs::MsgInfoSummary& fmpe,int col)
     {
         case COLUMN_THREAD_AUTHOR:   return QVariant(QString::fromStdString(fmpe.from.toStdString()));
         case COLUMN_THREAD_MSGID:    return QVariant(QString::fromStdString(fmpe.msgId));
-        case COLUMN_THREAD_TO:       return QVariant(QString::fromStdString(fmpe.to.toStdString()));
+        case COLUMN_THREAD_TO:
+        {
+            // First check if the .to field is filled.
+
+            if(!fmpe.to.toStdString().empty())
+                return QVariant(QString::fromStdString(fmpe.to.toStdString()));
+
+            // In the Send box, .to is never filled. In this case we look into destinations.
+
+            if(fmpe.destinations.size()==1)
+                return QVariant(QString::fromStdString((*fmpe.destinations.begin()).toStdString()));
+        }
     default:
         return QVariant();
     }

From a81caa3ac1f63aa388b7cbc0c616394a4377de3c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 6 Aug 2023 23:18:12 +0200
Subject: [PATCH 326/503] added comment about latest changes

---
 retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
index e56a1011b..053590e11 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.cpp
@@ -196,6 +196,10 @@ void GxsIdTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
     QString dt = index.data(Qt::UserRole).toString();
     RsGxsId id(index.data(Qt::UserRole).toString().toStdString());
 
+    // This is a trick: UserRole in Mail generally is 0000...00000 when there is a notification, and is empty when there are multiple
+    // destinations at once. This is not so nice to do that this way, but it's a quick workaround to a more complex method involving an
+    // additional Qt role only to determine the number of destinations.
+
     if(dt == "")
         ownOption.icon = FilesDefs::getIconFromQtResourcePath(":/icons/svg/people2.svg");
     else if(id.isNull())

From 234a510d6f3038dac2322c7821967ac0c6d09c63 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 10 Aug 2023 23:28:03 +0200
Subject: [PATCH 327/503] fixed possible crash in channel feed item being
 deleted during async loading

---
 .../src/gui/feeds/GxsChannelPostItem.cpp      | 38 +++++++++++++++++--
 .../src/gui/feeds/GxsChannelPostItem.h        |  7 +++-
 .../src/gui/feeds/GxsForumMsgItem.cpp         |  8 +++-
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
index 102dfb637..17036a15e 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
@@ -49,6 +49,10 @@ GxsChannelPostItem::GxsChannelPostItem(FeedHolder *feedHolder, uint32_t feedId,
     GxsFeedItem(feedHolder, feedId, group_meta.mGroupId, messageId, isHome, rsGxsChannels, autoUpdate),
     mGroupMeta(group_meta)
 {
+    mLoadingGroup = false;
+    mLoadingMessage = false;
+    mLoadingComment = false;
+
     mPost.mMeta.mMsgId = messageId; // useful for uniqueIdentifer() before the post is loaded
     mPost.mMeta.mGroupId = mGroupMeta.mGroupId;
 
@@ -136,6 +140,19 @@ void GxsChannelPostItem::paintEvent(QPaintEvent *e)
 
 GxsChannelPostItem::~GxsChannelPostItem()
 {
+    auto timeout = std::chrono::steady_clock::now() + std::chrono::milliseconds(300);
+
+    while( (mLoadingGroup || mLoadingMessage || mLoadingComment)
+           && std::chrono::steady_clock::now() < timeout)
+    {
+        RsDbg() << __PRETTY_FUNCTION__ << " is Waiting for "
+                << (mLoadingGroup ? "Group " : "")
+                << (mLoadingMessage ? "Message " : "")
+                << (mLoadingComment ? "Comment " : "")
+                << "loading." << std::endl;
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    }
+
 	delete(ui);
 }
 
@@ -277,6 +294,7 @@ void GxsChannelPostItem::loadGroup()
 	std::cerr << "GxsChannelGroupItem::loadGroup()";
 	std::cerr << std::endl;
 #endif
+    mLoadingGroup = true;
 
 	RsThread::async([this]()
 	{
@@ -306,6 +324,7 @@ void GxsChannelPostItem::loadGroup()
 			 * after a blocking call to RetroShare API complete */
 
 			mGroupMeta = group.mMeta;
+            mLoadingGroup = false;
 
 		}, this );
 	});
@@ -316,6 +335,8 @@ void GxsChannelPostItem::loadMessage()
 	std::cerr << "GxsChannelPostItem::loadMessage()";
 	std::cerr << std::endl;
 #endif
+    mLoadingMessage = true;
+
 	RsThread::async([this]()
 	{
 		// 1 - get group data
@@ -337,7 +358,11 @@ void GxsChannelPostItem::loadMessage()
 #endif
             const RsGxsChannelPost& post(posts[0]);
 
-			RsQThreadUtils::postToObject( [post,this]() { setPost(post);  }, this );
+            RsQThreadUtils::postToObject( [post,this]()
+            {
+                setPost(post);
+                mLoadingMessage = false;
+            }, this );
 		}
 		else if(comments.size() == 1)
 		{
@@ -356,7 +381,8 @@ void GxsChannelPostItem::loadMessage()
 				setMessageId(cmt.mMeta.mThreadId);
 				requestMessage();
 
-			}, this );
+                mLoadingMessage = false;
+            }, this );
 
 		}
 		else
@@ -366,7 +392,11 @@ void GxsChannelPostItem::loadMessage()
 			std::cerr << std::endl;
 #endif
 
-			RsQThreadUtils::postToObject( [this]() {  removeItem(); }, this );
+            RsQThreadUtils::postToObject( [this]()
+            {
+                removeItem();
+                mLoadingMessage = false;
+            }, this );
 		}
 	});
 }
@@ -377,6 +407,7 @@ void GxsChannelPostItem::loadComment()
 	std::cerr << "GxsChannelPostItem::loadComment()";
 	std::cerr << std::endl;
 #endif
+    mLoadingComment = true;
 
 	RsThread::async([this]()
 	{
@@ -407,6 +438,7 @@ void GxsChannelPostItem::loadComment()
 				sComButText = tr("Comments ").append("(%1)").arg(comNb);
 
 			ui->commentButton->setText(sComButText);
+            mLoadingComment = false;
 
 		}, this );
 	});
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h
index 8370b885e..b3e7843c0 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.h
@@ -119,7 +119,12 @@ private:
 private:
 	bool mInFill;
 	bool mCloseOnRead;
-	bool mLoaded;
+    bool mLoaded;
+
+    bool mLoadingMessage;
+    bool mLoadingGroup;
+    bool mLoadingComment;
+
 
 	RsGroupMetaData mGroupMeta;
 	RsGxsChannelPost mPost;
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
index 81b026d27..f4d091179 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
@@ -47,7 +47,13 @@ GxsForumMsgItem::GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const
 {
     mMessage.mMeta.mMsgId = messageId;	// useful for uniqueIdentifier() before the post is actually loaded
     mMessage.mMeta.mGroupId = groupId;
-	setup();
+
+    mLoadingGroup = false;
+    mLoadingMessage = false;
+    mLoadingSetAsRead = false;
+    mLoadingParentMessage = false;
+
+    setup();
 
 	requestGroup();
 	requestMessage();

From f6bcfb549a2ba6089a489b48980489a83cc89c85 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 10 Aug 2023 23:41:51 +0200
Subject: [PATCH 328/503] made delete button and delete menu item call the same
 functions, so as to make the actions identical

---
 retroshare-gui/src/gui/msgs/MessageWidget.cpp  | 7 ++++---
 retroshare-gui/src/gui/msgs/MessageWidget.h    | 1 +
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index cd06e9805..0d2e934f2 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -738,7 +738,8 @@ void MessageWidget::remove()
 		return;
 	}
 
-	bool deleteReal = false;
+#ifdef TO_REMOVE
+    bool deleteReal = false;
 	if (msgInfo.msgflags & RS_MSG_TRASH) {
 		deleteReal = true;
 	} else {
@@ -763,8 +764,8 @@ void MessageWidget::remove()
 			deleteLater();
 		}
 	}
-
-	emit messageRemoved();
+#endif
+    emit messageRemovalRequested(currMsgId);
 }
 
 void MessageWidget::print()
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.h b/retroshare-gui/src/gui/msgs/MessageWidget.h
index d6465e5cf..53b043720 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.h
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.h
@@ -61,6 +61,7 @@ public:
 
 signals:
 	void messageRemoved();
+    void messageRemovalRequested(std::string);
 
 private slots:
 	void reply();
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 1fb55821f..78d81ef20 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -144,7 +144,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
     msgWidget = new MessageWidget(true, this);
 	ui.msgLayout->addWidget(msgWidget);
-	connect(msgWidget, SIGNAL(messageRemoved()), this, SLOT(messageRemoved()));
+    connect(msgWidget, SIGNAL(messageRemovalRequested(std::string)), this, SLOT(removemessage()));
 
     connectActions();
 
@@ -838,7 +838,7 @@ void MessagesDialog::openAsWindow()
     }
 
     msgWidget->activateWindow();
-	connect(msgWidget, SIGNAL(messageRemoved()), this, SLOT(messageRemoved()));
+    connect(msgWidget, SIGNAL(messageRemovalRequested(std::string)), this, SLOT(removemessage()));
 
     /* window will destroy itself! */
 }
@@ -858,7 +858,7 @@ void MessagesDialog::openAsTab()
 
     ui.tabWidget->addTab(msgWidget,FilesDefs::getIconFromQtResourcePath(IMAGE_MAIL), msgWidget->subject(true));
     ui.tabWidget->setCurrentWidget(msgWidget);
-	connect(msgWidget, SIGNAL(messageRemoved()), this, SLOT(messageRemoved()));
+    connect(msgWidget, SIGNAL(messageRemovalRequested(std::string)), this, SLOT(removemessage()));
 
     /* window will destroy itself! */
 }

From 4a20e1b4d289bfe3c1a246b3c0495d1a12788d42 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 14 Aug 2023 21:27:46 +0200
Subject: [PATCH 329/503] Fix to hide picture browse button on republish & like
 view

* Fix to hide picture browse button on republish & like view
---
 retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp | 4 +++-
 retroshare-gui/src/gui/TheWire/PulseAddDialog.ui  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 8877d5cf6..6109e3866 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -194,7 +194,7 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
 	mReplyToPulse = pulse;
 	mReplyType = replyType;
 	ui.frame_reply->setVisible(true);
-	ui.pushButton_picture->show();
+	ui.pushButton_picture->hide();
 	ui.topheadshot->hide();
 
 	{
@@ -223,10 +223,12 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
 		if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
 			ui.postButton->setText(tr("Republish Pulse"));
 			ui.pushButton_picture->hide();
+			ui.pushButton_Browse->hide();
 		}
 		else if (mReplyType & WIRE_PULSE_TYPE_LIKE) {
 			ui.postButton->setText(tr("Like Pulse"));
 			ui.pushButton_picture->hide();
+			ui.pushButton_Browse->hide();
 		}
 	}
 
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
index c09119a40..bdfda3cc5 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
@@ -140,7 +140,7 @@
        <widget class="QWidget" name="widget_sentiment" native="true">
         <layout class="QHBoxLayout" name="widget_sentiment_HL">
          <property name="leftMargin">
-          <number>20</number>
+          <number>9</number>
          </property>
          <property name="topMargin">
           <number>0</number>

From eeacb4500d24c4891e2835c7dc111b6c55961e1b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 15 Aug 2023 21:13:53 +0200
Subject: [PATCH 330/503] removed some debug output

---
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 78d81ef20..de91df5ff 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -95,6 +95,7 @@
 #define ROW_SENTBOX       3
 #define ROW_TRASHBOX      4
 
+// #define DEBUG_MESSAGES_DIALOG 1
 
 class MessageSortFilterProxyModel: public QSortFilterProxyModel
 {
@@ -365,15 +366,18 @@ void MessagesDialog::preModelUpdate()
     if (m.isValid()) {
         mTmpSavedCurrentId = m.sibling(m.row(), RsMessageModel::COLUMN_THREAD_MSGID).data(RsMessageModel::MsgIdRole).toString();
     }
-
+#ifdef DEBUG_MESSAGES_DIALOG
     std::cerr << "Pre-change: saving selection for " << mTmpSavedSelectedIds.size() << " indexes" << std::endl;
+#endif
 }
 
 void MessagesDialog::postModelUpdate()
 {
     // restore selection
 
+#ifdef DEBUG_MESSAGES_DIALOG
     std::cerr << "Post-change: restoring selection for " << mTmpSavedSelectedIds.size() << " indexes" << std::endl;
+#endif
     QItemSelection sel;
 
     foreach(const QString& s,mTmpSavedSelectedIds)

From fd9f31987d9516f155e29da0efbdabd88796e927 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 15 Aug 2023 21:14:32 +0200
Subject: [PATCH 331/503] attempt at fixing crash with gtk2 style when the
 proper environment variable is not set

---
 retroshare-gui/src/gui/settings/AppearancePage.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp
index 2fb86e5a2..ad48ccabd 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.cpp
+++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp
@@ -75,7 +75,8 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
 		ui.cmboLanguage->addItem(FilesDefs::getIconFromQtResourcePath(":/images/flags/" + code + ".png"), LanguageSupport::languageName(code), code);
 	}
 	foreach (QString style, QStyleFactory::keys()) {
-		ui.cmboStyle->addItem(style, style.toLower());
+        if(style.toLower() != "gtk2" || (getenv("QT_QPA_PLATFORMTHEME")!=nullptr && !strcmp(getenv("QT_QPA_PLATFORMTHEME"),"gtk2")))	// make sure that if style is gtk2, the system has the correct environment variable set.
+            ui.cmboStyle->addItem(style, style.toLower());
 	}
 
 	QMap<QString, QString> styleSheets;

From 3a07a268ca9fbfabcc6125dedbbfe312763782b0 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 15 Aug 2023 21:57:42 +0200
Subject: [PATCH 332/503] Added to store last used group filter

---
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 38ea1b398..6738be68a 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -154,9 +154,16 @@ void WireDialog::processSettings(bool load)
 
 		// state of splitter
 		ui.splitter->restoreState(Settings->value("SplitterWire").toByteArray());
+
+		// state of filter combobox
+		int index = Settings->value("ShowGroup", 0).toInt();
+		ui.comboBox_groupSet->setCurrentIndex(index);
 	} else {
 		// save settings
 
+		// state of filter combobox
+		Settings->setValue("ShowGroup", ui.comboBox_groupSet->currentIndex());
+
 		// state of splitter
 		Settings->setValue("SplitterWire", ui.splitter->saveState());
 	}
@@ -1064,4 +1071,3 @@ void WireDialog::postGroupsPulses(std::list<RsWirePulseSPtr> pulses)
 
 	}
 }
-

From 1b8bee4262ca542c8f7940da5ea10233c4dbcdd1 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 15 Aug 2023 23:12:54 +0200
Subject: [PATCH 333/503] Removed hardcorded stylesheet from
 PulseReplySeperator

* Fixed some dark style issues
---
 .../src/gui/TheWire/PulseReplySeperator.ui    |  5 +---
 .../src/gui/qss/stylesheet/Standard_Dark.qss  | 26 ++++++++-----------
 .../src/gui/qss/stylesheet/Standard_Light.qss |  6 +++++
 retroshare-gui/src/qss/retroclassic.qss       |  6 +++++
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
index 4a605a219..6564fe5e3 100644
--- a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
@@ -40,10 +40,7 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">QFrame#frame{border: 2px solid #CCCCCC;
-background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                     stop: 0 #EEEEEE, stop: 1 #CCCCCC);
-border-radius: 10px}</string>
+      <string notr="true"/>
      </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
index 7497440c5..ffea0a4d8 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
@@ -2436,7 +2436,7 @@ WireGroupItem QFrame#wire_frame QLabel{
 	background: transparent;
 }
 WireGroupItem QFrame#wire_frame:hover {
-	background-color: #2e8bab;
+	background-color: #346792;
 }
 
 PulseTopLevel QFrame#frame,
@@ -2446,13 +2446,6 @@ PulseReply QFrame#frame {
 	border-radius: 6px;
 }
 
-PulseAddDialog QTextEdit#textEdit_Pulse {
-	border: 2px solid #c4cfd6;
-	border-radius: 6px;
-	background: white;
-	color: black;
-}
-
 PulseReply #line_replyLine,
 PulseMessage #line{
 	color: #c4cfd6;
@@ -2462,6 +2455,16 @@ PulseReply QLabel#label_groupName{
 	color: #5b7083;
 }
 
+PulseReplySeperator QFrame#frame {
+	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #455364, stop: 0.5 #54687A,stop: 0.6 #44586A, stop:1 #455364);
+	border-radius: 10px;
+}
+
+QLabel#label_masthead{
+	border: 2px solid #CCCCCC;
+	border-radius: 4px;
+}
+
 /**** Color definitions ****/
 
 ForumsDialog, GxsForumThreadWidget
@@ -2552,10 +2555,3 @@ OpModeStatus[opMode="Minimal"] {
 [WrongValue="true"] {
 	background-color: #702020;
 }
-
-/**** The Wire ****/
-
-QLabel#label_masthead{
-	border: 2px solid #CCCCCC;
-	border-radius: 4px;
-}
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
index 061ca0518..df6b9d51c 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
@@ -2687,6 +2687,12 @@ PulseReply QLabel#label_groupName{
 	color: #5b7083;
 }
 
+PulseReplySeperator QFrame#frame {
+	border: 2px solid #CCCCCC;
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
+	border-radius: 10px}
+}
+
 QLabel#label_masthead{
 	border: 2px solid #CCCCCC;
 	border-radius: 4px;
diff --git a/retroshare-gui/src/qss/retroclassic.qss b/retroshare-gui/src/qss/retroclassic.qss
index df8802f3a..eea7fdf25 100644
--- a/retroshare-gui/src/qss/retroclassic.qss
+++ b/retroshare-gui/src/qss/retroclassic.qss
@@ -184,3 +184,9 @@ QLabel#label_masthead{
 	border: 2px solid #CCCCCC;
 	border-radius: 4px;
 }
+
+PulseReplySeperator QFrame#frame {
+	border: 2px solid #CCCCCC;
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
+	border-radius: 10px}
+}

From 811b3b3658c568729456decb0214ea5222209f4d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 18 Aug 2023 13:21:28 +0200
Subject: [PATCH 334/503] fixed bug not showing icons/text button on loading

---
 retroshare-gui/src/gui/settings/AppearancePage.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp
index ad48ccabd..dcfb0350e 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.cpp
+++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp
@@ -267,9 +267,9 @@ void AppearancePage::load()
 	
 	index = ui.mainPageButtonType_CB->findData(Settings->getPageButtonLoc());
 	if (index != 0) {
-		ui.cmboTollButtonsStyle->hide();
-	}else {
-		ui.cmboTollButtonsStyle->show();
+        ui.cmboTollButtonsStyle->show();
+    }else {
+        ui.cmboTollButtonsStyle->hide();
 	}
 
 	whileBlocking(ui.mainPageButtonType_CB)->setCurrentIndex(!Settings->getPageButtonLoc());

From 5433e85323179697a25f81a893bd1663072d56f5 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Sun, 20 Aug 2023 18:19:05 +0530
Subject: [PATCH 335/503] added the new token service in this file

---
 .../src/gui/TheWire/PulseAddDialog.cpp        | 188 ++++++++++++------
 1 file changed, 126 insertions(+), 62 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 8877d5cf6..4dd233b26 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -25,6 +25,7 @@
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
 #include "util/misc.h"
+#include "util/qtthreadsutils.h"
 
 #include "PulseAddDialog.h"
 
@@ -98,11 +99,32 @@ void PulseAddDialog::setGroup(RsWireGroup &group)
 // set ReplyWith Group.
 void PulseAddDialog::setGroup(const RsGxsGroupId &grpId)
 {
-	/* fetch in the background */
-	RsWireGroupSPtr pGroup;
-	rsWire->getWireGroup(grpId, pGroup);
+    if(grpId.isNull()){
+        return;
+    }
 
-	setGroup(*pGroup);
+    RsWireGroupSPtr pGroup;
+
+    RsThread::async([this,grpId,&pGroup](){
+
+        if(!rsWire->getWireGroup(grpId,pGroup))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve wire group info for wire id:  " << grpId << std::endl;
+            return;
+        }
+
+        RsQThreadUtils::postToObject( [pGroup,this]()
+        {
+            /* Here it goes any code you want to be executed on the Qt Gui
+             * thread, for example to update the data model with new information
+             * after a blocking call to RetroShare API complete, note that
+             * Qt::QueuedConnection is important!
+             */
+
+            setGroup(*pGroup);
+        }, this );
+
+    });
 }
 
 void PulseAddDialog::cleanup()
@@ -234,30 +256,46 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
 
 void PulseAddDialog::setReplyTo(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId, uint32_t replyType)
 {
+    if(grpId.isNull()){
+        return;
+    }
 	/* fetch in the background */
-	RsWireGroupSPtr pGroup;
-	if (!rsWire->getWireGroup(grpId, pGroup))
-	{
-		std::cerr << "PulseAddDialog::setRplyTo() failed to fetch group";
-		std::cerr << std::endl;
-		return;
-	}
+    RsWireGroupSPtr pGroup;
+    RsWirePulseSPtr pPulse;
 
-	RsWirePulseSPtr pPulse;
-	if (!rsWire->getWirePulse(grpId, msgId, pPulse))
-	{
-		std::cerr << "PulseAddDialog::setRplyTo() failed to fetch pulse";
-		std::cerr << std::endl;
-		return;
-	}
+    RsThread::async([this,grpId,&pGroup,&pPulse,msgId,replyType](){
 
-	// update GroupPtr
-	// TODO - this should be handled in libretroshare if possible.
-	if (pPulse->mGroupPtr == NULL) {
-		pPulse->mGroupPtr = pGroup;
-	}
+        if(!rsWire->getWireGroup(grpId,pGroup))
+        {
+            std::cerr << __PRETTY_FUNCTION__ << "PulseAddDialog::setRplyTo() failed to fetch group id: "  << grpId << std::endl;
+            return;
+        }
+
+        if (!rsWire->getWirePulse(grpId, msgId, pPulse))
+        {
+            std::cerr << "PulseAddDialog::setRplyTo() failed to fetch pulse of group id: " << grpId << std::endl;
+            return;
+        }
+
+        // update GroupPtr
+        // TODO - this should be handled in libretroshare if possible.
+        if (pPulse->mGroupPtr == NULL) {
+            pPulse->mGroupPtr = pGroup;
+        }
+
+        RsQThreadUtils::postToObject( [pGroup,this,pPulse,replyType]()
+        {
+            /* Here it goes any code you want to be executed on the Qt Gui
+             * thread, for example to update the data model with new information
+             * after a blocking call to RetroShare API complete, note that
+             * Qt::QueuedConnection is important!
+             */
+
+            setReplyTo(*pPulse, pPulse, pGroup->mMeta.mGroupName, replyType);
+        }, this );
+
+    });
 
-	setReplyTo(*pPulse, pPulse, pGroup->mMeta.mGroupName, replyType);
 }
 
 void PulseAddDialog::addURL()
@@ -307,26 +345,39 @@ void PulseAddDialog::postOriginalPulse()
 	std::cerr << "PulseAddDialog::postOriginalPulse()";
 	std::cerr << std::endl;
 
-	RsWirePulseSPtr pPulse(new RsWirePulse());
+    RsWirePulseSPtr pPulse;
 
-	pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
-	pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
-	// set images here too.
-	pPulse->mImage1 = mImage1;
-	pPulse->mImage2 = mImage2;
-	pPulse->mImage3 = mImage3;
-	pPulse->mImage4 = mImage4;
+    pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
+    pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
+    // set images here too.
+    pPulse->mImage1 = mImage1;
+    pPulse->mImage2 = mImage2;
+    pPulse->mImage3 = mImage3;
+    pPulse->mImage4 = mImage4;
 
-	// this should be in async thread, so doesn't block UI thread.
-	if (!rsWire->createOriginalPulse(mGroup.mMeta.mGroupId, pPulse))
-	{
-		std::cerr << "PulseAddDialog::postOriginalPulse() FAILED";
-		std::cerr << std::endl;
-		return;
-	}
+    RsThread::async([this,pPulse](){
+
+        if (!rsWire->createOriginalPulse(mGroup.mMeta.mGroupId, pPulse))
+        {
+            std::cerr << "PulseAddDialog::postOriginalPulse() FAILED";
+            std::cerr << std::endl;
+            return;
+        }
+
+        RsQThreadUtils::postToObject( [this]()
+        {
+            /* Here it goes any code you want to be executed on the Qt Gui
+             * thread, for example to update the data model with new information
+             * after a blocking call to RetroShare API complete, note that
+             * Qt::QueuedConnection is important!
+             */
+
+            clearDialog();
+            hide();
+        }, this );
+
+    });
 
-	clearDialog();
-	hide();
 }
 
 uint32_t PulseAddDialog::toPulseSentiment(int index)
@@ -356,15 +407,15 @@ void PulseAddDialog::postReplyPulse()
 	std::cerr << "PulseAddDialog::postReplyPulse()";
 	std::cerr << std::endl;
 
-	RsWirePulseSPtr pPulse(new RsWirePulse());
+    RsWirePulseSPtr pPulse;
 
-	pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
-	pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
-	// set images here too.
-	pPulse->mImage1 = mImage1;
-	pPulse->mImage2 = mImage2;
-	pPulse->mImage3 = mImage3;
-	pPulse->mImage4 = mImage4;
+    pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
+    pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
+    // set images here too.
+    pPulse->mImage1 = mImage1;
+    pPulse->mImage2 = mImage2;
+    pPulse->mImage3 = mImage3;
+    pPulse->mImage4 = mImage4;
 
 	if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
 		// Copy details from parent, and override
@@ -378,20 +429,33 @@ void PulseAddDialog::postReplyPulse()
 		pPulse->mImage4 = mReplyToPulse.mImage4;
 	}
 
-	// this should be in async thread, so doesn't block UI thread.
-	if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
-			mReplyToPulse.mMeta.mOrigMsgId,
-			mGroup.mMeta.mGroupId,
-			mReplyType,
-			pPulse))
-	{
-		std::cerr << "PulseAddDialog::postReplyPulse() FAILED";
-		std::cerr << std::endl;
-		return;
-	}
+    RsThread::async([this, pPulse](){
+
+        if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
+                mReplyToPulse.mMeta.mOrigMsgId,
+                mGroup.mMeta.mGroupId,
+                mReplyType,
+                pPulse))
+        {
+            std::cerr << "PulseAddDialog::postReplyPulse() FAILED";
+            std::cerr << std::endl;
+            return;
+        }
+
+        RsQThreadUtils::postToObject( [this]()
+        {
+            /* Here it goes any code you want to be executed on the Qt Gui
+             * thread, for example to update the data model with new information
+             * after a blocking call to RetroShare API complete, note that
+             * Qt::QueuedConnection is important!
+             */
+
+            clearDialog();
+            hide();
+        }, this );
+
+    });
 
-	clearDialog();
-	hide();
 }
 
 void PulseAddDialog::clearDialog()

From 1efed9d436706353fd4b9f25dfd5e42a5bc98a52 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 29 Aug 2023 14:28:18 +0200
Subject: [PATCH 336/503] Fix transparency for channel post thumbnails

---
 .../src/gui/gxschannels/CreateGxsChannelMsg.cpp      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
index 05ce9bda6..f00d31539 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
@@ -35,6 +35,7 @@
 #include "util/rsdir.h"
 #include "util/qtthreadsutils.h"
 #include "util/RichTextEdit.h"
+#include "util/imageutil.h"
 
 #include <retroshare/rsfiles.h>
 
@@ -610,8 +611,10 @@ bool CreateGxsChannelMsg::setThumbNail(const std::string& path, int frame){
 	QImage tNail(imageBuffer, width, height, QImage::Format_RGB32);
 	QByteArray ba;
 	QBuffer buffer(&ba);
+	bool has_transparency = ImageUtil::hasAlphaContent(tNail.toImage());
+
 	buffer.open(QIODevice::WriteOnly);
-    tNail.save(&buffer, "JPG");
+	tNail.save(&buffer, has_transparency?"PNG":"JPG");
 	QPixmap img;
 	img.loadFromData(ba, "PNG");
 	img = img.scaled(thumbnail_label->width(), thumbnail_label->height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -797,15 +800,16 @@ void CreateGxsChannelMsg::sendMessage(const std::string &subject, const std::str
 		QByteArray ba;
 		QBuffer buffer(&ba);
 
-        RsGxsImage image;
+		RsGxsImage image;
+		bool has_transparency = ImageUtil::hasAlphaContent(picture.toImage());
 
 		if(!picture.isNull())
 		{
 			// send chan image
 
 			buffer.open(QIODevice::WriteOnly);
-            preview_W->getCroppedScaledPicture().save(&buffer, "JPG"); // writes image into ba in PNG format
-            image.copy((uint8_t *) ba.data(), ba.size());
+			preview_W->getCroppedScaledPicture().save(&buffer, has_transparency?"PNG":"JPG"); // writes image into ba in PNG format
+			image.copy((uint8_t *) ba.data(), ba.size());
 		}
 
         std::string error_string;

From d80951cd53bb89dd0297142edf9baa3af222e8aa Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 31 Aug 2023 23:18:06 +0200
Subject: [PATCH 337/503] added missing comment

---
 retroshare-gui/src/gui/settings/AppearancePage.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp
index dcfb0350e..8ad086ae9 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.cpp
+++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp
@@ -74,8 +74,12 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
 	foreach (QString code, LanguageSupport::languageCodes()) {
 		ui.cmboLanguage->addItem(FilesDefs::getIconFromQtResourcePath(":/images/flags/" + code + ".png"), LanguageSupport::languageName(code), code);
 	}
-	foreach (QString style, QStyleFactory::keys()) {
-        if(style.toLower() != "gtk2" || (getenv("QT_QPA_PLATFORMTHEME")!=nullptr && !strcmp(getenv("QT_QPA_PLATFORMTHEME"),"gtk2")))	// make sure that if style is gtk2, the system has the correct environment variable set.
+
+    // Note: apparently, on some linux systems (e.g. Debian 11), the gtk2 style makes Qt libs crash when the environment variable is not set.
+    //       So we first check that it's here before start.
+
+    foreach (QString style, QStyleFactory::keys()) {
+        if(style.toLower() != "gtk2" || (getenv("QT_QPA_PLATFORMTHEME")!=nullptr && !strcmp(getenv("QT_QPA_PLATFORMTHEME"),"gtk2")))
             ui.cmboStyle->addItem(style, style.toLower());
 	}
 

From 013786a7b7df627b81254f077db106d6fc882d43 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 31 Aug 2023 23:18:24 +0200
Subject: [PATCH 338/503] disabled external port+address on auto-tor mode

---
 retroshare-gui/src/gui/settings/ServerPage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index 3dfe9069d..adb1d655c 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -107,6 +107,8 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
           ui.hiddenpage_proxyPort_tor->setEnabled(false) ;
           ui.hiddenpage_localAddress->setEnabled(false) ;
           ui.hiddenpage_localPort->setEnabled(false) ;
+          ui.hiddenpage_serviceAddress->setEnabled(false) ;
+          ui.hiddenpage_servicePort->setEnabled(false) ;
           ui.testIncoming_PB->hide() ;
           ui.l_incomingTestResult->hide() ;
           ui.iconlabel_service_incoming->hide() ;

From 0ed32eb5975e4f8c56a5373b9d34b0660a862d1f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 31 Aug 2023 23:27:18 +0200
Subject: [PATCH 339/503] removed export menu entry (duplicates functionality,
 and wasnt connected anyway)

---
 retroshare-gui/src/gui/NetworkDialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index 216117f67..1dab369e2 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -127,8 +127,8 @@ void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ )
 	if(!rsPeers->getGPGDetails(peer_id, detail))		// that is not suppose to fail.
 		return ;
 
-	if(peer_id == rsPeers->getGPGOwnId())
-		contextMnu->addAction(QIcon(), tr("Export/create a new node"), this, SLOT(on_actionExportKey_activated()));
+    //if(peer_id == rsPeers->getGPGOwnId())
+    //	contextMnu->addAction(QIcon(), tr("Export/create a new node"), this, SLOT(on_actionExportKey_activated()));
 
 	contextMnu->addAction(QIcon(IMAGE_PEERDETAILS), tr("Profile details..."), this, SLOT(peerdetails()));
 	contextMnu->addSeparator() ;

From 8a20ab33b4d5a4390d6a358331ba1f6b5a2f974c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 4 Sep 2023 21:58:45 +0200
Subject: [PATCH 340/503] fixed bug in ModelIndex creation in channel post
 view, and implemented arrow key navigation

---
 .../src/gui/gxs/GxsCommentDialog.cpp          |  2 ++
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 21 +++++++++++++++-
 .../gui/gxschannels/GxsChannelPostsModel.h    |  1 +
 .../GxsChannelPostsWidgetWithModel.cpp        | 24 +++++++++++++++++++
 .../GxsChannelPostsWidgetWithModel.h          |  1 +
 5 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
index 7b9e28131..4757b036e 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
@@ -95,8 +95,10 @@ void GxsCommentDialog::commentClear()
 }
 void GxsCommentDialog::commentLoad(const RsGxsGroupId &grpId, const std::set<RsGxsMessageId>& msg_versions,const RsGxsMessageId& most_recent_msgId,bool use_cache)
 {
+#ifdef DEBUG_COMMENT_DIALOG
 	std::cerr << "GxsCommentDialog::commentLoad(" << grpId << ", most recent msg version: " << most_recent_msgId << ")";
 	std::cerr << std::endl;
+#endif
 
 	mGrpId = grpId;
 	mMostRecentMsgId = most_recent_msgId;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index e9be3e6ed..a42587d85 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -176,6 +176,25 @@ int RsGxsChannelPostsModel::rowCount(const QModelIndex& parent) const
     return 0;
 }
 
+int RsGxsChannelPostsModel::columnCount(int row) const
+{
+    if(mTreeMode == TREE_MODE_GRID)
+    {
+        if(row+1 == rowCount())
+        {
+            int r = ((int)mFilteredPosts.size() % (int)mColumns);
+
+            if(r > 0)
+                return r;
+            else
+                return columnCount();
+        }
+        else
+            return columnCount();
+    }
+    else
+        return 2;
+}
 int RsGxsChannelPostsModel::columnCount(const QModelIndex &/*parent*/) const
 {
     if(mTreeMode == TREE_MODE_GRID)
@@ -245,7 +264,7 @@ bool RsGxsChannelPostsModel::convertRefPointerToTabEntry(quintptr ref, uint32_t&
 
 QModelIndex RsGxsChannelPostsModel::index(int row, int column, const QModelIndex & parent) const
 {
-    if(row < 0 || column < 0 || column >= (int)mColumns)
+    if(row < 0 || column < 0 || row >= rowCount() || column >= columnCount(row))
 		return QModelIndex();
 
     quintptr ref = getChildRef(parent.internalId(),(mTreeMode == TREE_MODE_GRID)?(column + row*mColumns):row);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
index 42dcbb9f7..c447f11a3 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h
@@ -105,6 +105,7 @@ public:
 
 	QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}
 	QModelIndex getIndexOfMessage(const RsGxsMessageId& mid) const;
+    int columnCount(int row) const; // columns in the row of this particular index.
 
 	std::vector<std::pair<time_t,RsGxsMessageId> > getPostVersions(const RsGxsMessageId& mid) const;
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index a6ce946f5..ea27be6f9 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -504,6 +504,30 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
     }, mEventHandlerId, RsEventType::GXS_CHANNELS );
 }
 
+void GxsChannelPostsWidgetWithModel::keyPressEvent(QKeyEvent *e)
+{
+    QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
+
+    if(index.isValid() && mChannelPostsModel->getMode() == RsGxsChannelPostsModel::TREE_MODE_GRID)
+    {
+        int n = mChannelPostsModel->columnCount(index.row())-1;
+
+        if(e->key() == Qt::Key_Left && index.column()==0)
+        {
+            ui->postsTree->setCurrentIndex(index.siblingAtColumn(n));
+            e->accept();
+            return;
+        }
+        if(e->key() == Qt::Key_Right && index.column()==n)
+        {
+            ui->postsTree->setCurrentIndex(index.siblingAtColumn(0));
+            e->accept();
+            return;
+        }
+    }
+
+    GxsMessageFrameWidget::keyPressEvent(e);
+}
 void GxsChannelPostsWidgetWithModel::resizeEvent(QResizeEvent *e)
 {
     GxsMessageFrameWidget::resizeEvent(e);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
index 9cfcaae21..8891b57dd 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@@ -139,6 +139,7 @@ protected:
 	/* GxsMessageFrameWidget */
     virtual void setAllMessagesReadDo(bool read) override;
     virtual void resizeEvent(QResizeEvent *e) override;
+    virtual void keyPressEvent(QKeyEvent *e) override;
 
 private slots:
 	void showPostDetails();

From 43afcf3f98c41fa578c9bbc2e545c776ce092955 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 5 Sep 2023 21:10:38 +0200
Subject: [PATCH 341/503] Fix to use RGBA32

---
 retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
index f00d31539..66311d6fa 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
@@ -608,7 +608,7 @@ bool CreateGxsChannelMsg::setThumbNail(const std::string& path, int frame){
 	if(imageBuffer == NULL)
 		return false;
 
-	QImage tNail(imageBuffer, width, height, QImage::Format_RGB32);
+	QImage tNail(imageBuffer, width, height, QImage::Format_RGBA32);
 	QByteArray ba;
 	QBuffer buffer(&ba);
 	bool has_transparency = ImageUtil::hasAlphaContent(tNail.toImage());

From c90fab0136a08071f220b9ea97528bca76aa65ba Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 8 Sep 2023 20:48:54 +0200
Subject: [PATCH 342/503] added help for JSON API page

---
 retroshare-gui/src/gui/settings/JsonApiPage.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc
index a824a5fa0..f0767db7c 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.cc
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc
@@ -59,7 +59,15 @@ JsonApiPage::JsonApiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
     ui.listenAddressLineEdit->setValidator(ipValidator);
 
 }
-
+QString JsonApiPage::helpText() const
+{
+    return tr("<h1><img width=\"24\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Webinterface</h1>  \
+     <p>Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port]. \
+        Please refer to the Retroshare documentation for how to use this feature. </p>\
+        <p>Unless you know what you're doing, you shouldn't need to change anything in this page. \
+       The web interface for instance will automatically register its own token to the JSON API which will be visible \
+        in the list of authenticated tokens after you enable it.</p>");
+}
 void JsonApiPage::enableJsonApi(bool checked)
 {
 	ui.addTokenPushButton->setEnabled(checked);
@@ -107,8 +115,6 @@ void JsonApiPage::load()
 	whileBlocking(ui.tokensListView)->setModel(new QStringListModel(newTk));
 }
 
-QString JsonApiPage::helpText() const { return ""; }
-
 bool JsonApiPage::checkStartJsonApi()
 {
 	if(!Settings->getJsonApiEnabled()) return false;

From d0b4bfdaa1bbe00088f9cbc15a9b4ce7765a253f Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 10 Sep 2023 15:25:13 +0200
Subject: [PATCH 343/503] Fixed Linux compile of FeedReader plugin

---
 plugins/FeedReader/services/p3FeedReaderThread.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 01e449323..845b5c82b 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -1151,10 +1151,10 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 
 	if (isRunning()) {
 		/* process description */
-		bool processPostedFirstImage = (feed.flag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) ? TRUE : FALSE;
+		bool processPostedFirstImage = (feed.flag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) ? true : false;
 		if (!msg->attachmentBinary.empty()) {
 			/* use attachment as image */
-			processPostedFirstImage = FALSE;
+			processPostedFirstImage = false;
 		}
 
 		//long todo; // encoding

From d83f0125f33ddbc51022ce6693339321e5874bf9 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 10 Sep 2023 17:49:51 +0200
Subject: [PATCH 344/503] improved UI of webUI and JsonAPI and interaction
 between these two (unfinished)

---
 .../src/gui/settings/JsonApiPage.cc           |  16 ++-
 retroshare-gui/src/gui/settings/JsonApiPage.h |   4 +
 .../src/gui/settings/JsonApiPage.ui           | 108 +++++++++++++-----
 retroshare-gui/src/gui/settings/WebuiPage.cpp |  64 +++++------
 retroshare-gui/src/gui/settings/WebuiPage.h   |  13 +--
 retroshare-gui/src/gui/settings/WebuiPage.ui  |  48 ++++++--
 .../src/gui/settings/rsettingswin.cpp         |   2 -
 7 files changed, 169 insertions(+), 86 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc
index f0767db7c..136b37d56 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.cc
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc
@@ -23,6 +23,7 @@
 #include "rsharesettings.h"
 #include "jsonapi/jsonapi.h"
 #include "util/misc.h"
+#include "util/qtthreadsutils.h"
 
 #include <QTimer>
 #include <QStringListModel>
@@ -58,7 +59,16 @@ JsonApiPage::JsonApiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
 
     ui.listenAddressLineEdit->setValidator(ipValidator);
 
+    mEventHandlerId = 0;
+
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> /* event */)
+    {
+        std::cerr << "Caught JSONAPI event!" << std::endl;
+        RsQThreadUtils::postToObject([=]() { load(); }, this );
+    },
+    mEventHandlerId, RsEventType::JSON_API );
 }
+
 QString JsonApiPage::helpText() const
 {
     return tr("<h1><img width=\"24\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Webinterface</h1>  \
@@ -101,9 +111,9 @@ bool JsonApiPage::updateParams()
 
 void JsonApiPage::load()
 {
-	whileBlocking(ui.portSpinBox)->setValue(Settings->getJsonApiPort());
-	whileBlocking(ui.listenAddressLineEdit)->setText(Settings->getJsonApiListenAddress());
-	whileBlocking(ui.enableCheckBox)->setChecked(Settings->getJsonApiEnabled());
+    whileBlocking(ui.portSpinBox)->setValue(rsJsonApi->listeningPort());
+    whileBlocking(ui.listenAddressLineEdit)->setText(QString::fromStdString(rsJsonApi->getBindingAddress()));
+    whileBlocking(ui.enableCheckBox)->setChecked(rsJsonApi->isRunning());
 
     QStringList newTk;
 
diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.h b/retroshare-gui/src/gui/settings/JsonApiPage.h
index 7f69bbd1e..f06340d1a 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.h
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "retroshare/rsevents.h"
+
 #include "retroshare-gui/configpage.h"
 #include "gui/common/FilesDefs.h"
 #include "ui_JsonApiPage.h"
@@ -63,4 +65,6 @@ public slots:
 
 private:
 	Ui::JsonApiPage ui; /// Qt Designer generated object
+    RsEventsHandlerId_t mEventHandlerId;
 };
+
diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.ui b/retroshare-gui/src/gui/settings/JsonApiPage.ui
index 24b534712..9227a3251 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.ui
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="WebuiPageVLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="jsonApiGroupBox">
      <property name="minimumSize">
@@ -25,51 +25,43 @@
      <property name="title">
       <string>JSON API Server</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QCheckBox" name="enableCheckBox">
-        <property name="text">
-         <string>Enable RetroShare JSON API Server</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
-         <widget class="QLabel" name="label">
+         <widget class="QCheckBox" name="enableCheckBox">
           <property name="text">
-           <string>Port:</string>
+           <string>Enable RetroShare JSON API Server</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QSpinBox" name="portSpinBox">
-          <property name="minimum">
-           <number>1024</number>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-          <property name="maximum">
-           <number>65535</number>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
           </property>
-          <property name="value">
-           <number>9092</number>
-          </property>
-         </widget>
+         </spacer>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
-         <widget class="QLabel" name="label_3">
+         <widget class="QLabel" name="label_6">
           <property name="text">
-           <string>Listen Address:</string>
+           <string>Status:</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QLineEdit" name="listenAddressLineEdit">
+         <widget class="QLabel" name="statusLabelLED">
           <property name="text">
-           <string>127.0.0.1</string>
+           <string/>
+          </property>
+          <property name="pixmap">
+           <pixmap resource="../images.qrc">:/images/ledoff1.png</pixmap>
           </property>
          </widget>
         </item>
@@ -107,16 +99,68 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>Listen Address:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="listenAddressLineEdit">
+          <property name="text">
+           <string>127.0.0.1</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Port:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="portSpinBox">
+          <property name="minimum">
+           <number>1024</number>
+          </property>
+          <property name="maximum">
+           <number>65535</number>
+          </property>
+          <property name="value">
+           <number>9092</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item>
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Authenticated Tokens</string>
+         <string>Authenticated Tokens:</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QListView" name="tokensListView"/>
       </item>
+      <item>
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Registered services:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QListView" name="providersListView"/>
+      </item>
      </layout>
     </widget>
    </item>
@@ -142,6 +186,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../images.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp
index f0006fec3..073d775ae 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.cpp
+++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp
@@ -73,22 +73,12 @@ void WebuiPage::selectWebInterfaceDirectory()
 bool WebuiPage::updateParams(QString &errmsg)
 {
     std::cerr << "WebuiPage::save()" << std::endl;
-    bool ok = true;
-    bool changed = false;
-    if(ui.enableWebUI_CB->isChecked() != Settings->getWebinterfaceEnabled())
-        changed = true;
-    if(ui.webInterfaceFiles_LE->text() != Settings->getWebinterfaceFilesDirectory())
-        changed = true;
 
-    if(changed)
-    {
-        // store config
-        Settings->setWebinterfaceEnabled(ui.enableWebUI_CB->isChecked());
-        Settings->setWebinterfaceFilesDirectory(ui.webInterfaceFiles_LE->text());
+    // store config
+    Settings->setWebinterfaceEnabled(ui.enableWebUI_CB->isChecked());
+    Settings->setWebinterfaceFilesDirectory(ui.webInterfaceFiles_LE->text());
 
-        rsWebUi->setHtmlFilesDirectory(ui.webInterfaceFiles_LE->text().toStdString());
-    }
-    return ok;
+    return true;
 }
 
 void WebuiPage::onPasswordValueChanged(QString password)
@@ -112,10 +102,20 @@ void WebuiPage::onPasswordValueChanged(QString password)
 
 bool WebuiPage::restart()
 {
-	return checkStartWebui();
+    if(ui.password_LE->text().isNull())
+    {
+        QMessageBox::critical(nullptr,tr("Missing passphrase"),tr("Please set a passphrase to proect the access to the WEB interface."));
+        return false;
+    }
+
+    rsWebUi->setUserPassword(ui.password_LE->text().toStdString());
+    rsWebUi->setHtmlFilesDirectory(ui.webInterfaceFiles_LE->text().toStdString());
+    rsWebUi->restart();
+
+    return true;
 }
 
-void WebuiPage::load()
+void WebuiPage::loadParams()
 {
 	std::cerr << "WebuiPage::load()" << std::endl;
 	whileBlocking(ui.enableWebUI_CB)->setChecked(Settings->getWebinterfaceEnabled());
@@ -138,13 +138,11 @@ QString WebuiPage::helpText() const
      <p>Warning: don't expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.</p>");
 }
 
-/*static*/ bool WebuiPage::checkStartWebui()
+/*static*/ bool WebuiPage::checkStartWebui() // This is supposed to be called from main(). But normally the parameters below (including the paswd
+                                            // for the webUI should be saved in p3webui instead.
 {
-    if(!Settings->getWebinterfaceEnabled())
-        return false;
-
-	rsWebUi->setHtmlFilesDirectory(Settings->getWebinterfaceFilesDirectory().toStdString());
-	rsWebUi->restart();
+    rsWebUi->setHtmlFilesDirectory(Settings->getWebinterfaceFilesDirectory().toStdString());
+    rsWebUi->restart();
 
     return true;
 }
@@ -177,13 +175,6 @@ void WebuiPage::onEnableCBClicked(bool checked)
 	ui.apply_PB->setEnabled(checked);
 	ui.startWebBrowser_PB->setEnabled(checked);
 	QString S;
-
-    Settings->setWebinterfaceEnabled(checked);
-
-    if(checked)
-        checkStartWebui();
-    else
-        checkShutdownWebui();
 }
 
 void WebuiPage::onPortValueChanged(int /*value*/)
@@ -199,18 +190,19 @@ void WebuiPage::onAllIPCBClicked(bool /*checked*/)
 }
 void WebuiPage::onApplyClicked()
 {
-	rsWebUi->setUserPassword(ui.password_LE->text().toStdString());
-
     QString errmsg;
     updateParams(errmsg);
 
-    if(!restart())
+    if(ui.enableWebUI_CB->isChecked())
     {
-        QMessageBox::warning(0, tr("failed to start Webinterface"), "Failed to start the webinterface.");
-        return;
+        if(!restart())
+        {
+            QMessageBox::warning(0, tr("failed to start Webinterface"), "Failed to start the webinterface.");
+            return;
+        }
+        else
+            checkShutdownWebui();
     }
-
-    emit passwordChanged();
 }
 
 void WebuiPage::onStartWebBrowserClicked() { showWebui(); }
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.h b/retroshare-gui/src/gui/settings/WebuiPage.h
index 9ba8886ac..ad20d6afb 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.h
+++ b/retroshare-gui/src/gui/settings/WebuiPage.h
@@ -42,11 +42,11 @@ public:
   ~WebuiPage();
 
   /** Loads the settings for this page */
-  virtual void load();
+  virtual void load() override { loadParams() ; }
 
-  virtual QPixmap iconPixmap() const { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/webinterface.svg") ; }
-  virtual QString pageName() const { return tr("Webinterface") ; }
-  virtual QString helpText() const;
+  virtual QPixmap iconPixmap() const override { return FilesDefs::getPixmapFromQtResourcePath(":/icons/settings/webinterface.svg") ; }
+  virtual QString pageName() const override { return tr("Webinterface") ; }
+  virtual QString helpText() const override ;
 
   // call this after start of libretroshare/Retroshare
   // checks the settings and starts the webinterface if required
@@ -67,10 +67,9 @@ public slots:
   void onApplyClicked();
   void onStartWebBrowserClicked();
 
-signals:
-  void passwordChanged();
-
 private:
+  virtual void loadParams();
+
   /** Qt Designer generated object */
   Ui::WebuiPage ui;
 
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.ui b/retroshare-gui/src/gui/settings/WebuiPage.ui
index 5ca37e9b6..e48cd31c5 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.ui
+++ b/retroshare-gui/src/gui/settings/WebuiPage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>960</width>
-    <height>717</height>
+    <width>570</width>
+    <height>646</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,11 +15,45 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="QCheckBox" name="enableWebUI_CB">
-     <property name="text">
-      <string>Enable Retroshare WEB Interface</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QCheckBox" name="enableWebUI_CB">
+       <property name="text">
+        <string>Enable Retroshare WEB Interface</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="statusLabelLED">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../images.qrc">:/images/ledoff1.png</pixmap>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="params_GB">
diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp
index 46c85ea8e..e52ca1aed 100644
--- a/retroshare-gui/src/gui/settings/rsettingswin.cpp
+++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp
@@ -180,8 +180,6 @@ SettingsPage::initStackedWidget()
 #ifdef RS_WEBUI
     WebuiPage *webui_p = new WebuiPage() ;
     addPage(new WebuiPage() );
-
-    QObject::connect(webui_p,SIGNAL(passwordChanged()),jsonapi_p,SLOT(load()));
 #endif
 #endif
 

From d5088caac6a70b3a7dbf5cc9bb763b07f8c0131b Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 11 Sep 2023 21:54:54 +0200
Subject: [PATCH 345/503] fix second part for transparency check

---
 retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
index 66311d6fa..bc2f5d960 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
@@ -801,7 +801,10 @@ void CreateGxsChannelMsg::sendMessage(const std::string &subject, const std::str
 		QBuffer buffer(&ba);
 
 		RsGxsImage image;
-		bool has_transparency = ImageUtil::hasAlphaContent(picture.toImage());
+		QPixmap pixmap;
+		pixmap = preview_W->getCroppedScaledPicture();
+		QImage qimg = pixmap.toImage();
+		bool has_transparency = ImageUtil::hasAlphaContent(qimg);
 
 		if(!picture.isNull())
 		{

From c877a6e5c873f0024819c37244020a358ff66d3d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 11 Sep 2023 22:55:42 +0200
Subject: [PATCH 346/503] improved login of on/off and parameter display in
 webui/jsonapi config pages

---
 .../src/gui/settings/JsonApiPage.cc           | 16 +++++++++++++-
 retroshare-gui/src/gui/settings/WebuiPage.cpp | 21 ++++++++++++++++++-
 retroshare-gui/src/gui/settings/WebuiPage.h   |  4 ++++
 retroshare-gui/src/gui/settings/WebuiPage.ui  |  2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc
index 136b37d56..4e33c05e6 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.cc
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc
@@ -29,6 +29,8 @@
 #include <QStringListModel>
 #include <QProgressDialog>
 
+#define IMAGE_LEDOFF  ":/images/ledoff1.png"
+#define IMAGE_LEDON   ":/images/ledon1.png"
 
 JsonApiPage::JsonApiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
 {
@@ -122,7 +124,19 @@ void JsonApiPage::load()
 		            QString::fromStdString(it.first) + ":" +
 		            QString::fromStdString(it.second) );
 
-	whileBlocking(ui.tokensListView)->setModel(new QStringListModel(newTk));
+    whileBlocking(ui.tokensListView)->setModel(new QStringListModel(newTk));
+
+    QStringList newTk2;
+
+    for(const auto& it : rsJsonApi->getResourceProviders())
+        newTk2.push_back( QString::fromStdString(it.get().getName())) ;
+
+    whileBlocking(ui.providersListView)->setModel(new QStringListModel(newTk2));
+
+    if(rsJsonApi->isRunning())
+        ui.statusLabelLED->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_LEDON)) ;
+    else
+        ui.statusLabelLED->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_LEDOFF)) ;
 }
 
 bool JsonApiPage::checkStartJsonApi()
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp
index 073d775ae..cccf54369 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.cpp
+++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp
@@ -27,6 +27,7 @@
 #include <QSpinBox>
 
 #include "util/misc.h"
+#include "util/qtthreadsutils.h"
 #include "retroshare/rswebui.h"
 #include "retroshare/rsjsonapi.h"
 
@@ -40,6 +41,8 @@ resource_api::ApiServerLocal* WebuiPage::apiServerLocal = 0;
 #endif
 resource_api::RsControlModule* WebuiPage::controlModule = 0;
 
+#define IMAGE_LEDOFF  ":/images/ledoff1.png"
+#define IMAGE_LEDON   ":/images/ledon1.png"
 
 WebuiPage::WebuiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
 {
@@ -50,6 +53,15 @@ WebuiPage::WebuiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
     connect(ui.password_LE, SIGNAL(textChanged(QString)), this, SLOT(onPasswordValueChanged(QString)));
     connect(ui.startWebBrowser_PB, SIGNAL(clicked()), this, SLOT(onStartWebBrowserClicked()));
     connect(ui.webInterfaceFilesDirectory_PB, SIGNAL(clicked()), this, SLOT(selectWebInterfaceDirectory()));
+
+    mEventsHandlerId = 0;
+
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> /* event */)
+    {
+        std::cerr << "Caught JSONAPI event in webui!" << std::endl;
+        RsQThreadUtils::postToObject([=]() { load(); }, this );
+    },
+    mEventsHandlerId, RsEventType::JSON_API );
 }
 
 WebuiPage::~WebuiPage()
@@ -127,6 +139,13 @@ void WebuiPage::loadParams()
 
     if(it != smap.end())
 		whileBlocking(ui.password_LE)->setText(QString::fromStdString(it->second));
+
+    if(rsWebUi->isRunning() && rsJsonApi->isRunning())
+        ui.statusLabelLED->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_LEDON)) ;
+    else
+        ui.statusLabelLED->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_LEDOFF)) ;
+#else
+    ui.statusLabelLED->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_LEDOFF)) ;
 #endif
 }
 
@@ -172,7 +191,6 @@ QString WebuiPage::helpText() const
 void WebuiPage::onEnableCBClicked(bool checked)
 {
 	ui.params_GB->setEnabled(checked);
-	ui.apply_PB->setEnabled(checked);
 	ui.startWebBrowser_PB->setEnabled(checked);
 	QString S;
 }
@@ -203,6 +221,7 @@ void WebuiPage::onApplyClicked()
         else
             checkShutdownWebui();
     }
+    load();
 }
 
 void WebuiPage::onStartWebBrowserClicked() { showWebui(); }
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.h b/retroshare-gui/src/gui/settings/WebuiPage.h
index ad20d6afb..391612cf8 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.h
+++ b/retroshare-gui/src/gui/settings/WebuiPage.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "retroshare/rsevents.h"
+
 #include "retroshare-gui/configpage.h"
 #include "gui/common/FilesDefs.h"
 #include "ui_WebuiPage.h"
@@ -82,4 +84,6 @@ private:
   static resource_api::ApiServerLocal* apiServerLocal;
  #endif
   static resource_api::RsControlModule* controlModule;
+
+  RsEventsHandlerId_t mEventsHandlerId;
 };
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.ui b/retroshare-gui/src/gui/settings/WebuiPage.ui
index e48cd31c5..91d59736f 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.ui
+++ b/retroshare-gui/src/gui/settings/WebuiPage.ui
@@ -39,7 +39,7 @@
      <item>
       <widget class="QLabel" name="label_3">
        <property name="text">
-        <string>TextLabel</string>
+        <string>Status:</string>
        </property>
       </widget>
      </item>

From 5e62af44e57822ac0704eefce73120443c580f9a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 12 Sep 2023 13:50:43 +0200
Subject: [PATCH 347/503] fixed compilation

---
 retroshare-gui/src/gui/NetworkDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index 8db3e1e85..7c2b3fd14 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -170,7 +170,7 @@ void NetworkDialog::removeSelectedKeys()
 	std::set<RsPgpId> friends;
 	for (int i = 0; i < l.size(); i++)
 	{
-		RsPgpId peer_id = RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l[i].row(), COLUMN_PEERID)).toString().toStdString());
+		RsPgpId peer_id = RsPgpId(ui.connectTreeWidget->model()->data(ui.connectTreeWidget->model()->index(l[i].row(), pgpid_item_model::PGP_ITEM_MODEL_COLUMN_PEERID)).toString().toStdString());
 		RsPeerDetails details ;
 		if(rsPeers->getGPGDetails(peer_id,details))
 		{

From 5251427cbf4483a6e15f8bfad1967fd26a52091e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 12 Sep 2023 22:28:54 +0200
Subject: [PATCH 348/503] improved webui and jsonapi config pages

---
 .../src/gui/settings/JsonApiPage.ui           | 64 +++++++++----------
 retroshare-gui/src/gui/settings/WebuiPage.cpp | 37 +++++++----
 2 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.ui b/retroshare-gui/src/gui/settings/JsonApiPage.ui
index 9227a3251..f8d31e38f 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.ui
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.ui
@@ -67,38 +67,6 @@
         </item>
        </layout>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Token:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="tokenLineEdit">
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tokens should spell as &amp;quot;user:password&amp;quot; where both user and password are alphanumeric strings.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="addTokenPushButton">
-          <property name="text">
-           <string>Add</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="removeTokenPushButton">
-          <property name="text">
-           <string>Remove</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
@@ -141,6 +109,38 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Token:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="tokenLineEdit">
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tokens should spell as &amp;quot;user:password&amp;quot; where both user and password are alphanumeric strings.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="addTokenPushButton">
+          <property name="text">
+           <string>Add</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="removeTokenPushButton">
+          <property name="text">
+           <string>Remove</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item>
        <widget class="QLabel" name="label_2">
         <property name="text">
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp
index cccf54369..893fd87e2 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.cpp
+++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp
@@ -122,7 +122,10 @@ bool WebuiPage::restart()
 
     rsWebUi->setUserPassword(ui.password_LE->text().toStdString());
     rsWebUi->setHtmlFilesDirectory(ui.webInterfaceFiles_LE->text().toStdString());
+
+    setCursor(Qt::WaitCursor) ;
     rsWebUi->restart();
+    setCursor(Qt::ArrowCursor) ;
 
     return true;
 }
@@ -140,7 +143,7 @@ void WebuiPage::loadParams()
     if(it != smap.end())
 		whileBlocking(ui.password_LE)->setText(QString::fromStdString(it->second));
 
-    if(rsWebUi->isRunning() && rsJsonApi->isRunning())
+    if(rsWebUi->isRunning())
         ui.statusLabelLED->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_LEDON)) ;
     else
         ui.statusLabelLED->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_LEDOFF)) ;
@@ -190,9 +193,23 @@ QString WebuiPage::helpText() const
 
 void WebuiPage::onEnableCBClicked(bool checked)
 {
-	ui.params_GB->setEnabled(checked);
-	ui.startWebBrowser_PB->setEnabled(checked);
-	QString S;
+    QString errmsg;
+    updateParams(errmsg);
+
+    ui.params_GB->setEnabled(checked);
+    ui.startWebBrowser_PB->setEnabled(checked);
+    ui.apply_PB->setEnabled(checked);
+
+    if(checked)
+    {
+        if(!restart())
+        {
+            QMessageBox::warning(0, tr("failed to start Webinterface"), "Failed to start the webinterface.");
+            return;
+        }
+    }
+    else
+        checkShutdownWebui();
 }
 
 void WebuiPage::onPortValueChanged(int /*value*/)
@@ -211,16 +228,8 @@ void WebuiPage::onApplyClicked()
     QString errmsg;
     updateParams(errmsg);
 
-    if(ui.enableWebUI_CB->isChecked())
-    {
-        if(!restart())
-        {
-            QMessageBox::warning(0, tr("failed to start Webinterface"), "Failed to start the webinterface.");
-            return;
-        }
-        else
-            checkShutdownWebui();
-    }
+    restart();
+
     load();
 }
 

From b606b26dd3c201ab15114bd9f589feaaa1c9a56c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 15 Sep 2023 20:15:29 +0200
Subject: [PATCH 349/503] fixed double allocation of webui page

---
 retroshare-gui/src/gui/settings/rsettingswin.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp
index e52ca1aed..1d3d4ecc3 100644
--- a/retroshare-gui/src/gui/settings/rsettingswin.cpp
+++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp
@@ -178,8 +178,7 @@ SettingsPage::initStackedWidget()
     JsonApiPage *jsonapi_p = new JsonApiPage() ;
 	addPage(jsonapi_p);
 #ifdef RS_WEBUI
-    WebuiPage *webui_p = new WebuiPage() ;
-    addPage(new WebuiPage() );
+    addPage(new WebuiPage());
 #endif
 #endif
 

From 0e0430a222703c7746d2ed0114d7740dc694bbe3 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 19 Sep 2023 15:08:52 +0200
Subject: [PATCH 350/503] added more debug info to comment tree widget

---
 retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp     | 7 +++++--
 retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
index 4757b036e..1233b3100 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
@@ -29,6 +29,8 @@
 #include <QMessageBox>
 #include <QDateTime>
 
+//#define DEBUG_COMMENT_DIALOG 1
+
 /** Constructor */
 GxsCommentDialog::GxsCommentDialog(QWidget *parent, const RsGxsId &default_author, RsGxsCommentService *comment_service)
 	: QWidget(parent), ui(new Ui::GxsCommentDialog)
@@ -96,8 +98,9 @@ void GxsCommentDialog::commentClear()
 void GxsCommentDialog::commentLoad(const RsGxsGroupId &grpId, const std::set<RsGxsMessageId>& msg_versions,const RsGxsMessageId& most_recent_msgId,bool use_cache)
 {
 #ifdef DEBUG_COMMENT_DIALOG
-	std::cerr << "GxsCommentDialog::commentLoad(" << grpId << ", most recent msg version: " << most_recent_msgId << ")";
-	std::cerr << std::endl;
+    std::cerr << "GxsCommentDialog::commentLoad(" << grpId << ", most recent msg version: " << most_recent_msgId << ")" << std::endl;
+    for(const auto& mid:msg_versions)
+        std::cerr << "  msg version: " << mid << std::endl;
 #endif
 
 	mGrpId = grpId;
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index 517543b9a..6a7371384 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -73,6 +73,7 @@ std::map<RsGxsMessageId, std::vector<RsGxsComment> > GxsCommentTreeWidget::mComm
 QMutex GxsCommentTreeWidget::mCacheMutex;
 
 //#define USE_NEW_DELEGATE 1
+//#define DEBUG_GXSCOMMENT_TREEWIDGET 1
 
 // This class allows to draw the item using an appropriate size
 
@@ -508,6 +509,8 @@ void GxsCommentTreeWidget::service_requestComments(const RsGxsGroupId& group_id,
 	/* request comments */
 #ifdef DEBUG_GXSCOMMENT_TREEWIDGET
     std::cerr << "GxsCommentTreeWidget::service_requestComments for group " << group_id << std::endl;
+    for(const auto& mid:msgIds)
+        std::cerr << "  including message " << mid << std::endl;
 #endif
 
    RsThread::async([this,group_id,msgIds]()

From 11c07cd7c3aae4d50a2f488c3148fb6d2b49b7b5 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 19 Sep 2023 15:10:29 +0200
Subject: [PATCH 351/503] moved endResetModel() call to the endof internal data
 update in RsFriendListModel

---
 retroshare-gui/src/gui/common/FriendListModel.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index f8740466d..622ae3930 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -1145,8 +1145,6 @@ void RsFriendListModel::updateInternalData()
     mLocations.clear();
     mTopLevel.clear();
 
-    endResetModel();
-
     auto TL = mTopLevel ; // This allows to fill TL without touching mTopLevel outside of [begin/end]InsertRows().
 
     // create a map of profiles and groups
@@ -1282,7 +1280,8 @@ void RsFriendListModel::updateInternalData()
 		endInsertRows();
 	}
 
-	postMods();
+    endResetModel();
+    postMods();
 
 	mLastInternalDataUpdate = time(NULL);
 }

From 034bddf1efa62b60fc66fb27cf3358e5fa9c6413 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 22 Sep 2023 22:50:45 +0200
Subject: [PATCH 352/503] made registered services list non editable

---
 retroshare-gui/src/gui/settings/JsonApiPage.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc
index 4e33c05e6..07e75032f 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.cc
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc
@@ -60,6 +60,7 @@ JsonApiPage::JsonApiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
     QRegExpValidator *ipValidator = new QRegExpValidator(ipRegex, this);
 
     ui.listenAddressLineEdit->setValidator(ipValidator);
+    ui.providersListView->setSelectionMode(QAbstractItemView::NoSelection);	// prevents edition.
 
     mEventHandlerId = 0;
 

From 41069a0fa5b1200c055b0ca38c36415c4a0b0b08 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 23 Sep 2023 17:31:24 +0200
Subject: [PATCH 353/503] added missing removal of event handler in jsonapi and
 webui settings

---
 retroshare-gui/src/gui/settings/JsonApiPage.cc | 4 ++++
 retroshare-gui/src/gui/settings/JsonApiPage.h  | 2 +-
 retroshare-gui/src/gui/settings/WebuiPage.cpp  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc
index 07e75032f..67e5f22b8 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.cc
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc
@@ -72,6 +72,10 @@ JsonApiPage::JsonApiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
     mEventHandlerId, RsEventType::JSON_API );
 }
 
+JsonApiPage::~JsonApiPage()
+{
+    rsEvents->unregisterEventsHandler(mEventHandlerId);
+}
 QString JsonApiPage::helpText() const
 {
     return tr("<h1><img width=\"24\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Webinterface</h1>  \
diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.h b/retroshare-gui/src/gui/settings/JsonApiPage.h
index f06340d1a..ef28a4294 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.h
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.h
@@ -33,7 +33,7 @@ class JsonApiPage : public ConfigPage
 public:
 
 	JsonApiPage(QWidget * parent = nullptr, Qt::WindowFlags flags = 0);
-	~JsonApiPage() override = default;
+    ~JsonApiPage() override ;
 
 	virtual QPixmap iconPixmap() const override
 	{
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp
index 893fd87e2..d7ff0b894 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.cpp
+++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp
@@ -66,7 +66,7 @@ WebuiPage::WebuiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
 
 WebuiPage::~WebuiPage()
 {
-
+    rsEvents->unregisterEventsHandler(mEventsHandlerId);
 }
 
 void WebuiPage::selectWebInterfaceDirectory()

From a99f686fd1df1b8e7801fcdd5e6fe8979a9df0cf Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 23 Sep 2023 17:53:12 +0200
Subject: [PATCH 354/503] restricted SPAM/STAR/TAGS to inbox, and made msg
 summary list refer to current box only

---
 retroshare-gui/src/gui/msgs/MessageModel.cpp   | 4 ++++
 retroshare-gui/src/gui/msgs/MessageModel.h     | 1 +
 retroshare-gui/src/gui/msgs/MessagesDialog.cpp | 8 ++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index 09508cad6..6116e42b4 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -690,6 +690,10 @@ void RsMessageModel::setCurrentBox(Rs::Msgs::BoxName bn)
 	}
 }
 
+Rs::Msgs::BoxName RsMessageModel::currentBox() const
+{
+    return mCurrentBox;
+}
 void RsMessageModel::setQuickViewFilter(QuickViewFilter fn)
 {
 	if(fn != mQuickViewFilter)
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h
index fb8c6daa5..d23b21f86 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.h
+++ b/retroshare-gui/src/gui/msgs/MessageModel.h
@@ -100,6 +100,7 @@ public:
     // This method will asynchroneously update the data
 
     void setCurrentBox(Rs::Msgs::BoxName bn) ;
+    Rs::Msgs::BoxName currentBox() const ;
     void setQuickViewFilter(QuickViewFilter fn) ;
 
     void setFilter(FilterType filter_type, const QStringList& strings) ;
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index de91df5ff..be9eedf6b 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -925,9 +925,9 @@ void MessagesDialog::changeBox(int box_row)
 
 		ui.messageTreeWidget->setPlaceholderText(placeholderText);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_READ,box_row!=ROW_INBOX);
-        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_STAR,box_row==ROW_OUTBOX);
-        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_SPAM,box_row==ROW_OUTBOX);
-        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_TAGS,box_row==ROW_OUTBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_STAR,box_row!=ROW_INBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_SPAM,box_row!=ROW_INBOX);
+        ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_TAGS,box_row!=ROW_INBOX);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_MSGID,true);
         ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_CONTENT,true);
     }
@@ -1296,7 +1296,7 @@ void MessagesDialog::updateMessageSummaryList()
     /* calculating the new messages */
 
     std::list<MsgInfoSummary> msgList;
-    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_ALL,msgList);
+    rsMail->getMessageSummaries(mMessageModel->currentBox(),msgList);
 
     QMap<int, int> tagCount;
 

From 606baf6f3ed11ed78002d47f33234197850438fa Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 8 Oct 2023 23:49:16 +0200
Subject: [PATCH 355/503] updated webui, libbitdht and libretroshare to latest
 submodule commit

---
 .gitmodules      | 4 ++--
 libbitdht        | 2 +-
 libretroshare    | 2 +-
 retroshare-webui | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3c767cf19..84d326387 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,8 +30,8 @@
 	branch = master
 [submodule "libretroshare"]
 	path = libretroshare
-	url = ../libretroshare
+	url = https://github.com/RetroShare/libretroshare.git
 	branch = master
 [submodule "retroshare-webui"]
 	path = retroshare-webui
-	url = ../RSNewWebUI
+	url = https://github.com/RetroShare/RSNewWebUI.git
diff --git a/libbitdht b/libbitdht
index 659423769..2ddc86fb5 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 659423769541169457c41f71c8a038e2d64ba079
+Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
diff --git a/libretroshare b/libretroshare
index 8c02b54e4..a54563935 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 8c02b54e4d16e38b28e77263a0b1570c50df4c99
+Subproject commit a545639352ceb0350041b2889dd2ae74574a402f
diff --git a/retroshare-webui b/retroshare-webui
index b0ddb0918..542a8c07b 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit b0ddb09184e8fff86bd3325e00c6d4b329ae1790
+Subproject commit 542a8c07bd02f9bb9082f7aba5aaaed54e643fc1

From 7a873c3b534adb897fe7a4e7a81f7439fedc87ca Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 12 Oct 2023 20:18:21 +0200
Subject: [PATCH 356/503] fixed compilation on ubuntu 18.04

---
 .../src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index ea27be6f9..2e292444e 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -514,13 +514,13 @@ void GxsChannelPostsWidgetWithModel::keyPressEvent(QKeyEvent *e)
 
         if(e->key() == Qt::Key_Left && index.column()==0)
         {
-            ui->postsTree->setCurrentIndex(index.siblingAtColumn(n));
+            ui->postsTree->setCurrentIndex(index.sibling(index.row(),n));
             e->accept();
             return;
         }
         if(e->key() == Qt::Key_Right && index.column()==n)
         {
-            ui->postsTree->setCurrentIndex(index.siblingAtColumn(0));
+            ui->postsTree->setCurrentIndex(index.sibling(index.row(),0));
             e->accept();
             return;
         }

From d83709d51997760d237d8c0c426f5b599763b34b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 12 Oct 2023 20:18:36 +0200
Subject: [PATCH 357/503] fixed implicit type warning

---
 retroshare-gui/src/gui/msgs/MessageComposer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h
index 0df2dbd8e..040681095 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.h
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.h
@@ -255,7 +255,7 @@ private:
     QList<QLabel*> tagLabels;
 
     // needed to send system flags with reply
-    unsigned msgFlags;
+    unsigned int msgFlags;
 
     RSTreeWidgetItemCompareRole *m_compareRole;
     QCompleter *m_completer;

From d8bca5c56db4f58b8afe486fde87fde97bef1102 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 12 Oct 2023 20:18:53 +0200
Subject: [PATCH 358/503] removed some debug output

---
 retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index 517543b9a..4de6e8675 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -42,6 +42,8 @@
 
 #include <iostream>
 
+//#define DEBUG_COMMENT_TREE_WIDGET
+
 #define PCITEM_COLUMN_COMMENT		0
 #define PCITEM_COLUMN_AUTHOR		1
 #define PCITEM_COLUMN_DATE		2
@@ -765,8 +767,10 @@ void GxsCommentTreeWidget::insertComments(const std::vector<RsGxsComment>& comme
             new_comments.push_back(comment.mMeta.mMsgId);
 
 		/* convert to a QTreeWidgetItem */
+#ifdef DEBUG_COMMENT_TREE_WIDGET
 		std::cerr << "GxsCommentTreeWidget::service_loadThread() Got Comment: " << comment.mMeta.mMsgId;
 		std::cerr << std::endl;
+#endif
 
 		GxsIdRSTreeWidgetItem *item = new GxsIdRSTreeWidgetItem(NULL,GxsIdDetails::ICON_TYPE_AVATAR) ;
 		QString text;

From 5db6eb0359a190838b08fd85256bfc36f1c8b66c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 12 Oct 2023 21:03:00 +0200
Subject: [PATCH 359/503] updated retroshare base dir to latest version of
 libretroshare

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index a54563935..3bb5a2b28 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit a545639352ceb0350041b2889dd2ae74574a402f
+Subproject commit 3bb5a2b282949bc170dcff6141424cb095e4bb7b

From e9d4cacac520e497a0402d4bb8c31c295c8bd7cd Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Fri, 13 Oct 2023 18:55:01 +0200
Subject: [PATCH 360/503] Attempt to fix udp-discovery-cpp submodule ref

---
 .gitmodules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 3c767cf19..6ae5adcfb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,7 +10,8 @@
 [submodule "supportlibs/udp-discovery-cpp"]
 	path = supportlibs/udp-discovery-cpp
 	url = https://github.com/truvorskameikin/udp-discovery-cpp.git
-	branch = develop
+	branch = master
+# develop branch was removed we were using it at commit f3a3103a6c52e5707629e8d0a7e279a7758fe845
 [submodule "supportlibs/rapidjson"]
 	path = supportlibs/rapidjson
 	url = https://github.com/Tencent/rapidjson.git

From 9d406ba26f9cad3d23b3e6dd51d062e0924afc60 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Wed, 18 Oct 2023 10:34:17 +0200
Subject: [PATCH 361/503] Fix inconsistence in friendserver QMake build option
 naming

---
 retroshare.pri | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare.pri b/retroshare.pri
index 9ed316b9a..19dd5434f 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -52,9 +52,9 @@ CONFIG *= retroshare_service
 no_retroshare_service:CONFIG -= retroshare_service
 
 # To disable RetroShare FriendServer append the following assignation to
-# qmake command line "CONFIG+=no_rs_friendserver"
+# qmake command line "CONFIG+=no_retroshare_friendserver"
 CONFIG *= retroshare_friendserver
-no_rs_friendserver:CONFIG -= retroshare_friendserver
+no_retroshare_friendserver:CONFIG -= retroshare_friendserver
 
 # To disable SQLCipher support append the following assignation to qmake
 # command line "CONFIG+=no_sqlcipher"

From eab5c4bf4c7dc61ada0f90e3e2f899b6d805e579 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Wed, 18 Oct 2023 10:36:19 +0200
Subject: [PATCH 362/503] Updated gui build script according to new
 friendserver naming

---
 build_scripts/OBS                     | 2 +-
 build_scripts/Windows/build/build.bat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index df16cb915..31fa63acb 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit df16cb915465d058c75277678799ce4dadeae287
+Subproject commit 31fa63acb6394916ba605aa1a08e86ed47068708
diff --git a/build_scripts/Windows/build/build.bat b/build_scripts/Windows/build/build.bat
index 487647568..91ff71382 100644
--- a/build_scripts/Windows/build/build.bat
+++ b/build_scripts/Windows/build/build.bat
@@ -56,7 +56,7 @@ if "%ParamWebui%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_webui
 if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retroshare_plugins
 if "%ParamUseNativeDialogs%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_use_native_dialogs
 if "%ParamService%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_service
-if "%ParamFriendServer%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_rs_friendserver
+if "%ParamFriendServer%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_friendserver
 if "%ParamEmbeddedFriendServer%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_efs
 
 qmake "%SourcePath%\RetroShare.pro" -r -spec win32-g++ "CONFIG+=%RS_QMAKE_CONFIG%" "EXTERNAL_LIB_DIR=%BuildLibsPath%\libs"

From 9b7149f16e54821b634497ae8c8496ee4e55d127 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Wed, 18 Oct 2023 11:44:58 +0200
Subject: [PATCH 363/503] Update OBS submodule

---
 build_scripts/OBS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index 31fa63acb..1a859d239 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 31fa63acb6394916ba605aa1a08e86ed47068708
+Subproject commit 1a859d2392cd6b148c5a5aa3df36eca3c2e6140a

From e67abc36af55609bfb96d7f13c017b43b41afa5d Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Wed, 18 Oct 2023 12:23:32 +0200
Subject: [PATCH 364/503] Update OBS submodule

---
 build_scripts/OBS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index 1a859d239..1de347e99 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 1a859d2392cd6b148c5a5aa3df36eca3c2e6140a
+Subproject commit 1de347e993ed1147bb84cdaf6c0604ff220eb221

From d84b981e9ab41e27e6dc63ddc4e3a6aa38c14c82 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Wed, 18 Oct 2023 18:56:04 +0200
Subject: [PATCH 365/503] Update libsam3 submodule

---
 supportlibs/libsam3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportlibs/libsam3 b/supportlibs/libsam3
index 8623304b6..2226ef0a2 160000
--- a/supportlibs/libsam3
+++ b/supportlibs/libsam3
@@ -1 +1 @@
-Subproject commit 8623304b62294dafbe477573f321a464fef721dd
+Subproject commit 2226ef0a20a001ec0942be6abe5e909c15447d8e

From 98c27fcf6d106be7782a16cc55d1ff3a658a9322 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Wed, 18 Oct 2023 18:57:11 +0200
Subject: [PATCH 366/503] Update libretroshare submodule

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index 3bb5a2b28..a10087b27 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 3bb5a2b282949bc170dcff6141424cb095e4bb7b
+Subproject commit a10087b27a804d0a43745aa39e7515dd691740f3

From d26f7db319084dbdb50a8ca59fa9c4d8a66c7a7d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 21 Oct 2023 14:35:47 +0200
Subject: [PATCH 367/503] fixed non working expand button in forum feed

---
 retroshare-gui/src/gui/feeds/GxsForumGroupItem.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
index 29b7851f2..bfe24f2a7 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
@@ -47,7 +47,6 @@ public:
 protected:
 	/* FeedItem */
 	virtual void doExpand(bool open);
-	void toggle() override;
 
 	/* GxsGroupFeedItem */
 	virtual QString groupName();
@@ -56,6 +55,7 @@ protected:
 
 private slots:
 	void subscribeForum();
+    void toggle() override;
 
 private:
 	void fill();

From 168f36bc2101b5283d05378d356fad317df207fa Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 24 Oct 2023 22:44:40 +0200
Subject: [PATCH 368/503] Added colors for the output

---
 retroshare-service/src/retroshare-service.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index 040a2012d..a8c7ec37d 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -60,7 +60,7 @@ public:
 	        bool /*prev_is_bad*/, std::string& password, bool& cancel )
 	{
 		std::string question1 = title +
-		        "\nPlease enter your PGP password for key:\n    " +
+		        "\033[0;32mPlease enter your PGP password for key:\n    \033[0m" +
 		        question + " :";
 		password = RsUtil::rs_getpass(question1.c_str()) ;
 		cancel = false ;
@@ -182,9 +182,9 @@ int main(int argc, char* argv[])
 		while(keepRunning)
 		{
 			webui_pass1 = RsUtil::rs_getpass(
-			            "Please register a password for the web interface: " );
+			            "\033[0;32mPlease register a password for the web interface:\033[0m" );
 			webui_pass2 = RsUtil::rs_getpass(
-			            "Please enter the same password again            : " );
+			            "\033[0;32mPlease enter the same password again            :\033[0m" );
 
 			if(webui_pass1 != webui_pass2)
 			{
@@ -223,12 +223,12 @@ int main(int argc, char* argv[])
 
             if(locations.size() == 0)
             {
-                RsErr() << "No available accounts. You cannot use option -U list" << std::endl;
+                RsErr() << "\033[1;33mNo available accounts. You cannot use option -U list\033[0m" << std::endl;
                 return -RsInit::ERR_NO_AVAILABLE_ACCOUNT;
             }
 
             std::cout << std::endl << std::endl
-                      << "Available accounts:" << std::endl;
+                      << "\033[0;32mAvailable accounts:\033[0m" << std::endl;
 
             int accountCountDigits = static_cast<int>( ceil(log(locations.size())/log(10.0)) );
 
@@ -244,7 +244,7 @@ int main(int argc, char* argv[])
 			uint32_t nacc = 0;
 			while(keepRunning && (nacc < 1 || nacc >= locations.size()))
 			{
-				std::cout << "Please enter account number: ";
+				std::cout << "\033[0;32mPlease enter account number: \033[0m";
 				std::cout.flush();
 
 				std::string inputStr;

From 8814cbd9f279441eb98892e503b2af869507aa39 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Wed, 25 Oct 2023 11:54:51 +0200
Subject: [PATCH 369/503] color improvements for accounts display

---
 retroshare-service/src/retroshare-service.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index a8c7ec37d..afda36771 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -233,18 +233,18 @@ int main(int argc, char* argv[])
             int accountCountDigits = static_cast<int>( ceil(log(locations.size())/log(10.0)) );
 
 			for( uint32_t i=0; i<locations.size(); ++i )
-				std::cout << "[" << std::setw(accountCountDigits)
-				          << std::setfill('0') << i+1 << "] "
-				          << locations[i].mLocationId << " ("
+				std::cout << "\033[0;32m[" << std::setw(accountCountDigits)
+				          << std::setfill('0') << i+1 << "]\033[0m "
+				          << locations[i].mLocationId << "\033[0;35m ("
 				          << locations[i].mPgpId << "): "
 				          << locations[i].mPgpName
-				          << " \t (" << locations[i].mLocationName << ")"
+				          << "   (" << locations[i].mLocationName << ")\033[0m"
 				          << std::endl;
 
 			uint32_t nacc = 0;
 			while(keepRunning && (nacc < 1 || nacc >= locations.size()))
 			{
-				std::cout << "\033[0;32mPlease enter account number: \033[0m";
+				std::cout << "\033[0;32mPlease enter account number:\n \033[0m";
 				std::cout.flush();
 
 				std::string inputStr;

From 9f89ac42e739cc733027544710e7d421a4ea5ce6 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Wed, 25 Oct 2023 12:13:15 +0200
Subject: [PATCH 370/503] Fix spacing

---
 retroshare-service/src/retroshare-service.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index afda36771..d643fc36f 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -244,7 +244,7 @@ int main(int argc, char* argv[])
 			uint32_t nacc = 0;
 			while(keepRunning && (nacc < 1 || nacc >= locations.size()))
 			{
-				std::cout << "\033[0;32mPlease enter account number:\n \033[0m";
+				std::cout << "\033[0;32mPlease enter account number:\n\033[0m";
 				std::cout.flush();
 
 				std::string inputStr;

From 36282e750de13f88bef50947d5b3ab560263f3ad Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Thu, 26 Oct 2023 18:31:37 +0200
Subject: [PATCH 371/503] update output colors

---
 retroshare-service/src/retroshare-service.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index d643fc36f..76162647c 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -188,12 +188,12 @@ int main(int argc, char* argv[])
 
 			if(webui_pass1 != webui_pass2)
 			{
-				std::cout << "Passwords do not match!" << std::endl;
+				std::cout << "\033[1;31mPasswords do not match!\033[0m" << std::endl;
 				continue;
 			}
 			if(webui_pass1.empty())
 			{
-				std::cout << "Password cannot be empty!" << std::endl;
+				std::cout << "\033[1;31mPassword cannot be empty!\033[0m" << std::endl;
 				continue;
 			}
 
@@ -223,7 +223,7 @@ int main(int argc, char* argv[])
 
             if(locations.size() == 0)
             {
-                RsErr() << "\033[1;33mNo available accounts. You cannot use option -U list\033[0m" << std::endl;
+                RsErr() << "\033[1;31mNo available accounts. You cannot use option -U list\033[0m" << std::endl;
                 return -RsInit::ERR_NO_AVAILABLE_ACCOUNT;
             }
 
@@ -234,8 +234,8 @@ int main(int argc, char* argv[])
 
 			for( uint32_t i=0; i<locations.size(); ++i )
 				std::cout << "\033[0;32m[" << std::setw(accountCountDigits)
-				          << std::setfill('0') << i+1 << "]\033[0m "
-				          << locations[i].mLocationId << "\033[0;35m ("
+				          << std::setfill('0') << i+1 << "]\033[0m \033[33m"
+				          << locations[i].mLocationId << "\033[0m \033[0;35m ("
 				          << locations[i].mPgpId << "): "
 				          << locations[i].mPgpName
 				          << "   (" << locations[i].mLocationName << ")\033[0m"
@@ -264,7 +264,7 @@ int main(int argc, char* argv[])
 		RsPeerId ssl_id(prefUserString);
 		if(ssl_id.isNull())
 		{
-			RsErr() << "Invalid User location id: a hexadecimal ID is expected."
+			RsErr() << "\033[1;31mInvalid User location id: a hexadecimal ID is expected.\033[0m"
 			        << std::endl;
 			return -EINVAL;
 		}
@@ -299,7 +299,7 @@ int main(int argc, char* argv[])
         if(RsAccounts::isTorAuto())
         {
 
-            std::cerr << "(II) Hidden service is ready:" << std::endl;
+            std::cerr << "\033[0;32(II) Hidden service is ready:\033[0m" << std::endl;
 
             std::string service_id ;
             std::string onion_address ;

From 315fb77d6346dfd45ec242e63b21507c625a7b61 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 28 Oct 2023 21:03:21 +0200
Subject: [PATCH 372/503] fixed forum and chnanel group feed items reacting to
 changes to the channel/forum group

---
 .../src/gui/feeds/GxsChannelGroupItem.cpp     | 24 +++++++++++++++
 .../src/gui/feeds/GxsChannelGroupItem.h       |  1 +
 .../src/gui/feeds/GxsChannelGroupItem.ui      |  2 +-
 .../src/gui/feeds/GxsForumGroupItem.cpp       | 29 +++++++++++++++++--
 .../src/gui/feeds/GxsForumGroupItem.h         | 11 ++++---
 5 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
index e9c38a022..dc20c3aee 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
@@ -39,6 +39,29 @@ GxsChannelGroupItem::GxsChannelGroupItem(FeedHolder *feedHolder, uint32_t feedId
 	setup();
 
 	requestGroup();
+
+    mEventHandlerId = 0;
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
+    {
+        RsQThreadUtils::postToObject([=]()
+        {
+            const auto *e = dynamic_cast<const RsGxsChannelEvent*>(event.get());
+
+            if(!e || e->mChannelGroupId != this->groupId())
+                return;
+
+            switch(e->mChannelEventCode)
+            {
+                case RsChannelEventCode::SUBSCRIBE_STATUS_CHANGED:
+                case RsChannelEventCode::UPDATED_CHANNEL:
+                case RsChannelEventCode::RECEIVED_PUBLISH_KEY:
+                    loadGroup();
+                    break;
+                default:
+                    break;
+            }
+        }, this );
+    }, mEventHandlerId, RsEventType::GXS_CHANNELS );
 }
 
 GxsChannelGroupItem::GxsChannelGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsChannelGroup &group, bool isHome, bool autoUpdate) :
@@ -51,6 +74,7 @@ GxsChannelGroupItem::GxsChannelGroupItem(FeedHolder *feedHolder, uint32_t feedId
 
 GxsChannelGroupItem::~GxsChannelGroupItem()
 {
+    rsEvents->unregisterEventsHandler(mEventHandlerId);
 	delete(ui);
 }
 
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h
index cd7f6510b..8f0a6e332 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h
@@ -66,6 +66,7 @@ private:
 
 	/** Qt Designer generated object */
 	Ui::GxsChannelGroupItem *ui;
+    RsEventsHandlerId_t mEventHandlerId;
 };
 
 #endif
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
index 151e6920b..e17f53c48 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
@@ -251,7 +251,7 @@
              <enum>Qt::NoFocus</enum>
             </property>
             <property name="toolTip">
-             <string>Subscribe to Channel</string>
+             <string>Subscribe this Channel</string>
             </property>
             <property name="text">
              <string>Subscribe</string>
diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
index 43c94a377..23c9c35ac 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
@@ -35,8 +35,9 @@ GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, co
     GxsGroupFeedItem(feedHolder, feedId, groupId, isHome, rsGxsForums, autoUpdate)
 {
 	setup();
-
 	requestGroup();
+
+
 }
 
 GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const std::list<RsGxsId>& added_moderators,const std::list<RsGxsId>& removed_moderators,bool isHome, bool autoUpdate):
@@ -47,6 +48,29 @@ GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, co
 	setup();
 
 	requestGroup();
+
+    mEventHandlerId = 0;
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
+    {
+        RsQThreadUtils::postToObject([=]()
+        {
+            const auto *e = dynamic_cast<const RsGxsForumEvent*>(event.get());
+
+            if(!e || e->mForumGroupId != this->groupId())
+                return;
+
+            switch(e->mForumEventCode)
+            {
+                case RsForumEventCode::SUBSCRIBE_STATUS_CHANGED:
+                case RsForumEventCode::UPDATED_FORUM:
+                case RsForumEventCode::MODERATOR_LIST_CHANGED:
+                    loadGroup();
+                    break;
+                default:
+                    break;
+            }
+        }, this );
+    }, mEventHandlerId, RsEventType::GXS_FORUMS );
 }
 
 GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumGroup &group, bool isHome, bool autoUpdate) :
@@ -59,7 +83,8 @@ GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, co
 
 GxsForumGroupItem::~GxsForumGroupItem()
 {
-	delete(ui);
+    rsEvents->unregisterEventsHandler(mEventHandlerId);
+    delete(ui);
 }
 
 void GxsForumGroupItem::setup()
diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
index bfe24f2a7..e09a3cb13 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
@@ -22,6 +22,7 @@
 #define _GXSFORUMGROUPITEM_H
 
 #include <retroshare/rsgxsforums.h>
+#include <retroshare/rsevents.h>
 #include "gui/gxs/GxsGroupFeedItem.h"
 
 namespace Ui {
@@ -39,19 +40,19 @@ public:
 	GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, bool isHome, bool autoUpdate);
 	GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const std::list<RsGxsId>& added_moderators,const std::list<RsGxsId>& removed_moderators,bool isHome, bool autoUpdate);
 	GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumGroup &group, bool isHome, bool autoUpdate);
-	~GxsForumGroupItem();
+    virtual ~GxsForumGroupItem() override;
 
 	bool setGroup(const RsGxsForumGroup &group);
 
     uint64_t uniqueIdentifier() const override { return hash_64bits("GxsForumGroupItem " + groupId().toStdString()) ; }
 protected:
 	/* FeedItem */
-	virtual void doExpand(bool open);
+    virtual void doExpand(bool open) override;
 
 	/* GxsGroupFeedItem */
-	virtual QString groupName();
+    virtual QString groupName() override;
 	virtual void loadGroup() override;
-	virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_FORUM; }
+    virtual RetroShareLink::enumType getLinkType() override { return RetroShareLink::TYPE_FORUM; }
 
 private slots:
 	void subscribeForum();
@@ -69,6 +70,8 @@ private:
 
     std::list<RsGxsId> mAddedModerators;
     std::list<RsGxsId> mRemovedModerators;
+
+    RsEventsHandlerId_t mEventHandlerId;
 };
 
 #endif

From ab7deede57f81a89c7dc34acee244c1f4dd9299e Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 29 Oct 2023 18:24:25 +0100
Subject: [PATCH 373/503] clean the color code from the text

---
 retroshare-service/src/retroshare-service.cc | 30 ++++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index 76162647c..9830a56f5 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -60,7 +60,7 @@ public:
 	        bool /*prev_is_bad*/, std::string& password, bool& cancel )
 	{
 		std::string question1 = title +
-		        "\033[0;32mPlease enter your PGP password for key:\n    \033[0m" +
+		        "\033[0;32m" "Please enter your PGP password for key:\n    " "\033[0m" +
 		        question + " :";
 		password = RsUtil::rs_getpass(question1.c_str()) ;
 		cancel = false ;
@@ -182,18 +182,18 @@ int main(int argc, char* argv[])
 		while(keepRunning)
 		{
 			webui_pass1 = RsUtil::rs_getpass(
-			            "\033[0;32mPlease register a password for the web interface:\033[0m" );
+			            "\033[0;32m" "Please register a password for the web interface:" "\033[0m" );
 			webui_pass2 = RsUtil::rs_getpass(
-			            "\033[0;32mPlease enter the same password again            :\033[0m" );
+			            "\033[0;32m" "Please enter the same password again            :" "\033[0m" );
 
 			if(webui_pass1 != webui_pass2)
 			{
-				std::cout << "\033[1;31mPasswords do not match!\033[0m" << std::endl;
+				std::cout << "\033[1;31m" "Passwords do not match!" "\033[0m" << std::endl;
 				continue;
 			}
 			if(webui_pass1.empty())
 			{
-				std::cout << "\033[1;31mPassword cannot be empty!\033[0m" << std::endl;
+				std::cout << "\033[1;31m" "Password cannot be empty!" "\033[0m" << std::endl;
 				continue;
 			}
 
@@ -223,28 +223,28 @@ int main(int argc, char* argv[])
 
             if(locations.size() == 0)
             {
-                RsErr() << "\033[1;31mNo available accounts. You cannot use option -U list\033[0m" << std::endl;
+                RsErr() << "\033[1;31m" "No available accounts. You cannot use option -U list" "\033[0m" << std::endl;
                 return -RsInit::ERR_NO_AVAILABLE_ACCOUNT;
             }
 
             std::cout << std::endl << std::endl
-                      << "\033[0;32mAvailable accounts:\033[0m" << std::endl;
+                      << "\033[0;32m" "Available accounts:" "\033[0m" << std::endl;
 
             int accountCountDigits = static_cast<int>( ceil(log(locations.size())/log(10.0)) );
 
 			for( uint32_t i=0; i<locations.size(); ++i )
-				std::cout << "\033[0;32m[" << std::setw(accountCountDigits)
-				          << std::setfill('0') << i+1 << "]\033[0m \033[33m"
-				          << locations[i].mLocationId << "\033[0m \033[0;35m ("
-				          << locations[i].mPgpId << "): "
+				std::cout << "\033[0;32m" "[" << std::setw(accountCountDigits)
+				          << std::setfill('0') << i+1 << "] " "\033[0m" "\033[33m"
+				          << locations[i].mLocationId << "\033[0m" "\033[0;36m" " ("
+				          << locations[i].mPgpId << "): " "\033[0m" "\033[0;35m"
 				          << locations[i].mPgpName
-				          << "   (" << locations[i].mLocationName << ")\033[0m"
+				          << " (" << locations[i].mLocationName << ")" "\033[0m"
 				          << std::endl;
 
 			uint32_t nacc = 0;
 			while(keepRunning && (nacc < 1 || nacc >= locations.size()))
 			{
-				std::cout << "\033[0;32mPlease enter account number:\n\033[0m";
+				std::cout << "\033[0;32m" "Please enter account number:\n" "\033[0m";
 				std::cout.flush();
 
 				std::string inputStr;
@@ -264,7 +264,7 @@ int main(int argc, char* argv[])
 		RsPeerId ssl_id(prefUserString);
 		if(ssl_id.isNull())
 		{
-			RsErr() << "\033[1;31mInvalid User location id: a hexadecimal ID is expected.\033[0m"
+			RsErr() << "\033[1;31m" "Invalid User location id: a hexadecimal ID is expected." "\033[0m"
 			        << std::endl;
 			return -EINVAL;
 		}
@@ -299,7 +299,7 @@ int main(int argc, char* argv[])
         if(RsAccounts::isTorAuto())
         {
 
-            std::cerr << "\033[0;32(II) Hidden service is ready:\033[0m" << std::endl;
+            std::cerr << "\033[0;32" "(II) Hidden service is ready:" "\033[0m" << std::endl;
 
             std::string service_id ;
             std::string onion_address ;

From 55651e73d9d3b073bc4c9f49a4e82a97548127eb Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 29 Oct 2023 20:47:00 +0100
Subject: [PATCH 374/503] made ConnectFriendWizard to accept retroshare links

---
 .../src/gui/connect/ConnectFriendWizard.cpp   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 4a7429f27..7ffdcd687 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -34,6 +34,7 @@
 #endif
 
 #include "gui/common/FilesDefs.h"
+#include "gui/RetroShareLink.h"
 #include "gui/settings/rsharesettings.h"
 #include "util/misc.h"
 #include "ConnectFriendWizard.h"
@@ -449,8 +450,9 @@ void ConnectFriendWizard::initializePage(int id)
 			}
 
         sockaddr_storage addr ;
-
+#ifdef DEBUG_FRIENDWIZARD
 		std::cerr << "Cert IP = " << peerDetails.extAddr << std::endl;
+#endif
 
         if(sockaddr_storage_ipv4_aton(addr,peerDetails.extAddr.c_str()) && sockaddr_storage_isValidNet(addr))
         {
@@ -870,7 +872,18 @@ void ConnectFriendWizard::cleanFriendCert()
 	bool certValid = false;
 	QString errorMsg ;
 	QString certDetail;
-	std::string cert = ui->friendCertEdit->toPlainText().toUtf8().constData();
+
+    std::string cert ;
+    RetroShareLink rslink(ui->friendCertEdit->toPlainText());
+
+    if(rslink.valid() && rslink.type() == RetroShareLink::TYPE_CERTIFICATE)
+        cert = rslink.radix().toStdString();
+    else
+        cert = ui->friendCertEdit->toPlainText().toUtf8().constData();
+
+#ifdef DEBUG_FRIENDWIZARD
+    std::cerr << "Friend cert:\"" << cert << "\"" << std::endl;
+#endif
 
 	if (cert.empty()) {
 		ui->friendCertCleanLabel->setToolTip("");
@@ -936,7 +949,7 @@ void ConnectFriendWizard::cleanFriendCert()
 void ConnectFriendWizard::pasteCert()
 {
 	QClipboard *clipboard = QApplication::clipboard();
-	ui->friendCertEdit->setPlainText(clipboard->text());
+    ui->friendCertEdit->setPlainText(clipboard->text());
 }
 
 void ConnectFriendWizard::openCert()

From ab61149cb107ee07830b3c5ec62baf5946dd6172 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 29 Oct 2023 21:05:02 +0100
Subject: [PATCH 375/503] fixed missing event handler registration

---
 .../src/gui/feeds/GxsChannelGroupItem.cpp     | 21 +++++++++++--------
 .../src/gui/feeds/GxsChannelGroupItem.h       |  1 +
 .../src/gui/feeds/GxsForumGroupItem.cpp       |  8 ++++---
 .../src/gui/feeds/GxsForumGroupItem.h         |  1 +
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
index dc20c3aee..a6213e740 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
@@ -37,9 +37,20 @@ GxsChannelGroupItem::GxsChannelGroupItem(FeedHolder *feedHolder, uint32_t feedId
     GxsGroupFeedItem(feedHolder, feedId, groupId, isHome, rsGxsChannels, autoUpdate)
 {
 	setup();
-
 	requestGroup();
+    addEventHandler();
+}
 
+GxsChannelGroupItem::GxsChannelGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsChannelGroup &group, bool isHome, bool autoUpdate) :
+    GxsGroupFeedItem(feedHolder, feedId, group.mMeta.mGroupId, isHome, rsGxsChannels, autoUpdate)
+{
+    setup();
+    setGroup(group);
+    addEventHandler();
+}
+
+void GxsChannelGroupItem::addEventHandler()
+{
     mEventHandlerId = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
     {
@@ -64,14 +75,6 @@ GxsChannelGroupItem::GxsChannelGroupItem(FeedHolder *feedHolder, uint32_t feedId
     }, mEventHandlerId, RsEventType::GXS_CHANNELS );
 }
 
-GxsChannelGroupItem::GxsChannelGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsChannelGroup &group, bool isHome, bool autoUpdate) :
-    GxsGroupFeedItem(feedHolder, feedId, group.mMeta.mGroupId, isHome, rsGxsChannels, autoUpdate)
-{
-	setup();
-
-	setGroup(group);
-}
-
 GxsChannelGroupItem::~GxsChannelGroupItem()
 {
     rsEvents->unregisterEventsHandler(mEventHandlerId);
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h
index 8f0a6e332..b0366bc98 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.h
@@ -60,6 +60,7 @@ private slots:
 private:
 	void fill();
 	void setup();
+    void addEventHandler();
 
 private:
 	RsGxsChannelGroup mGroup;
diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
index 23c9c35ac..5ad2e92f6 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
@@ -36,8 +36,7 @@ GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, co
 {
 	setup();
 	requestGroup();
-
-
+    addEventHandler();
 }
 
 GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const std::list<RsGxsId>& added_moderators,const std::list<RsGxsId>& removed_moderators,bool isHome, bool autoUpdate):
@@ -46,9 +45,12 @@ GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, co
     mRemovedModerators(removed_moderators)
 {
 	setup();
-
 	requestGroup();
+    addEventHandler();
+}
 
+void GxsForumGroupItem::addEventHandler()
+{
     mEventHandlerId = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
     {
diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
index e09a3cb13..d80671e5a 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.h
@@ -61,6 +61,7 @@ private slots:
 private:
 	void fill();
 	void setup();
+    void addEventHandler();
 
 private:
 	RsGxsForumGroup mGroup;

From b02acfae4bc700a893933ac1e7eef55ddbb19f4d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 29 Oct 2023 21:06:09 +0100
Subject: [PATCH 376/503] fixed missing event handler registration

---
 retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
index 5ad2e92f6..663951a6c 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.cpp
@@ -79,8 +79,8 @@ GxsForumGroupItem::GxsForumGroupItem(FeedHolder *feedHolder, uint32_t feedId, co
     GxsGroupFeedItem(feedHolder, feedId, group.mMeta.mGroupId, isHome, rsGxsForums, autoUpdate)
 {
 	setup();
-
 	setGroup(group);
+    addEventHandler();
 }
 
 GxsForumGroupItem::~GxsForumGroupItem()

From c502b0df068419c7d6dd1dc66dbd6e87e5c881db Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:43:17 +0100
Subject: [PATCH 377/503] coloring hidden outputs

---
 retroshare-service/src/retroshare-service.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index 9830a56f5..1ae2506da 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -312,13 +312,13 @@ int main(int argc, char* argv[])
             RsTor::getHiddenServiceInfo(service_id,onion_address,service_port,service_target_address,service_target_port);
             RsTor::getProxyServerInfo(proxy_server_address,proxy_server_port) ;
 
-            std::cerr << "  onion address  : " << onion_address << std::endl;
-            std::cerr << "  service_id     : " << service_id << std::endl;
-            std::cerr << "  service port   : " << service_port << std::endl;
-            std::cerr << "  target port    : " << service_target_port << std::endl;
-            std::cerr << "  target address : " << service_target_address << std::endl;
+            std::cerr << "\033[0;32" "  onion address  : " "\033[0m" << onion_address << std::endl;
+            std::cerr << "\033[0;32" "  service_id     : " "\033[0m" << service_id << std::endl;
+            std::cerr << "\033[0;32" "  service port   : " "\033[0m" << service_port << std::endl;
+            std::cerr << "\033[0;32" "  target port    : " "\033[0m" << service_target_port << std::endl;
+            std::cerr << "\033[0;32" "  target address : " "\033[0m" << service_target_address << std::endl;
 
-            std::cerr << "Setting proxy server to " << service_target_address << ":" << service_target_port << std::endl;
+            std::cerr << "\033[0;32" "Setting proxy server to " "\033[0m" << service_target_address << ":" << service_target_port << std::endl;
 
             rsPeers->setLocalAddress(rsPeers->getOwnId(), service_target_address, service_target_port);
             rsPeers->setHiddenNode(rsPeers->getOwnId(), onion_address, service_port);

From fb78591bafc6684ed154d08c56b76173179dc40c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 1 Nov 2023 15:52:02 +0100
Subject: [PATCH 378/503] fixed colored output

---
 retroshare-service/src/retroshare-service.cc | 69 ++++++++++++--------
 1 file changed, 43 insertions(+), 26 deletions(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index 1ae2506da..c68a1b80a 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -33,6 +33,7 @@
 #include "retroshare/rsiface.h"
 
 #include "util/stacktrace.h"
+#include "util/rsprint.h"
 #include "util/argstream.h"
 #include "util/rskbdinput.h"
 #include "util/rsdir.h"
@@ -48,6 +49,28 @@
 
 static CrashStackTrace gCrashStackTrace;
 
+// We should move these functions to rsprint in libretroshare
+
+#define COLOR_GREEN  0
+#define COLOR_YELLOW 1
+#define COLOR_BLUE   2
+#define COLOR_PURPLE 3
+#define COLOR_RED    4
+
+std::string colored(int color,const std::string& s)
+{
+    switch(color)
+    {
+    case COLOR_GREEN : return "\033[0;32m"+s+"\033[0m";
+    case COLOR_YELLOW: return "\033[0;33m"+s+"\033[0m";
+    case COLOR_BLUE  : return "\033[0;36m"+s+"\033[0m";
+    case COLOR_PURPLE: return "\033[0;35m"+s+"\033[0m";
+    case COLOR_RED   : return "\033[0;31m"+s+"\033[0m";
+    default:
+        return s;
+    }
+}
+
 #ifdef RS_SERVICE_TERMINAL_LOGIN
 class RsServiceNotify: public NotifyClient
 {
@@ -59,9 +82,7 @@ public:
 	        const std::string& title, const std::string& question,
 	        bool /*prev_is_bad*/, std::string& password, bool& cancel )
 	{
-		std::string question1 = title +
-		        "\033[0;32m" "Please enter your PGP password for key:\n    " "\033[0m" +
-		        question + " :";
+        std::string question1 = title + colored(COLOR_GREEN,"Please enter your PGP password for key:\n    ")  + question + " :";
 		password = RsUtil::rs_getpass(question1.c_str()) ;
 		cancel = false ;
 
@@ -181,19 +202,17 @@ int main(int argc, char* argv[])
 
 		while(keepRunning)
 		{
-			webui_pass1 = RsUtil::rs_getpass(
-			            "\033[0;32m" "Please register a password for the web interface:" "\033[0m" );
-			webui_pass2 = RsUtil::rs_getpass(
-			            "\033[0;32m" "Please enter the same password again            :" "\033[0m" );
+            webui_pass1 = RsUtil::rs_getpass( colored(COLOR_GREEN,"Please register a password for the web interface: "));
+            webui_pass2 = RsUtil::rs_getpass( colored(COLOR_GREEN,"Please enter the same password again            : "));
 
 			if(webui_pass1 != webui_pass2)
 			{
-				std::cout << "\033[1;31m" "Passwords do not match!" "\033[0m" << std::endl;
+                std::cout << colored(COLOR_RED,"Passwords do not match!") << std::endl;
 				continue;
 			}
 			if(webui_pass1.empty())
 			{
-				std::cout << "\033[1;31m" "Password cannot be empty!" "\033[0m" << std::endl;
+                std::cout << colored(COLOR_RED,"Password cannot be empty!") << std::endl;
 				continue;
 			}
 
@@ -223,28 +242,26 @@ int main(int argc, char* argv[])
 
             if(locations.size() == 0)
             {
-                RsErr() << "\033[1;31m" "No available accounts. You cannot use option -U list" "\033[0m" << std::endl;
+                RsErr() << colored(COLOR_RED,"No available accounts. You cannot use option -U list") << std::endl;
                 return -RsInit::ERR_NO_AVAILABLE_ACCOUNT;
             }
 
             std::cout << std::endl << std::endl
-                      << "\033[0;32m" "Available accounts:" "\033[0m" << std::endl;
+                      << colored(COLOR_GREEN,"Available accounts:") << std::endl;
 
             int accountCountDigits = static_cast<int>( ceil(log(locations.size())/log(10.0)) );
 
 			for( uint32_t i=0; i<locations.size(); ++i )
-				std::cout << "\033[0;32m" "[" << std::setw(accountCountDigits)
-				          << std::setfill('0') << i+1 << "] " "\033[0m" "\033[33m"
-				          << locations[i].mLocationId << "\033[0m" "\033[0;36m" " ("
-				          << locations[i].mPgpId << "): " "\033[0m" "\033[0;35m"
-				          << locations[i].mPgpName
-				          << " (" << locations[i].mLocationName << ")" "\033[0m"
+                std::cout << colored(COLOR_GREEN,"[" + RsUtil::NumberToString(i+1,false,'0',accountCountDigits)+"]") << " "
+                          << colored(COLOR_YELLOW,locations[i].mLocationId.toStdString())<< " "
+                          << colored(COLOR_BLUE,"(" + locations[i].mPgpId.toStdString()+ "): ")
+                          << colored(COLOR_PURPLE,locations[i].mPgpName + " (" + locations[i].mLocationName + ")" )
 				          << std::endl;
 
 			uint32_t nacc = 0;
 			while(keepRunning && (nacc < 1 || nacc >= locations.size()))
 			{
-				std::cout << "\033[0;32m" "Please enter account number:\n" "\033[0m";
+                std::cout << colored(COLOR_GREEN,"Please enter account number:\n");
 				std::cout.flush();
 
 				std::string inputStr;
@@ -264,7 +281,7 @@ int main(int argc, char* argv[])
 		RsPeerId ssl_id(prefUserString);
 		if(ssl_id.isNull())
 		{
-			RsErr() << "\033[1;31m" "Invalid User location id: a hexadecimal ID is expected." "\033[0m"
+            RsErr() << colored(COLOR_RED,"Invalid User location id: a hexadecimal ID is expected.")
 			        << std::endl;
 			return -EINVAL;
 		}
@@ -299,7 +316,7 @@ int main(int argc, char* argv[])
         if(RsAccounts::isTorAuto())
         {
 
-            std::cerr << "\033[0;32" "(II) Hidden service is ready:" "\033[0m" << std::endl;
+            std::cerr << colored(COLOR_GREEN,"(II) Hidden service is ready:") << std::endl;
 
             std::string service_id ;
             std::string onion_address ;
@@ -312,13 +329,13 @@ int main(int argc, char* argv[])
             RsTor::getHiddenServiceInfo(service_id,onion_address,service_port,service_target_address,service_target_port);
             RsTor::getProxyServerInfo(proxy_server_address,proxy_server_port) ;
 
-            std::cerr << "\033[0;32" "  onion address  : " "\033[0m" << onion_address << std::endl;
-            std::cerr << "\033[0;32" "  service_id     : " "\033[0m" << service_id << std::endl;
-            std::cerr << "\033[0;32" "  service port   : " "\033[0m" << service_port << std::endl;
-            std::cerr << "\033[0;32" "  target port    : " "\033[0m" << service_target_port << std::endl;
-            std::cerr << "\033[0;32" "  target address : " "\033[0m" << service_target_address << std::endl;
+            std::cerr << colored(COLOR_GREEN,"  onion address  : ") << onion_address << std::endl;
+            std::cerr << colored(COLOR_GREEN,"  service_id     : ") << service_id << std::endl;
+            std::cerr << colored(COLOR_GREEN,"  service port   : ") << service_port << std::endl;
+            std::cerr << colored(COLOR_GREEN,"  target port    : ") << service_target_port << std::endl;
+            std::cerr << colored(COLOR_GREEN,"  target address : ") << service_target_address << std::endl;
 
-            std::cerr << "\033[0;32" "Setting proxy server to " "\033[0m" << service_target_address << ":" << service_target_port << std::endl;
+            std::cerr << colored(COLOR_GREEN,"Setting proxy server to ") << service_target_address << ":" << service_target_port << std::endl;
 
             rsPeers->setLocalAddress(rsPeers->getOwnId(), service_target_address, service_target_port);
             rsPeers->setHiddenNode(rsPeers->getOwnId(), onion_address, service_port);

From 62513a0d23e683bc209ca12b17ea7e0ba9e9f6e9 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 1 Nov 2023 22:08:51 +0100
Subject: [PATCH 379/503] made initialization of webui as early as possible to
 avoir the need to restart jsonapi

---
 retroshare-service/src/retroshare-service.cc | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index c68a1b80a..dc543549d 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -219,12 +219,23 @@ int main(int argc, char* argv[])
 			break;
 		}
 	}
+#ifdef RS_SERVICE_TERMINAL_WEBUI_PASSWORD
+    if(!webui_pass1.empty())
+    {
+        rsWebUi->setHtmlFilesDirectory(webui_base_directory);
+        conf.webUIPasswd = webui_pass1;	// cannot be set using rsWebUI methods because it calls the still non-existent rsJsonApi
+        conf.enableWebUI = true;
+
+        // JsonApi is started below in InitRetroShare(). Not calling restart here avoids multiple restart.
+    }
+#endif
 #endif /* defined(RS_JSONAPI) && defined(RS_WEBUI)
 	&& defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD) */
 
 	conf.main_executable_path = argv[0];
 
 	int initResult = RsInit::InitRetroShare(conf);
+
 	if(initResult != RS_INIT_OK)
 	{
 		RsFatal() << "Retroshare core initalization failed with: " << initResult
@@ -344,15 +355,6 @@ int main(int argc, char* argv[])
 	}
 #endif // def RS_SERVICE_TERMINAL_LOGIN
 
-#if (defined(RS_JSONAPI) && defined(RS_WEBUI)) && defined(RS_SERVICE_TERMINAL_WEBUI_PASSWORD)
-	if(rsJsonApi && !webui_pass1.empty())
-	{
-		rsWebUi->setHtmlFilesDirectory(webui_base_directory);
-		rsWebUi->setUserPassword(webui_pass1);
-		rsWebUi->restart();
-	}
-#endif
-
 	rsControl->setShutdownCallback([&](int){keepRunning = false;});
 
 	while(keepRunning)

From 53313670f53dfa0a193f87c082b24ee23c2c8403 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 4 Nov 2023 23:41:49 +0100
Subject: [PATCH 380/503] cleaning up webui/jsonapi interaction code

---
 retroshare-gui/src/gui/settings/WebuiPage.cpp |  2 ++
 retroshare-gui/src/main.cpp                   | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp
index d7ff0b894..a14cc022d 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.cpp
+++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp
@@ -142,6 +142,8 @@ void WebuiPage::loadParams()
 
     if(it != smap.end())
 		whileBlocking(ui.password_LE)->setText(QString::fromStdString(it->second));
+    else
+        whileBlocking(ui.enableWebUI_CB)->setChecked(false);
 
     if(rsWebUi->isRunning())
         ui.statusLabelLED->setPixmap(FilesDefs::getPixmapFromQtResourcePath(IMAGE_LEDON)) ;
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index e33fe795d..ff091ccf9 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -22,6 +22,7 @@
 
 #include "util/stacktrace.h"
 #include "util/argstream.h"
+#include "retroshare/rswebui.h"
 
 CrashStackTrace gCrashStackTrace;
 
@@ -380,7 +381,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 		return 1;
 	}
 
-	/* recreate global settings object, now with correct path */
+    /* recreate global settings object, now with correct path, specific to the selected node */
 	RshareSettings::Create(true);
 	Rshare::resetLanguageAndStyle();
 
@@ -571,13 +572,18 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 
 	notify->enable() ;	// enable notification system after GUI creation, to avoid data races in Qt.
 
-#ifdef RS_JSONAPI
-	JsonApiPage::checkStartJsonApi();
+    // Read webui params in settings. We cannot save them to some webui.cfg because cfg needs the node id and
+    // jsonapi is started before node ID selection in retroshare-service.
 
+#ifdef RS_JSONAPI
 #ifdef RS_WEBUI
-    WebuiPage::checkStartWebui();	// normally we should rather save the UI flags internally to p3webui
+    conf.enableWebUI = Settings->getWebinterfaceEnabled();
+
+    if(!Settings->getWebinterfaceFilesDirectory().isNull())
+        rsWebUi->setHtmlFilesDirectory(Settings->getWebinterfaceFilesDirectory().toStdString());
+#endif
+    RsInit::startupWebServices(conf);
 #endif
-#endif // RS_JSONAPI
 
 	/* dive into the endless loop */
 	int ti = rshare.exec();

From a64fda1fb813fb2a83180b88869ff6eb2bfcf6a8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 5 Nov 2023 16:10:42 +0100
Subject: [PATCH 381/503] improved user commandline webui startup user
 experience

---
 retroshare-gui/src/gui/settings/JsonApiPage.cc | 13 +++++++++++--
 retroshare-service/src/retroshare-service.cc   | 12 +++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc
index 67e5f22b8..fee064093 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.cc
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc
@@ -64,9 +64,18 @@ JsonApiPage::JsonApiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
 
     mEventHandlerId = 0;
 
-    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> /* event */)
+    rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e)
     {
-        std::cerr << "Caught JSONAPI event!" << std::endl;
+        if(e->mType != RsEventType::JSON_API)
+            return;
+
+        auto je = dynamic_cast<const RsJsonApiEvent*>(e.get());
+
+        if(!je)
+            return;
+
+        std::cerr << "Caught JSONAPI event! code=" << static_cast<int>(je->mJsonApiEventCode) << std::endl;
+
         RsQThreadUtils::postToObject([=]() { load(); }, this );
     },
     mEventHandlerId, RsEventType::JSON_API );
diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index dc543549d..010b644e3 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -220,7 +220,7 @@ int main(int argc, char* argv[])
 		}
 	}
 #ifdef RS_SERVICE_TERMINAL_WEBUI_PASSWORD
-    if(!webui_pass1.empty())
+    if(askWebUiPassword && !webui_pass1.empty())
     {
         rsWebUi->setHtmlFilesDirectory(webui_base_directory);
         conf.webUIPasswd = webui_pass1;	// cannot be set using rsWebUI methods because it calls the still non-existent rsJsonApi
@@ -236,6 +236,11 @@ int main(int argc, char* argv[])
 
 	int initResult = RsInit::InitRetroShare(conf);
 
+#ifdef RS_JSONAPI
+    RsInit::startupWebServices(conf);
+    rstime::rs_usleep(1000000); // waits for jas->restart to print stuff
+#endif
+
 	if(initResult != RS_INIT_OK)
 	{
 		RsFatal() << "Retroshare core initalization failed with: " << initResult
@@ -269,10 +274,11 @@ int main(int argc, char* argv[])
                           << colored(COLOR_PURPLE,locations[i].mPgpName + " (" + locations[i].mLocationName + ")" )
 				          << std::endl;
 
-			uint32_t nacc = 0;
+            std::cout << std::endl;
+            uint32_t nacc = 0;
 			while(keepRunning && (nacc < 1 || nacc >= locations.size()))
 			{
-                std::cout << colored(COLOR_GREEN,"Please enter account number:\n");
+                std::cout << colored(COLOR_GREEN,"Please enter account number: ");
 				std::cout.flush();
 
 				std::string inputStr;

From befc4736248b817ee86fd71ec78e7d267d33f5a1 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 15 Oct 2023 03:32:26 +0200
Subject: [PATCH 382/503] Fixed download of tor in Windows native build

---
 build_scripts/Windows/env/tools/prepare-tools.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/Windows/env/tools/prepare-tools.bat b/build_scripts/Windows/env/tools/prepare-tools.bat
index c2c1e1bdd..189ac73cd 100644
--- a/build_scripts/Windows/env/tools/prepare-tools.bat
+++ b/build_scripts/Windows/env/tools/prepare-tools.bat
@@ -176,7 +176,7 @@ mkdir "%EnvTempPath%"
 call "%ToolsPath%\download-file.bat" "%TorDownloadIndexUrl%" "%EnvTempPath%\index.html"
 if not exist "%EnvTempPath%\index.html" %cecho% error "Cannot download Tor installation" & goto error
 
-for /F "tokens=1,2 delims= " %%A in ('%EnvSedExe% -r -n -e"s/.*href=\"^(.*^)^(tor-.*windows-i686\.tar\.gz^)\".*/\2 \1\2/p" "%EnvTempPath%\index.html"') do set TorInstall=%%A& set TorDownloadUrl=%%B
+for /F "tokens=1,2 delims= " %%A in ('%EnvSedExe% -r -n -e"s/.*href=\"^(.*^)^(tor-.*windows-i686.*\.tar\.gz^)\".*/\2 \1\2/p" "%EnvTempPath%\index.html"') do set TorInstall=%%A& set TorDownloadUrl=%%B
 call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 if "%TorInstall%"=="" %cecho% error "Cannot download Tor installation" & goto error
 if "%TorDownloadUrl%"=="" %cecho% error "Cannot download Tor installation" & goto error

From cd81d69357b0d6e4ba4de32fc636144de68413e9 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 6 Nov 2023 20:40:46 +0100
Subject: [PATCH 383/503] Removed not needed files of tor from Windows
 installer

---
 build_scripts/Windows/installer/retroshare-Qt5.nsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi
index 3a7fbf37f..63c81bbcc 100644
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@@ -318,7 +318,7 @@ SectionEnd
 !ifdef TOR_EXISTS
   Section /o $(Section_Tor) Section_Tor
     SetOutPath "$INSTDIR\tor"
-    File /r "${TORDIR}\*"
+    File "${TORDIR}\*"
   SectionEnd
 !endif
 

From eb7e2ec8e64258b64389521fb7f5400b871fe0ac Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 6 Nov 2023 23:00:06 +0100
Subject: [PATCH 384/503] Enabled ANSI color support in Windows console for
 retroshare-service

---
 retroshare-service/src/retroshare-service.cc | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index dc543549d..f73630f5b 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -111,6 +111,33 @@ int main(int argc, char* argv[])
 	signal(SIGBREAK, signalHandler);
 #endif // ifdef SIGBREAK
 
+#ifdef WINDOWS_SYS
+	// Enable ANSI color support in Windows console
+	{
+#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
+#endif
+
+		HANDLE hStdin = GetStdHandle(STD_OUTPUT_HANDLE);
+		if (hStdin) {
+			DWORD consoleMode;
+			if (GetConsoleMode(hStdin, &consoleMode)) {
+				if ((consoleMode & ENABLE_VIRTUAL_TERMINAL_PROCESSING) == 0) {
+					if (SetConsoleMode(hStdin, consoleMode | ENABLE_VIRTUAL_TERMINAL_PROCESSING)) {
+						std::cout << "Enabled ANSI color support in console" << std::endl;
+					} else {
+						RsErr() << "Error getting console mode" << std::endl;
+					}
+				}
+			} else {
+				RsErr() << "Error getting console mode" << std::endl;
+			}
+		} else {
+			RsErr() << "Error getting stdin handle" << std::endl;
+		}
+	}
+#endif
+
 	RsInfo() << "\n" <<
 	    "+================================================================+\n"
 	    "|     o---o                                             o        |\n"

From 97fe92d1e7396087b73707886aec201fb999a437 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 7 Nov 2023 14:05:39 +0100
Subject: [PATCH 385/503] updated master branch of Retroshare/ to latest
 commits in master branches of OBS and libretroshare

---
 build_scripts/OBS | 2 +-
 libretroshare     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index 1de347e99..353596b0e 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 1de347e993ed1147bb84cdaf6c0604ff220eb221
+Subproject commit 353596b0ee5ea76611eb663b90bf3ab1c9f34ad7
diff --git a/libretroshare b/libretroshare
index 3bb5a2b28..c2b26f2c9 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 3bb5a2b282949bc170dcff6141424cb095e4bb7b
+Subproject commit c2b26f2c97151d526b5a94baa321110bbcfde8ca

From bc125a75bff848fc0c7a8f08b165b0cbeb965cdb Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Fri, 10 Nov 2023 20:44:48 +0100
Subject: [PATCH 386/503] Fixed download of msys2 during Windows build

---
 .../Windows-msys2/env/tools/prepare-msys2.bat | 28 ++++++++++---------
 .../Windows-msys2/env/tools/prepare-tools.bat |  2 +-
 .../env/tools/root/update-msys2.bat           | 11 ++------
 build_scripts/Windows/env/env-msys2.bat       |  3 +-
 .../Windows/env/tools/prepare-msys2.bat       | 25 ++++++++---------
 .../Windows/env/tools/prepare-tools.bat       | 18 ++++++------
 6 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
index d07c7a058..eaeba1482 100644
--- a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
@@ -16,7 +16,13 @@ if "%~1"=="clean" (
 	goto exit
 )
 
-if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
+set MSYS2Version=20231026
+
+set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
+set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
+set MSYS2UnpackPath=%EnvMSYS2Path%\msys64
+
+if exist "%MSYS2UnpackPath%\usr\bin\pacman.exe" (
 	if "%~1"=="reinstall" (
 		choice /M "Found existing MSYS2 version. Do you want to proceed?"
 		if !ERRORLEVEL!==2 goto exit
@@ -25,30 +31,26 @@ if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
 	)
 )
 
-if "%MSYS2Architecture%"=="i686" set MSYS2Version=20210705
-if "%MSYS2Architecture%"=="x86_64" set MSYS2Version=20210725
+if exist "%MSYS2UnpackPath%" (
+	%cecho% info "Remove previous MSYS2 version"
+	call "%ToolsPath%\remove-dir.bat" "%MSYS2UnpackPath%"
+)
 
-set MSYS2Install=msys2-base-%MSYS2Architecture%-%MSYS2Version%.tar.xz
-set MSYS2Url=https://repo.msys2.org/distrib/%MSYS2Architecture%/%MSYS2Install%
-
-%cecho% info "Remove previous MSYS2 version"
-call "%ToolsPath%\remove-dir.bat" "%EnvMSYS2Path%"
-
-%cecho% info "Download installation files"
+%cecho% info "Download MSYS2 installation files"
 if not exist "%EnvDownloadPath%\%MSYS2Install%" call "%ToolsPath%\download-file.bat" "%MSYS2Url%" "%EnvDownloadPath%\%MSYS2Install%"
 if not exist "%EnvDownloadPath%\%MSYS2Install%" %cecho% error "Cannot download MSYS" & goto error
 
 %cecho% info "Unpack MSYS2"
-"%EnvSevenZipExe%" x -so "%EnvDownloadPath%\%MSYS2Install%" | "%EnvSevenZipExe%" x -y -si -ttar -o"%EnvMSYS2Path%"
+"%EnvDownloadPath%\%MSYS2Install%" -y -o"%EnvMSYS2Path%"
 
-set MSYS2SH=%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\sh
+set MSYS2SH=%MSYS2UnpackPath%\usr\bin\sh
 
 %cecho% info "Initialize MSYS2"
 "%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
 "%MSYS2SH%" -lc "pacman --noconfirm -Sy"
 "%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-call "%EnvMSYS2Path%\msys%MSYS2Base%\autorebase.bat"
+call "%MSYS2UnpackPath%\autorebase.bat"
 
 :exit
 endlocal
diff --git a/build_scripts/Windows-msys2/env/tools/prepare-tools.bat b/build_scripts/Windows-msys2/env/tools/prepare-tools.bat
index c6b14a787..66f5f9120 100644
--- a/build_scripts/Windows-msys2/env/tools/prepare-tools.bat
+++ b/build_scripts/Windows-msys2/env/tools/prepare-tools.bat
@@ -34,7 +34,7 @@ if not exist "%EnvToolsPath%\cecho.exe" (
 	if not exist "%EnvDownloadPath%\%cCEhoInstall%" echo Cannot download cecho installation& goto error
 
 	echo Unpack cecho
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%" -y -bso0
 	copy "%EnvTempPath%\cecho.exe" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
diff --git a/build_scripts/Windows-msys2/env/tools/root/update-msys2.bat b/build_scripts/Windows-msys2/env/tools/root/update-msys2.bat
index a3d2398cd..ddd5bdd0f 100644
--- a/build_scripts/Windows-msys2/env/tools/root/update-msys2.bat
+++ b/build_scripts/Windows-msys2/env/tools/root/update-msys2.bat
@@ -2,18 +2,13 @@
 
 setlocal
 
-if exist "%~dp0msys2\msys32" call :update 32
-if exist "%~dp0msys2\msys64" call :update 64
+if not exist "%~dp0msys2\msys64" goto :EOF
 
-goto :EOF
+set MSYS2SH=%~dp0msys2\msys64\usr\bin\sh
 
-:update
-set MSYS2SH=%~dp0msys2\msys%~1\usr\bin\sh
-
-echo Update MSYS2 %~1
+echo Update MSYS2
 "%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
 "%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-:exit
 endlocal
 goto :EOF
diff --git a/build_scripts/Windows/env/env-msys2.bat b/build_scripts/Windows/env/env-msys2.bat
index fee7e46b9..47dd8d96a 100644
--- a/build_scripts/Windows/env/env-msys2.bat
+++ b/build_scripts/Windows/env/env-msys2.bat
@@ -22,11 +22,12 @@ if "%GCCArchitecture%"=="x64" (
 )
 
 set EnvMSYS2Path=%EnvRootPath%\msys2
+set EnvMSYS2BasePath=%EnvMSYS2Path%\msys64
 
 call "%~dp0tools\prepare-msys2.bat" %1
 if errorlevel 1 exit /B %ERRORLEVEL%
 
-set EnvMSYS2SH=%EnvMSYS2Path%\msys64\usr\bin\sh.exe
+set EnvMSYS2SH=%EnvMSYS2BasePath%\usr\bin\sh.exe
 if not exist "%EnvMSYS2SH%" if errorlevel 1 goto error_env
 
 set EnvMSYS2Cmd="%EnvMSYS2SH%" -lc
diff --git a/build_scripts/Windows/env/tools/prepare-msys2.bat b/build_scripts/Windows/env/tools/prepare-msys2.bat
index 17fe6c36e..25f00ac30 100644
--- a/build_scripts/Windows/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows/env/tools/prepare-msys2.bat
@@ -16,15 +16,15 @@ if "%~1"=="clean" (
 	goto exit
 )
 
-set MSYS2Version=20230318
+set MSYS2Version=20231026
 
 set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
 set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
+set MSYS2UnpackPath=%EnvMSYS2Path%\msys64
 set CMakeInstall=cmake-3.19.0-win32-x86.zip
 set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
-set CMakeUnpackPath=%EnvMSYS2Path%\msys64
 
-if exist "%CMakeUnpackPath%\usr\bin\pacman.exe" (
+if exist "%MSYS2UnpackPath%\usr\bin\pacman.exe" (
 	if "%~1"=="reinstall" (
 		choice /M "Found existing MSYS2 version. Do you want to proceed?"
 		if !ERRORLEVEL!==2 goto exit
@@ -33,13 +33,12 @@ if exist "%CMakeUnpackPath%\usr\bin\pacman.exe" (
 	)
 )
 
-
-if exist "%CMakeUnpackPath%" (
+if exist "%MSYS2UnpackPath%" (
 	%cecho% info "Remove previous MSYS2 version"
-	call "%ToolsPath%\remove-dir.bat" "%CMakeUnpackPath%"
+	call "%ToolsPath%\remove-dir.bat" "%MSYS2UnpackPath%"
 )
 
-%cecho% info "Download installation files"
+%cecho% info "Download MSYS2 installation files"
 if not exist "%EnvDownloadPath%\%MSYS2Install%" call "%ToolsPath%\download-file.bat" "%MSYS2Url%" "%EnvDownloadPath%\%MSYS2Install%"
 if not exist "%EnvDownloadPath%\%MSYS2Install%" %cecho% error "Cannot download MSYS" & goto error
 
@@ -50,29 +49,29 @@ if not exist "%EnvDownloadPath%\%CMakeInstall%" %cecho% error "Cannot download C
 "%EnvDownloadPath%\%MSYS2Install%" -y -o"%EnvMSYS2Path%"
 
 %cecho% info "Unpack CMake"
-"%EnvSevenZipExe%" x -o"%CMakeUnpackPath%" "%EnvDownloadPath%\%CMakeInstall%"
+"%EnvSevenZipExe%" x -o"%MSYS2UnpackPath%" "%EnvDownloadPath%\%CMakeInstall%" -y -bso0
 
 %cecho% info "Install CMake"
 set CMakeVersion=
-for /D %%F in (%CMakeUnpackPath%\cmake*) do set CMakeVersion=%%~nxF
+for /D %%F in (%MSYS2UnpackPath%\cmake*) do set CMakeVersion=%%~nxF
 if "%CMakeVersion%"=="" %cecho% error "CMake version not found." & goto :exit
 %cecho% info "Found CMake version %CMakeVersion%"
 
 set FoundProfile=
-for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%CMakeUnpackPath%\etc\profile"') do set FoundProfile=%%F
+for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%MSYS2UnpackPath%\etc\profile"') do set FoundProfile=%%F
 
 if "%FoundProfile%"=="0" (
-	echo export PATH="${PATH}:/%CMakeVersion%/bin">>"%CMakeUnpackPath%\etc\profile"
+	echo export PATH="${PATH}:/%CMakeVersion%/bin">>"%MSYS2UnpackPath%\etc\profile"
 )
 
-set MSYS2SH=%CMakeUnpackPath%\usr\bin\sh
+set MSYS2SH=%MSYS2UnpackPath%\usr\bin\sh
 
 %cecho% info "Initialize MSYS2"
 "%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
 "%MSYS2SH%" -lc "pacman --noconfirm -Sy"
 "%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-call "%CMakeUnpackPath%\autorebase.bat"
+call "%MSYS2UnpackPath%\autorebase.bat"
 
 :exit
 endlocal
diff --git a/build_scripts/Windows/env/tools/prepare-tools.bat b/build_scripts/Windows/env/tools/prepare-tools.bat
index 189ac73cd..88549faed 100644
--- a/build_scripts/Windows/env/tools/prepare-tools.bat
+++ b/build_scripts/Windows/env/tools/prepare-tools.bat
@@ -53,7 +53,7 @@ if not exist "%EnvToolsPath%\cecho.exe" (
 	if not exist "%EnvDownloadPath%\%cCEhoInstall%" echo Cannot download cecho installation& goto error
 
 	echo Unpack cecho
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%" -y -bso0
 	copy "%EnvTempPath%\cecho.exe" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
@@ -69,7 +69,7 @@ if not exist "%EnvToolsPath%\depends.exe" (
 	if not exist "%EnvDownloadPath%\%DependsInstall%" %cecho% error "Cannot download Dependendy Walker installation" & goto error
 
 	%cecho% info "Unpack Dependency Walker"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%DependsInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%DependsInstall%" -y -bso0
 	copy "%EnvTempPath%\*" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
@@ -85,7 +85,7 @@ if not exist "%EnvToolsPath%\cut.exe" (
 	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error "Cannot download Unix Tools installation" & goto error
 
 	%cecho% info "Unpack Unix Tools"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%" -y -bso0
 	copy "%EnvTempPath%\cut.exe" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
@@ -101,7 +101,7 @@ if not exist "%EnvToolsPath%\sed.exe" (
 	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error "Cannot download Unix Tools installation" & goto error
 
 	%cecho% info "Unpack Unix Tools"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%" -y -bso0
 	copy "%EnvTempPath%\sed.exe" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
@@ -121,7 +121,7 @@ if not exist "%NSISInstallPath%\nsis.exe" (
 	if not exist "%EnvDownloadPath%\%NSISInstall%" %cecho% error "Cannot download NSIS installation" & goto error
 
 	%cecho% info "Unpack NSIS"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%NSISInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%NSISInstall%" -y -bso0
 	if not exist "%NSISInstallPath%" mkdir "%NSISInstallPath%"
 	xcopy /s "%EnvTempPath%" "%NSISInstallPath%"
 
@@ -135,7 +135,7 @@ if not exist "%MinGitInstallPath%\cmd\git.exe" (
 	if not exist "%EnvDownloadPath%\%MinGitInstall%" %cecho% error "Cannot download MinGit installation" & goto error
 
 	%cecho% info "Unpack MinGit"
-	"%EnvSevenZipExe%" x -o"%MinGitInstallPath%" "%EnvDownloadPath%\%MinGitInstall%"
+	"%EnvSevenZipExe%" x -o"%MinGitInstallPath%" "%EnvDownloadPath%\%MinGitInstall%" -y -bso0
 )
 
 if not exist "%EnvDownloadPath%\%DoxygenInstall%" call "%ToolsPath%\remove-dir.bat" "%DoxygenInstallPath%"
@@ -148,7 +148,7 @@ if not exist "%DoxygenInstallPath%\doxygen.exe" (
 	if not exist "%EnvDownloadPath%\%DoxygenInstall%" %cecho% error "Cannot download doxygen installation" & goto error
 
 	%cecho% info "Unpack Doxygen"
-	"%EnvSevenZipExe%" x -o"%DoxygenInstallPath%" "%EnvDownloadPath%\%DoxygenInstall%"
+	"%EnvSevenZipExe%" x -o"%DoxygenInstallPath%" "%EnvDownloadPath%\%DoxygenInstall%" -y -bso0
 )
 
 if not exist "%EnvDownloadPath%\%CMakeInstall%" call "%ToolsPath%\remove-dir.bat" "%CMakeInstallPath%"
@@ -163,7 +163,7 @@ if not exist "%CMakeInstallPath%\bin\cmake.exe" (
 	if not exist "%EnvDownloadPath%\%CMakeInstall%" %cecho% error "Cannot download CMake installation" & goto error
 
 	%cecho% info "Unpack CMake"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CMakeInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CMakeInstall%" -y -bso0
 
 	move "%EnvTempPath%\%CMakeVersion%" "%CMakeInstallPath%"
 
@@ -189,7 +189,7 @@ if not exist "%EnvTorPath%\Tor\tor.exe" (
 	if not exist "%EnvDownloadPath%\%TorInstall%" %cecho% error "Cannot download Tor installation" & goto error
 
 	%cecho% info "Unpack Tor"
-	"%EnvSevenZipExe%" x -so "%EnvDownloadPath%\%TorInstall%" | "%EnvSevenZipExe%" x -si -ttar -o"%EnvTorPath%" 
+	"%EnvSevenZipExe%" x -so "%EnvDownloadPath%\%TorInstall%" | "%EnvSevenZipExe%" x -si -ttar -o"%EnvTorPath%" -y -bso0
 )
 
 :exit

From 2c8e7d2a51b26a8ca904200a864d1aaf0a18510e Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Fri, 10 Nov 2023 20:46:08 +0100
Subject: [PATCH 387/503] Updated OpenSSL to 1.1.1w in Windows native build

---
 build_scripts/Windows/build-libs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/Windows/build-libs/Makefile b/build_scripts/Windows/build-libs/Makefile
index b7efeaa37..0075770cd 100644
--- a/build_scripts/Windows/build-libs/Makefile
+++ b/build_scripts/Windows/build-libs/Makefile
@@ -1,7 +1,7 @@
 ZLIB_VERSION=1.2.11
 BZIP2_VERSION=1.0.8
 MINIUPNPC_VERSION=2.2.3
-OPENSSL_VERSION=1.1.1p
+OPENSSL_VERSION=1.1.1w
 SPEEX_VERSION=1.2.0
 SPEEXDSP_VERSION=1.2.0
 LIBXML2_VERSION=2.9.12

From 48da2d195a725987b74d93bf9d630fab3e1edf8b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 10 Nov 2023 22:42:32 +0100
Subject: [PATCH 388/503] removed some debug output

---
 retroshare-gui/src/gui/GenCertDialog.cpp        | 4 +++-
 retroshare-gui/src/gui/common/NewFriendList.cpp | 2 ++
 retroshare-gui/src/gui/settings/JsonApiPage.cc  | 3 ++-
 retroshare-gui/src/gui/settings/WebuiPage.cpp   | 6 +++++-
 retroshare-gui/src/main.cpp                     | 5 +++--
 retroshare-gui/src/rshare.cpp                   | 7 ++++++-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index b71e324c7..d3b755f0d 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -609,7 +609,9 @@ void GenCertDialog::genPerson()
 
 		QCoreApplication::processEvents();
 		QAbstractEventDispatcher* ed = QAbstractEventDispatcher::instance();
-		std::cout << "Waiting ed->processEvents()" << std::endl;
+#ifdef DEBUG_GENCERTDIALOG
+        std::cout << "Waiting ed->processEvents()" << std::endl;
+#endif
 		time_t waitEnd = time(NULL) + 10;//Wait no more than 10 sec to processEvents
 		if (ed->hasPendingEvents())
 			while(ed->processEvents(QEventLoop::AllEvents) && (time(NULL) < waitEnd));
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 893433469..bd6faec41 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -1619,7 +1619,9 @@ bool NewFriendList::isColumnVisible(int col) const
 }
 void NewFriendList::setColumnVisible(int col,bool visible)
 {
+#ifdef DEBUG_NEW_FRIEND_LIST
     std::cerr << "Setting column " << col << " to be visible: " << visible << std::endl;
+#endif
     ui->peerTreeWidget->setColumnHidden(col, !visible);
 }
 void NewFriendList::toggleColumnVisible()
diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc
index fee064093..2b7f25d80 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.cc
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc
@@ -73,8 +73,9 @@ JsonApiPage::JsonApiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
 
         if(!je)
             return;
-
+#ifdef DEBUG
         std::cerr << "Caught JSONAPI event! code=" << static_cast<int>(je->mJsonApiEventCode) << std::endl;
+#endif
 
         RsQThreadUtils::postToObject([=]() { load(); }, this );
     },
diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp
index a14cc022d..4b36b758c 100644
--- a/retroshare-gui/src/gui/settings/WebuiPage.cpp
+++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp
@@ -58,7 +58,9 @@ WebuiPage::WebuiPage(QWidget */*parent*/, Qt::WindowFlags /*flags*/)
 
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> /* event */)
     {
+#ifdef DEBUG
         std::cerr << "Caught JSONAPI event in webui!" << std::endl;
+#endif
         RsQThreadUtils::postToObject([=]() { load(); }, this );
     },
     mEventsHandlerId, RsEventType::JSON_API );
@@ -132,7 +134,9 @@ bool WebuiPage::restart()
 
 void WebuiPage::loadParams()
 {
-	std::cerr << "WebuiPage::load()" << std::endl;
+#ifdef DEBUG
+    std::cerr << "WebuiPage::load()" << std::endl;
+#endif
 	whileBlocking(ui.enableWebUI_CB)->setChecked(Settings->getWebinterfaceEnabled());
 	whileBlocking(ui.webInterfaceFiles_LE)->setText(Settings->getWebinterfaceFilesDirectory());
 
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index ff091ccf9..13710a28b 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -538,8 +538,9 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 	//
 
 	qRegisterMetaType<RsPeerId>("RsPeerId") ;
-
+#ifdef DEBUG
 	std::cerr << "connecting signals and slots" << std::endl ;
+#endif
 	QObject::connect(notify,SIGNAL(deferredSignatureHandlingRequested()),notify,SLOT(handleSignatureEvent()),Qt::QueuedConnection) ;
 	QObject::connect(notify,SIGNAL(chatLobbyTimeShift(int)),notify,SLOT(handleChatLobbyTimeShift(int)),Qt::QueuedConnection) ;
 	QObject::connect(notify,SIGNAL(diskFull(int,int))						,w                   		,SLOT(displayDiskSpaceWarning(int,int))) ;
@@ -582,7 +583,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     if(!Settings->getWebinterfaceFilesDirectory().isNull())
         rsWebUi->setHtmlFilesDirectory(Settings->getWebinterfaceFilesDirectory().toStdString());
 #endif
-    RsInit::startupWebServices(conf);
+    RsInit::startupWebServices(conf,false);
 #endif
 
 	/* dive into the endless loop */
diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index 8fb8fdc58..e5f450f57 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -139,17 +139,22 @@ static bool notifyRunningInstance()
     // that a new process had been started
     QLocalSocket localSocket;
     localSocket.connectToServer(QString(TARGET));
-
+#ifdef DEBUG
     std::cerr << "Rshare::Rshare waitForConnected to other instance." << std::endl;
+#endif
     if( localSocket.waitForConnected(100) )
     {
+#ifdef DEBUG
       std::cerr << "Rshare::Rshare Connection etablished. Waiting for disconnection." << std::endl;
+#endif
       localSocket.waitForDisconnected(1000);
       return true;
     }
     else
     {
+#ifdef DEBUG
         std::cerr << "Rshare::Rshare failed to connect to other instance." << std::endl;
+#endif
         return false;
     }
 }

From 9db3208f7219d57fa75ec4b0dcdbb69d0bff9a38 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 11 Nov 2023 23:49:55 +0100
Subject: [PATCH 389/503] improved colored output on login

---
 retroshare-service/src/retroshare-service.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/retroshare-service/src/retroshare-service.cc b/retroshare-service/src/retroshare-service.cc
index 010b644e3..8102686f0 100644
--- a/retroshare-service/src/retroshare-service.cc
+++ b/retroshare-service/src/retroshare-service.cc
@@ -237,7 +237,7 @@ int main(int argc, char* argv[])
 	int initResult = RsInit::InitRetroShare(conf);
 
 #ifdef RS_JSONAPI
-    RsInit::startupWebServices(conf);
+    RsInit::startupWebServices(conf,true);
     rstime::rs_usleep(1000000); // waits for jas->restart to print stuff
 #endif
 
@@ -263,12 +263,12 @@ int main(int argc, char* argv[])
             }
 
             std::cout << std::endl << std::endl
-                      << colored(COLOR_GREEN,"Available accounts:") << std::endl;
+                      << colored(COLOR_GREEN,"Available accounts:") << std::endl<<std::endl;
 
             int accountCountDigits = static_cast<int>( ceil(log(locations.size())/log(10.0)) );
 
 			for( uint32_t i=0; i<locations.size(); ++i )
-                std::cout << colored(COLOR_GREEN,"[" + RsUtil::NumberToString(i+1,false,'0',accountCountDigits)+"]") << " "
+                std::cout << colored(COLOR_GREEN,"  [" + RsUtil::NumberToString(i+1,false,'0',accountCountDigits)+"]") << " "
                           << colored(COLOR_YELLOW,locations[i].mLocationId.toStdString())<< " "
                           << colored(COLOR_BLUE,"(" + locations[i].mPgpId.toStdString()+ "): ")
                           << colored(COLOR_PURPLE,locations[i].mPgpName + " (" + locations[i].mLocationName + ")" )

From 470a1044186fd35cb3fe4f96348a145bc669b808 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 12 Nov 2023 11:23:54 +0100
Subject: [PATCH 390/503] updated Retroshare to the latest submodule commits

---
 libretroshare    | 2 +-
 retroshare-webui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libretroshare b/libretroshare
index c2b26f2c9..b85295b6d 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit c2b26f2c97151d526b5a94baa321110bbcfde8ca
+Subproject commit b85295b6d3e22fce8f23dd216f7d67d2b4d785ee
diff --git a/retroshare-webui b/retroshare-webui
index 542a8c07b..ddd8b0b24 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit 542a8c07bd02f9bb9082f7aba5aaaed54e643fc1
+Subproject commit ddd8b0b241c21940c7addc20c3cce774ff8dc021

From 0e48422d1f9a173c40b3f58539101d7d0363043b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 12 Nov 2023 12:07:56 +0100
Subject: [PATCH 391/503] updated retroshare to latest libretroshare

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index b85295b6d..de2b4bd80 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit b85295b6d3e22fce8f23dd216f7d67d2b4d785ee
+Subproject commit de2b4bd80c57ca757b5f878130f98becf710236d

From 902f278a19c4f1ff306f6a724c0428231cc2d63e Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Wed, 15 Nov 2023 20:42:56 +0100
Subject: [PATCH 392/503] Fixed led labels

---
 retroshare-gui/src/gui/settings/ServerPage.ui | 110 +++++++++++-------
 1 file changed, 70 insertions(+), 40 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui
index 60abc5fd8..93eb82637 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.ui
+++ b/retroshare-gui/src/gui/settings/ServerPage.ui
@@ -256,11 +256,14 @@
              </property>
              <item row="0" column="0">
               <widget class="QLabel" name="iconlabel_ext">
-               <property name="maximumSize">
-                <size>
-                 <width>16</width>
-                 <height>16</height>
-                </size>
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="layoutDirection">
+                <enum>Qt::LeftToRight</enum>
                </property>
                <property name="text">
                 <string/>
@@ -272,6 +275,12 @@
              </item>
              <item row="0" column="1">
               <widget class="QLabel" name="textlabel_ext">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
                <property name="toolTip">
                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
@@ -290,13 +299,29 @@
              <property name="rightMargin">
               <number>6</number>
              </property>
+             <item row="0" column="1">
+              <widget class="QLabel" name="textlabel_netLimited">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Local network</string>
+               </property>
+              </widget>
+             </item>
              <item row="0" column="0">
               <widget class="QLabel" name="iconlabel_netLimited">
-               <property name="maximumSize">
-                <size>
-                 <width>16</width>
-                 <height>16</height>
-                </size>
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="layoutDirection">
+                <enum>Qt::LeftToRight</enum>
                </property>
                <property name="text">
                 <string/>
@@ -306,13 +331,6 @@
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QLabel" name="textlabel_netLimited">
-               <property name="text">
-                <string>Local network</string>
-               </property>
-              </widget>
-             </item>
             </layout>
            </item>
            <item row="6" column="0">
@@ -351,13 +369,29 @@
              <property name="rightMargin">
               <number>6</number>
              </property>
+             <item row="0" column="1">
+              <widget class="QLabel" name="textlabel_upnp">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>UPnP</string>
+               </property>
+              </widget>
+             </item>
              <item row="0" column="0">
               <widget class="QLabel" name="iconlabel_upnp">
-               <property name="maximumSize">
-                <size>
-                 <width>16</width>
-                 <height>16</height>
-                </size>
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="layoutDirection">
+                <enum>Qt::LeftToRight</enum>
                </property>
                <property name="text">
                 <string/>
@@ -367,13 +401,6 @@
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QLabel" name="textlabel_upnp">
-               <property name="text">
-                <string>UPnP</string>
-               </property>
-              </widget>
-             </item>
             </layout>
            </item>
            <item row="0" column="3">
@@ -386,11 +413,14 @@
              </property>
              <item row="0" column="0">
               <widget class="QLabel" name="iconlabel_hiddenMode">
-               <property name="maximumSize">
-                <size>
-                 <width>16</width>
-                 <height>16</height>
-                </size>
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="layoutDirection">
+                <enum>Qt::LeftToRight</enum>
                </property>
                <property name="text">
                 <string/>
@@ -402,6 +432,12 @@
              </item>
              <item row="0" column="1">
               <widget class="QLabel" name="textlabel_hiddenMode">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
                <property name="font">
                 <font>
                  <weight>75</weight>
@@ -802,12 +838,6 @@ behind a firewall or a VPN.</string>
               <layout class="QHBoxLayout" name="hiddenpage_proxyOKHLayout_tor">
                <item>
                 <widget class="QLabel" name="iconlabel_tor_outgoing">
-                 <property name="maximumSize">
-                  <size>
-                   <width>16</width>
-                   <height>16</height>
-                  </size>
-                 </property>
                  <property name="text">
                   <string/>
                  </property>

From 6555cc5792fc15893e2c62c298ed4965fa621f07 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 17 Nov 2023 14:10:14 +0100
Subject: [PATCH 393/503] attempt to fix bug in closing GxsChannelComment feed
 item

---
 .../src/gui/feeds/ChannelsCommentsItem.cpp    | 33 ++++++++++++++++++-
 .../src/gui/feeds/ChannelsCommentsItem.h      |  4 +++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
index ecbba96af..527ca8698 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
@@ -53,6 +53,10 @@ ChannelsCommentsItem::ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feed
     GxsFeedItem(feedHolder, feedId, group_meta.mGroupId, messageId, isHome, rsGxsChannels, autoUpdate),
     mGroupMeta(group_meta)
 {
+    mLoadingGroup = false;
+    mLoadingMessage = false;
+    mLoadingComment = false;
+
     mPost.mMeta.mMsgId = messageId; // useful for uniqueIdentifer() before the post is loaded
     mPost.mMeta.mGroupId = mGroupMeta.mGroupId;
 
@@ -74,6 +78,10 @@ ChannelsCommentsItem::ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feed
 ChannelsCommentsItem::ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId& groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate,const std::set<RsGxsMessageId>& older_versions) :
     GxsFeedItem(feedHolder, feedId, groupId, messageId, isHome, rsGxsChannels, autoUpdate) // this one should be in GxsFeedItem
 {
+    mLoadingGroup = false;
+    mLoadingMessage = false;
+    mLoadingComment = false;
+
     mPost.mMeta.mMsgId = messageId; // useful for uniqueIdentifer() before the post is loaded
 
 	QVector<RsGxsMessageId> v;
@@ -114,6 +122,19 @@ void ChannelsCommentsItem::paintEvent(QPaintEvent *e)
 
 ChannelsCommentsItem::~ChannelsCommentsItem()
 {
+    auto timeout = std::chrono::steady_clock::now() + std::chrono::milliseconds(300);
+
+    while( (mLoadingGroup || mLoadingMessage || mLoadingComment)
+           && std::chrono::steady_clock::now() < timeout)
+    {
+        RsDbg() << __PRETTY_FUNCTION__ << " is Waiting for "
+                << (mLoadingGroup ? "Group " : "")
+                << (mLoadingMessage ? "Message " : "")
+                << (mLoadingComment ? "Comment " : "")
+                << "loading." << std::endl;
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    }
+
 	delete(ui);
 }
 
@@ -255,6 +276,7 @@ void ChannelsCommentsItem::loadGroup()
 			return;
 		}
 		RsGxsChannelGroup group(groups[0]);
+        mLoadingGroup = true;
 
 		RsQThreadUtils::postToObject( [group,this]()
 		{
@@ -263,6 +285,7 @@ void ChannelsCommentsItem::loadGroup()
 			 * after a blocking call to RetroShare API complete */
 
 			mGroupMeta = group.mMeta;
+            mLoadingGroup = false;
 
 		}, this );
 	});
@@ -293,8 +316,9 @@ void ChannelsCommentsItem::loadMessage()
 			std::cerr << (void*)this << ": Obtained post, with msgId = " << posts[0].mMeta.mMsgId << std::endl;
 #endif
             RsGxsChannelPost post(posts[0]);	// no reference to temporary here, because we pass this to a thread
+            mLoadingMessage = true;
 
-			RsQThreadUtils::postToObject( [post,this]() { setPost(post);  }, this );
+            RsQThreadUtils::postToObject( [post,this]() { setPost(post);  mLoadingMessage=false; }, this );
 		}
 		else if(comments.size() == 1)
 		{
@@ -302,6 +326,7 @@ void ChannelsCommentsItem::loadMessage()
 #ifdef DEBUG_ITEM
 			std::cerr << (void*)this << ": Obtained comment, setting messageId to threadID = " << cmt.mMeta.mThreadId << std::endl;
 #endif
+            mLoadingComment = true;
 
 			RsQThreadUtils::postToObject( [cmt,this]()
 			{
@@ -323,6 +348,7 @@ void ChannelsCommentsItem::loadMessage()
 
 				//Change this item to be uploaded with thread element.
 				setMessageId(cmt.mMeta.mThreadId);
+                mLoadingComment=false;
 				requestMessage();
 
 			}, this );
@@ -344,6 +370,8 @@ void ChannelsCommentsItem::loadMessage()
 
 void ChannelsCommentsItem::loadComment()
 {
+#ifdef DOES_NOTHING
+
 #ifdef DEBUG_ITEM
 	std::cerr << "ChannelsCommentsItem::loadComment()";
 	std::cerr << std::endl;
@@ -369,6 +397,8 @@ void ChannelsCommentsItem::loadComment()
 
 		int comNb = comments.size();
 
+        mLoadingComment=true;
+
 		RsQThreadUtils::postToObject( [comNb]()
 		{
 			QString sComButText = tr("Comment");
@@ -381,6 +411,7 @@ void ChannelsCommentsItem::loadComment()
 
 		}, this );
 	});
+#endif
 }
 
 void ChannelsCommentsItem::fill()
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h
index 53537d61e..c790e3107 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h
@@ -113,6 +113,10 @@ private:
 	bool mCloseOnRead;
 	bool mLoaded;
 
+    bool mLoadingGroup;
+    bool mLoadingMessage;
+    bool mLoadingComment;
+
 	RsGroupMetaData mGroupMeta;
 	RsGxsChannelPost mPost;
 

From 69a84c94a29dfeeec55ee94fc02c008c58f4963e Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Fri, 17 Nov 2023 17:10:18 +0100
Subject: [PATCH 394/503] Cosmetic layout fixes

---
 retroshare-gui/src/gui/Identity/IdDialog.ui | 553 +++++++++++---------
 1 file changed, 301 insertions(+), 252 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index ff3775aee..7687c321d 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -301,8 +301,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>456</width>
-             <height>731</height>
+             <width>466</width>
+             <height>738</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">
@@ -573,17 +573,68 @@ border-image: url(:/images/closepressed.png)
                <string>Identity info</string>
               </property>
               <layout class="QGridLayout" name="gridLayout">
-               <item row="3" column="0">
-                <widget class="QLabel" name="label_GpgId">
+               <item row="13" column="0">
+                <widget class="QLabel" name="neighborNodesOpinion_LB">
                  <property name="text">
-                  <string>Owner node ID :</string>
+                  <string>Friend votes:</string>
                  </property>
                 </widget>
                </item>
-               <item row="13" column="1">
-                <widget class="QLineEdit" name="overallOpinion_TF">
+               <item row="9" column="0" colspan="2">
+                <widget class="Line" name="line_IdInfo">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="1">
+                <widget class="QLineEdit" name="lineEdit_GpgName">
+                 <property name="enabled">
+                  <bool>true</bool>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QLineEdit" name="lineEdit_KeyId">
+                 <property name="enabled">
+                  <bool>true</bool>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="0">
+                <widget class="QLabel" name="label_LastUsed">
+                 <property name="text">
+                  <string>Last used:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="12" column="1">
+                <widget class="QCheckBox" name="autoBanIdentities_CB">
                  <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends'.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  <string>Auto-Ban all identities signed by the same node</string>
+                 </property>
+                 <property name="text">
+                  <string>Auto-Ban profile</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="1">
+                <widget class="QLineEdit" name="lineEdit_PublishTS">
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QLineEdit" name="lineEdit_Nickname">
+                 <property name="enabled">
+                  <bool>true</bool>
                  </property>
                  <property name="readOnly">
                   <bool>true</bool>
@@ -600,61 +651,253 @@ border-image: url(:/images/closepressed.png)
                  </property>
                 </widget>
                </item>
-               <item row="0" column="2" rowspan="14">
+               <item row="14" column="1">
+                <widget class="QLineEdit" name="overallOpinion_TF">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends'.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="10" column="0" rowspan="2">
+                <widget class="QLabel" name="label_YourOpinion">
+                 <property name="text">
+                  <string>Your opinion:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="14" column="0">
+                <widget class="QLabel" name="overallOpinion_LB">
+                 <property name="font">
+                  <font>
+                   <weight>75</weight>
+                   <bold>true</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Overall:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="0">
+                <widget class="QLabel" name="label_PublishTS">
+                 <property name="text">
+                  <string>Created on :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_Nickname">
+                 <property name="text">
+                  <string>Identity name :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_KeyId">
+                 <property name="text">
+                  <string>Identity ID :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="13" column="1">
+                <widget class="QLineEdit" name="neighborNodesOpinion_TF">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QLineEdit" name="lineEdit_Type">
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_Type">
+                 <property name="text">
+                  <string>Type:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="1">
+                <widget class="QLineEdit" name="lineEdit_LastUsed">
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="15" column="0" colspan="2">
+                <spacer name="verticalSpacer">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>1</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item row="3" column="0">
+                <widget class="QLabel" name="label_GpgId">
+                 <property name="text">
+                  <string>Owner node ID :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="0">
+                <widget class="QLabel" name="label_GpgName">
+                 <property name="text">
+                  <string>Owner node name :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="12" column="0">
+                <widget class="QLabel" name="banoption_label">
+                 <property name="text">
+                  <string>Ban-option:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="10" column="1" rowspan="2">
+                <widget class="RSComboBox" name="ownOpinion_CB">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend's positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="iconSize">
+                  <size>
+                   <width>22</width>
+                   <height>22</height>
+                  </size>
+                 </property>
+                 <item>
+                  <property name="text">
+                   <string>Negative</string>
+                  </property>
+                  <property name="icon">
+                   <iconset resource="../icons.qrc">
+                    <normaloff>:/icons/png/thumbs-down.png</normaloff>:/icons/png/thumbs-down.png</iconset>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Neutral</string>
+                  </property>
+                  <property name="icon">
+                   <iconset resource="../icons.qrc">
+                    <normaloff>:/icons/png/thumbs-neutral.png</normaloff>:/icons/png/thumbs-neutral.png</iconset>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Positive</string>
+                  </property>
+                  <property name="icon">
+                   <iconset resource="../icons.qrc">
+                    <normaloff>:/icons/png/thumbs-up.png</normaloff>:/icons/png/thumbs-up.png</iconset>
+                  </property>
+                 </item>
+                </widget>
+               </item>
+               <item row="0" column="2" rowspan="15">
                 <layout class="QVBoxLayout" name="verticalLayout">
                  <property name="spacing">
                   <number>0</number>
                  </property>
                  <item>
-                  <widget class="QLabel" name="avatarLabel">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="minimumSize">
-                    <size>
-                     <width>128</width>
-                     <height>128</height>
-                    </size>
-                   </property>
-                   <property name="maximumSize">
-                    <size>
-                     <width>128</width>
-                     <height>128</height>
-                    </size>
-                   </property>
-                   <property name="frameShape">
-                    <enum>QFrame::Box</enum>
-                   </property>
-                   <property name="frameShadow">
-                    <enum>QFrame::Sunken</enum>
-                   </property>
-                   <property name="text">
-                    <string extracomment="Click here to change your avatar">Your Avatar</string>
-                   </property>
-                   <property name="scaledContents">
-                    <bool>true</bool>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="inviteButton">
-                   <property name="text">
-                    <string>Send Invite</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="editButton">
-                   <property name="text">
-                    <string>Edit Identity</string>
-                   </property>
-                  </widget>
+                  <layout class="QGridLayout" name="gridLayout_2">
+                   <item row="0" column="1">
+                    <widget class="QLabel" name="avatarLabel">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="minimumSize">
+                      <size>
+                       <width>128</width>
+                       <height>128</height>
+                      </size>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>128</width>
+                       <height>128</height>
+                      </size>
+                     </property>
+                     <property name="frameShape">
+                      <enum>QFrame::Box</enum>
+                     </property>
+                     <property name="frameShadow">
+                      <enum>QFrame::Sunken</enum>
+                     </property>
+                     <property name="text">
+                      <string extracomment="Click here to change your avatar">Your Avatar</string>
+                     </property>
+                     <property name="scaledContents">
+                      <bool>true</bool>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="1">
+                    <widget class="QPushButton" name="editButton">
+                     <property name="text">
+                      <string>Edit Identity</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="1">
+                    <widget class="QPushButton" name="inviteButton">
+                     <property name="text">
+                      <string>Send Invite</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="0" column="2" rowspan="3">
+                    <spacer name="horizontalSpacer">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeType">
+                      <enum>QSizePolicy::Minimum</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>6</width>
+                       <height>128</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                   <item row="0" column="0" rowspan="3">
+                    <spacer name="horizontalSpacer_2">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeType">
+                      <enum>QSizePolicy::Minimum</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>6</width>
+                       <height>128</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
                  </item>
                  <item>
                   <layout class="QHBoxLayout" name="avatarOpinionHLayout">
@@ -756,200 +999,6 @@ border-image: url(:/images/closepressed.png)
                  </item>
                 </layout>
                </item>
-               <item row="2" column="1">
-                <widget class="QLineEdit" name="lineEdit_Type">
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="0">
-                <widget class="QLabel" name="label_Type">
-                 <property name="text">
-                  <string>Type:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="13" column="0">
-                <widget class="QLabel" name="overallOpinion_LB">
-                 <property name="font">
-                  <font>
-                   <weight>75</weight>
-                   <bold>true</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Overall:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="6" column="0">
-                <widget class="QLabel" name="label_LastUsed">
-                 <property name="text">
-                  <string>Last used:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_KeyId">
-                 <property name="text">
-                  <string>Identity ID :</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="5" column="0">
-                <widget class="QLabel" name="label_PublishTS">
-                 <property name="text">
-                  <string>Created on :</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="4" column="0">
-                <widget class="QLabel" name="label_GpgName">
-                 <property name="text">
-                  <string>Owner node name :</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="11" column="0">
-                <widget class="QLabel" name="banoption_label">
-                 <property name="text">
-                  <string>Ban-option:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="9" column="0" rowspan="2">
-                <widget class="QLabel" name="label_YourOpinion">
-                 <property name="text">
-                  <string>Your opinion:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="12" column="1">
-                <widget class="QLineEdit" name="neighborNodesOpinion_TF">
-                 <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="6" column="1">
-                <widget class="QLineEdit" name="lineEdit_LastUsed">
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="9" column="1" rowspan="2">
-                <widget class="RSComboBox" name="ownOpinion_CB">
-                 <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend's positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                 </property>
-                 <property name="iconSize">
-                  <size>
-                   <width>22</width>
-                   <height>22</height>
-                  </size>
-                 </property>
-                 <item>
-                  <property name="text">
-                   <string>Negative</string>
-                  </property>
-                  <property name="icon">
-                   <iconset resource="../icons.qrc">
-                    <normaloff>:/icons/png/thumbs-down.png</normaloff>:/icons/png/thumbs-down.png</iconset>
-                  </property>
-                 </item>
-                 <item>
-                  <property name="text">
-                   <string>Neutral</string>
-                  </property>
-                  <property name="icon">
-                   <iconset resource="../icons.qrc">
-                    <normaloff>:/icons/png/thumbs-neutral.png</normaloff>:/icons/png/thumbs-neutral.png</iconset>
-                  </property>
-                 </item>
-                 <item>
-                  <property name="text">
-                   <string>Positive</string>
-                  </property>
-                  <property name="icon">
-                   <iconset resource="../icons.qrc">
-                    <normaloff>:/icons/png/thumbs-up.png</normaloff>:/icons/png/thumbs-up.png</iconset>
-                  </property>
-                 </item>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_Nickname">
-                 <property name="text">
-                  <string>Identity name :</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="11" column="1">
-                <widget class="QCheckBox" name="autoBanIdentities_CB">
-                 <property name="toolTip">
-                  <string>Auto-Ban all identities signed by the same node</string>
-                 </property>
-                 <property name="text">
-                  <string>Auto-Ban profile</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="4" column="1">
-                <widget class="QLineEdit" name="lineEdit_GpgName">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="5" column="1">
-                <widget class="QLineEdit" name="lineEdit_PublishTS">
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="12" column="0">
-                <widget class="QLabel" name="neighborNodesOpinion_LB">
-                 <property name="text">
-                  <string>Friend votes:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="lineEdit_Nickname">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="8" column="0" colspan="2">
-                <widget class="Line" name="line_IdInfo">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QLineEdit" name="lineEdit_KeyId">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
               </layout>
              </widget>
             </item>

From 929c04edd53202534a42238795d83de1d647e3d8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 18 Nov 2023 23:46:32 +0100
Subject: [PATCH 395/503] fixing channel comment feed item crash

---
 retroshare-gui/src/gui/NewsFeed.cpp           |   2 +-
 .../src/gui/feeds/ChannelsCommentsItem.cpp    | 454 +++++++-----------
 .../src/gui/feeds/ChannelsCommentsItem.h      |  27 +-
 3 files changed, 188 insertions(+), 295 deletions(-)

diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp
index c73f834fb..dc0834e71 100644
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@@ -299,7 +299,7 @@ void NewsFeed::handleChannelEvent(std::shared_ptr<const RsEvent> event)
 		addFeedItem(new GxsChannelPostItem(this, NEWSFEED_CHANNELNEWLIST, pe->mChannelGroupId, pe->mChannelMsgId, false, true));
 		break;
 	case RsChannelEventCode::NEW_COMMENT:
-		addFeedItem(new ChannelsCommentsItem(this, NEWSFEED_CHANNELNEWLIST, pe->mChannelGroupId, pe->mChannelMsgId, false, true));
+        addFeedItem(new ChannelsCommentsItem(this, NEWSFEED_CHANNELNEWLIST, pe->mChannelGroupId, pe->mChannelMsgId,pe->mChannelThreadId, false, true));
 		break;
 	case RsChannelEventCode::RECEIVED_PUBLISH_KEY:
 		addFeedItem(new GxsChannelGroupItem(this, NEWSFEED_CHANNELPUBKEYLIST, pe->mChannelGroupId, false, true));
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
index 527ca8698..46c129ebe 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
@@ -49,54 +49,41 @@
  * #define DEBUG_ITEM 1
  ****/
 
-ChannelsCommentsItem::ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData& group_meta, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate,const std::set<RsGxsMessageId>& older_versions) :
-    GxsFeedItem(feedHolder, feedId, group_meta.mGroupId, messageId, isHome, rsGxsChannels, autoUpdate),
-    mGroupMeta(group_meta)
-{
-    mLoadingGroup = false;
-    mLoadingMessage = false;
-    mLoadingComment = false;
+// ChannelsCommentsItem::ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData& group_meta, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate,const std::set<RsGxsMessageId>& older_versions) :
+//     GxsFeedItem(feedHolder, feedId, group_meta.mGroupId, messageId, isHome, rsGxsChannels, autoUpdate),
+//     mGroupMeta(group_meta)
+// {
+//     mLoadingGroup = false;
+//     mLoadingMessage = false;
+//     mLoadingComment = false;
+//
+//     mPost.mMeta.mMsgId = messageId; // useful for uniqueIdentifer() before the post is loaded
+//     mPost.mMeta.mGroupId = mGroupMeta.mGroupId;
+//
+// 	QVector<RsGxsMessageId> v;
+// 	//bool self = false;
+//
+// 	for(std::set<RsGxsMessageId>::const_iterator it(older_versions.begin());it!=older_versions.end();++it)
+// 		v.push_back(*it) ;
+//
+// 	if(older_versions.find(messageId) == older_versions.end())
+// 		v.push_back(messageId);
+//
+// 	setMessageVersions(v) ;
+// 	setup();
+//
+// 	// no call to loadGroup() here because we have it already.
+// }
 
-    mPost.mMeta.mMsgId = messageId; // useful for uniqueIdentifer() before the post is loaded
-    mPost.mMeta.mGroupId = mGroupMeta.mGroupId;
+ChannelsCommentsItem::ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId& groupId, const RsGxsMessageId &commentId, const RsGxsMessageId &threadId, bool isHome, bool autoUpdate) :
+    GxsFeedItem(feedHolder, feedId, groupId, commentId, isHome, rsGxsChannels, autoUpdate), // this one should be in GxsFeedItem
+    mThreadId(threadId)
+{
+    mLoading= false;
 
 	QVector<RsGxsMessageId> v;
-	//bool self = false;
 
-	for(std::set<RsGxsMessageId>::const_iterator it(older_versions.begin());it!=older_versions.end();++it)
-		v.push_back(*it) ;
-
-	if(older_versions.find(messageId) == older_versions.end())
-		v.push_back(messageId);
-
-	setMessageVersions(v) ;
 	setup();
-
-	// no call to loadGroup() here because we have it already.
-}
-
-ChannelsCommentsItem::ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId& groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate,const std::set<RsGxsMessageId>& older_versions) :
-    GxsFeedItem(feedHolder, feedId, groupId, messageId, isHome, rsGxsChannels, autoUpdate) // this one should be in GxsFeedItem
-{
-    mLoadingGroup = false;
-    mLoadingMessage = false;
-    mLoadingComment = false;
-
-    mPost.mMeta.mMsgId = messageId; // useful for uniqueIdentifer() before the post is loaded
-
-	QVector<RsGxsMessageId> v;
-	//bool self = false;
-
-	for(std::set<RsGxsMessageId>::const_iterator it(older_versions.begin());it!=older_versions.end();++it)
-		v.push_back(*it) ;
-
-	if(older_versions.find(messageId) == older_versions.end())
-		v.push_back(messageId);
-
-	setMessageVersions(v) ;
-	setup();
-
-	loadGroup();
 }
 
 void ChannelsCommentsItem::paintEvent(QPaintEvent *e)
@@ -107,15 +94,8 @@ void ChannelsCommentsItem::paintEvent(QPaintEvent *e)
 	if(!mLoaded)
 	{
 		mLoaded = true ;
-
-        std::set<RsGxsMessageId> older_versions;	// not so nice. We need to use std::set everywhere
-        for(auto& m:messageVersions())
-            older_versions.insert(m);
-
-		fill();
-		requestMessage();
-		requestComment();
-	}
+        load();
+    }
 
 	GxsFeedItem::paintEvent(e) ;
 }
@@ -124,14 +104,9 @@ ChannelsCommentsItem::~ChannelsCommentsItem()
 {
     auto timeout = std::chrono::steady_clock::now() + std::chrono::milliseconds(300);
 
-    while( (mLoadingGroup || mLoadingMessage || mLoadingComment)
-           && std::chrono::steady_clock::now() < timeout)
+    while( mLoading && std::chrono::steady_clock::now() < timeout )
     {
-        RsDbg() << __PRETTY_FUNCTION__ << " is Waiting for "
-                << (mLoadingGroup ? "Group " : "")
-                << (mLoadingMessage ? "Message " : "")
-                << (mLoadingComment ? "Comment " : "")
-                << "loading." << std::endl;
+        RsDbg() << __PRETTY_FUNCTION__ << " is Waiting for data to load " << std::endl;
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
 
@@ -203,21 +178,24 @@ void ChannelsCommentsItem::setup()
 	ui->expandFrame->hide();
 }
 
-bool ChannelsCommentsItem::setPost(const RsGxsChannelPost &post, bool doFill)
+bool ChannelsCommentsItem::setPost(const RsGxsChannelPost& post, bool doFill)
 {
-	if (groupId() != post.mMeta.mGroupId || messageId() != post.mMeta.mMsgId) {
-		std::cerr << "ChannelsCommentsItem::setPost() - Wrong id, cannot set post";
-		std::cerr << std::endl;
-		return false;
-	}
-
 	mPost = post;
 
-	if (doFill) {
+    if (doFill)
 		fill();
-	}
 
-	return true;
+    std::cerr << "end setting post." << std::endl;
+    return true;
+}
+bool ChannelsCommentsItem::setMissingPost()
+{
+    std::cerr << "setting missing post." << std::endl;
+
+    fill(true);
+
+    std::cerr << "end setting missing post." << std::endl;
+    return true;
 }
 
 QString ChannelsCommentsItem::getTitleLabel()
@@ -251,178 +229,150 @@ void ChannelsCommentsItem::loadComments()
 
 void ChannelsCommentsItem::loadGroup()
 {
-#ifdef DEBUG_ITEM
-	std::cerr << "GxsChannelGroupItem::loadGroup()";
-	std::cerr << std::endl;
-#endif
-
-	RsThread::async([this]()
-	{
-		// 1 - get group data
-
-		std::vector<RsGxsChannelGroup> groups;
-		const std::list<RsGxsGroupId> groupIds = { groupId() };
-
-		if(!rsGxsChannels->getChannelsInfo(groupIds,groups))	// would be better to call channel Summaries for a single group
-		{
-			RsErr() << "GxsGxsChannelGroupItem::loadGroup() ERROR getting data" << std::endl;
-			return;
-		}
-
-		if (groups.size() != 1)
-		{
-			std::cerr << "GxsGxsChannelGroupItem::loadGroup() Wrong number of Items";
-			std::cerr << std::endl;
-			return;
-		}
-		RsGxsChannelGroup group(groups[0]);
-        mLoadingGroup = true;
-
-		RsQThreadUtils::postToObject( [group,this]()
-		{
-			/* Here it goes any code you want to be executed on the Qt Gui
-			 * thread, for example to update the data model with new information
-			 * after a blocking call to RetroShare API complete */
-
-			mGroupMeta = group.mMeta;
-            mLoadingGroup = false;
-
-		}, this );
-	});
+//#ifdef DEBUG_ITEM
+//	std::cerr << "GxsChannelGroupItem::loadGroup()";
+//	std::cerr << std::endl;
+//#endif
+//    if(mLoading)
+//        return;
+//
+//    mLoading= true;
+//
+//    std::cerr << "Loading group" << std::endl;
+//	RsThread::async([this]()
+//	{
+//		// 1 - get group data
+//
+//		std::vector<RsGxsChannelGroup> groups;
+//		const std::list<RsGxsGroupId> groupIds = { groupId() };
+//
+//		if(!rsGxsChannels->getChannelsInfo(groupIds,groups))	// would be better to call channel Summaries for a single group
+//		{
+//			RsErr() << "GxsGxsChannelGroupItem::loadGroup() ERROR getting data" << std::endl;
+//			return;
+//		}
+//
+//		if (groups.size() != 1)
+//		{
+//			std::cerr << "GxsGxsChannelGroupItem::loadGroup() Wrong number of Items";
+//			std::cerr << std::endl;
+//			return;
+//		}
+//		RsGxsChannelGroup group(groups[0]);
+//
+//		RsQThreadUtils::postToObject( [group,this]()
+//		{
+//			/* Here it goes any code you want to be executed on the Qt Gui
+//			 * thread, for example to update the data model with new information
+//			 * after a blocking call to RetroShare API complete */
+//
+//			mGroupMeta = group.mMeta;
+//            mLoading= false;
+//
+//            std::cerr << "End loading group" << std::endl;
+//        }, this );
+//	});
 }
-void ChannelsCommentsItem::loadMessage()
+void ChannelsCommentsItem::load()
 {
+    // This function loads everything that's needed:
+    // - the comment text
+    // - the comment parent message
+
 #ifdef DEBUG_ITEM
 	std::cerr << "ChannelsCommentsItem::loadMessage()";
 	std::cerr << std::endl;
 #endif
-	RsThread::async([this]()
+    if(mLoading)
+        return;
+
+    mLoading= true;
+    std::cerr << "Loading message " << mPost.mMeta.mMsgId << std::endl;
+
+    RsThread::async([this]()
 	{
-		// 1 - get group data
+        // 1 - get group meta data
+
+        std::vector<RsGxsChannelGroup> groups;
+        const std::list<RsGxsGroupId> groupIds = { groupId() };
+
+        if(!rsGxsChannels->getChannelsInfo(groupIds,groups))	// would be better to call channel Summaries for a single group
+        {
+            RsErr() << "GxsGxsChannelGroupItem::loadGroup() ERROR getting data" << std::endl;
+            return;
+        }
+
+        if (groups.size() != 1)
+        {
+            std::cerr << "GxsGxsChannelGroupItem::loadGroup() Wrong number of Items";
+            std::cerr << std::endl;
+            return;
+        }
+        RsGxsChannelGroup group(groups[0]);
+
+        // 2 - get message and comment data
 
 		std::vector<RsGxsChannelPost> posts;
 		std::vector<RsGxsComment> comments;
 		std::vector<RsGxsVote> votes;
 
-		if(! rsGxsChannels->getChannelContent( groupId(), std::set<RsGxsMessageId>( { messageId() } ),posts,comments,votes))
+        if(! rsGxsChannels->getChannelContent( groupId(), std::set<RsGxsMessageId>( { messageId(),mThreadId } ),posts,comments,votes))
 		{
 			RsErr() << "GxsGxsChannelGroupItem::loadGroup() ERROR getting data" << std::endl;
 			return;
 		}
 
-		if (posts.size() == 1)
-		{
-#ifdef DEBUG_ITEM
-			std::cerr << (void*)this << ": Obtained post, with msgId = " << posts[0].mMeta.mMsgId << std::endl;
-#endif
-            RsGxsChannelPost post(posts[0]);	// no reference to temporary here, because we pass this to a thread
-            mLoadingMessage = true;
+            // now that everything is in place, update the UI
 
-            RsQThreadUtils::postToObject( [post,this]() { setPost(post);  mLoadingMessage=false; }, this );
-		}
-		else if(comments.size() == 1)
-		{
-            RsGxsComment cmt(comments[0]);
-#ifdef DEBUG_ITEM
-			std::cerr << (void*)this << ": Obtained comment, setting messageId to threadID = " << cmt.mMeta.mThreadId << std::endl;
-#endif
-            mLoadingComment = true;
+        RsQThreadUtils::postToObject( [group,posts,comments,this]()
+        {
+            /* Here it goes any code you want to be executed on the Qt Gui
+             * thread, for example to update the data model with new information
+             * after a blocking call to RetroShare API complete */
 
-			RsQThreadUtils::postToObject( [cmt,this]()
-			{
-				uint32_t autorized_lines = (int)floor( (ui->avatarLabel->height() - ui->button_HL->sizeHint().height())
-				                                      / QFontMetricsF(ui->subjectLabel->font()).height());
+            mGroupMeta = group.mMeta;
 
-				ui->commLabel->setText(RsHtml().formatText(NULL, RsStringUtil::CopyLines(QString::fromUtf8(cmt.mComment.c_str()), autorized_lines), RSHTML_FORMATTEXT_EMBED_LINKS));
+            if(comments.size()==1)
+            {
+                RsGxsComment cmt(comments[0]);
 
-				ui->nameLabel->setId(cmt.mMeta.mAuthorId);
-				ui->datetimeLabel->setText(DateTime::formatLongDateTime(cmt.mMeta.mPublishTs));
+                std::cerr << "setting comment." << std::endl;
+                uint32_t autorized_lines = (int)floor( (ui->avatarLabel->height() - ui->button_HL->sizeHint().height())
+                                                      / QFontMetricsF(ui->subjectLabel->font()).height());
 
-				RsIdentityDetails idDetails ;
-				rsIdentity->getIdDetails(cmt.mMeta.mAuthorId,idDetails);
-				QPixmap pixmap ;
+                ui->commLabel->setText(RsHtml().formatText(NULL, RsStringUtil::CopyLines(QString::fromUtf8(cmt.mComment.c_str()), autorized_lines), RSHTML_FORMATTEXT_EMBED_LINKS));
+                ui->nameLabel->setId(cmt.mMeta.mAuthorId);
+                ui->datetimeLabel->setText(DateTime::formatLongDateTime(cmt.mMeta.mPublishTs));
 
-				if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL))
-				pixmap = GxsIdDetails::makeDefaultIcon(cmt.mMeta.mAuthorId,GxsIdDetails::LARGE);
-				ui->avatarLabel->setPixmap(pixmap);
+                RsIdentityDetails idDetails ;
+                rsIdentity->getIdDetails(cmt.mMeta.mAuthorId,idDetails);
+                QPixmap pixmap ;
 
-				//Change this item to be uploaded with thread element.
-				setMessageId(cmt.mMeta.mThreadId);
-                mLoadingComment=false;
-				requestMessage();
+                if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL))
+                pixmap = GxsIdDetails::makeDefaultIcon(cmt.mMeta.mAuthorId,GxsIdDetails::LARGE);
+                ui->avatarLabel->setPixmap(pixmap);
 
-			}, this );
+                //Change this item to be uploaded with thread element. This is really bad practice.
 
-		}
-		else
-		{
-#ifdef DEBUG_ITEM
-			std::cerr << "ChannelsCommentsItem::loadMessage() Wrong number of Items. Remove It.";
-			std::cerr << std::endl;
-#endif
+                mLoading=false;
+            }
+            else
+                removeItem();
 
-			RsQThreadUtils::postToObject( [this]() {  removeItem(); }, this );
-		}
-	});
-	
-	emit sizeChanged(this);
+            if (posts.size() == 1)
+                setPost(posts[0]);
+            else
+                setMissingPost();
+
+            std::cerr << "End loading channel post comment data" << std::endl;
+            emit sizeChanged(this);
+
+        }, this );
+    });
 }
 
-void ChannelsCommentsItem::loadComment()
+void ChannelsCommentsItem::fill(bool missing_post)
 {
-#ifdef DOES_NOTHING
-
-#ifdef DEBUG_ITEM
-	std::cerr << "ChannelsCommentsItem::loadComment()";
-	std::cerr << std::endl;
-#endif
-
-	RsThread::async([this]()
-	{
-		// 1 - get group data
-
-        std::set<RsGxsMessageId> msgIds;
-
-        for(auto MsgId: messageVersions())
-            msgIds.insert(MsgId);
-
-		std::vector<RsGxsChannelPost> posts;
-		std::vector<RsGxsComment> comments;
-
-		if(! rsGxsChannels->getChannelComments( groupId(),msgIds,comments))
-		{
-			RsErr() << "GxsGxsChannelGroupItem::loadGroup() ERROR getting data" << std::endl;
-			return;
-		}
-
-		int comNb = comments.size();
-
-        mLoadingComment=true;
-
-		RsQThreadUtils::postToObject( [comNb]()
-		{
-			QString sComButText = tr("Comment");
-			if (comNb == 1)
-				sComButText = sComButText.append("(1)");
-			else if(comNb > 1)
-				sComButText = tr("Comments ").append("(%1)").arg(comNb);
-
-			//ui->commentButton->setText(sComButText);
-
-		}, this );
-	});
-#endif
-}
-
-void ChannelsCommentsItem::fill()
-{
-	/* fill in */
-
-//	if (isLoading()) {
-	//	/* Wait for all requests */
-		//return;
-//	}
-
 #ifdef DEBUG_ITEM
 	std::cerr << "ChannelsCommentsItem::fill()";
 	std::cerr << std::endl;
@@ -430,9 +380,6 @@ void ChannelsCommentsItem::fill()
 
 	mInFill = true;
 
-	//QString title;
-	//float f = QFontMetricsF(font()).height()/14.0 ;
-
 	if (!mIsHome)
 	{
 		if (mCloseOnRead && !IS_MSG_NEW(mPost.mMeta.mMsgStatus)) {
@@ -443,19 +390,14 @@ void ChannelsCommentsItem::fill()
 		//title += link.toHtml();
 		//ui->titleLabel->setText(title);
 
-		RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, mPost.mMeta.mMsgId, messageName());
-		ui->subjectLabel->setText(msgLink.toHtml());
+        RetroShareLink msgLink = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_CHANNEL, mPost.mMeta.mGroupId, mPost.mMeta.mMsgId, messageName());
+
+        if(missing_post)
+            ui->subjectLabel->setText("[" + QObject::tr("Missing channel post")+"]");
+        else
+            ui->subjectLabel->setText(msgLink.toHtml());
 
-		if (IS_GROUP_SUBSCRIBED(mGroupMeta.mSubscribeFlags) || IS_GROUP_ADMIN(mGroupMeta.mSubscribeFlags))
-		{
-			//ui->unsubscribeButton->setEnabled(true);
-		}
-		else 
-		{
-			//ui->unsubscribeButton->setEnabled(false);
-		}
 		ui->readButton->hide();
-		//ui->titleLabel->hide();
 
 		if (IS_MSG_NEW(mPost.mMeta.mMsgStatus)) {
 			mCloseOnRead = true;
@@ -463,19 +405,10 @@ void ChannelsCommentsItem::fill()
 	}
 	else
 	{
-		/* subject */
-		//ui->titleLabel->setText(QString::fromUtf8(mPost.mMeta.mMsgName.c_str()));
-
-		//uint32_t autorized_lines = (int)floor( (ui->avatarLabel->height() - ui->button_HL->sizeHint().height())
-		//                                      / QFontMetricsF(ui->subjectLabel->font()).height());
-
-		// fill first 4 lines of message. (csoler) Disabled the replacement of smileys and links, because the cost is too crazy
-		//ui->subjectLabel->setText(RsHtml().formatText(NULL, RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), autorized_lines), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
-
-		ui->subjectLabel->setText(RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), 2)) ;
-
-		//QString score = QString::number(post.mTopScore);
-		// scoreLabel->setText(score); 
+        if(missing_post)
+            ui->subjectLabel->setText("[" + QObject::tr("Missing channel post")+"]");
+        else
+            ui->subjectLabel->setText(RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), 2)) ;
 
 		/* disable buttons: deletion facility not enabled with cache services yet */
 		ui->clearButton->setEnabled(false);
@@ -498,50 +431,9 @@ void ChannelsCommentsItem::fill()
 		mCloseOnRead = false;
 	}
 	
-	// differences between Feed or Top of Comment.
-	if (mFeedHolder)
-	{
-		//ui->commentButton->show();
-
-		// Not yet functional
-		/*if (mPost.mCommentCount)
-		{
-			QString commentText = QString::number(mPost.mCommentCount);
-			commentText += " ";
-			commentText += tr("Comments");
-			ui->commentButton->setText(commentText);
-		}
-		else
-		{
-			ui->commentButton->setText(tr("Comment"));
-		}*/
-
-	}
-	else
-	{
-		//ui->commentButton->hide();
-	}
-	
-	// disable voting buttons - if they have already voted.
-	/*if (post.mMeta.mMsgStatus & GXS_SERV::GXS_MSG_STATUS_VOTE_MASK)
-	{
-		voteUpButton->setEnabled(false);
-		voteDownButton->setEnabled(false);
-	}*/
-
-	if (wasExpanded() || ui->expandFrame->isVisible()) {
-		fillExpandFrame();
-	}
-
 	mInFill = false;
 }
 
-void ChannelsCommentsItem::fillExpandFrame()
-{
-	//ui->msgLabel->setText(RsHtml().formatText(NULL, QString::fromUtf8(mPost.mMsg.c_str()), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
-
-}
-
 QString ChannelsCommentsItem::messageName()
 {
 	return QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
@@ -605,10 +497,6 @@ void ChannelsCommentsItem::doExpand(bool open)
 void ChannelsCommentsItem::expandFill(bool first)
 {
 	GxsFeedItem::expandFill(first);
-
-	if (first) {
-		fillExpandFrame();
-	}
 }
 
 void ChannelsCommentsItem::toggle()
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h
index c790e3107..c245cbca7 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.h
@@ -42,12 +42,17 @@ public:
 	// It can be used for all apparences of channel posts. But in rder to merge comments from the previous versions of the post, the list of
 	// previous posts should be supplied. It's optional. If not supplied only the comments of the new version will be displayed.
 
-	ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId& groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate, const std::set<RsGxsMessageId>& older_versions = std::set<RsGxsMessageId>());
+    ChannelsCommentsItem(FeedHolder *feedHolder,
+                         uint32_t feedId,
+                         const RsGxsGroupId& groupId,
+                         const RsGxsMessageId& commentId,
+                         const RsGxsMessageId& threadId,
+                         bool isHome,
+                         bool autoUpdate);
 
 	// This one is used in channel thread widget. We don't want the group data to reload at every post, so we load it in the hosting
     // GxsChannelsPostsWidget and pass it to created items.
-
-	ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData& group, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate, const std::set<RsGxsMessageId>& older_versions = std::set<RsGxsMessageId>());
+    // ChannelsCommentsItem(FeedHolder *feedHolder, uint32_t feedId, const RsGroupMetaData& group, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate, const std::set<RsGxsMessageId>& older_versions = std::set<RsGxsMessageId>());
 
 	virtual ~ChannelsCommentsItem();
 
@@ -55,6 +60,7 @@ public:
 
 	bool setGroup(const RsGxsChannelGroup& group, bool doFill = true);
 	bool setPost(const RsGxsChannelPost& post, bool doFill = true);
+    bool setMissingPost();
 
 	QString getTitleLabel();
 	QString getMsgLabel();
@@ -85,8 +91,8 @@ protected:
 
 	/* GxsFeedItem */
 	virtual QString messageName();
-	virtual void loadMessage();
-	virtual void loadComment();
+    virtual void loadMessage() override {}
+    virtual void loadComment() override {}
 
 private slots:
 	/* default stuff */
@@ -104,21 +110,20 @@ signals:
 	void vote(const RsGxsGrpMsgIdPair& msgId, bool up);	
 
 private:
-	void setup();
-	void fill();
-	void fillExpandFrame();
+    void load();
+    void setup();
+    void fill(bool missing_post=false);
 
 private:
 	bool mInFill;
 	bool mCloseOnRead;
 	bool mLoaded;
 
-    bool mLoadingGroup;
-    bool mLoadingMessage;
-    bool mLoadingComment;
+    bool mLoading;
 
 	RsGroupMetaData mGroupMeta;
 	RsGxsChannelPost mPost;
+    RsGxsMessageId mThreadId;
 
 	/** Qt Designer generated object */
 	Ui::ChannelsCommentsItem *ui;

From 45c701c8e8694acd7cd39d3361395006c7137b7a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 19 Nov 2023 17:16:48 +0100
Subject: [PATCH 396/503] removed debug output

---
 .../src/gui/feeds/ChannelsCommentsItem.cpp      | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
index 46c129ebe..5b0e0b264 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
@@ -185,16 +185,11 @@ bool ChannelsCommentsItem::setPost(const RsGxsChannelPost& post, bool doFill)
     if (doFill)
 		fill();
 
-    std::cerr << "end setting post." << std::endl;
     return true;
 }
 bool ChannelsCommentsItem::setMissingPost()
 {
-    std::cerr << "setting missing post." << std::endl;
-
     fill(true);
-
-    std::cerr << "end setting missing post." << std::endl;
     return true;
 }
 
@@ -287,7 +282,6 @@ void ChannelsCommentsItem::load()
         return;
 
     mLoading= true;
-    std::cerr << "Loading message " << mPost.mMeta.mMsgId << std::endl;
 
     RsThread::async([this]()
 	{
@@ -304,8 +298,7 @@ void ChannelsCommentsItem::load()
 
         if (groups.size() != 1)
         {
-            std::cerr << "GxsGxsChannelGroupItem::loadGroup() Wrong number of Items";
-            std::cerr << std::endl;
+            std::cerr << "GxsGxsChannelGroupItem::loadGroup() Wrong number of Items" << std::endl;
             return;
         }
         RsGxsChannelGroup group(groups[0]);
@@ -336,7 +329,6 @@ void ChannelsCommentsItem::load()
             {
                 RsGxsComment cmt(comments[0]);
 
-                std::cerr << "setting comment." << std::endl;
                 uint32_t autorized_lines = (int)floor( (ui->avatarLabel->height() - ui->button_HL->sizeHint().height())
                                                       / QFontMetricsF(ui->subjectLabel->font()).height());
 
@@ -353,19 +345,20 @@ void ChannelsCommentsItem::load()
                 ui->avatarLabel->setPixmap(pixmap);
 
                 //Change this item to be uploaded with thread element. This is really bad practice.
-
-                mLoading=false;
             }
             else
+            {
+                mLoading=false;
                 removeItem();
+            }
 
             if (posts.size() == 1)
                 setPost(posts[0]);
             else
                 setMissingPost();
 
-            std::cerr << "End loading channel post comment data" << std::endl;
             emit sizeChanged(this);
+            mLoading=false;
 
         }, this );
     });

From 737eecad9e565da49cb90d672a9a023ed33ae1d0 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 20 Nov 2023 11:29:13 +0100
Subject: [PATCH 397/503] retroshare-service CMake fix icons install path

---
 retroshare-service/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index 672644369..443ca2227 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -116,15 +116,17 @@ if(RS_SERVICE_DESKTOP)
 
 		install(
 			FILES data/retroshare-service_48x48.png
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/retroshare-service.png )
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/
+			RENAME retroshare-service.png)
 
 		install(
 			FILES data/retroshare-service_128x128.png
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/retroshare-service.png )
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps/
+			RENAME retroshare-service.png )
 
 		install(
 			FILES data/retroshare-service.desktop
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/data/retroshare-service.desktop )
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/data/ )
 	endif(UNIX AND NOT APPLE)
 endif(RS_SERVICE_DESKTOP)
 

From 951be8f9a1c6da9e106e6188449d752a30632a60 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 25 Nov 2023 17:25:16 +0100
Subject: [PATCH 398/503] updated to latest commits in submodules

---
 libretroshare    | 2 +-
 retroshare-webui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libretroshare b/libretroshare
index de2b4bd80..bfa91bdef 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit de2b4bd80c57ca757b5f878130f98becf710236d
+Subproject commit bfa91bdef24f2339f1db053d155a6ef169027a95
diff --git a/retroshare-webui b/retroshare-webui
index ddd8b0b24..dae0c13ef 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit ddd8b0b241c21940c7addc20c3cce774ff8dc021
+Subproject commit dae0c13ef78aee59a4f1f9e1cdb0127b5e27d256

From 441ba17b53acc837337aac687cb83ffb5669d1be Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Sun, 26 Nov 2023 00:19:59 +0100
Subject: [PATCH 399/503] Changed automatic version numbering with "git
 describe" to split the third part into mini version (leading numbers) and
 extra version (string after the numbers)

---
 retroshare.pri | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/retroshare.pri b/retroshare.pri
index 19dd5434f..7858f67f6 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -456,13 +456,26 @@ defined in command line")
         RS_MINOR_VERSION = $$member(RS_GIT_DESCRIBE_SPLIT, 1)
 
         RS_GIT_DESCRIBE_SPLIT = $$member(RS_GIT_DESCRIBE_SPLIT, 2)
-        RS_GIT_DESCRIBE_SPLIT = $$split(RS_GIT_DESCRIBE_SPLIT, -)
+        RS_GIT_DESCRIBE_SPLIT = $$split(RS_GIT_DESCRIBE_SPLIT, )
 
-        RS_MINI_VERSION = $$member(RS_GIT_DESCRIBE_SPLIT, 0)
-
-        RS_GIT_DESCRIBE_SPLIT = $$member(RS_GIT_DESCRIBE_SPLIT, 1, -1)
-
-        RS_EXTRA_VERSION = $$join(RS_GIT_DESCRIBE_SPLIT,-,-)
+        # Split string into mini version (leading numbers) and extra version (string after the numbers)
+        RS_MINI_VERSION =
+        RS_EXTRA_VERSION =
+        for(CHAR, RS_GIT_DESCRIBE_SPLIT) {
+            isEqual(CHAR, 0) | greaterThan(CHAR, 0):lessThan(CHAR, 9) | isEqual(CHAR, 9) {
+                # Number
+                isEmpty(RS_EXTRA_VERSION) {
+                    # Add leading numbers to mini version
+                    RS_MINI_VERSION = $${RS_MINI_VERSION}$${CHAR}
+                } else {
+                    # Add to extra version
+                    RS_EXTRA_VERSION = $${RS_EXTRA_VERSION}$${CHAR}
+                }
+            } else {
+                # Add to extra version
+                RS_EXTRA_VERSION = $${RS_EXTRA_VERSION}$${CHAR}
+            }
+        }
 
         message("RetroShare version\
 $${RS_MAJOR_VERSION}.$${RS_MINOR_VERSION}.$${RS_MINI_VERSION}$${RS_EXTRA_VERSION}\

From e0873687a2022ada3ed41e43efee91676c1a56f0 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Sun, 26 Nov 2023 09:30:52 +0100
Subject: [PATCH 400/503] Update submodules and gitignore

---
 .gitignore        | 2 +-
 build_scripts/OBS | 2 +-
 libretroshare     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b4dfddcac..606e522a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ Thumbs.db
 !supportlibs/libsam3/Makefile
 
 # QtCreator cruft
-*CMakeLists.txt.user
+*CMakeLists.txt.user*
 
 # Build artifacts
 /jsonapi-generator/src/jsonapi-generator
diff --git a/build_scripts/OBS b/build_scripts/OBS
index 353596b0e..ce70038d0 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 353596b0ee5ea76611eb663b90bf3ab1c9f34ad7
+Subproject commit ce70038d0ff0110360b1529a8743307c8354e8aa
diff --git a/libretroshare b/libretroshare
index bfa91bdef..63a6a067d 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit bfa91bdef24f2339f1db053d155a6ef169027a95
+Subproject commit 63a6a067d7198acab21912903b048ca30855c8d9

From c0e564517e8e784eef84d165d800aad3fb63db37 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Sun, 26 Nov 2023 09:52:25 +0100
Subject: [PATCH 401/503] Add script to ease tag cleanup for every developers

---
 build_scripts/git_tag_cleaner.sh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100755 build_scripts/git_tag_cleaner.sh

diff --git a/build_scripts/git_tag_cleaner.sh b/build_scripts/git_tag_cleaner.sh
new file mode 100755
index 000000000..cf7a3ef0c
--- /dev/null
+++ b/build_scripts/git_tag_cleaner.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+function git_del_tag()
+{
+	mTag=$1
+
+	for mRemote in $(git remote); do
+		echo "Attempting tag $mTag removal from remote $mRemote"
+		GIT_TERMINAL_PROMPT=0 git push $mRemote :$mTag || true
+	done
+	git tag --delete $mTag
+}
+
+for mModule in . build_scripts/OBS/ libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ ; do
+	pushd $mModule
+	git_del_tag v0.6.7a
+	git tag --list | grep untagged | while read mTag; do git_del_tag $mTag ; done
+	popd
+done
+

From 9ae8c7a196740f99e7d67c53a5497e9d25293f42 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sun, 26 Nov 2023 18:07:06 +0100
Subject: [PATCH 402/503] Improved masos compile guide

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 62 ++++++++++++++++-------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 6dafd63c0..0ac7efcfa 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -30,13 +30,23 @@ In GitHub Desktop -> Clone Repository -> URL
 
        Add Repository URL: https://github.com/RetroShare/RetroShare.git and Clone
 
+## ***Get XCode & MacOSX SDK***
+
+Install XCode following this guide: [XCode](http://guide.macports.org/#installing.xcode)
+
+Install XCode command line developer tools:
+
+       $xcode-select --install
+
+Start XCode to get it updated and to able C compiler to create executables.
+
+Get Your MacOSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
+
 ## ***Choose if you use MacPort or HomeBrew***
 
 ### MacPort Installation
 
-Install MacPort and XCode following this guide: [MacPort and XCode](http://guide.macports.org/#installing.xcode)
-
-Start XCode to get it updated and to able C compiler to create executables.
+Install MacPort following this guide: [MacPort](http://guide.macports.org/#installing.xcode)
 
 #### Install libraries  
 
@@ -51,18 +61,11 @@ For VOIP Plugin:
        $ sudo port install opencv
        $ sudo port install ffmpeg
 
-Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
 
 ### HOMEBREW Installation
 
 Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)
 
-Install XCode command line developer tools:
-
-       $xcode-select --install
-
-Start XCode to get it updated and to able C compiler to create executables.
-
 #### Install libraries  
 
        $ brew install openssl
@@ -86,7 +89,6 @@ For FeedReader Plugin:
 
        $ brew install libxslt
 
-Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
 
 ## Last Settings
 
@@ -108,7 +110,7 @@ Edit RetroShare.pro
 
     CONFIG += c++14 rs_macos11.1
 
-and then retroshare.pri
+Edit retroshare.pri
 
     macx:CONFIG *= rs_macos11.1
     rs_macos10.8:CONFIG -= rs_macos11.1
@@ -131,13 +133,18 @@ Edit your retroshare.pri and add to macx-*  section
 
 alternative via Terminal
 
-    $ qmake INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib"
+    $ qmake 
+    INCLUDEPATH+="/usr/local/opt/openssl/include" \
+    QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" \
+    CONFIG+=rs_autologin \
+    CONFIG+=rs_use_native_dialogs \
+    CONFIG+=release \
+    ..
 
-For FeedReader Plugin:
 
-    INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2"
-
-For building RetroShare with plugins:
+With plugins:
 
     $ qmake \
     INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
@@ -159,13 +166,30 @@ For building RetroShare with plugins:
 
 You can now compile RetroShare into Qt Creator or with Terminal
 
-       cd retroshare
-       qmake; make
+       $ cd /path/to/retroshare
+       $ qmake ..
+       $ make
 
 You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK
 
 You can find the compiled application at *./retroshare/retroshare-gui/src/retroshare.app*
 
+## Issues
+
+If you have issues with openssl (Undefined symbols for architecture x86_64) try to add to *~/.profile* file this or via Terminal
+
+       export PATH="/usr/local/opt/openssl/bin:$PATH"
+       export LDFLAGS="-L/usr/local/opt/openssl/lib"
+       export CPPFLAGS="-I/usr/local/opt/openssl/include"
+       export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
+
+For Qt Creator -> QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additional arguments:
+
+       LDFLAGS="-L/usr/local/opt/openssl/lib"
+       CPPFLAGS="-I/usr/local/opt/openssl/include"
+
+
+
 ## Copy Plugins
 
     $ cp \

From 331cc2e3743056076f436ffefd9195a1b84e068a Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sun, 26 Nov 2023 18:09:56 +0100
Subject: [PATCH 403/503] added new improved macos package file

---
 build_scripts/OSX/makeOSXPackage.sh | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 build_scripts/OSX/makeOSXPackage.sh

diff --git a/build_scripts/OSX/makeOSXPackage.sh b/build_scripts/OSX/makeOSXPackage.sh
new file mode 100644
index 000000000..440760ac4
--- /dev/null
+++ b/build_scripts/OSX/makeOSXPackage.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+APP="RetroShare"
+RSVERSION="0.6.7a"
+QTVERSION="Qt-5.14.1"
+
+# Install the 7z to create dmg archives.
+#brew list p7zip || brew install p7zip
+
+# Package your app
+echo "Packaging retroshare..."
+#cd ${project_dir}/build/macOS/clang/x86_64/release/
+cd retroshare-gui/src/
+
+# Remove build directories that you don't want to deploy
+rm -rf moc
+rm -rf obj
+rm -rf qrc
+
+# This automatically creates retroshare.dmg
+
+echo "Creating dmg archive..."
+macdeployqt retroshare.app -dmg
+
+DATE=`date +"%m-%d-%Y"`
+MACVERSION=`sw_vers -productVersion`
+
+mv $APP.dmg "$APP-$RSVERSION-$DATE-MacOS-$MACVERSION-$QTVERSION.dmg"
+
+# You can use the appdmg command line app to create your dmg file if
+# you want to use a custom background and icon arrangement. I'm still
+# working on this for my apps, myself. If you want to do this, you'll
+# remove the -dmg option above.
+# appdmg json-path YourApp_${TRAVIS_TAG}.dmg
+
+# Copy other project files
+cp "../../libbitdht/src/bitdht/bdboot.txt" "retroshare.app/Contents/Resources/"
+cp "../../plugins/FeedReader/lib/libFeedReader.dylib" "retroshare.app/Contents/Resources/"
+
+# cp "${project_dir}/README.md" "README.md"
+# cp "${project_dir}/LICENSE" "LICENSE"
+# cp "${project_dir}/Qt License" "Qt License"

From ea943369a0475dc10b15553a85769989c2f4713e Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Sun, 26 Nov 2023 21:56:37 +0100
Subject: [PATCH 404/503] Update libretroshare submodule

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index 63a6a067d..9c53fb6f0 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 63a6a067d7198acab21912903b048ca30855c8d9
+Subproject commit 9c53fb6f03561264b22bdca9aa88753f94dc0363

From 678357ab2a0621f54aab704253d5876626cea4b5 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Sun, 26 Nov 2023 22:53:35 +0100
Subject: [PATCH 405/503] Update libretroshare submodule

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index 9c53fb6f0..6ef55dd3b 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 9c53fb6f03561264b22bdca9aa88753f94dc0363
+Subproject commit 6ef55dd3b0f7b1d8e56143a50b7ad4fa6859ab74

From 3f40837b1c1043638465d1b55e7cf376b9c3b45d Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 27 Nov 2023 00:06:12 +0100
Subject: [PATCH 406/503] Fix GitlabCI and improve CMake support

Do not use mirrors which may be out of sync
---
 build_scripts/GitlabCI/base.Dockerfile     | 19 ++++++++++++-------
 build_scripts/GitlabCI/gitlabCI.Dockerfile |  8 ++++----
 libretroshare                              |  2 +-
 retroshare-service/CMakeLists.txt          |  4 ++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/build_scripts/GitlabCI/base.Dockerfile b/build_scripts/GitlabCI/base.Dockerfile
index 13097f58d..014b8fb04 100644
--- a/build_scripts/GitlabCI/base.Dockerfile
+++ b/build_scripts/GitlabCI/base.Dockerfile
@@ -40,18 +40,23 @@ RUN git clone --depth 1 https://github.com/aetilius/pHash.git && \
 	rm -rf pHash-build pHash
 
 ARG FRESHCLONE=0
-ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 ARG REPO_DEPTH="--depth 2000"
-RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && cd RetroShare && \
+RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && \
+	cd RetroShare && \
 	git fetch --tags && \
-	git submodule update --init --remote --force \
-		libbitdht/ libretroshare/ openpgpsdk/ && \
-	cd ..
+	git submodule update --init \
+		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ \
+		supportlibs/restbed/ && \
+	cd supportlibs/restbed/ && \
+	git submodule update --init \
+		dependency/asio/ dependency/kashmir/ && \
+	cd ../../../
 
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON && \
-	make -j$(nproc) && make install && \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON && \
+	make -j$(nproc) -j1 && make install && \
 	cd .. && rm -rf RetroShare-build
diff --git a/build_scripts/GitlabCI/gitlabCI.Dockerfile b/build_scripts/GitlabCI/gitlabCI.Dockerfile
index c62c4d198..5ae3f4ed3 100644
--- a/build_scripts/GitlabCI/gitlabCI.Dockerfile
+++ b/build_scripts/GitlabCI/gitlabCI.Dockerfile
@@ -2,19 +2,19 @@ FROM registry.gitlab.com/retroshare/retroshare:base
 
 RUN apt-get update -y && apt-get upgrade -y
 
-ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 RUN \
 	cd RetroShare && git remote add testing $REPO_URL && \
 	git fetch --tags testing $REPO_BRANCH && \
 	git reset --hard testing/$REPO_BRANCH && \
-	git submodule update --init --remote --force \
-		libbitdht/ libretroshare/ openpgpsdk/ && \
+	git submodule update --init \
+		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ && \
 	git --no-pager log --max-count 1
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON \
 		-DRS_WARN_DEPRECATED=OFF -DRS_WARN_LESS=ON && \
 	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build
diff --git a/libretroshare b/libretroshare
index 6ef55dd3b..78739f1eb 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 6ef55dd3b0f7b1d8e56143a50b7ad4fa6859ab74
+Subproject commit 78739f1eb504503b12f107109356624da49e75ef
diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index 443ca2227..c7560728e 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -95,7 +95,7 @@ if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/CMakeLists.txt" )
 else()
 	FetchContent_Declare(
 		libretroshare
-		GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
+		GIT_REPOSITORY "https://github.com/RetroShare/libretroshare.git"
 		GIT_TAG "origin/master"
 		GIT_SHALLOW TRUE
 		GIT_PROGRESS TRUE
@@ -151,7 +151,7 @@ if(RS_WEBUI)
 	else()
 		FetchContent_Declare(
 			webui
-			GIT_REPOSITORY "https://gitlab.com/RetroShare/RetroShareWebUI.git"
+			GIT_REPOSITORY "https://github.com/RetroShare/RSNewWebUI.git"
 			GIT_TAG "origin/master"
 			GIT_SHALLOW TRUE
 			GIT_PROGRESS TRUE

From 67762c1eb0472891d00fae421ee92a3503abd01e Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Mon, 27 Nov 2023 01:33:19 +0100
Subject: [PATCH 407/503] More attempts at fixing GitlabCI

See https://forum.gitlab.com/t/docker-dind-stops-working-after-12-1-0-update/28664/11
---
 .gitlab-ci.yml                         | 6 ++++--
 build_scripts/GitlabCI/base.Dockerfile | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c91f867a5..45fed1bb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
-image: docker:stable
+image: docker:latest
 
 services:
-  - docker:stable-dind
+  - docker:dind
 
 stages:
   - build
@@ -18,6 +18,7 @@ variables:
 build-ubuntu-test-image:
     stage: build
     script:
+        - docker --version
         - > 
           docker login "$CI_REGISTRY"
           --username "$CI_REGISTRY_USER"
@@ -35,6 +36,7 @@ build-ubuntu-test-image:
 test-ubuntu:
     stage: test
     script:
+        - docker --version
         - > 
           docker login "$CI_REGISTRY"
           --username "$CI_REGISTRY_USER"
diff --git a/build_scripts/GitlabCI/base.Dockerfile b/build_scripts/GitlabCI/base.Dockerfile
index 014b8fb04..5fd1bd81d 100644
--- a/build_scripts/GitlabCI/base.Dockerfile
+++ b/build_scripts/GitlabCI/base.Dockerfile
@@ -58,5 +58,5 @@ RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
 		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON && \
-	make -j$(nproc) -j1 && make install && \
+	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build

From 463a25a0486557b133115147ec25e59ae59e476c Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@retroshare.cc>
Date: Tue, 28 Nov 2023 22:47:59 +0100
Subject: [PATCH 408/503] Update OBS submodule

---
 build_scripts/OBS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index ce70038d0..97a75f2f0 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit ce70038d0ff0110360b1529a8743307c8354e8aa
+Subproject commit 97a75f2f098babf2f6498f01ff9119aa35ce9a28

From 5ee6f6a2e8da2dec2bb2218256a35b45a1a754c0 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Wed, 29 Nov 2023 12:36:23 +0100
Subject: [PATCH 409/503] Update XCode part

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 0ac7efcfa..2349a4146 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -34,6 +34,19 @@ In GitHub Desktop -> Clone Repository -> URL
 
 Install XCode following this guide: [XCode](http://guide.macports.org/#installing.xcode)
 
+To identify the correct version of Xcode to install, you need to know which OS you are running. Go to the [x] menu -> "About This Mac" and read the macOS version number.
+
+If you are running the macOS Catalina >= 10.15, you can install Xcode directly from App Store using the instructions below. 
+
+You can find older versions of Xcode at [Apple Developer Downloads](https://developer.apple.com/downloads/). Find the appropriate .xip file for your macOS version
+
+To install from App Store:
+
+Select [x] menu - > "App Store…".
+Search for Xcode. Download and install.
+
+Once Xcode has installed, you must drag the XCode icon into your Applications folder. After you have done this, open Xcode from the Applications folder by double-clicking on the icon and then follow the remaining instructions below. 
+
 Install XCode command line developer tools:
 
        $xcode-select --install

From 31552b111914446d040faceb15c51d80c7488218 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:32:16 +0100
Subject: [PATCH 410/503] Update MacOS_X_InstallGuide.md

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 2349a4146..886372ce4 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -119,7 +119,7 @@ In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additiona
 
 ## Set your Mac OS SDK version
 
-Edit RetroShare.pro  
+Edit RetroShare.pro and set your installed sdk version example for 11.1 -> rs_macos11.1
 
     CONFIG += c++14 rs_macos11.1
 
@@ -137,7 +137,7 @@ Edit retroshare.pri
 
 ## Link Include & Libraries
 
-Edit your retroshare.pri and add to macx-*  section
+When required edit your retroshare.pri macx-* section, check if the Include and Lib path are correct (macx-* section)
 
     INCLUDEPATH += "/usr/local/opt/openssl/include"
     QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"

From 6fffb322ae4557f261da5066d6b070c1627e042f Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Fri, 1 Dec 2023 22:26:44 +0100
Subject: [PATCH 411/503] Improved makeOSXPackage.sh file

* Added to ship sounds dir
* Added CFBundleVersion & CFBundleShortVersionString string
* Added to get Git head string for package naming
---
 build_scripts/OSX/makeOSXPackage.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build_scripts/OSX/makeOSXPackage.sh b/build_scripts/OSX/makeOSXPackage.sh
index 440760ac4..0af925693 100644
--- a/build_scripts/OSX/makeOSXPackage.sh
+++ b/build_scripts/OSX/makeOSXPackage.sh
@@ -17,6 +17,11 @@ rm -rf moc
 rm -rf obj
 rm -rf qrc
 
+# This sets the CFBundleVersion & CFBundleShortVersionString string
+#/usr/libexec/PlistBuddy -c "Delete :CFBundleGetInfoString" retroshare.app/Contents/Info.plist
+/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $RSVERSION" retroshare.app/Contents/Info.plist
+/usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string $RSVERSION" retroshare.app/Contents/Info.plist
+
 # This automatically creates retroshare.dmg
 
 echo "Creating dmg archive..."
@@ -24,8 +29,10 @@ macdeployqt retroshare.app -dmg
 
 DATE=`date +"%m-%d-%Y"`
 MACVERSION=`sw_vers -productVersion`
+#RSVERSION=`git describe --abbrev=0 --tags`
+GITHEAD=`git rev-parse --short HEAD`
 
-mv $APP.dmg "$APP-$RSVERSION-$DATE-MacOS-$MACVERSION-$QTVERSION.dmg"
+mv $APP.dmg "$APP-$RSVERSION-$GITHEAD-$DATE-$MACVERSION-$QTVERSION.dmg"
 
 # You can use the appdmg command line app to create your dmg file if
 # you want to use a custom background and icon arrangement. I'm still
@@ -36,6 +43,7 @@ mv $APP.dmg "$APP-$RSVERSION-$DATE-MacOS-$MACVERSION-$QTVERSION.dmg"
 # Copy other project files
 cp "../../libbitdht/src/bitdht/bdboot.txt" "retroshare.app/Contents/Resources/"
 cp "../../plugins/FeedReader/lib/libFeedReader.dylib" "retroshare.app/Contents/Resources/"
+cp -R "sounds" "retroshare.app/Contents/Resources/sounds"
 
 # cp "${project_dir}/README.md" "README.md"
 # cp "${project_dir}/LICENSE" "LICENSE"

From ec35e74400df00a1ae825d8128d46fa6cab32f9a Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Fri, 1 Dec 2023 22:31:01 +0100
Subject: [PATCH 412/503] fix last commit

---
 build_scripts/OSX/makeOSXPackage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/OSX/makeOSXPackage.sh b/build_scripts/OSX/makeOSXPackage.sh
index 0af925693..b599df3c3 100644
--- a/build_scripts/OSX/makeOSXPackage.sh
+++ b/build_scripts/OSX/makeOSXPackage.sh
@@ -32,7 +32,7 @@ MACVERSION=`sw_vers -productVersion`
 #RSVERSION=`git describe --abbrev=0 --tags`
 GITHEAD=`git rev-parse --short HEAD`
 
-mv $APP.dmg "$APP-$RSVERSION-$GITHEAD-$DATE-$MACVERSION-$QTVERSION.dmg"
+mv $APP.dmg "$APP-$RSVERSION-$GITHEAD-$DATE-MacOS-$MACVERSION-$QTVERSION.dmg"
 
 # You can use the appdmg command line app to create your dmg file if
 # you want to use a custom background and icon arrangement. I'm still

From 493f89643ce499e7c452eadcdd8d60a869ab4982 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:49:19 +0100
Subject: [PATCH 413/503] Update MacOS_X_InstallGuide.md

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 886372ce4..0868500ee 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -119,11 +119,8 @@ In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additiona
 
 ## Set your Mac OS SDK version
 
-Edit RetroShare.pro and set your installed sdk version example for 11.1 -> rs_macos11.1
 
-    CONFIG += c++14 rs_macos11.1
-
-Edit retroshare.pri
+Edit retroshare.pri and set your installed sdk version example for 11.1 -> rs_macos11.1 ( line 129:)
 
     macx:CONFIG *= rs_macos11.1
     rs_macos10.8:CONFIG -= rs_macos11.1

From e00e94e87f4b10447eed237f9779e2f682d21bca Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:46:06 +0100
Subject: [PATCH 414/503] fix for line

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 0868500ee..b3dc0e88d 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -120,7 +120,7 @@ In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additiona
 ## Set your Mac OS SDK version
 
 
-Edit retroshare.pri and set your installed sdk version example for 11.1 -> rs_macos11.1 ( line 129:)
+Edit retroshare.pri and set your installed sdk version example for 11.1 -> rs_macos11.1 (line 135:)
 
     macx:CONFIG *= rs_macos11.1
     rs_macos10.8:CONFIG -= rs_macos11.1

From 7decd2b7b03787cb36164e6dfe3d2337afa53057 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 11 Dec 2023 21:51:17 +0100
Subject: [PATCH 415/503] removed some debug output

---
 .../src/gui/Posted/PostedListWidgetWithModel.cpp       |  5 ++++-
 retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp        | 10 ++++++++--
 retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp     |  2 ++
 .../src/gui/gxschannels/GxsChannelPostFilesModel.cpp   |  3 ++-
 .../src/gui/gxschannels/GxsChannelPostsModel.cpp       |  4 +++-
 .../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp |  6 ++++++
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 1798bb4bc..9245706d1 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -619,12 +619,13 @@ void PostedListWidgetWithModel::updateGroupData()
 
 void PostedListWidgetWithModel::postPostLoad()
 {
+#ifdef DEBUG_POSTED
 	std::cerr << "Post channel load..." << std::endl;
+#endif
 	whileBlocking(ui->filter_LE)->setText(QString()); //Clear it before navigate, as it will update it.
 
 	if (!mNavigatePendingMsgId.isNull())
 		navigate(mNavigatePendingMsgId);
-
 #ifdef TO_REMOVE
 	else if( (mLastSelectedPosts.count(groupId()) > 0)
 	         && !mLastSelectedPosts[groupId()].isNull())
@@ -639,8 +640,10 @@ void PostedListWidgetWithModel::postPostLoad()
 		ui->postsTree->setFocus();
 	}
 #endif
+#ifdef DEBUG_POSTED
 	else
 		std::cerr << "No pre-selected channel post." << std::endl;
+#endif
 
 	updateShowLabel();
 }
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
index 1233b3100..afc676bdd 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
@@ -131,15 +131,19 @@ void GxsCommentDialog::idChooserReady()
 
 void GxsCommentDialog::voterSelectionChanged( int index )
 {
+#ifdef DEBUG_COMMENT_DIALOG
 	std::cerr << "GxsCommentDialog::voterSelectionChanged(" << index << ")";
 	std::cerr << std::endl;
+#endif
 
 	RsGxsId voterId; 
 	switch (ui->idChooser->getChosenId(voterId)) {
 		case GxsIdChooser::KnowId:
 		case GxsIdChooser::UnKnowId:
-		std::cerr << "GxsCommentDialog::voterSelectionChanged() => " << voterId;
+#ifdef DEBUG_COMMENT_DIALOG
+        std::cerr << "GxsCommentDialog::voterSelectionChanged() => " << voterId;
 		std::cerr << std::endl;
+#endif
 		ui->treeWidget->setVoteId(voterId);
 
 		break;
@@ -160,8 +164,10 @@ void GxsCommentDialog::setCommentHeader(QWidget *header)
 		return;
 	}
 
-	std::cerr << "GxsCommentDialog::setCommentHeader() Adding header to ui,postFrame";
+#ifdef DEBUG_COMMENT_DIALOG
+    std::cerr << "GxsCommentDialog::setCommentHeader() Adding header to ui,postFrame";
 	std::cerr << std::endl;
+#endif
 
 	//header->setParent(ui->postFrame);
 	//ui->postFrame->setVisible(true);
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 9d8d66d61..069c51b79 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -466,7 +466,9 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point)
 			uint32_t current_store_time = checkDelay(mInterface->getStoragePeriod(mGroupId))/86400 ;
 			uint32_t current_sync_time  = checkDelay(mInterface->getSyncPeriod(mGroupId))/86400 ;
 
+#ifdef DEBUG_GROUPFRAMEDIALOG
 			std::cerr << "Got sync=" << current_sync_time << ". store=" << current_store_time << std::endl;
+#endif
 			QAction *actnn = NULL;
 
 			QMenu *ctxMenu2 = contextMnu.addMenu(tr("Synchronise posts of last...")) ;
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index 0796b6ce1..806fcaa69 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -499,8 +499,9 @@ void RsGxsChannelPostFilesModel::update_files(std::set<ChannelPostFileInfo>& add
         else
             ++afit;
     }
-
+#ifdef DEBUG_CHANNEL_FILES_MODEL
     RsDbg() << "  Remains: " << added_files.size() << " added files and " << removed_files.size() << " removed files" ;
+#endif
 
     // 2 - add whatever file remains,
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index a42587d85..8b5b7e707 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -38,7 +38,7 @@
 #include "GxsChannelPostFilesModel.h"
 
 //#define DEBUG_CHANNEL_MODEL_DATA
-#define DEBUG_CHANNEL_MODEL
+//#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 Q_DECLARE_METATYPE(RsGxsChannelPost)
@@ -592,10 +592,12 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
 			std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve channel messages for channel " << group_id << std::endl;
 			return;
 		}
+#ifdef DEBUG_CHANNEL_MODEL
         std::cerr << "Got channel all content for channel " << group_id << std::endl;
         std::cerr << "  posts   : " << posts->size() << std::endl;
         std::cerr << "  comments: " << comments.size() << std::endl;
         std::cerr << "  votes   : " << votes.size() << std::endl;
+#endif
 
         // 2 - update the model in the UI thread.
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 2e292444e..18aa2ad17 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -781,7 +781,9 @@ void GxsChannelPostsWidgetWithModel::handlePostsTreeSizeChange(QSize s,bool forc
         return;
 
     int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),ui->postsTree->width()))));
+#ifdef DEBUG_CHANNEL_POSTS_WIDGET
     RsDbg() << "nb columns: " << n_columns << " current count=" << mChannelPostsModel->columnCount() ;
+#endif
 
     // save current post. The setNumColumns() indeed loses selection
 
@@ -825,7 +827,9 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         {
             if(e->mChannelGroupId == groupId())
             {
+#ifdef DEBUG_CHANNEL_POSTS_WIDGET
                 RsDbg() << "Received new message in current channel, msgId=" << e->mChannelMsgId ;
+#endif
 
                 RsThread::async([this,E=*e]()	// dereferencing to make a copy that will survive while e is deleted by the parent thread.
                 {
@@ -1042,7 +1046,9 @@ void GxsChannelPostsWidgetWithModel::updateData(bool update_group_data, bool upd
 
 void GxsChannelPostsWidgetWithModel::postChannelPostLoad()
 {
+#ifdef DEBUG_CHANNEL_POSTS_WIDGET
     std::cerr << "Post channel load..." << std::endl;
+#endif
 
     if (!mNavigatePendingMsgId.isNull())
         navigate(mNavigatePendingMsgId);

From b9e7bb5457342ad399d9db7f29afb60c69ee6575 Mon Sep 17 00:00:00 2001
From: PYRET1C <88980503+PYRET1C@users.noreply.github.com>
Date: Fri, 15 Dec 2023 00:05:41 +0530
Subject: [PATCH 416/503] added the new token service in more funcitons and
 resolved the crash on posting a pulse

---
 .../src/gui/TheWire/PulseAddDialog.cpp        | 15 +++++++-------
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 20 ++++++++++++-------
 retroshare-gui/src/gui/TheWire/WireDialog.h   |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 4dd233b26..f50caa790 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -103,10 +103,9 @@ void PulseAddDialog::setGroup(const RsGxsGroupId &grpId)
         return;
     }
 
-    RsWireGroupSPtr pGroup;
-
-    RsThread::async([this,grpId,&pGroup](){
+    RsThread::async([this,grpId](){
 
+        RsWireGroupSPtr pGroup;
         if(!rsWire->getWireGroup(grpId,pGroup))
         {
             std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve wire group info for wire id:  " << grpId << std::endl;
@@ -260,11 +259,11 @@ void PulseAddDialog::setReplyTo(const RsGxsGroupId &grpId, const RsGxsMessageId
         return;
     }
 	/* fetch in the background */
-    RsWireGroupSPtr pGroup;
-    RsWirePulseSPtr pPulse;
 
-    RsThread::async([this,grpId,&pGroup,&pPulse,msgId,replyType](){
+    RsThread::async([this,grpId,msgId,replyType](){
 
+        RsWireGroupSPtr pGroup;
+        RsWirePulseSPtr pPulse;
         if(!rsWire->getWireGroup(grpId,pGroup))
         {
             std::cerr << __PRETTY_FUNCTION__ << "PulseAddDialog::setRplyTo() failed to fetch group id: "  << grpId << std::endl;
@@ -345,7 +344,7 @@ void PulseAddDialog::postOriginalPulse()
 	std::cerr << "PulseAddDialog::postOriginalPulse()";
 	std::cerr << std::endl;
 
-    RsWirePulseSPtr pPulse;
+    RsWirePulseSPtr pPulse(new RsWirePulse());
 
     pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
     pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
@@ -407,7 +406,7 @@ void PulseAddDialog::postReplyPulse()
 	std::cerr << "PulseAddDialog::postReplyPulse()";
 	std::cerr << std::endl;
 
-    RsWirePulseSPtr pPulse;
+    RsWirePulseSPtr pPulse(new RsWirePulse());
 
     pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
     pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 38ea1b398..46d2486ea 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -140,6 +140,7 @@ WireDialog::~WireDialog()
 	processSettings(false);
 	
 	clearTwitterView();
+    std::cerr << "WireDialog::~WireDialog()" << std::endl;
     delete(mWireQueue);
 
     rsEvents->unregisterEventsHandler(mEventHandlerId);
@@ -467,13 +468,13 @@ bool WireDialog::loadGroupData(const uint32_t &token)
 	std::cerr << "WireDialog::loadGroupData()";
 	std::cerr << std::endl;
 
-	std::vector<RsWireGroup> groups;
-	rsWire->getGroupData(token, groups);
+    std::vector<RsWireGroup> groups;
+    rsWire->getGroupData(token, groups);
 
-	// save list of groups.
-	updateGroups(groups);
-	showGroups();
-	return true;
+    // save list of groups.
+    updateGroups(groups);
+    showGroups();
+    return true;
 }
 
 rstime_t WireDialog::getFilterTimestamp()
@@ -681,6 +682,7 @@ void WireDialog::PVHrate(const RsGxsId &authorId)
 void WireDialog::postTestTwitterView()
 {
 	clearTwitterView();
+    std::cerr << "WireDialog::postTestTwitterView()" << std::endl;
 
 	addTwitterView(new PulseTopLevel(NULL,RsWirePulseSPtr())); 
 	addTwitterView(new PulseReply(NULL,RsWirePulseSPtr()));
@@ -837,6 +839,7 @@ void WireDialog::requestPulseFocus(const RsGxsGroupId groupId, const RsGxsMessag
 void WireDialog::showPulseFocus(const RsGxsGroupId groupId, const RsGxsMessageId msgId)
 {
 	clearTwitterView();
+    std::cerr << "WireDialog::showPulseFocus()" << std::endl;
 
 	// background thread for loading.
 	RsThread::async([this, groupId, msgId]()
@@ -866,6 +869,8 @@ void WireDialog::showPulseFocus(const RsGxsGroupId groupId, const RsGxsMessageId
 void WireDialog::postPulseFocus(RsWirePulseSPtr pPulse)
 {
 	clearTwitterView();
+    std::cerr << "WireDialog::postPulseFocus()" << std::endl;
+
 	if (!pPulse)
 	{
 		std::cerr << "WireDialog::postPulseFocus() Invalid pulse";
@@ -938,7 +943,7 @@ void WireDialog::requestGroupFocus(const RsGxsGroupId groupId)
 void WireDialog::showGroupFocus(const RsGxsGroupId groupId)
 {
 	clearTwitterView();
-
+    std::cerr << "WireDialog::showGroupFocus()" << std::endl;
 	// background thread for loading.
 	RsThread::async([this, groupId]()
 	{
@@ -1015,6 +1020,7 @@ void WireDialog::requestGroupsPulses(const std::list<RsGxsGroupId>& groupIds)
 void WireDialog::showGroupsPulses(const std::list<RsGxsGroupId>& groupIds)
 {
 	clearTwitterView();
+    std::cerr << "WireDialog::showGroupPulses()" << std::endl;
 
 	// background thread for loading.
 	RsThread::async([this, groupIds]()
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.h b/retroshare-gui/src/gui/TheWire/WireDialog.h
index a55369fc0..fcd33ad37 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.h
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.h
@@ -150,7 +150,7 @@ private:
 
 	// Loading Data.
 	void requestGroupData();
-	bool loadGroupData(const uint32_t &token);
+    bool loadGroupData(const uint32_t &token);
 	void acknowledgeGroup(const uint32_t &token, const uint32_t &userType);
 
 	virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req) override;

From 6fb53d823eac10ced3d409b3403b5405a6e881ce Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Mon, 18 Dec 2023 13:07:36 +0100
Subject: [PATCH 417/503] Added icon for retroshare-service for the macOS
 platform #2802

---
 retroshare-service/src/retroshare-service.pro | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/retroshare-service/src/retroshare-service.pro b/retroshare-service/src/retroshare-service.pro
index 6458e03ed..275f868cc 100644
--- a/retroshare-service/src/retroshare-service.pro
+++ b/retroshare-service/src/retroshare-service.pro
@@ -70,6 +70,10 @@ macx {
 	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
 	LIBS += -lz 
         #LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
+	RC_FILE = $$files($$PWD/logo.icns)
+        mac_icon.files = $$files($$PWD/logo.icns)
+        mac_icon.path = Contents/Resources
+        QMAKE_BUNDLE_DATA += mac_icon
 
 	for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
 

From 6f982a20ba71b0b2abb5247275ed60372527b637 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Mon, 18 Dec 2023 13:09:11 +0100
Subject: [PATCH 418/503] Added logo for retroshare-service on macOS

---
 retroshare-service/src/logo.icns | Bin 0 -> 432754 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 retroshare-service/src/logo.icns

diff --git a/retroshare-service/src/logo.icns b/retroshare-service/src/logo.icns
new file mode 100644
index 0000000000000000000000000000000000000000..cb105009d416164976c442f33efd41418a42d3f0
GIT binary patch
literal 432754
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
DK~xvX

literal 0
HcmV?d00001


From 419d3895be07a414d9afc82876887506c609d083 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 19 Dec 2023 18:58:16 +0100
Subject: [PATCH 419/503] Added a dock menu for macOS

---
 retroshare-gui/src/gui/MainWindow.cpp | 47 +++++++++++++++++++++++++++
 retroshare-gui/src/gui/MainWindow.h   | 11 +++++++
 2 files changed, 58 insertions(+)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index a59d76dfb..31fa13467 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -28,6 +28,7 @@
 #include <QString>
 #include <QUrl>
 #include <QtDebug>
+#include <QMenuBar>
 
 #include <retroshare/rsplugin.h>
 #include <retroshare/rsconfig.h>
@@ -377,6 +378,10 @@ MainWindow::~MainWindow()
     delete sysTrayStatus;
     delete trayIcon;
     delete trayMenu;
+#if defined(Q_OS_DARWIN)
+    delete menuBar;
+    delete dockMenu;
+#endif
 //  delete notifyMenu; // already deleted by the deletion of trayMenu
     StatisticsWindow::releaseInstance();
 
@@ -651,10 +656,48 @@ void MainWindow::createTrayIcon()
     trayIcon->setContextMenu(trayMenu);
     trayIcon->setIcon(QIcon(IMAGE_NOONLINE));
 
+#if defined(Q_OS_DARWIN)
+    createMenuBar();
+#endif
+
     connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleVisibility(QSystemTrayIcon::ActivationReason)));
     trayIcon->show();
 }
 
+#if defined(Q_OS_DARWIN)
+/** Creates a new menubar for macOS */
+void MainWindow::createMenuBar()
+{
+    /* Mac users sure like their shortcuts. */
+    actionMinimize = new QAction(tr("Minimize"),this);
+    actionMinimize->setShortcutContext(Qt::ApplicationShortcut);
+    actionMinimize->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
+    actionMinimize->setShortcutVisibleInContextMenu(true);
+    connect(actionMinimize,SIGNAL(triggered()),this,SLOT(showMinimized())) ;
+
+    menuBar = new QMenuBar(this);
+    QMenu *fileMenu = menuBar->addMenu("");
+    fileMenu->addAction(actionMinimize);
+
+    dockMenu = new QMenu(this);
+    dockMenu->setAsDockMenu();
+    dockMenu->addAction(tr("Open Messages"), this, SLOT(Mess()));
+    dockMenu->addAction(tr("Bandwidth Graph"), this, SLOT(showBandwidthGraph()));
+    dockMenu->addAction(tr("Statistics"), this, SLOT(showStatisticsWindow()));
+    dockMenu->addAction(tr("Options"), this, SLOT(showSettings()));
+    dockMenu->addAction(tr("Help"), this, SLOT(showHelpDialog()));
+
+    dockMenu->addSeparator();
+    QObject::connect(dockMenu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
+    toggleVisibilityAction = dockMenu->addAction(tr("Show/Hide"), this, SLOT(toggleVisibilitycontextmenu()));
+
+    dockMenu->addSeparator();
+    QMenu *statusMenu = dockMenu->addMenu(tr("Status"));
+    initializeStatusObject(statusMenu, true);
+
+}
+#endif
+
 void MainWindow::showBandwidthGraph()
 {
 	if(_bandwidthGraph == NULL)
@@ -1220,7 +1263,11 @@ void MainWindow::updateMenu()
 
 void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e)
 {
+#if defined(Q_OS_DARWIN)
+    if (e == QSystemTrayIcon::DoubleClick) {
+#else
     if (e == QSystemTrayIcon::Trigger || e == QSystemTrayIcon::DoubleClick) {
+#endif
         if (isHidden() || isMinimized()) {
             show();
             if (isMinimized()) {
diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h
index bac210f2c..692d7ed55 100644
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@@ -308,6 +308,10 @@ private:
     void initStackedPage();
     void addPage(MainPage *page, QActionGroup *grp, 	QList<QPair<MainPage *, QPair<QAction *, QListWidgetItem *> > > *notify);
     void createTrayIcon();
+#if defined(Q_OS_DARWIN)
+    /** Creates a default menubar on Mac */
+    void createMenuBar();
+#endif
     void createNotifyIcons();
     static MainWindow *_instance;
 
@@ -324,6 +328,13 @@ private:
 
     QString nameAndLocation;
 
+#if defined(Q_OS_DARWIN)
+    /** The menubar (Mac OS X only). */
+    QMenuBar *menuBar;
+    QMenu *dockMenu;
+    QAction* actionMinimize;
+#endif
+
     QSystemTrayIcon *trayIcon;
     QMenu *notifyMenu;
     QMenu *trayMenu;

From 50c6b4a8aa4f74d4f5787602af696fd268d9224a Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Wed, 20 Dec 2023 21:12:18 +0100
Subject: [PATCH 420/503] Added needed feedreader depencies

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index b3dc0e88d..24c111acc 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -101,7 +101,7 @@ For VOIP Plugin:
 For FeedReader Plugin:
 
        $ brew install libxslt
-
+       $ brew install libxml2
 
 ## Last Settings
 

From 48510e381822a4b463094a7fca0d4c02cd9395ee Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Wed, 20 Dec 2023 12:30:42 -0800
Subject: [PATCH 421/503] Added Feedreader include path for libxml2

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 24c111acc..7f8b389a4 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -153,6 +153,9 @@ alternative via Terminal
     CONFIG+=release \
     ..
 
+For FeedReader Plugin:
+
+    INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2"
 
 With plugins:
 

From 0ec569216b80fea10e423c1c8eb3e1e4dfa149cb Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sat, 23 Dec 2023 09:23:53 +0100
Subject: [PATCH 422/503] Added cmake install to the guide

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 7f8b389a4..35c89a7eb 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -86,6 +86,10 @@ Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)
        $ brew install libmicrohttpd
        $ brew install rapidjson
        $ brew install sqlcipher
+
+#### Install CMake 
+
+       $ brew install cmake
        
 If you have error in linking, run this:
 

From eb4a5a4e4d25a640d3412e9328a9fff1300053b1 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sun, 24 Dec 2023 14:54:05 +0100
Subject: [PATCH 423/503] Fix show messages on macos

---
 retroshare-gui/src/gui/MainWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 31fa13467..8cdd2ac66 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -681,7 +681,7 @@ void MainWindow::createMenuBar()
 
     dockMenu = new QMenu(this);
     dockMenu->setAsDockMenu();
-    dockMenu->addAction(tr("Open Messages"), this, SLOT(Mess()));
+    dockMenu->addAction(tr("Open Messages"), this, SLOT(showMess()));
     dockMenu->addAction(tr("Bandwidth Graph"), this, SLOT(showBandwidthGraph()));
     dockMenu->addAction(tr("Statistics"), this, SLOT(showStatisticsWindow()));
     dockMenu->addAction(tr("Options"), this, SLOT(showSettings()));

From d395be256b310ae78d518425f36ae4f84908c223 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sun, 24 Dec 2023 18:56:43 +0100
Subject: [PATCH 424/503] fix cmake compile on macos to find include and libs
 path

---
 retroshare-service/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index c7560728e..97562c91e 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -10,6 +10,11 @@ project(retroshare-service)
 
 include(CMakeDependentOption)
 
+if(APPLE)
+  include_directories("/usr/local/include") 
+  LINK_DIRECTORIES("/usr/local/lib")
+endif()
+
 set(
 	RS_BIN_INSTALL_DIR
 	"${CMAKE_INSTALL_PREFIX}/bin"

From 4af12b14e1b7738eebac93a813da2e0a5a48c2c0 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sun, 24 Dec 2023 22:01:03 +0100
Subject: [PATCH 425/503] Set fusion style for macos

---
 retroshare-gui/src/gui/settings/rsharesettings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index 586d4df4f..28a29300c 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -109,7 +109,7 @@ void RshareSettings::initSettings()
 	setDefault(SETTING_STYLE, "GTK+");
 #else
 #if defined(Q_OS_MAC)
-	setDefault(SETTING_STYLE, "macintosh (aqua)");
+	setDefault(SETTING_STYLE, "Fusion");
 #else
 	static QStringList styles = QStyleFactory::keys();
 #if defined(Q_OS_WIN)

From c0f9f14455d784edc041cffbcd7d8023447a9443 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Tue, 26 Dec 2023 12:30:56 +0100
Subject: [PATCH 426/503] Update GxsCommentTreeWidget.h

---
 retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
index 43a6f55a5..5f52459a9 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
@@ -72,6 +72,7 @@ public slots:
 
     void makeComment();
     void replyToComment();
+    void showAuthor();
 
     void copyComment();
 

From d1393acfa698cd1c9eda10b381c695736f86e297 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Tue, 26 Dec 2023 12:35:29 +0100
Subject: [PATCH 427/503] Added show author for comments tree

---
 .../src/gui/gxs/GxsCommentTreeWidget.cpp      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index bd230fe9c..277b11e4f 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -21,6 +21,8 @@
 #include "GxsCommentTreeWidget.h"
 
 #include "gui/common/FilesDefs.h"
+#include "gui/Identity/IdDialog.h"
+#include "gui/MainWindow.h"
 #include "gui/common/RSElidedItemDelegate.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/gxs/GxsCreateCommentDialog.h"
@@ -346,6 +348,10 @@ void GxsCommentTreeWidget::customPopUpMenu(const QPoint& point)
 	action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_VOTEDOWN), tr("Vote Down"), this, SLOT(voteDown()));
 	action->setDisabled(!item || mCurrentCommentMsgId.isNull() || mVoterId.isNull());
 
+	contextMnu.addSeparator();
+
+	action = contextMnu.addAction(tr("Show Author"), this, SLOT(showAuthor()));
+	action->setDisabled(!item || mCurrentCommentMsgId.isNull() || mVoterId.isNull());
 
 	if (!mCurrentCommentMsgId.isNull())
 	{
@@ -464,6 +470,19 @@ void GxsCommentTreeWidget::replyToComment()
 	pcc.exec();
 }
 
+
+void GxsCommentTreeWidget::showAuthor()
+{
+	/* window will destroy itself! */
+	IdDialog *idDialog = dynamic_cast<IdDialog*>(MainWindow::getPage(MainWindow::People));
+
+	if (!idDialog)
+		return ;
+
+	MainWindow::showWindow(MainWindow::People);
+	idDialog->navigate(RsGxsId(mCurrentCommentAuthorId));
+}
+
 void GxsCommentTreeWidget::copyComment()
 {
     QString txt = dynamic_cast<QAction*>(sender())->data().toString();

From 5c9c7e8cf64687bbfc20434caee409c4ef243a29 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Tue, 26 Dec 2023 15:54:40 +0100
Subject: [PATCH 428/503] changed broadcast chat notify icon

---
 retroshare-gui/src/gui/chat/ChatUserNotify.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
index 5f78739c3..dcafae59a 100644
--- a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
+++ b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
@@ -76,7 +76,7 @@ bool ChatUserNotify::hasSetting(QString *name, QString *group)
 
 QIcon ChatUserNotify::getIcon()
 {
-    return FilesDefs::getIconFromQtResourcePath(":/images/chat.png");
+    return FilesDefs::getIconFromQtResourcePath(":/images/orange-bubble-64.png");
 }
 
 QIcon ChatUserNotify::getMainIcon(bool hasNew)

From 17407f7ea3adc91105e14b5cffa31d4a2ca4f9ca Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Tue, 26 Dec 2023 17:53:53 +0100
Subject: [PATCH 429/503] removed not needed dependency libmicrohttp

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index 35c89a7eb..eb19df093 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -66,7 +66,6 @@ Install MacPort following this guide: [MacPort](http://guide.macports.org/#insta
        $ sudo port -v selfupdate
        $ sudo port install openssl
        $ sudo port install miniupnpc
-       $ sudo port install libmicrohttpd
        
 For VOIP Plugin: 
 
@@ -83,7 +82,6 @@ Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)
 
        $ brew install openssl
        $ brew install miniupnpc
-       $ brew install libmicrohttpd
        $ brew install rapidjson
        $ brew install sqlcipher
 

From b5d40f79648596cace82e3aa2c857ddc3bac9f5f Mon Sep 17 00:00:00 2001
From: Vlad Pirlog <vlad@pirlog.com>
Date: Wed, 27 Dec 2023 12:41:25 +0200
Subject: [PATCH 430/503] Add row count check in the RsFriendListModel::index
 method

Fix bug occurring after login where the app would crash unexpectedly.
Turns out there was an index out of bounds exception occurring in
the RsFriendListModel::index method.
---
 retroshare-gui/src/gui/common/FriendListModel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index 622ae3930..cc6fd9c43 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -287,7 +287,7 @@ uint32_t   RsFriendListModel::EntryIndex::parentRow(uint32_t nb_groups) const
 
 QModelIndex RsFriendListModel::index(int row, int column, const QModelIndex& parent) const
 {
-    if(row < 0 || column < 0 || column >= COLUMN_THREAD_NB_COLUMNS)
+    if(row < 0 || column < 0 || column >= columnCount(parent) || row >= rowCount(parent))
 		return QModelIndex();
 
     if(parent.internalId() == 0)

From 3615ebf05eba1e79c74aabcb8466b865cacd4ae3 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Wed, 27 Dec 2023 22:50:22 +0100
Subject: [PATCH 431/503] Added retroshare-service compile with cmake to guide

---
 build_scripts/OSX/MacOS_X_InstallGuide.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index eb19df093..4afa90e2c 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -212,3 +212,13 @@ For Qt Creator -> QtCreator Projects -> Build -> Build Settings -> Build Steps -
     ./plugins/VOIP/lib/libVOIP.dylib \
     ./plugins/RetroChess/lib/libRetroChess.dylib \
     ./retroshare-gui/src/RetroShare.app/Contents/Resources/
+
+### Compile Retroshare-Service & Webui with CMake
+before you can compile overwrite the file "asio/include/asio/detail/config.hpp" here is a fix for macos [
+asio fix](https://github.com/chriskohlhoff/asio/commit/68df16d560c68944809bb2947360fe8035e9ae0a)   
+
+       $ cd retroshare-service
+       $ mkdir build-dir
+       $ cd build-dir
+       $ cmake -DRS_WEBUI=ON -DCMAKE_BUILD_TYPE=Release ..
+       $ make

From 79977a0c3731048e85499f63959343e50fa25df2 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 29 Dec 2023 21:34:54 +0100
Subject: [PATCH 432/503] Fixed minimize on macOS with CTRL + M shortcut

---
 retroshare-gui/src/gui/MainWindow.cpp | 9 ++++++++-
 retroshare-gui/src/gui/MainWindow.h   | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 8cdd2ac66..9e5671598 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -673,7 +673,7 @@ void MainWindow::createMenuBar()
     actionMinimize->setShortcutContext(Qt::ApplicationShortcut);
     actionMinimize->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
     actionMinimize->setShortcutVisibleInContextMenu(true);
-    connect(actionMinimize,SIGNAL(triggered()),this,SLOT(showMinimized())) ;
+    connect(actionMinimize,SIGNAL(triggered()),this,SLOT(minimizeWindow())) ;
 
     menuBar = new QMenuBar(this);
     QMenu *fileMenu = menuBar->addMenu("");
@@ -698,6 +698,13 @@ void MainWindow::createMenuBar()
 }
 #endif
 
+#if defined(Q_OS_DARWIN)
+void MainWindow::minimizeWindow()
+{
+    setWindowState(windowState() | Qt::WindowMinimized);
+}
+#endif
+
 void MainWindow::showBandwidthGraph()
 {
 	if(_bandwidthGraph == NULL)
diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h
index 692d7ed55..7525a0e30 100644
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@@ -265,6 +265,10 @@ private slots:
     void toggleVisibility(QSystemTrayIcon::ActivationReason e);
     void toggleVisibilitycontextmenu();
 
+#if defined(Q_OS_DARWIN)
+    void minimizeWindow();
+#endif
+
     /** Toolbar fns. */
     void addFriend();
     //void newRsCollection();

From 75ef4dceb535ee35e5e164d3f12aa6bb1022bd0e Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 30 Dec 2023 00:15:28 +0100
Subject: [PATCH 433/503] Added close window shortcut

---
 retroshare-gui/src/gui/MainWindow.cpp | 17 ++++++++++++++++-
 retroshare-gui/src/gui/MainWindow.h   |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 9e5671598..be53e41c9 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -673,11 +673,18 @@ void MainWindow::createMenuBar()
     actionMinimize->setShortcutContext(Qt::ApplicationShortcut);
     actionMinimize->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
     actionMinimize->setShortcutVisibleInContextMenu(true);
-    connect(actionMinimize,SIGNAL(triggered()),this,SLOT(minimizeWindow())) ;
+    connect(actionMinimize,SIGNAL(triggered()),this,SLOT(minimizeWindow())) ; 
+
+    actionCloseWindow = new QAction(tr("Close window"),this);
+    actionCloseWindow->setShortcutContext(Qt::ApplicationShortcut);
+    actionCloseWindow->setShortcut(QKeySequence::Close);
+    actionCloseWindow->setShortcutVisibleInContextMenu(true);
+    connect(actionCloseWindow,SIGNAL(triggered()),this,SLOT(closeWindow())) ;
 
     menuBar = new QMenuBar(this);
     QMenu *fileMenu = menuBar->addMenu("");
     fileMenu->addAction(actionMinimize);
+    fileMenu->addAction(actionCloseWindow);
 
     dockMenu = new QMenu(this);
     dockMenu->setAsDockMenu();
@@ -705,6 +712,14 @@ void MainWindow::minimizeWindow()
 }
 #endif
 
+#if defined(Q_OS_DARWIN)
+void MainWindow::closeWindow()
+{
+    // On macOS window close is basically equivalent to window hide.
+    close();
+}
+#endif
+
 void MainWindow::showBandwidthGraph()
 {
 	if(_bandwidthGraph == NULL)
diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h
index 7525a0e30..64211d67d 100644
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@@ -267,6 +267,7 @@ private slots:
 
 #if defined(Q_OS_DARWIN)
     void minimizeWindow();
+    void closeWindow();
 #endif
 
     /** Toolbar fns. */
@@ -337,6 +338,7 @@ private:
     QMenuBar *menuBar;
     QMenu *dockMenu;
     QAction* actionMinimize;
+    QAction* actionCloseWindow;
 #endif
 
     QSystemTrayIcon *trayIcon;

From 4982e4b6647003535842d015b40ad735dc2406a5 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sat, 30 Dec 2023 16:01:43 +0100
Subject: [PATCH 434/503] Fix for macos alternative chat room notify

---
 .../src/gui/chat/ChatLobbyUserNotify.cpp      | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
index 4407cc73c..3d2679628 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
@@ -146,6 +146,46 @@ QString ChatLobbyUserNotify::getNotifyMessage(bool plural)
 
 void ChatLobbyUserNotify::iconClicked()
 {
+    #if defined(Q_OS_DARWIN)
+    std::list<ChatLobbyId> lobbies;
+    rsMsgs->getChatLobbyList(lobbies);
+    bool doUpdate=false;
+
+    for (lobby_map::iterator itCL=_listMsg.begin(); itCL!=_listMsg.end();)
+    {
+        bool bFound=false;
+        QString strLobbyName=tr("Unknown Lobby");
+        QIcon icoLobby=QIcon();
+        std::list<ChatLobbyId>::const_iterator lobbyIt;
+        for (lobbyIt = lobbies.begin(); lobbyIt != lobbies.end(); ++lobbyIt) {
+            ChatLobbyId clId = *lobbyIt;
+            if (clId==itCL->first) {
+                ChatLobbyInfo clInfo;
+                if (rsMsgs->getChatLobbyInfo(clId,clInfo))
+                    strLobbyName=QString::fromUtf8(clInfo.lobby_name.c_str()) ;
+                bFound=true;
+                break;
+            }
+        }
+
+        if (bFound)
+        {
+            MainWindow::showWindow(MainWindow::ChatLobby);
+            ChatLobbyWidget *chatLobbyWidget = dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby));
+            if (chatLobbyWidget) chatLobbyWidget->showLobbyAnchor(itCL->first,strLobbyName);
+            ++itCL ;
+        }
+        else
+        {
+            lobby_map::iterator ittmp(itCL);
+            ++ittmp ;
+            _listMsg.erase(itCL);
+            itCL=ittmp ;
+            doUpdate=true;
+        }
+    }
+    #else
+
 	/// Tray icon Menu ///
 	QMenu* trayMenu = new QMenu(MainWindow::getInstance());
 	std::list<ChatLobbyId> lobbies;
@@ -207,6 +247,7 @@ void ChatLobbyUserNotify::iconClicked()
 	trayMenu->exec(QCursor::pos());
 	if (doUpdate) updateIcon();
 
+	#endif
 }
 
 void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString strLobbyName, ChatLobbyId id)
@@ -251,7 +292,6 @@ void ChatLobbyUserNotify::iconHovered()
 	iconClicked();
 }
 
-
 void ChatLobbyUserNotify::chatLobbyNewMessage(ChatLobbyId lobby_id, QDateTime time, QString senderName, QString msg)
 {
 

From f00e8ba18e4978e2c4ac9bcb0d980c13455975ca Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Thu, 28 Dec 2023 17:05:29 +0100
Subject: [PATCH 435/503] Fixed memory leak when using tray menu of chat lobby
 and removed double connect of signals

---
 .../src/gui/chat/ChatLobbyUserNotify.cpp      | 28 +++++++------------
 .../src/gui/chat/ChatLobbyUserNotify.h        |  1 +
 retroshare-gui/src/gui/chat/ChatWidget.cpp    |  3 +-
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
index 3d2679628..719ad7d2d 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
@@ -187,7 +187,7 @@ void ChatLobbyUserNotify::iconClicked()
     #else
 
 	/// Tray icon Menu ///
-	QMenu* trayMenu = new QMenu(MainWindow::getInstance());
+	QMenu* trayMenu = createMenu();
 	std::list<ChatLobbyId> lobbies;
 	rsMsgs->getChatLobbyList(lobbies);
 	bool doUpdate=false;
@@ -226,30 +226,27 @@ void ChatLobbyUserNotify::iconClicked()
         }
     }
 
-	if (notifyCombined()) {
-		QSystemTrayIcon* trayIcon=getTrayIcon();
-		if (trayIcon!=NULL) trayIcon->setContextMenu(trayMenu);
-	} else {
-		QAction* action=getNotifyIcon();
-		if (action!=NULL) {
-			action->setMenu(trayMenu);
-		}
-	}
-
 	QString strName=tr("Remove All");
 	QAction *pAction = new QAction( QIcon(), strName, trayMenu);
 	ActionTag actionTag={0x0, "", true};
 	pAction->setData(qVariantFromValue(actionTag));
-	connect(trayMenu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
-	connect(trayMenu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
 	trayMenu->addAction(pAction);
 
 	trayMenu->exec(QCursor::pos());
+	delete(trayMenu);
 	if (doUpdate) updateIcon();
 
 	#endif
 }
 
+QMenu* ChatLobbyUserNotify::createMenu()
+{
+	QMenu* menu = new QMenu(MainWindow::getInstance());
+	connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
+	connect(menu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
+	return menu;
+}
+
 void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString strLobbyName, ChatLobbyId id)
 {
 	lobby_map::iterator itCL=_listMsg.find(id);
@@ -258,11 +255,7 @@ void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString
 
 	unsigned int msgCount=msgMap.size();
 
-	if(!parentMenu) parentMenu = new QMenu(MainWindow::getInstance());
 	QMenu *lobbyMenu = parentMenu->addMenu(icoLobby, strLobbyName);
-	connect(lobbyMenu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
-	connect(lobbyMenu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
-
 	lobbyMenu->setToolTip(getNotifyMessage(msgCount>1).arg(msgCount));
 
 	for (msg_map::iterator itMsg=msgMap.begin(); itMsg!=msgMap.end(); ++itMsg) {
@@ -284,7 +277,6 @@ void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString
 	ActionTag actionTag={itCL->first, "", true};
 	pAction->setData(qVariantFromValue(actionTag));
 	lobbyMenu->addAction(pAction);
-
 }
 
 void ChatLobbyUserNotify::iconHovered()
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h
index fd95511b4..2e49f450f 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h
+++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h
@@ -49,6 +49,7 @@ public:
 	ChatLobbyUserNotify(QObject *parent = 0);
 
 	virtual bool hasSetting(QString *name, QString *group);
+	QMenu* createMenu();
 	void makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString strLobbyName, ChatLobbyId id);
 	void chatLobbyNewMessage(ChatLobbyId lobby_id, QDateTime time, QString senderName, QString msg);
 	void chatLobbyCleared(ChatLobbyId lobby_id, QString anchor, bool onlyUnread=false);
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 03f954964..abab8336a 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -982,11 +982,12 @@ void ChatWidget::on_notifyButton_clicked()
 	if(!notify) return;
 	if (chatType() != CHATTYPE_LOBBY) return;
 
-	QMenu* menu = new QMenu(MainWindow::getInstance());
+	QMenu* menu = notify->createMenu();
 	QIcon icoLobby=(ui->notifyButton->icon());
 
 	notify->makeSubMenu(menu, icoLobby, title, chatId.toLobbyId());
 	menu->exec(ui->notifyButton->mapToGlobal(QPoint(0,ui->notifyButton->geometry().height())));
+	delete(menu);
 
 }
 

From 15f2ea4e29e3d946add9fc285928a48c53230615 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 2 Jan 2024 12:58:11 +0100
Subject: [PATCH 436/503] Added to fix from Dock Icon to Show/Hide for macOS
 platform

---
 retroshare-gui/src/gui/MainWindow.cpp         | 18 +++++--
 .../src/gui/common/MacDockIconHandler.h       | 27 ++++++++++
 .../src/gui/common/MacDockIconHandler.mm      | 53 +++++++++++++++++++
 retroshare-gui/src/retroshare-gui.pro         |  3 ++
 4 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 retroshare-gui/src/gui/common/MacDockIconHandler.h
 create mode 100644 retroshare-gui/src/gui/common/MacDockIconHandler.mm

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index be53e41c9..d69e2bb42 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -33,6 +33,10 @@
 #include <retroshare/rsplugin.h>
 #include <retroshare/rsconfig.h>
 
+#if defined(Q_OS_DARWIN)
+#include "gui/common/MacDockIconHandler.h"
+#endif
+
 #ifdef MESSENGER_WINDOW
 #include "MessengerWindow.h"
 #endif
@@ -381,6 +385,7 @@ MainWindow::~MainWindow()
 #if defined(Q_OS_DARWIN)
     delete menuBar;
     delete dockMenu;
+    MacDockIconHandler::cleanup();
 #endif
 //  delete notifyMenu; // already deleted by the deletion of trayMenu
     StatisticsWindow::releaseInstance();
@@ -656,6 +661,15 @@ void MainWindow::createTrayIcon()
     trayIcon->setContextMenu(trayMenu);
     trayIcon->setIcon(QIcon(IMAGE_NOONLINE));
 
+#if defined(Q_OS_DARWIN)
+    // Note: On macOS, the Dock icon is used to provide the tray's functionality.
+    MacDockIconHandler* dockIconHandler = MacDockIconHandler::instance();
+    connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, [this] {
+        show();
+        activateWindow();
+    });
+#endif
+
 #if defined(Q_OS_DARWIN)
     createMenuBar();
 #endif
@@ -694,10 +708,6 @@ void MainWindow::createMenuBar()
     dockMenu->addAction(tr("Options"), this, SLOT(showSettings()));
     dockMenu->addAction(tr("Help"), this, SLOT(showHelpDialog()));
 
-    dockMenu->addSeparator();
-    QObject::connect(dockMenu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
-    toggleVisibilityAction = dockMenu->addAction(tr("Show/Hide"), this, SLOT(toggleVisibilitycontextmenu()));
-
     dockMenu->addSeparator();
     QMenu *statusMenu = dockMenu->addMenu(tr("Status"));
     initializeStatusObject(statusMenu, true);
diff --git a/retroshare-gui/src/gui/common/MacDockIconHandler.h b/retroshare-gui/src/gui/common/MacDockIconHandler.h
new file mode 100644
index 000000000..d9d4d41f5
--- /dev/null
+++ b/retroshare-gui/src/gui/common/MacDockIconHandler.h
@@ -0,0 +1,27 @@
+// Copyright (c) 2011-2018 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef MACDOCKICONHANDLER_H
+#define MACDOCKICONHANDLER_H
+
+#include <QObject>
+
+/** macOS-specific Dock icon handler.
+ */
+class MacDockIconHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    static MacDockIconHandler *instance();
+    static void cleanup();
+
+Q_SIGNALS:
+    void dockIconClicked();
+
+private:
+    MacDockIconHandler();
+};
+
+#endif // MACDOCKICONHANDLER_H
diff --git a/retroshare-gui/src/gui/common/MacDockIconHandler.mm b/retroshare-gui/src/gui/common/MacDockIconHandler.mm
new file mode 100644
index 000000000..51a26135d
--- /dev/null
+++ b/retroshare-gui/src/gui/common/MacDockIconHandler.mm
@@ -0,0 +1,53 @@
+// Copyright (c) 2011-2019 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "MacDockIconHandler.h"
+
+#include <AppKit/AppKit.h>
+#include <objc/runtime.h>
+
+static MacDockIconHandler *s_instance = nullptr;
+
+bool dockClickHandler(id self, SEL _cmd, ...) {
+    Q_UNUSED(self)
+    Q_UNUSED(_cmd)
+
+    Q_EMIT s_instance->dockIconClicked();
+
+    // Return NO (false) to suppress the default macOS actions
+    return false;
+}
+
+void setupDockClickHandler() {
+    Class delClass = (Class)[[[NSApplication sharedApplication] delegate] class];
+    SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
+    class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:");
+}
+
+MacDockIconHandler::MacDockIconHandler() : QObject()
+{
+    setupDockClickHandler();
+}
+
+MacDockIconHandler *MacDockIconHandler::instance()
+{
+    if (!s_instance)
+        s_instance = new MacDockIconHandler();
+    return s_instance;
+}
+
+void MacDockIconHandler::cleanup()
+{
+    delete s_instance;
+}
+
+/**
+ * Force application activation on macOS. With Qt 5.5.1 this is required when
+ * an action in the Dock menu is triggered.
+ * TODO: Define a Qt version where it's no-longer necessary.
+ */
+void ForceActivation()
+{
+    [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
+}
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 93734b454..b27102d42 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -304,6 +304,9 @@ macx {
 
 	#DEFINES *= MAC_IDLE # for idle feature
 	CONFIG -= uitools
+
+        OBJECTIVE_SOURCES += gui/common/MacDockIconHandler.mm
+        OBJECTIVE_HEADERS +=  gui/common/MacDockIconHandler.h
 }
 
 ##################################### FreeBSD ######################################

From 020e9e5927f86ef8439bd34e3f0f6231c1ceb3a0 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Tue, 2 Jan 2024 15:30:32 +0100
Subject: [PATCH 437/503] Enabled delete CFBundleGetInfoString, to update
 Version string

---
 build_scripts/OSX/makeOSXPackage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/OSX/makeOSXPackage.sh b/build_scripts/OSX/makeOSXPackage.sh
index b599df3c3..24808d487 100644
--- a/build_scripts/OSX/makeOSXPackage.sh
+++ b/build_scripts/OSX/makeOSXPackage.sh
@@ -18,7 +18,7 @@ rm -rf obj
 rm -rf qrc
 
 # This sets the CFBundleVersion & CFBundleShortVersionString string
-#/usr/libexec/PlistBuddy -c "Delete :CFBundleGetInfoString" retroshare.app/Contents/Info.plist
+/usr/libexec/PlistBuddy -c "Delete :CFBundleGetInfoString" retroshare.app/Contents/Info.plist
 /usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $RSVERSION" retroshare.app/Contents/Info.plist
 /usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string $RSVERSION" retroshare.app/Contents/Info.plist
 

From d9f7e96c6888a86245ed3d246e956b73385a2e58 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 14 Jan 2024 16:26:07 +0100
Subject: [PATCH 438/503] updated master branch to sync with submodules

---
 build_scripts/OBS | 2 +-
 libretroshare     | 2 +-
 retroshare-webui  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index 97a75f2f0..353596b0e 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 97a75f2f098babf2f6498f01ff9119aa35ce9a28
+Subproject commit 353596b0ee5ea76611eb663b90bf3ab1c9f34ad7
diff --git a/libretroshare b/libretroshare
index 78739f1eb..ac1c5f301 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 78739f1eb504503b12f107109356624da49e75ef
+Subproject commit ac1c5f3019ff17c695758dabec0ee8e540d401e0
diff --git a/retroshare-webui b/retroshare-webui
index dae0c13ef..ba0de17f4 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit dae0c13ef78aee59a4f1f9e1cdb0127b5e27d256
+Subproject commit ba0de17f41914f1be6754db5bc5b4507b0deaafd

From 3063e74e5931a85ecb9efae101f1615405d70e10 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 15 Jan 2024 21:43:09 +0100
Subject: [PATCH 439/503] Improved downloads and uploads tree display

---
 .../src/gui/FileTransfer/DLListDelegate.cpp      | 16 ++++++++--------
 .../src/gui/FileTransfer/ULListDelegate.cpp      | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
 mode change 100644 => 100755 retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp

diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
old mode 100644
new mode 100755
index 3fc982012..319c284d5
--- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
@@ -102,7 +102,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight, temp);
+			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
 			break;
         case COLUMN_REMAINING:
 			remaining = index.data().toLongLong();
@@ -121,7 +121,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight, temp);
+			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
 			break;
         case COLUMN_COMPLETED:
 			completed = index.data().toLongLong();
@@ -140,7 +140,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight, temp);
+			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
 			break;
         case COLUMN_DLSPEED:
                         dlspeed = index.data().toDouble();
@@ -151,7 +151,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                             temp.sprintf("%.2f", dlspeed/1024.);
                             temp += " KB/s";
                         }
-			painter->drawText(option.rect, Qt::AlignRight, temp);
+			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
 			break;
         case COLUMN_PROGRESS:
 			{
@@ -236,7 +236,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
 				p.setX( p.x() + pixOffset);
 				painter->drawPixmap(p, pixmap);
 				temp = " " + temp;
@@ -247,13 +247,13 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
 				p.setX( p.x() + pixOffset);
 				painter->drawPixmap(p, pixmap);
 				temp = " " + temp;
 				pixOffset += pixmap.size().width();
 			}
-			painter->drawText(option.rect.translated(pixOffset, 0), Qt::AlignLeft, temp);
+			painter->drawText(option.rect.translated(pixOffset, 0), Qt::AlignLeft | Qt::AlignVCenter, temp);
 		}
 		break;
     case COLUMN_LASTDL:
@@ -279,7 +279,7 @@ QSize DLListDelegate::sizeHint(const QStyleOptionViewItem & option, const QModel
 {
     float w = QFontMetricsF(option.font).width(index.data(Qt::DisplayRole).toString());
 
-    int S = QFontMetricsF(option.font).height() ;
+    int S = QFontMetricsF(option.font).height()*1.5 ;
     return QSize(w,S);
 }
 
diff --git a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
old mode 100644
new mode 100755
index 6bad045e0..8bddc5017
--- a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
@@ -101,7 +101,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight, temp);
+			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
 			break;
         case COLUMN_UTRANSFERRED:
 			transferred = index.data().toLongLong();
@@ -120,7 +120,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight, temp);
+			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
 			break;
         case COLUMN_ULSPEED:
                         ulspeed = index.data().toDouble();
@@ -131,7 +131,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                             temp.sprintf("%.2f", ulspeed/1024.);
                             temp += " KB/s";
                         }
-			painter->drawText(option.rect, Qt::AlignRight, temp);
+			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
 			break;
         case COLUMN_UPROGRESS:
 			{
@@ -164,10 +164,10 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
 				painter->drawPixmap(p, pixmap);
 			}
-			painter->drawText(option.rect.translated(pixmap.size().width(), 0), Qt::AlignLeft, index.data().toString());
+			painter->drawText(option.rect.translated(pixmap.size().width(), 0), Qt::AlignLeft | Qt::AlignVCenter, index.data().toString());
 			break;
 		default:
 			painter->drawText(option.rect, Qt::AlignCenter, index.data().toString());
@@ -181,7 +181,7 @@ QSize ULListDelegate::sizeHint(const QStyleOptionViewItem & option, const QModel
 {
     float w = QFontMetricsF(option.font).width(index.data(Qt::DisplayRole).toString());
 
-    int S = QFontMetricsF(option.font).height() ;
+    int S = QFontMetricsF(option.font).height()*1.5 ;
     return QSize(w,S);
 }
 

From a523d654ef8a34a14ecdec26371baf37d4ebb2b3 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:54:04 +0100
Subject: [PATCH 440/503] Improved Sharedfiles treesize and font fix for macos

---
 retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp | 6 +++++-
 retroshare-gui/src/gui/settings/TransferPage.cpp          | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 74a7d5744..5abe9ab39 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -1688,12 +1688,16 @@ bool SharedFilesDialog::tree_FilterItem(const QModelIndex &index, const QString
 
 void SharedFilesDialog::updateFontSize()
 {
+#if defined(Q_OS_DARWIN)
+    int customFontSize = Settings->valueFromGroup("File", "MinimumFontSize", 13).toInt();
+#else
     int customFontSize = Settings->valueFromGroup("File", "MinimumFontSize", 11).toInt();
+#endif
     QFont newFont = ui.dirTreeView->font();
     if (newFont.pointSize() != customFontSize) {
         newFont.setPointSize(customFontSize);
         QFontMetricsF fontMetrics(newFont);
-        int iconHeight = fontMetrics.height();
+        int iconHeight = fontMetrics.height()*1.5;
         ui.dirTreeView->setFont(newFont);
         ui.dirTreeView->setIconSize(QSize(iconHeight, iconHeight));
     }
diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index 915eaa679..6a0feaf2b 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -204,7 +204,11 @@ void TransferPage::load()
 	whileBlocking(ui.suffixesIgnoreList_LE)->setText( ignore_suffixes_string );
 
 	Settings->beginGroup(QString("File"));
+#if defined(Q_OS_DARWIN)
+    whileBlocking(ui.minimumFontSize_SB)->setValue( Settings->value("MinimumFontSize", 13 ).toInt());
+#else
 	whileBlocking(ui.minimumFontSize_SB)->setValue( Settings->value("MinimumFontSize", 11 ).toInt());
+#endif
 	Settings->endGroup();
 }
 

From e4da288b25d404ec3d91f26708dfc5e2c3e70a6e Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Mon, 29 Jan 2024 21:53:09 +0100
Subject: [PATCH 441/503] removed "chat rooms" string from tree item

---
 retroshare-gui/src/gui/ChatLobbyWidget.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
index 0b5350110..9682bc4c5 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@@ -143,28 +143,28 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
 	QHeaderView_setSectionResizeModeColumn(header, COLUMN_TOPIC, QHeaderView::Interactive);
 
     privateSubLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-    privateSubLobbyItem->setText(COLUMN_NAME, tr("Private Subscribed chat rooms"));
+    privateSubLobbyItem->setText(COLUMN_NAME, tr("Private Subscribed"));
 	privateSubLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "1");
 	//	privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
     privateSubLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE);
 	ui.lobbyTreeWidget->insertTopLevelItem(0, privateSubLobbyItem);
 
 	publicSubLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed chat rooms"));
+	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed"));
 	publicSubLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "2");
 	//	publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
     publicSubLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC);
 	ui.lobbyTreeWidget->insertTopLevelItem(1, publicSubLobbyItem);
 
 	privateLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	privateLobbyItem->setText(COLUMN_NAME, tr("Private chat rooms"));
+	privateLobbyItem->setText(COLUMN_NAME, tr("Private"));
 	privateLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "3");
 	//	privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
     privateLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE);
 	ui.lobbyTreeWidget->insertTopLevelItem(2, privateLobbyItem);
 
 	publicLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	publicLobbyItem->setText(COLUMN_NAME, tr("Public chat rooms"));
+	publicLobbyItem->setText(COLUMN_NAME, tr("Public"));
 	publicLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "4");
 	//	publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
     publicLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC);
@@ -721,9 +721,9 @@ void ChatLobbyWidget::updateDisplay()
         }
 	}
 	publicSubLobbyItem->setHidden(publicSubLobbyItem->childCount()==0);
-	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed chat rooms")+ QString(" (") + QString::number(publicSubLobbyItem->childCount())+QString(")"));
+	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed")+ QString(" (") + QString::number(publicSubLobbyItem->childCount())+QString(")"));
 	privateSubLobbyItem->setHidden(privateSubLobbyItem->childCount()==0);
-	publicLobbyItem->setText(COLUMN_NAME, tr("Public chat rooms")+ " (" + QString::number(publicLobbyItem->childCount())+QString(")"));
+	publicLobbyItem->setText(COLUMN_NAME, tr("Public")+ " (" + QString::number(publicLobbyItem->childCount())+QString(")"));
 }
 
 void ChatLobbyWidget::createChatLobby()

From 388120956d9594e5da421cb4c49da510945fd818 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 30 Jan 2024 23:15:23 +0100
Subject: [PATCH 442/503] update translations

---
 .../src/gui/TheWire/WireGroupItem.cpp         |   12 +-
 retroshare-gui/src/lang/retroshare_bg.ts      | 3636 +++++----
 retroshare-gui/src/lang/retroshare_ca_ES.ts   | 5778 +++++---------
 retroshare-gui/src/lang/retroshare_cs.ts      | 4615 +++++------
 retroshare-gui/src/lang/retroshare_da.ts      | 3514 +++++----
 retroshare-gui/src/lang/retroshare_de.qm      |  Bin 427070 -> 490182 bytes
 retroshare-gui/src/lang/retroshare_de.ts      | 6832 +++++++----------
 retroshare-gui/src/lang/retroshare_el.ts      | 4898 +++++-------
 retroshare-gui/src/lang/retroshare_en.ts      | 3498 +++++----
 retroshare-gui/src/lang/retroshare_es.ts      | 5768 +++++---------
 retroshare-gui/src/lang/retroshare_fi.ts      | 5727 +++++---------
 retroshare-gui/src/lang/retroshare_fr.ts      | 5754 +++++---------
 retroshare-gui/src/lang/retroshare_hu.ts      | 5399 +++++--------
 retroshare-gui/src/lang/retroshare_it.ts      | 5282 +++++--------
 retroshare-gui/src/lang/retroshare_ja_JP.ts   | 3909 +++++-----
 retroshare-gui/src/lang/retroshare_ko.ts      | 3983 +++++-----
 retroshare-gui/src/lang/retroshare_nl.ts      | 4988 +++++-------
 retroshare-gui/src/lang/retroshare_pl.ts      | 4272 +++++------
 retroshare-gui/src/lang/retroshare_pt.ts      | 3509 +++++----
 retroshare-gui/src/lang/retroshare_ru.ts      | 5767 +++++---------
 retroshare-gui/src/lang/retroshare_sl.ts      | 3548 +++++----
 retroshare-gui/src/lang/retroshare_sr.ts      | 3584 +++++----
 retroshare-gui/src/lang/retroshare_sv.ts      | 4931 +++++-------
 retroshare-gui/src/lang/retroshare_tr.ts      | 5715 +++++---------
 retroshare-gui/src/lang/retroshare_zh_CN.ts   | 5641 +++++---------
 retroshare-gui/src/lang/retroshare_zh_TW.ts   | 3611 +++++----
 26 files changed, 50856 insertions(+), 63315 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
index 199800581..1759103f6 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
@@ -123,21 +123,21 @@ void WireGroupItem::setup()
 void WireGroupItem::setGroupSet()
 {
 	if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) {
-		toolButton_type->setText("Own");
-		toolButton_subscribe->setText("N/A");
+		toolButton_type->setText(tr("Own"));
+		toolButton_subscribe->setText(tr("N/A"));
 		toolButton_subscribe->setEnabled(false);
 		editButton->show();
 	}
 	else if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
 	{
-		toolButton_type->setText("Following");
-		toolButton_subscribe->setText("Unfollow");
+		toolButton_type->setText(tr("Following"));
+		toolButton_subscribe->setText(tr("Unfollow"));
 		editButton->hide();
 	}
 	else
 	{
-		toolButton_type->setText("Other");
-		toolButton_subscribe->setText("Follow");
+		toolButton_type->setText(tr("Other"));
+		toolButton_subscribe->setText(tr("Follow"));
 		editButton->hide();
 	}
 }
diff --git a/retroshare-gui/src/lang/retroshare_bg.ts b/retroshare-gui/src/lang/retroshare_bg.ts
index 86615025a..7bb75556d 100644
--- a/retroshare-gui/src/lang/retroshare_bg.ts
+++ b/retroshare-gui/src/lang/retroshare_bg.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Добави коментар</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -128,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -143,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -163,17 +156,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Описание:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Качество:</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -202,10 +184,6 @@
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Описание:</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -562,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -588,10 +566,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -634,7 +625,7 @@ p, li { white-space: pre-wrap; }
         <translation>Премахване на</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -721,7 +712,7 @@ p, li { white-space: pre-wrap; }
         <translation>Връщане</translation>
     </message>
     <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -740,14 +731,6 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Запазване</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Отмяна</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
@@ -825,7 +808,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -855,12 +838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +851,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -926,7 +909,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -946,7 +929,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -976,7 +959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -986,7 +969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Нов</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -994,12 +977,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1019,18 +1002,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Разширяване</translation>
     </message>
@@ -1045,12 +1028,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Премахни елемент</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1219,17 +1202,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1239,7 +1222,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1247,7 +1240,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1270,7 +1263,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1295,18 +1288,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Разширяване</translation>
     </message>
@@ -1321,7 +1314,7 @@ into the image, so as to
         <translation type="unfinished">Премахни елемент</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
@@ -1331,17 +1324,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Скрий</translation>
     </message>
@@ -1349,7 +1332,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
@@ -1540,7 +1523,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1573,13 +1556,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,13 +1571,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1603,29 +1587,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1635,7 +1597,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1692,12 +1654,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1707,23 +1669,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-240"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-564"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1733,27 +1714,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1768,47 +1744,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1823,7 +1799,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Показване</translation>
@@ -1843,7 +1819,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Премахни елемент</translation>
     </message>
@@ -1888,7 +1864,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1903,7 +1879,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1923,7 +1899,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1948,7 +1924,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1978,7 +1954,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +1964,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2012,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2082,12 +2058,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2097,7 +2083,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2194,7 +2190,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Чувствителност към регистъра</translation>
     </message>
@@ -2300,7 +2296,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2336,7 +2332,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2371,12 +2367,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2456,11 +2452,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2498,7 +2489,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2520,7 +2511,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2570,7 +2561,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2592,7 +2583,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2607,12 +2598,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2628,12 +2619,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2644,12 +2635,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2669,7 +2660,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2695,7 +2686,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2717,7 +2708,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2743,7 +2734,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2803,7 +2794,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2819,7 +2810,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2871,45 +2862,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +2910,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3001,12 +2992,17 @@ Double click on it to add his name on text writer.</source>
         <translation>без</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3026,7 +3022,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3094,7 +3090,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3110,12 +3106,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
@@ -3125,17 +3121,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3145,7 +3141,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3170,12 +3166,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3195,32 +3201,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3266,17 +3267,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3296,12 +3297,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3309,7 +3310,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3349,7 +3350,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3374,7 +3375,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3384,7 +3385,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3423,7 +3424,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3433,7 +3434,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3458,7 +3459,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3471,7 +3472,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3506,7 +3507,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3516,12 +3517,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3586,7 +3582,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3614,7 +3610,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3624,17 +3620,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3644,12 +3643,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3659,7 +3660,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3684,7 +3686,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3976,7 +3978,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3984,7 +3986,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3994,7 +3997,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4030,12 +4033,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4055,7 +4058,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4075,18 +4078,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4101,11 +4104,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation type="vanished">Тип</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Име:</translation>
     </message>
@@ -4145,19 +4144,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4167,12 +4166,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Добавяне</translation>
     </message>
@@ -4182,7 +4193,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4235,13 +4246,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4260,7 +4271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4295,7 +4306,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4305,7 +4316,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4450,17 +4461,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4485,7 +4496,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4500,18 +4516,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4545,7 +4555,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +4565,16 @@ p, li { white-space: pre-wrap; }
         <translation>Форум</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+31"/>
+        <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;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4570,16 +4589,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+114"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4594,7 +4604,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4624,17 +4634,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Заглавие</translation>
     </message>
@@ -4687,7 +4697,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4697,8 +4707,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4721,7 +4731,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4756,7 +4766,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4766,7 +4776,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4781,7 +4791,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4802,7 +4812,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4810,17 +4820,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4830,12 +4840,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4855,12 +4865,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4870,7 +4875,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4880,17 +4885,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4900,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4970,33 +4970,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5086,7 +5086,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5754,7 +5754,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5762,38 +5762,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5801,12 +5801,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5968,7 +5968,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5978,7 +5978,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6038,11 +6038,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6164,7 +6174,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6206,7 +6216,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6242,7 +6252,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6258,7 +6268,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6495,7 +6505,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6533,7 +6543,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6544,16 +6554,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Име</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Статус</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6636,33 +6762,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6680,7 +6811,17 @@ at least one peer was not added to a group</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6690,17 +6831,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6721,38 +6857,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6772,12 +6908,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6787,38 +6923,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6862,13 +7003,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6878,7 +7019,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6913,7 +7054,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6923,12 +7064,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6938,12 +7074,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7169,27 +7300,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7199,39 +7316,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7239,49 +7374,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7306,7 +7437,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7356,12 +7487,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7485,7 +7616,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7493,7 +7624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7663,7 +7794,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Заглавие</translation>
     </message>
@@ -7676,12 +7807,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7706,7 +7837,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7721,14 +7852,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
@@ -7739,13 +7870,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7758,7 +7889,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7894,7 +8025,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -7905,22 +8036,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7940,12 +8071,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7980,22 +8111,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8015,17 +8146,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8035,25 +8166,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Формуляр</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Заглавие</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Статус</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8091,8 +8207,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8107,7 +8233,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -8122,7 +8248,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8136,6 +8262,11 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8145,7 +8276,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8166,7 +8297,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8228,18 +8359,18 @@ p, li { white-space: pre-wrap; }
         <translation>Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8254,17 +8385,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8289,35 +8420,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Заглавие</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Търсене в заглавието</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Информационни канали</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Описание:</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8387,7 +8499,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8423,7 +8535,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8438,13 +8550,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Информационни канали</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8459,7 +8571,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8474,7 +8586,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8534,12 +8646,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8614,12 +8736,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8670,17 +8793,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8795,7 +8918,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8808,7 +8931,7 @@ p, li { white-space: pre-wrap; }
         <translation>Формуляр</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8838,7 +8961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -8877,7 +9000,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8901,6 +9024,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -8910,7 +9048,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -8939,7 +9077,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8970,7 +9108,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9021,7 +9159,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9037,7 +9175,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -9056,6 +9194,11 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9085,13 +9228,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9102,7 +9245,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -9122,17 +9265,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
@@ -9145,59 +9288,66 @@ before you can comment</source>
         <translation>Формуляр</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Търсене Форуми</translation>
     </message>
     <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Заглавие</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9207,12 +9357,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9252,23 +9397,23 @@ before you can comment</source>
         <translation>Търсене на автор</translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Няма име</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9311,16 +9456,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Разширяване</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9350,8 +9491,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9365,10 +9506,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">без</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9438,12 +9575,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">Редактиране</translation>
     </message>
@@ -9504,7 +9641,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9524,7 +9661,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9576,7 +9713,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9586,7 +9723,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9601,7 +9738,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9667,12 +9804,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9707,12 +9844,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9723,12 +9860,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9736,7 +9873,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9796,7 +9933,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9819,7 +9956,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9835,12 +9972,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9857,23 +9994,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9889,22 +10026,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9914,12 +10057,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9929,7 +10072,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10004,7 +10147,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10020,27 +10168,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Автор</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10048,7 +10191,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10108,7 +10251,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10165,12 +10308,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10193,7 +10336,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10206,14 +10349,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10223,7 +10366,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10233,7 +10376,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10253,6 +10401,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10264,7 +10420,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10312,7 +10468,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10699,7 +10855,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10715,7 +10871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10734,7 +10890,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10808,7 +10964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Формуляр</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10818,7 +10974,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10846,7 +11002,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10856,7 +11012,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10866,7 +11022,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10886,13 +11042,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10904,12 +11084,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10924,12 +11104,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11194,14 +11369,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11211,12 +11386,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11226,7 +11401,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11241,27 +11416,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11277,29 +11452,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11319,18 +11504,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11340,78 +11527,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11422,17 +11609,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11447,24 +11634,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11479,7 +11666,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11489,7 +11681,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11564,7 +11756,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11594,7 +11786,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">непознат</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11609,7 +11801,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11657,7 +11849,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11665,7 +11857,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11708,7 +11900,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11788,7 +11980,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11804,17 +11996,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11919,7 +12106,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11969,21 +12156,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11993,7 +12180,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12008,7 +12195,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12023,12 +12210,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12048,12 +12235,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12063,7 +12250,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12071,7 +12258,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12101,7 +12288,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12115,7 +12308,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12125,7 +12318,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12136,27 +12334,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12176,7 +12374,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12186,12 +12384,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12201,12 +12405,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12216,7 +12415,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12226,10 +12425,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Премахване на</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12255,7 +12459,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Добавяне</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12265,13 +12469,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12281,7 +12485,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12355,7 +12559,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Копиране</translation>
     </message>
@@ -12365,12 +12569,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Премахване на</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12393,18 +12597,34 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12422,27 +12642,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12463,7 +12688,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12472,26 +12702,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12501,7 +12736,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12529,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12545,7 +12780,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Настройки</translation>
     </message>
@@ -12566,7 +12802,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12577,12 +12813,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12607,11 +12843,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12622,31 +12859,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Помощ</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12661,7 +12902,12 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12691,7 +12937,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12711,7 +12957,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Показване</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12756,12 +13002,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12776,7 +13023,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12785,17 +13032,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12831,12 +13078,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12851,32 +13098,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12887,32 +13134,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12982,7 +13229,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13022,7 +13269,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13042,18 +13289,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13064,7 +13311,17 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13084,7 +13341,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13094,21 +13351,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13123,7 +13380,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13133,30 +13390,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Неизвестен</translation>
     </message>
@@ -13271,13 +13528,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13297,7 +13554,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13318,7 +13575,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13348,18 +13605,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>От:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13399,13 +13656,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13415,12 +13672,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13498,7 +13755,7 @@ Do you want to save message ?</source>
         <translation>По подразбиране</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13508,7 +13765,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13531,7 +13788,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13539,7 +13796,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13567,7 +13824,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13577,37 +13834,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>От:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>До:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13647,7 +13904,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13699,7 +13956,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13709,12 +13966,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13724,17 +13981,22 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13743,14 +14005,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13765,12 +14037,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13792,10 +14064,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Изтриване</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -13874,7 +14142,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13884,20 +14152,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="vanished">Изтриване</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -13927,17 +14191,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -13968,7 +14232,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13978,7 +14242,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
@@ -13988,7 +14252,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13997,6 +14261,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14023,13 +14297,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14104,7 +14378,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14118,7 +14392,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14133,18 +14407,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14179,7 +14463,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14233,7 +14527,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -14243,7 +14537,7 @@ Do you want to save message ?</source>
         <translation>Премахни елемент</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14278,7 +14572,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
@@ -14419,7 +14713,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14429,7 +14723,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14443,7 +14737,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14476,18 +14776,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14497,12 +14792,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14535,7 +14830,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14556,7 +14851,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14586,19 +14881,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14608,12 +14903,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14623,7 +14918,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14738,7 +15033,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14748,7 +15043,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -14855,7 +15150,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14870,7 +15165,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14880,12 +15175,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15114,10 +15409,6 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Емисия</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15127,7 +15418,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15147,12 +15438,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15167,7 +15458,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Тест</translation>
     </message>
@@ -15178,17 +15469,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15196,7 +15489,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15335,7 +15628,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15380,12 +15678,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Настройки</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15431,21 +15724,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15463,7 +15756,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15539,12 +15832,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15570,7 +15863,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15591,7 +15884,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Премахни елемент</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
@@ -15631,7 +15924,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15689,7 +15982,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15856,13 +16149,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Формуляр</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -15935,10 +16221,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Добави коментар</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16018,17 +16300,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16057,7 +16339,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16116,19 +16398,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16164,12 +16446,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16380,12 +16662,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16438,7 +16735,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Нов</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16458,8 +16755,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16484,13 +16781,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16518,12 +16815,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16538,12 +16835,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16559,7 +16866,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16569,7 +16886,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16589,12 +16906,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16609,7 +16936,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16620,7 +16947,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16630,7 +16957,7 @@ p, li { white-space: pre-wrap; }
         <translation>Заглавие</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16638,12 +16965,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -16677,7 +17004,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16715,7 +17042,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16731,7 +17068,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -16746,12 +17083,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16764,18 +17106,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16786,12 +17128,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16801,7 +17143,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16811,17 +17153,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Задай като четене и премахване на елемент</translation>
     </message>
@@ -16831,7 +17173,7 @@ p, li { white-space: pre-wrap; }
         <translation>Нов</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16841,7 +17183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
@@ -16882,34 +17224,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Формуляр</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Нов</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Следващ</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Предишна</translation>
-    </message>
-</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -16928,7 +17247,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16938,15 +17267,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">непознат</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16956,42 +17285,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17011,7 +17340,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17041,17 +17370,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17066,12 +17395,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17081,27 +17415,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Редактиране</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17116,7 +17454,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17190,6 +17528,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17279,16 +17627,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17396,7 +17744,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17412,7 +17760,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17447,12 +17795,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17496,27 +17844,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17526,12 +17874,12 @@ and use the import button to load it</source>
         <translation type="unfinished">От:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17561,13 +17909,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17579,12 +17927,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17599,7 +17957,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17614,30 +17972,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>Date</source>
-        <translation type="vanished">Дата</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17648,7 +18000,7 @@ and use the import button to load it</source>
         <translation type="unfinished">Формуляр</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -17667,7 +18019,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17677,7 +18029,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17704,7 +18056,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17714,7 +18066,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17734,7 +18086,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17850,7 +18202,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17858,37 +18210,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17920,7 +18277,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17928,8 +18285,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18197,12 +18554,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18233,7 +18590,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18267,7 +18624,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18286,6 +18643,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18365,7 +18742,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18375,7 +18752,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18385,7 +18762,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18401,7 +18778,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18468,7 +18845,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18496,7 +18873,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18676,13 +19053,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Име</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Статус</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18925,6 +19318,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19064,7 +19469,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19231,7 +19636,7 @@ p, li { white-space: pre-wrap; }
         <translation>Формуляр</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19244,7 +19649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19417,12 +19822,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19430,12 +19845,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20123,7 +20538,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Име</translation>
@@ -20244,7 +20659,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
@@ -20264,7 +20679,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20320,7 +20735,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20334,11 +20749,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20352,6 +20762,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20374,12 +20789,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20403,7 +20823,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20424,7 +20846,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20485,7 +20907,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20506,7 +20928,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20536,7 +20958,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20554,7 +20976,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20571,12 +20993,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20637,7 +21059,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20652,7 +21074,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20752,23 +21174,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20778,7 +21200,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20815,7 +21237,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Папка</translation>
@@ -20826,17 +21248,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20856,7 +21278,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20864,7 +21286,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20880,22 +21302,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Премахни елемент</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20912,7 +21334,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20937,8 +21359,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20946,7 +21368,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20977,7 +21399,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -21022,12 +21444,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21047,17 +21469,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished">Неизвестен</translation>
     </message>
@@ -21067,7 +21484,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
@@ -21077,7 +21504,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21087,12 +21514,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21151,12 +21578,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21177,22 +21604,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21205,21 +21632,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21229,23 +21651,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21255,7 +21700,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21280,37 +21725,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21325,71 +21828,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">непознат</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21399,22 +21838,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21426,12 +21850,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21441,7 +21865,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21456,23 +21880,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21483,17 +21907,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21503,12 +21917,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21518,17 +21927,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21568,7 +21967,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21583,12 +21982,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21624,7 +22018,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21679,7 +22098,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21704,7 +22123,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -21716,7 +22135,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21739,7 +22158,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
@@ -21799,17 +22218,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21825,18 +22255,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21871,12 +22301,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21899,22 +22329,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21949,7 +22379,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21959,12 +22389,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22044,7 +22474,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22054,12 +22484,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22078,7 +22508,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22098,17 +22528,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22118,7 +22548,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Премахване на</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22209,7 +22639,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22217,7 +22647,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22268,11 +22698,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22282,7 +22717,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22297,7 +22732,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22313,7 +22748,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22338,7 +22773,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22481,12 +22916,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22510,7 +22945,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22849,7 +23284,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23086,7 +23521,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23122,12 +23557,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished">Неизвестен</translation>
     </message>
@@ -23137,18 +23575,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23158,12 +23591,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23171,7 +23649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23181,7 +23659,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23192,11 +23670,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23224,7 +23703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23235,7 +23714,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23245,22 +23724,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23345,7 +23829,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23354,7 +23838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23379,7 +23868,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23444,12 +23938,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23459,7 +23948,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23487,7 +23986,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23515,19 +24014,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Име</translation>
@@ -23734,7 +24233,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23759,7 +24263,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23780,7 +24284,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -23813,7 +24317,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23828,7 +24342,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -23955,23 +24469,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Пътека</translation>
     </message>
@@ -23981,7 +24490,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23991,7 +24500,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24006,7 +24515,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24016,7 +24525,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24430,12 +24939,17 @@ p, li { white-space: pre-wrap; }
         <translation>Формуляр</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24475,17 +24989,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24495,12 +25019,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24637,7 +25161,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24652,7 +25176,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24740,7 +25264,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24775,7 +25299,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24805,14 +25329,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
@@ -24833,7 +25361,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24916,16 +25444,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24940,7 +25459,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24960,7 +25479,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24990,11 +25509,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="vanished">Нов</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25004,7 +25519,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25067,35 +25582,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Формуляр</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Премахване на</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25140,11 +25662,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Неизвестен</translation>
@@ -25222,7 +25774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25259,7 +25811,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_ca_ES.ts b/retroshare-gui/src/lang/retroshare_ca_ES.ts
index fe57c6488..ef5261f6a 100644
--- a/retroshare-gui/src/lang/retroshare_ca_ES.ts
+++ b/retroshare-gui/src/lang/retroshare_ca_ES.ts
@@ -84,13 +84,6 @@
         <translation>Només node ocult</translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Afegir comentari</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -128,12 +121,12 @@
         <translation>RetroShare: Cerca Avançada</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Criteris de Cerca</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Afegeix un altre criteri de cerca.</translation>
     </message>
@@ -143,7 +136,7 @@
         <translation>Reinicialitzar els criteris de cerca.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Cancel·la la cerca.</translation>
     </message>
@@ -163,177 +156,6 @@
         <translation>Cerca</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Crear àlbum</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Nom d&apos;àlbum:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Categoria:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Animals</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Família</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Amics</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Flors</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Vacances</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Paisatges</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Mascotes</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Retrats</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Viatges</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Treball</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Aleatori</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Llegenda:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">On:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotògraf:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descripció:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Opcions de compartició:</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Política:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Qualitat:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Comentari:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Identitat:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Públic</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Restringit</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Redimensionar imatges (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Redimensionar imatges (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Enviar imatges originals</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">No es permeten els comentaris</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Comentaris autenticats</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Qualsevol comentari permès</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Publicar amb identitat</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Arrosegar i deixar per inserir imatges. Clica en una imatge per editar-ne els detalls a sota.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Enrere</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Afegir fotos.</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Publicar àlbum</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Àlbum sense títol</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Digues alguna cosa sobre aquest àlbum...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">On ha anat a parar això?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Carrega la miniatura de l&apos;àlbum</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -342,19 +164,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Àlbum</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Miniatura de l&apos;àlbum</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>EtiquetaTexte</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Resum</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -370,34 +184,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Llegenda</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">On:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Quan</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descripció:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Opcions de compartició:</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Comentaris</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Publicar identitat</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Visibilitat</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -766,7 +552,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Avís: Els serveis aquí esmentat són experimentals. Si us plau, ajuda&apos;ns a testejar-los. 
@@ -782,14 +568,6 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">FòrumsGxs</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">CanalsGxs</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -801,10 +579,23 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation>Fotos</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">Desar imatge</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p kb</translation>
     </message>
@@ -841,17 +632,13 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Afegir avatar</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Treure</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Tria la fotografia del teu avatar</translation>
     </message>
@@ -870,10 +657,6 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Carrega avatar</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -942,22 +725,10 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation>Restablir</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Taxa de Recepció</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Taxa d&apos;enviament</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Sempre per damunt</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Estil</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -973,23 +744,11 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <source>% Opaque</source>
         <translation>% Opac</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Desa</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Cancel·la</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Des de:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Amagar opcions</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1062,7 +821,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Comentari</translation>
     </message>
@@ -1092,12 +851,12 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L&apos;autor d&apos;aquest missatge (amb Id %1) està expulsat.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1105,7 +864,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positiu</translation>
     </message>
@@ -1125,7 +884,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,7 +922,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positiu</translation>
     </message>
@@ -1183,7 +942,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1213,7 +972,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Compartir</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Canvia l&apos;estat dels missatges llegits</translation>
     </message>
@@ -1223,7 +982,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Nou</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1231,12 +990,12 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">M&apos;agrada</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1256,18 +1015,18 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Ampliar</translation>
     </message>
@@ -1282,12 +1041,12 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1456,17 +1215,17 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Canals</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Pestanyes</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>General</translation>
     </message>
@@ -1476,11 +1235,17 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Carrega les entrades en segon pla (Utilitza fils)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Descarregues</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Obrir cada canal en una nova pestanya</translation>
     </message>
@@ -1488,7 +1253,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1511,7 +1276,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">M&apos;agrada</translation>
     </message>
@@ -1536,18 +1301,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Ampliar</translation>
     </message>
@@ -1562,7 +1327,7 @@ into the image, so as to
         <translation type="unfinished">Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -1572,17 +1337,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Comentari</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished">Comentaris</translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Amagar</translation>
     </message>
@@ -1590,7 +1345,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -1781,7 +1536,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Mostra el xat de sala</translation>
     </message>
@@ -1793,22 +1548,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>Xats</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Tens %1 nous missatges</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Tens %1 nou missatge</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 missatges nous</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 missatges nous</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1830,13 +1569,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Sala desconeguda</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Suprimeix-ho tot</translation>
     </message>
@@ -1844,13 +1584,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Comte</translation>
     </message>
@@ -1860,33 +1600,7 @@ into the image, so as to
         <translation>Tema</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>Sales de xat privades subscrites</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>Sales de xat públiques subscrites</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Sales de xat privades</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Sales de xat públiques</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">                             &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Sales de xat&lt;/h1&gt;	 &lt;p&gt;Les sales de xat són sales distribuïdes que funcionen molt semblant a les de IRC. 	Et permeten parlar anònimament amb moltíssima gent sense haver-los de fer amics.&lt;/p&gt; 	 &lt;p&gt;Una sala de xat pot ser pública (els teus amics la veuen ) o privades (els teus amics no poden veure-la si no els invites amb &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	Un cop has sigut invitat a una sala privada podràs veure quan els teus amics 	 la estan usant.&lt;/p&gt; 	 &lt;p&gt;La llista de l&apos;esquerra mostra 	 sales de xat en que participen els teus amics. Pots o bé		 &lt;ul&gt;			 &lt;li&gt;Fer clic dret per crear una sala de xat nova&lt;/li&gt; 		 &lt;li&gt;Fer doble clic per entrar a una sala, xatejar, i que els teus amics ho vegin&lt;/li&gt;	 &lt;/ul&gt; 	 Nota: Per a que les sales de xat funcionin correctament el teu ordinador a d&apos;anar a l&apos;hora. Comprova-ho!	 &lt;/p&gt; </translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Crear sala de xat</translation>
     </message>
@@ -1896,7 +1610,7 @@ into the image, so as to
         <translation>Abandonar sala</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Crear una identitat no anònima i entrar a aquesta sala</translation>
     </message>
@@ -1955,12 +1669,12 @@ Selecciona entre les sales de la esquerra per mostrar-ne els detalls.
 Fes doble clic a les sales per entrar-hi i xatejar.</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 t&apos;invita a una sala de xat anomenada %2</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Escull una identitat no anònima per aquesta sala:</translation>
     </message>
@@ -1970,31 +1684,31 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Escull una identitat per aquesta sala:</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Crear sala de xat</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[No s&apos;ha proporcionat cap assumpte]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Informació de la sala seleccionada</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Privat</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Públic</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>IDs anònimes acceptades</translation>
     </message>
@@ -2004,42 +1718,25 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Eliminar auto-subscripció</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Afegir auto-subscripció</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Cercar sales de xat</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Cercar nom</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Subscrit</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Columnes</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">No</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2051,47 +1748,47 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Nom de la sala de xat:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>Id de la sala de xat:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Tema:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Tipus:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Seguretat:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Contactes:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>EtiquetaText</translation>
     </message>
@@ -2106,13 +1803,24 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Ids anònims prohibits</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>columna</translation>
@@ -2126,7 +1834,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Eliminar l&apos;element</translation>
     </message>
@@ -2171,46 +1879,22 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Xat distant</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Tothom</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Contactes</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Ningú</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Acceptar xats distants encriptats de </translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Configuració xat</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Activa les emoticones al xat privat</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Activa emoticones pels xats en grup</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Activa tipus de lletra personalitzats</translation>
     </message>
@@ -2219,10 +1903,6 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Enable custom font size</source>
         <translation>Activa mida de lletra personalitzat</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Mida de lletra mínima</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2234,7 +1914,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Activa cursiva</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2259,11 +1939,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Carrega imatges incrustades</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Sala de xat</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Icona de pestanya parpellejant</translation>
     </message>
@@ -2272,10 +1948,6 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Do not send typing notifications</source>
         <translation>No enviar avís d&apos;estar escribint</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Xat privat</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2297,11 +1969,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Icona de pestanya/finestra parpellejant</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Tipus de lletra pel xat</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Canviar tipografia pel xat</translation>
     </message>
@@ -2311,14 +1979,10 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Tipus de lletra pel xat:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Històric</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Estil</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2333,17 +1997,13 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Variant:</source>
         <translation>Variant:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Xat en grup</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Xat privat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation>Escull una tipografia pel Xat.</translation>
     </message>
@@ -2407,22 +2067,28 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;En aquesta pestanya pots modificar quants missatges de xat el RetroShare mantindrà emmagatzemats en disc i quantes de les converses prèvies mostrarà pels diferents sistemes de xat. El període màxim d&apos;emmagatzematge et permet descartar missatges vells i impedeix que l&apos;historial de xat s&apos;ompli amb xats esporàdics (per ex. sales de xat i xats distants).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Salesxat</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Activat:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2432,7 +2098,17 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Sales de xat</translation>
@@ -2529,11 +2205,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Període màxim d&apos;emmagatzemat, en dies (0=Il·limitat):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Cerca per defecte</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Diferenciar majúscules/minúscules</translation>
     </message>
@@ -2572,10 +2244,6 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Threshold for automatic search</source>
         <translation>Límit per fer una cerca automàtica</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Identitat per defecte per les sales de xat:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2643,7 +2311,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Mostra xat</translation>
     </message>
@@ -2679,7 +2347,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Tancar</translation>
     </message>
@@ -2714,12 +2382,12 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>Insertar emoticona</translation>
     </message>
@@ -2728,10 +2396,6 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Attach a Picture</source>
         <translation>Adjunta una imatge</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:desactivat {&lt;/p&gt;&lt;p&gt;	imatge: url(:/icons/png/send-message-blocked.png) ;}&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2803,11 +2467,6 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Insert horizontal rule</source>
         <translation>Inserir regla horitzontal</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Desar imatge</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2845,7 +2504,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>està escrivint...</translation>
     </message>
@@ -2869,7 +2528,7 @@ després de convertir a HTML.</translation>
         <translation>Escull el tipus de lletra</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Segur que vols eliminar físicament l&apos;historial?</translation>
     </message>
@@ -2919,7 +2578,7 @@ després de convertir a HTML.</translation>
         <translation>està ocupat i pot no respondre</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Cercar diferenciant majúscules i minúscules</translation>
     </message>
@@ -2941,7 +2600,7 @@ després de convertir a HTML.</translation>
         <translation>No deixis de colorejar fins trobar X elements (Necessita més UCP)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Trobar anterior &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2956,16 +2615,12 @@ després de convertir a HTML.</translation>
         <translation>&lt;b&gt;Trobar &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Estat)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Estableix tipus de lletra i color</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Adjunta un arxiu</translation>
     </message>
@@ -2981,12 +2636,12 @@ després de convertir a HTML.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Marca el text seleccionat&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation>Id de la persona:</translation>
     </message>
@@ -2998,12 +2653,12 @@ Double click on it to add his name on text writer.</source>
 Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation>No signat</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>Elements trobats.</translation>
     </message>
@@ -3023,7 +2678,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Escriu un missatge aquí</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>No t&apos;aturis a colorejar després de</translation>
     </message>
@@ -3049,7 +2704,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Mostrant detalls:</translation>
     </message>
@@ -3071,7 +2726,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Cercles personals</translation>
     </message>
@@ -3097,7 +2752,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Amics</translation>
     </message>
@@ -3157,7 +2812,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Amics dels amics</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Cercles externs (Admin)</translation>
     </message>
@@ -3173,7 +2828,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
@@ -3225,43 +2880,48 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: no es poden obtenir detalls del contacte.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3273,7 +2933,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Encriptació</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>No connectat</translation>
     </message>
@@ -3355,25 +3015,17 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>cap</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Aquest certificat conté:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;un&lt;b&gt;ID de node&lt;/b&gt; i &lt;b&gt;nom&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">una &lt;b&gt;adreça onion&lt;/b&gt; i &lt;b&gt;port&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">una &lt;b&gt;adreça IP&lt;/b&gt; i &lt;b&gt;port&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Pots utilitzar aquest certificat per fer nous amics. Envia&apos;l per correu o entrega&apos;l en ma.&lt;/p&gt;</translation>
     </message>
@@ -3388,7 +3040,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquest és el mètode d&apos;encriptat utilitzat per &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. La conexió cap a nodes amics&lt;/p&gt;&lt;p&gt;és sempre forta i si hi ha DHE disponible la conexió a més a més utilitza&lt;/p&gt;&lt;p&gt;&amp;quot;perfect forward secrecy&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>amb</translation>
     </message>
@@ -3405,118 +3057,16 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <source>Connect Friend Wizard</source>
         <translation>Auxiliar de connexió amb amic</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Afegir un nou amic</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;El teu amic et proporciona un arxiu de certificat</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;Fes-te amic dels amics seleccionats dels teus amics</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Email 
- (Your friend will receive an email with instructions how to download RetroShare)</source>
-        <translation type="vanished">&amp;Envia una invitació per correu electrònic 
-(El teu amic rebrà un correu electrònic amb instruccions sobre com descarregar el RetroShare)</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Inclou les signatures</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Copiar el teu certificat al porta-retalls</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Desar el teu certificar en un arxiu</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Executa el programa de correu electrònic</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Obre el certificat d&apos;un amic des d&apos;un arxiu</translation>
     </message>
-    <message>
-        <source>Open certificate</source>
-        <translation type="vanished">Obre un certificat</translation>
-    </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">Si us plau, enganxa el certificat de Retroshare dels teus amics a la caixa inferior</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Arxiu de certificat</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Utilitza certificats PGP desat en arxius.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Importa certificats d&apos;amics...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Has de generar un arxiu amb el teu certificat i donar-lo al teu amic. També pots utilitzar un arxiu generat anteriorment.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Exportar el meu certificat...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Arrossega i deixa el certificat dels teus amics a aquesta finestra o especifica una ubicació a la part inferior</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Navegar</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Amics d&apos;amics</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Selecciona amb qui et vols fer amic ara.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Mostra-m&apos;ho:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Fer-se amic amb aquests contactes</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>ID RetroShare</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Utilitza la Id de RetroShare per afegir un amic que es troba disponible a la xarxa.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Afegir amics utilitzant la Id de RetroShare...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Enganxar Id de RetroShare de l&apos;amic a la casella inferior</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Introdueix el Id de RetroShare del teu amic, ex. Contacte@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3558,27 +3108,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Correu electrònic</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Convidar amics per correu electrònic</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Introdueix l&apos;adreça de correu electrònic dels teus amics (Separa-les amb un punt i coma)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">L&apos;adreça de correu electrònic dels teus amics:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Introdueix les adreces de correu electrònic dels teus amics</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Assumpte:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3594,77 +3124,32 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Detalls sobre la petició</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Detalls del contacte</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Correu electrònic:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Node:</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">Si us plau, tingues en compte que RetroShare necessitarà una quantitat excessiva d&apos;ample de banda, memòria i CPU si afegeixes masses amics. Pots afegir tants amics com vulguis, però més de 40 serà probablement excessiu.</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Ubicació:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Opcions</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">Aquest assistent t&apos;ajudarà a connectar amb el(s) teu(s) amic(s) de la xarxa RetroShare.&lt;br&gt;Escull com t&apos;agradaria afegir un amic:</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Introdueix el certificat manualment</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">Introdueix la  Id de RetroShare manualment</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">&amp;Envia una Invitació utilitzant web mail</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Recomanar molts amics els uns als altres</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">Certificat Retroshare</translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">Si us plau, enganxa el certificat de Retroshare del teu amic aquí sota</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Enganxar certificat</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquesta casella espera el certificat de Retroshare del teu amic. AVÍS: No és el mateix que la clau del perfil del teu amic. No enganxis la clau del perfil del teu amic aquí (Ni tan sols part d&apos;ella). No funcionarà.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Afegir amic al grup:</translation>
     </message>
@@ -3674,7 +3159,7 @@ resources.</source>
         <translation>Autentica amic (Signa clau PGP)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3699,16 +3184,22 @@ resources.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Afegir com amic amb qui connectar</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Per acceptar la petició de l&apos;amic, clica al botó acabar.</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Ho sentim, ha aparegut algun error</translation>
     </message>
@@ -3728,32 +3219,27 @@ resources.</source>
         <translation>Detalls sobre el teu amic:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Validesa de la clau:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Signants</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signar la clau d&apos;un amic és una forma d&apos;expressar la teva confiança en aquest amic als teus altres amics. Les signatures a sota testimonien criptogràficament que els propietaris de les claus llistades reconeixen la clau PGP com autèntica. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Aquest contacte ja és a la llista d&apos;amics. Afegir-lo potser només actualitzi la seva adreça IP.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3799,49 +3285,17 @@ resources.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Càrrega de certificat fallida</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">No es poden aconseguir els detalls del contacte de la clau PGP %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Qualsevol contacte que no he signat</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Amics dels meus amics que ja confien en mi</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Contactes signats mostrats com denegats</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Nom del contacte</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">També signat per</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Id contacte</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">El certificat sembla vàlid</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>No és un certificat de Retroshare vàlid!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Invitació al RetroShare</translation>
     </message>
@@ -3863,12 +3317,12 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Aquest és el teu certificat! No vols fer-te amic amb tu mateix, oi?</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3876,7 +3330,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation>Aquesta clau ja és a la teva llista de confiança</translation>
     </message>
@@ -3916,7 +3370,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>Tens una petició d&apos;amic de</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3941,7 +3395,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3951,47 +3405,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Carrega de certificat fallada: No es troba l&apos;arxiu %1</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">El contacte %1 no està disponible a la teva xarxa</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Utilitza el format nou de certificat (més robust i segur)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Utilitza el format de certificat antic (Compatible amb versions anteriors)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Elimina signatures</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">Invita al RetroShare</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Ajuda de connectar amic</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Pots copiar aquest text i enviar-lo al teu amic per correu electrònic a un altre mètode</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">S&apos;ha copiat el teu certificat al porta-retalls, enganxa&apos;l i envia&apos;l al teu amic per correu </translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Desa com...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4030,11 +3444,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>*** Cap ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Utilitza com a font directa quan estigui disponible</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>Adreça IP:</translation>
     </message>
@@ -4044,7 +3454,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>Adreça IP:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Mostrar opcions avançades</translation>
     </message>
@@ -4053,10 +3463,6 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signar la clau d&apos;un amic és una forma d&apos;expressar la teva confiança en aquest amic als teus altres amics. Els ajudarà a decidir si volen acceptar o no connexions d&apos;aquesta clau basant-se en la teva confiança. Signar una clau és completament opcional i no es pot desfer, fes-ho amb cura.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;El Retroshare periòdicament comprova la teva llista d&apos;amics per arxius navegables que coincideixin amb els mateixos que estàs descarregant, per establir una transferència directa. En aquest cas els teus amics sabran què descarregues.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Si no vols que això passi per algun amic en concret, desmarca aquesta casella. Encara podràs realitzar transferències directes si ho demanes explícitament, per exemple descarregant de la llista del teu amic directament. Això s&apos;aplicarà a totes les ubicacions del mateix node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4067,45 +3473,13 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Els contactes que tenen aquesta opció no poden connectar-se si la seva adreça no és a la llista blanca. Això et protegeix d&apos;atacs de reenviament. Quan s&apos;usen, els contactes refusats són notificats a la secció de Novetats amb un tiquet de seguretat. Des d&apos;allí es pot decidir que fer amb la IP. S&apos;aplica a totes les ubicacions del mateix node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Recomanar molts amics els uns als altres</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Recomanacions de l&apos;amic</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">El text a sota és el teu certificat de Retroshare. L&apos;has de proporcionar al teu amic</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Missatge:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Recomanar amics</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">A</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Si us plau, escull almenys un amic per recomanació.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Si us plau, selecciona almenys un amic com a destinatari.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Afegeix clau al clauer</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Aquesta claus ja és al clauer</translation>
     </message>
@@ -4121,7 +3495,7 @@ missatges distants a aquest contacte
 encara que no sigueu amics.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>El certificat té un nombre de versió erroni. Recorda que les xarxes v0.6 i v0.5 són incompatibles.</translation>
     </message>
@@ -4156,7 +3530,7 @@ encara que no sigueu amics.</translation>
         <translation>Afegir la IP a la llista blanca</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>Aquest certificat no té IP!</translation>
     </message>
@@ -4166,27 +3540,10 @@ encara que no sigueu amics.</translation>
         <translation>&lt;p&gt;Aquest certificat no té IP. Només podràs utilitzar descobriment i DHT per trobar-lo. Com que és necessari que estigui a la llista blanca d&apos;IPs el contacte provocarà un avís a la pestanya de Novetats. Des d&apos;allí podràs afegir la IP a la llista blanca.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished">[Desconegut]</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Afegit amb el certificat de %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Enganxa el certificat del teu amic des del porta-retalls</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Carrega de certificat fallada: no es pot llegir de l&apos;arxiu %1</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Carrega de certificat fallada: Hi ha alguna cosa malament amb %1</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4248,7 +3605,7 @@ encara que no sigueu amics.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>Configuració UDP</translation>
     </message>
@@ -4284,7 +3641,7 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;pots tancar-lo.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Auxiliar de connexió</translation>
     </message>
@@ -4294,17 +3651,20 @@ p, li { white-space: pre-wrap; }
         <translation>Id contacte invàlida</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Estat desconegut</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Fora de línia</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Darrera NAT simètric</translation>
     </message>
@@ -4314,12 +3674,14 @@ p, li { white-space: pre-wrap; }
         <translation>Darrera NAT i sense DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Reiniciar xarxa</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>Darrera NAT</translation>
     </message>
@@ -4329,7 +3691,8 @@ p, li { white-space: pre-wrap; }
         <translation>Sense DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>ESTAT DE LA XARXA BO!</translation>
     </message>
@@ -4354,7 +3717,7 @@ p, li { white-space: pre-wrap; }
         <translation>Trobant contactes RS</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Descobriment requereix DHT</translation>
     </message>
@@ -4646,7 +4009,7 @@ p, li { white-space: pre-wrap; }
         <translation>Si us plau, intenta-ho important un certificat complet</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4654,7 +4017,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>REENVIAMENT NO VERIFICABLE!</translation>
     </message>
@@ -4664,7 +4028,7 @@ p, li { white-space: pre-wrap; }
         <translation>REENVIAMENT NO VERIFICABLE I SENSE DHT</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Cercant</translation>
     </message>
@@ -4700,12 +4064,12 @@ p, li { white-space: pre-wrap; }
         <translation>Detalls del cercle</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nom del cercle, contacte de l&apos;autor i la llista de membres invitats serà visible a tots els membres invitats. Si el cercle no és privat, també serà visible pels nodes veïns dels nodes que pertanyen als membres invitats.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4725,7 +4089,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>Ids</translation>
     </message>
@@ -4745,18 +4109,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtre</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Sobrenom</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Membres convidats</translation>
     </message>
@@ -4771,15 +4135,7 @@ p, li { white-space: pre-wrap; }
         <translation>Gent Coneguda</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Tipus</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
@@ -4819,23 +4175,19 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Els cercles poden restringir-se a membres d&apos;un altre cercle. Només els membres d&apos;aquest segon cercle podran veure el nou cercle i el contingut (llistat de membres, etc.).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Només visible a membres de:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Si us plau, introdueix un nom pel teu cercle</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>No s&apos;ha seleccionat cap cercle de restricció</translation>
     </message>
@@ -4845,12 +4197,24 @@ p, li { white-space: pre-wrap; }
         <translation>No s&apos;ha seleccionat cap cercle de limitacions</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Desconegut]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Afegir</translation>
     </message>
@@ -4860,7 +4224,7 @@ p, li { white-space: pre-wrap; }
         <translation>Treure</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Cercar</translation>
@@ -4875,10 +4239,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Signat</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Signat per nodes coneguts</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4895,10 +4255,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>Identitat PGP</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Id anonima</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4921,17 +4277,13 @@ p, li { white-space: pre-wrap; }
         <translation>Crear Nou Cercle</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">Id enllaç PGP</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Afegir Membre</translation>
     </message>
@@ -4950,7 +4302,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crear grup</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Nom del grup:</translation>
     </message>
@@ -4985,7 +4337,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Nova entrada al canal</translation>
     </message>
@@ -4995,7 +4347,7 @@ p, li { white-space: pre-wrap; }
         <translation>Entrada al canal</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5056,23 +4408,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Fes arrossegar i deixar / Botó d&apos;afegir arxius per calcular el número de hash d&apos;arxius nous.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copiar/Enganxar enllaços RetroShare dels teus compartits&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Afegir arxiu per adjuntar</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Afegir miniatura del canal</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Missatge</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Assumpte:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5158,17 +4498,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5187,17 +4527,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Arxiu ja afegit i hash calculat</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Si us plau, afegeix un assumpte</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Carrega miniatura</translation>
     </message>
@@ -5212,18 +4553,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Generar dades en massa</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Segur que vols generar %1 missatges?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Estàs a punt d&apos;afegir arxius que ara mateix no comparteixes. Segur que ho vols fer?</translation>
     </message>
@@ -5257,7 +4592,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Publica missatge al fòrum</translation>
     </message>
@@ -5266,10 +4601,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Fòrum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Assumpte</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5290,8 +4621,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5310,7 +4641,7 @@ p, li { white-space: pre-wrap; }
         <translation>Podeu adjuntar arxius arrossegant i deixant anar en aquesta finestra</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5340,17 +4671,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Sense fòrum</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>En resposta a</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Títol</translation>
     </message>
@@ -5404,7 +4735,7 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished">Carrega arxiu d&apos;imatge</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>No hi ha un ID compatible amb aquest fòrum</translation>
     </message>
@@ -5414,8 +4745,8 @@ Vols descartar aquest missatge?</translation>
         <translation>Cap de les teves identitats té permès publicar en aquest fòrum. Això pot deures a que el fòrum estigui limitat a un cercle que no té cap de les teves identitats, o a que el fòrum requereixi una identitat signada amb PGP.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Generar dades en massa</translation>
     </message>
@@ -5424,10 +4755,6 @@ Vols descartar aquest missatge?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Segur que vols generar %1 missatges?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Enviar</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5442,23 +4769,7 @@ Vols descartar aquest missatge?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Crear sala de xat</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Un sala de xat és un grup de xat descentralitzat i anònim. Tots els participants reben tots els missatges. Un cop la sala és creada pots invitar altres amics de la pestanya d&apos;amics.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Nom de la sala:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Assumpte de la sala:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5493,7 +4804,7 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
@@ -5503,11 +4814,7 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si marques aquí només ids signades amb PGP podran ser utilitzades per accedir i parlar a la sala. Aquesta limitació evita l&apos;spam anònim donat que esdevé possible que, com a mínim algunes de les persones de la sala, puguin localitzar el node de l&apos;spammer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>requereix identitats signades amb PGP</translation>
     </message>
@@ -5522,11 +4829,7 @@ Vols descartar aquest missatge?</translation>
         <translation>Escull els amics amb qui vols fer un xat en grup.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Amics convidats</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Crear sala de xat</translation>
@@ -5547,7 +4850,7 @@ Vols descartar aquest missatge?</translation>
         <translation>Contactes:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Identitat a utilitzar:</translation>
     </message>
@@ -5555,17 +4858,17 @@ Vols descartar aquest missatge?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Informació pública</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Ubicació:</translation>
     </message>
@@ -5575,12 +4878,12 @@ Vols descartar aquest missatge?</translation>
         <translation>Id d&apos;ubicació:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Versió de programari:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>En línia des de:</translation>
     </message>
@@ -5600,12 +4903,7 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5615,7 +4913,7 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Altra informació</translation>
     </message>
@@ -5625,17 +4923,12 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished">Perfil</translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Certificat</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5645,11 +4938,7 @@ Vols descartar aquest missatge?</translation>
         <translation>Inclou les signatures</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Desa la clau a un arxiu</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exportar identitat</translation>
     </message>
@@ -5722,33 +5011,33 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>EtiquetaText</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>fingerprint PGP:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Informació de node</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>Id PGP:</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Nodes de l&apos;amic:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5787,14 +5076,6 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>Node</source>
         <translation>Node</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Crear node nou...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">mostra la finestra d&apos;estadístiques</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5811,10 +5092,6 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Retroshare utilitza el DHT de Bittorrent com a repetidor per les connexions. No emmagatzema la teva IP al DHT. ⇥⇥⇥⇥ En lloc d&apos;això el DHT és utilitzat pels teus contactes per contactar amb tu mentre es processen peticions DHT estàndard.  ⇥⇥⇥⇥⇥⇥⇥⇥⇥⇥⇥⇥L&apos;indicador d&apos;estat es tornarà verd tan aviat com el Retroshare obtingui una resposta per DHT d&apos;un dels teus amics.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5850,7 +5127,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6518,7 +5795,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Arxiu d&apos;inici</translation>
     </message>
@@ -6526,38 +5803,38 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>a</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>ignora majúscules/minúscules</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>dd.mm.aaaa</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>kB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6565,12 +5842,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Giny d&apos;expressió</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Suprimir aquesta expressió</translation>
     </message>
@@ -6732,7 +6009,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Imatge</translation>
     </message>
@@ -6742,7 +6019,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Àudio</translation>
     </message>
@@ -6802,11 +6079,21 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Directoris dels amics</translation>
     </message>
@@ -6928,7 +6215,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -6963,10 +6250,6 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>Show State</source>
         <translation>Mostrar Estat</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">Nodes de confiança</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6974,7 +6257,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Mostra grups</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Grup</translation>
     </message>
@@ -7010,7 +6293,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Afegir al grup</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Cerca</translation>
@@ -7026,7 +6309,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Ordena per estat</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Detalls del perfil</translation>
     </message>
@@ -7270,7 +6553,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Confirma la petició d&apos;amic</translation>
     </message>
@@ -7287,10 +6570,6 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Cercar:</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7312,7 +6591,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Busca als amics</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Marcar tots/es</translation>
     </message>
@@ -7323,16 +6602,134 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Marcar cap</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished">Adreça</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Estat</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Fer amic</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished">El repetidor no està activat o està trencat.
+Estan tots els serveis funcionant correctament??
+Comprova els teus ports!</translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Editar missatge d&apos;estat</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Difusió</translation>
     </message>
@@ -7415,33 +6812,38 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Restablir tipografia per defecte</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Clauer</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Xarxa&lt;/h1&gt; &lt;p&gt;La pestanya Xarxa mostra els nodes RertoShare dels teus amics: Els nodes de RetroShare veïns amb que estàs.connectat. &lt;/p&gt; &lt;p&gt;Pots agrupar els nodes en grups per millorar el control de l&apos;accés a les dades, per permetre només a alguns nodes veure alguns arxius.&lt;/p&gt; &lt;p&gt;A la dreta, trobaràs 3 útils pestanyes: &lt;ul&gt; &lt;li&gt;Difusió envia missatges a tots els nodes connectats a la vegada&lt;/li&gt;&lt;li&gt;El gràfic de xarxa propera mostra la xarxa al teu voltant, basant-se en la informació de descobriment&lt;/li&gt; &lt;li&gt;Anell de claus conté les claus que tens, principalment les reenviades pels nodes dels teus amics cap a tu&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Xat de difusió del RetroShare: Els missatges són enviats a tots els amics connectats.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Xarxa</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Gràfic de xarxa</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Estableix aquí el teu missatge d&apos;estat.</translation>
     </message>
@@ -7459,7 +6861,17 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Contrasenya</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Tots els camps són obligatoris amb un mínim de 3 caràcters</translation>
     </message>
@@ -7469,17 +6881,12 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Les contrasenyes no coincideixen</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation>Utilitza BOB</translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Aquesta contrasenya és pel PGP</translation>
@@ -7500,50 +6907,38 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Ha fallat la generació del teu nou certificat, potser la contrasenya PGP sigui incorrecta!</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="vanished">Opcions</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation>Longitud de clau PGP</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Utilitza una contrasenya complicada. Aquesta contrasenya protegeix la clau privada del teu node!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si us plau, mou el ratolí una mica per captar tanta aleatorietat com sigui possible. És necessari arribar fins el 20% per crear la clau del teu node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Node estàndard</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">Node ocult Tor/I2P</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nom del teu node estableix la instancia de Retroshare que&lt;/p&gt;&lt;p&gt;s&apos;executarà en el teu ordinador.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Use existing profile</source>
-        <translation type="vanished">Tornar a utilitzar un perfil existent</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Nom del node</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7563,12 +6958,12 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nom del perfil t&apos;identifica a tu a la xarxa.&lt;/p&gt;&lt;p&gt;És l&apos;utilitzat pels teus amics per acceptar les teves connexions.&lt;/p&gt;&lt;p&gt;Pots crear multiples nodes de Retroshare amb el&lt;/p&gt;&lt;p&gt;mateix perfil a ordinadors diferents.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Exportar aquest perfil</translation>
     </message>
@@ -7578,42 +6973,43 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pot ser una adreça Tor Onion del tipus: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;o una adreça I2P del tipus: [52 caràcters].b32.i2p &lt;/p&gt;Per tal d&apos;obtindre&apos;n una has de configurar o Tor o I2P per crear un nou servei ocult/servidor de túnel. &lt;p&gt;&lt;p&gt;Pots deixar-ho en blanc ara, però el teu node només funcionarà si poses una adreça Tor/I2P a les opcions del Retroshare a Opcions&gt;Xarxa-&gt;Panell de configuració de servei ocult.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les identitats s&apos;utilitzen quan escrius en sales de xat, fòrums i comentaris en canals. &lt;/p&gt;&lt;p&gt;També s&apos;empren quan envies/reps correus electrònics per la xarxa de Retroshare. Pots crear &lt;/p&gt;&lt;p&gt;una identitat signada ara o deixar-ho per més tard, quan ho necessitis.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>Som-hi!</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation>EtiquetaText</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Opcions avançades</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>adreça oculta</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>El teu perfil està associat a un parell de clau PGP. RetroShare ara mateix ignora les claus DSA.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquest és el teu port de connexió.&lt;/p&gt;&lt;p&gt;Qualsevol valor entre 1024 i 65535 &lt;/p&gt;&lt;p&gt;serà vàlid. Podràs canviar-ho més tard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7661,13 +7057,13 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>El teu perfil no s&apos;ha desat. Hi ha hagut un error.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importar perfil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Crear un nou perfil i un node nou de Retroshare</translation>
     </message>
@@ -7677,7 +7073,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Crear un node nou de Retroshare</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation>Adreça Tor/I2P</translation>
     </message>
@@ -7712,7 +7108,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7722,12 +7118,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La creació de node està desactivada fins que els camps estiguin completats correctament.&lt;/p&gt;</translation>
     </message>
@@ -7737,12 +7128,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>&lt;p&gt;La creació de node està desactivada fins que s&apos;hagi acumulat suficient aleatorietat. Si us plau, mou el ratolí fins que arribis com a mínim al 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation>Adreça de la instancia I2P amb BOB activat.</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation>Adreça instancia I2P</translation>
     </message>
@@ -7968,36 +7354,13 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Començant</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Convidar amics</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;El RetroShare és res sense els teus amics. Clica en el botó per començar el procés.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Envia una invitació per correu electrònic amb el teu &quot;Id de Certificat&quot; al teus amics.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Assegurat de rebre la seva invitació també... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Només pots connectar-te amb els teus amics si tots dos us heu afegit com amics.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Afegir els teus amics al RetroShare</translation>
     </message>
@@ -8007,136 +7370,103 @@ p, li { white-space: pre-wrap; }
         <translation> Afegir amics </translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Estigues en línia a la vegada que els teus amics i el Retroshare automàticament us connectarà!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;El teu client necessita trobar la xarxa Retroshare abans de poder fer les connexions.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Això pot trigar entre 5-30 minuts la primera vegada que engegues el RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;L&apos;indicador de DHT (A la barra d&apos;estat) es tornarà Verda quan pugui realitzar connexions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Al cap d&apos;un parell de minuts, l&apos;indicador de NAT (També a la barra d&apos;estat) canviarà a Groc o Verd.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Si continua Vermell, tens un Tallafocs Dolentot que el Retroshare té problemes per travessar.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Busca a la secció d&apos;Ajuda Extra per més consells sobre connectar-se.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Connectar-se als amics</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Pots millorar el rendiment del Retroshare obrint un port extern. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Això accelerarà les connexions i permetrà que més gent connecti amb tu. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;La forma més senzilla de fer-ho és activant el UPnP en el teu encaminador o aparell Wifi.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Com que cada encaminador és diferent hauràs de ser tu qui trobi les instruccions per com fer-ho.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Si no saps de que t&apos;estem parlant no hi pensis més, el Retroshare continuarà funcionant.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avançat: Obrir port del tallafocs</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Tens problemes per iniciar-te amb el RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Mira la PMF Viqui. És una mica antiga, estem intentant posar-la al dia.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Busca en els fòrums en línia. Fes preguntes i parla sobre les possibilitats.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Prova els fòrums interns de RetroShare &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;⇥- Apareixeran com disponibles quan et connectis amb amics.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) Si tot i així estàs encallat. Envia&apos;ns un correu.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Disfruta utilitzant el RetroShare&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Connectar-se als amics</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Quan els teus amics t&apos;envien la seva invitació, clica per obrir la finestra Afegir amics..&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enganxa el &amp;quot;Certificat ID&amp;quot; dels teus amics a la finestra i afegeix-los com amics.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avançat: Obrir port del tallafocs</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Més ajuda i suport</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Obrir lloc web del RS</translation>
     </message>
@@ -8161,7 +7491,7 @@ p, li { white-space: pre-wrap; }
         <translation>Resposta de correu electrònic</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>Invitació al RetroShare</translation>
     </message>
@@ -8211,12 +7541,12 @@ p, li { white-space: pre-wrap; }
         <translation>Resposta per RetroShare</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>Suport del RetroShare</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Té múltiples utilitats, incloent-hi xat, missatgeria, </translation>
     </message>
@@ -8340,7 +7670,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Mostra xat en grup</translation>
     </message>
@@ -8348,7 +7678,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[Desconegut]</translation>
     </message>
@@ -8514,20 +7844,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Pots fer que els teus amics sàpiguen del teu fòrum compartint-lo amb ells. Escull els amics amb qui vols compartir el teu fòrum.</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">Compartir els permisos d&apos;administrador del tema</translation>
-    </message>
-    <message>
-        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
-        <translation type="vanished">Pots permetre als teus amics editar el tema. Selecciona&apos;ls a la llista inferior.
-Nota: No es poden revocar els permisos d&apos;administrador publicats</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Títol</translation>
     </message>
@@ -8540,12 +7861,12 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Descripció</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8570,35 +7891,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">Ordena en ordre descendent</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">Ordena en ordre ascendent</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Ordena per nom</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Ordena per popularitat</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Ordena per darrer missatge</translation>
-    </message>
-    <message>
-        <source>Sort by Number of Posts</source>
-        <translation type="vanished">Ordenar per nombre de publicacións</translation>
-    </message>
-    <message>
-        <source>Sort by Unread</source>
-        <translation type="vanished">Ordena per no llegit</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Ets l&apos;administrador (Modifica noms i descripció utilitzant el menú Editar)</translation>
     </message>
@@ -8613,14 +7906,14 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Darrera publicació</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
@@ -8631,17 +7924,13 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished">Popularitat</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Mostra</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8654,7 +7943,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>i</translation>
     </message>
@@ -8790,7 +8079,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Canals</translation>
@@ -8801,26 +8090,22 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>Crear canal</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Activa l&apos;auto-descàrrega</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Els meus canals</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Canals&lt;/h1&gt; &lt;p&gt;Canals et permet publicar dades (Ex: pel·lícules, música) que es propagaran per la xarxa&lt;/p&gt; &lt;p&gt;Pots veure els canals als que tens amics subscrits i tu faràs el mateix amb els teus. Això promociona els canals populars dins la xarxa.&lt;/p&gt; &lt;p&gt;Només el creador del canal pot publicar en un canal. Els altres contactes a la xarxa només poden llegir el canal, a no ser que el canal sigui privat. No obstant, pots compartir els drets de publicació o lectura amb nodes de Retroshare amics.&lt;/p&gt; &lt;p&gt;Els canals poden ser anònims o associats a una identitat de Retroshare per tal que els lectors puguin contactar amb tu si volen. Activa &quot;Permetre comentaris&quot; si vols permetre que els usuaris facin comentaris sobre el que publiques.&lt;/p&gt;&lt;p&gt;Les entrades publicades es mantenen durant %1 dies, i es sincronitzen pels últims %2 dies, a no ser que ho canviïs.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Canals subscrits</translation>
     </message>
@@ -8840,12 +8125,12 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>Seleccionar directori de descarrega del canal</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Desactivar auto-descàrrega</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>Seleccionar directori de descarrega</translation>
     </message>
@@ -8880,22 +8165,22 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Reproduir</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Obrir directori</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -8915,17 +8200,17 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>Comprovant</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Segur que vols cancel·lar i esborrar aquest arxiu?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>No es pot obrir el directori</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Reproduir arxiu</translation>
     </message>
@@ -8935,37 +8220,10 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished">L&apos;arxiu %1 no existeix a la ruta.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulari</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Nom d&apos;arxiu</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Mida</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Títol</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Publicat</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Estat</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Crear nou canal</translation>
     </message>
@@ -9003,9 +8261,19 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Subscriu-te al canal</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9019,7 +8287,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -9034,7 +8302,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>Descripció del canal</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Carregant</translation>
     </message>
@@ -9049,8 +8317,9 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Nou canal</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Mai</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -9061,7 +8330,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Nou comentari:</translation>
     </message>
@@ -9082,7 +8351,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Reproduir</translation>
     </message>
@@ -9138,28 +8407,24 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <source>Files</source>
         <translation>Arxius</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Avís! Tens menys de %1 hores i %2 minuts abans que aquest arxiu sigui esborrat. Considera desar-lo.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Nou</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Comentari</translation>
     </message>
@@ -9174,21 +8439,17 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>No m&apos;agrada</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Carregant</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation>Comentaris</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9213,139 +8474,16 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>Reproduir Medi</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Publica al canal</translation>
-    </message>
-    <message>
-        <source>Add new post</source>
-        <translation type="vanished">Afegir nova publicació</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Carregant</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Cercar canals</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Títol</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Cerca títol</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Missatge</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Cercar missatge</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Nom d&apos;arxiu</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Cercar arxiu</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">No hi ha canal seleccionat</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Mai</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Públic</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle &quot;</source>
-        <translation type="vanished">Restringit a membres del cercle &quot;</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle </source>
-        <translation type="vanished">Restringit a membres del cercle</translation>
-    </message>
-    <message>
-        <source>Your eyes only</source>
-        <translation type="vanished">Només per tu</translation>
-    </message>
-    <message>
-        <source>You and your friend nodes</source>
-        <translation type="vanished">Per tu i pels nodes dels teus amics</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Desactivar auto-descàrrega</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Activar auto-descàrrega</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Mostra fonts</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Mostra arxius</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Administrador:</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Última publicació:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">desconegut</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Distribució:</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Fonts</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Arxius</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Subscriptors</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descripció:</translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">Publicat (A nodes veïns):</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Publica al canal</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished">Afegir nova publicació</translation>
     </message>
@@ -9415,7 +8553,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9441,7 +8579,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
     <message>
         <location line="+41"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Detalls</translation>
     </message>
     <message>
         <location line="+83"/>
@@ -9451,7 +8589,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Comentaris</translation>
     </message>
@@ -9466,13 +8604,13 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished">Fonts</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9487,7 +8625,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9502,7 +8640,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9562,12 +8700,22 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9642,12 +8790,13 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation type="unfinished">Per tu i pels nodes dels teus amics</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Subscrit</translation>
     </message>
@@ -9684,7 +8833,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
     <message>
         <location line="+0"/>
         <source>Enable Auto-Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Activa l&apos;auto-descàrrega</translation>
     </message>
 </context>
 <context>
@@ -9698,17 +8847,17 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9728,27 +8877,11 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <source>Remove Item</source>
         <translation>Eliminar l&apos;element</translation>
     </message>
-    <message>
-        <source>for identity </source>
-        <translation type="vanished">per identitat</translation>
-    </message>
-    <message>
-        <source>You received a membership request for circle:</source>
-        <translation type="vanished">Has rebut una petició de pertinença al cercle:</translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Accepta la petició de pertinença</translation>
     </message>
-    <message>
-        <source>Revoke membership request</source>
-        <translation type="vanished">Rebutja la petició de pertinença</translation>
-    </message>
-    <message>
-        <source>You received an invitation for circle:</source>
-        <translation type="vanished">Has rebut una invitació pel cercle:</translation>
-    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -9839,7 +8972,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Contenidor de comentari</translation>
     </message>
@@ -9852,7 +8985,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9882,7 +9015,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>Refrescar</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Comentari</translation>
@@ -9921,7 +9054,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Resposta al comentari</translation>
     </message>
@@ -9945,6 +9078,21 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <source>Vote Down</source>
         <translation>Votar negatiu</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9954,7 +9102,7 @@ Nota: No es poden revocar els permisos d&apos;administrador publicats</translati
         <translation>Fer comentari</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9983,26 +9131,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comentari&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Signat per</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -10031,7 +9163,7 @@ before you can comment</source>
 abans de poder comentar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10073,14 +9205,6 @@ abans de poder comentar</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Afegir administradors de fòrum</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Seleccionar administradors de fòrum</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -10090,7 +9214,7 @@ abans de poder comentar</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Subscriure&apos;s al fòrum</translation>
     </message>
@@ -10106,7 +9230,7 @@ abans de poder comentar</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -10126,8 +9250,9 @@ abans de poder comentar</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Carregant</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10158,13 +9283,13 @@ abans de poder comentar</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Assumpte:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Donar de baixa del fòrum</translation>
     </message>
@@ -10175,7 +9300,7 @@ abans de poder comentar</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -10195,21 +9320,17 @@ abans de poder comentar</translation>
         <translation>En resposta a:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Carregant</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Font del fòrum</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
@@ -10222,63 +9343,66 @@ abans de poder comentar</translation>
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Comença nova conversa al fòrum seleccionat</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Cercar fòrums</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Darrer missatge</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation>Nova conversa</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Vista per conversa</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Vista plana</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Títol</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Desar imatge</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Carregant</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10288,12 +9412,7 @@ abans de poder comentar</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Respondre missatge</translation>
     </message>
@@ -10317,10 +9436,6 @@ abans de poder comentar</translation>
         <source>Download all files</source>
         <translation>Descarregar tots els arxius</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Següent no llegit</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10337,35 +9452,23 @@ abans de poder comentar</translation>
         <translation>Cerca autor</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Contingut</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Cerca contingut</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Subscriure&apos;s al fòrum buscarà les entrades publicades disponibles dels teus amics subscrits, i farà el fòrum visible a tots els teus altres amics.&lt;/p&gt;&lt;p&gt;Després podràs des-subscriure&apos;t des del menú contextual de la llista de fòrums a l&apos;esquerra.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Sense nom</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10408,20 +9511,12 @@ abans de poder comentar</translation>
         <translation>Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Ampliar</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Expulsat]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[desconegut]</translation>
     </message>
@@ -10451,8 +9546,8 @@ abans de poder comentar</translation>
         <translation>Només per tu</translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation>Distribució</translation>
     </message>
@@ -10466,26 +9561,6 @@ abans de poder comentar</translation>
         <source>Anti-spam</source>
         <translation>Anti-spam</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Missatge modificat ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anònim</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">signat</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">cap</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Missatge perdut ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10555,16 +9630,12 @@ abans de poder comentar</translation>
         <translation>Missatge original</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation>Nova conversa</translation>
     </message>
     <message>
-        <source>Read status</source>
-        <translation type="vanished">Estat de lectura</translation>
-    </message>
-    <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
@@ -10625,7 +9696,7 @@ abans de poder comentar</translation>
         <translation>Reputació de l&apos;autor</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10645,7 +9716,7 @@ abans de poder comentar</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Els missatges anònims/desconeguts es propagaran si la reputació és positiva</translation>
     </message>
@@ -10697,7 +9768,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10707,7 +9778,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10722,26 +9793,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information for this identity is currently missing.</source>
-        <translation type="vanished">No hi ha informació per aquesta identitat</translation>
-    </message>
-    <message>
-        <source>You have banned this ID. The message will not be
-displayed nor forwarded to your friends.</source>
-        <translation type="vanished">Has prohibit aquesta identitat. El missatge no es mostrarà ni propagarà als teus amics.</translation>
-    </message>
-    <message>
-        <source>You have not set an opinion for this person,
- and your friends do not vote positively: Spam regulation 
-prevents the message to be forwarded to your friends.</source>
-        <translation type="vanished">No has establert una opinió per aquesta persona i els teus amics no opinien positivament: L&apos;anti-spam evita que el missatge sigui propagat als teus amics.</translation>
-    </message>
-    <message>
-        <source>Message will be forwarded to your friends.</source>
-        <translation type="vanished">El missatge es propagarà als teus amics.</translation>
-    </message>
-    <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation>(Nou)</translation>
     </message>
@@ -10750,10 +9802,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>(Old) </source>
         <translation>(Vell)</translation>
     </message>
-    <message>
-        <source>You cant act on the author to a non-existant Message</source>
-        <translation type="vanished">No pots fer res a l&apos;autor d&apos;un missatge que no existeix</translation>
-    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -10811,12 +9859,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Fòrums&lt;/h1&gt; 			&lt;p&gt;Els fòrums de Retroshare es veuen com fòrums d&apos;Internet, però funcionen de forma descentralitzada&lt;/p&gt; 			&lt;p&gt;Tu veus els fòrums als que els teus amics estan subscrits i tu fas el mateix amb els teus			 pels teus amics. Això promociona automàticament els fòrums interessants a la xarxa.&lt;/p&gt; &lt;p&gt;Els missatges es mantenen durant %1 dies i es sincronitzen durant %2 dies, si no ho canvies.&lt;/p&gt;</translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Fòrums</translation>
@@ -10847,35 +9895,16 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Altres fòrums</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Esperant</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Recuperant</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Carregant</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Afegir icona</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Els destinataris de les claus poden publicar en grups restringits, i poden veure i publicar en canals privats</translation>
     </message>
@@ -10884,22 +9913,14 @@ prevents the message to be forwarded to your friends.</source>
         <source>Share Publish Key</source>
         <translation>Compartir clau pública</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">comprovar els contactes amb qui t&apos;agradaria compartir les claus de publicació</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Compartir clau amb</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Descripció</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Distribució de missatge</translation>
     </message>
@@ -10907,7 +9928,7 @@ prevents the message to be forwarded to your friends.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Públic</translation>
     </message>
@@ -10926,14 +9947,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>New Thread</source>
         <translation>Nova conversa</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Requerit</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Encriptar missatge</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10975,7 +9988,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Protecció-Spam</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Comentari:</translation>
     </message>
@@ -10998,7 +10011,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Anti Spam:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11014,12 +10027,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation>Restringit al cercle:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation>Limitat als teus amics</translation>
     </message>
@@ -11036,23 +10049,23 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>Seguiment de missatges</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>Signatura PGP requerida</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation>Només els nodes d&apos;amics al grup</translation>
     </message>
@@ -11068,30 +10081,28 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Si us plau, afegeix un nom</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>Signatura PGP de ID coneguda requerida</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Carrega logotip del grup</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Publicar canvis al grup</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Fallo al preparar les metadades del Grup - Revisa-les</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">S&apos;utilitzarà per enviar resposta</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Propietari:</translation>
     </message>
@@ -11101,12 +10112,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Estableix una descripció</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Informació</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -11116,7 +10127,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Darrer missatge</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Els missatges es distribuiran més enllà dels nodes dels teus amics, sempre que la gent es subscrigui al canal/fòrum/publicació que creis.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -11191,7 +10202,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Defavorir IDs no signats i IDs de nodes desconeguts</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Popularitat</translation>
     </message>
@@ -11207,27 +10223,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Autor</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>EtiquetaGxsId</translation>
     </message>
@@ -11235,7 +10246,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Carregant</translation>
     </message>
@@ -11295,7 +10306,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Editar detalls</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation>Sincronitza els missatges dels/de les últims/es...</translation>
     </message>
@@ -11352,16 +10363,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share publish permissions</source>
-        <translation type="vanished">Compartir permisos de publicació</translation>
-    </message>
-    <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Copia l&apos;enllaç RetroShare</translation>
     </message>
@@ -11384,7 +10391,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Sense signatura</translation>
     </message>
@@ -11397,40 +10404,24 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Carregant</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>No trobat</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Sense signatura</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Expulsat]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Autenticació</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>clau desconeguda</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">anònim</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11440,7 +10431,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Identitat&amp;nbsp;nom</translation>
     </message>
@@ -11454,16 +10450,20 @@ prevents the message to be forwarded to your friends.</source>
         <source>Node</source>
         <translation type="unfinished">Node</translation>
     </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">Signat&amp;nbsp;per</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Desconegut]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11475,7 +10475,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11523,17 +10523,13 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Desconegut]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Carregant</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11650,10 +10646,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>Group ID / Author</source>
         <translation>ID Grup / Autor</translation>
     </message>
-    <message>
-        <source>Number of messages / Publish TS</source>
-        <translation type="vanished">Nombre de missatges / TS publicats</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -11669,10 +10661,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>Popularity</source>
         <translation>Popularitat</translation>
     </message>
-    <message>
-        <source>Details</source>
-        <translation type="vanished">Dells</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -11705,41 +10693,6 @@ prevents the message to be forwarded to your friends.</source>
         <translation>No</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">Túnels autenticats:</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">ID túnel: %1</translation>
-    </message>
-    <message>
-        <source>from: %1</source>
-        <translation type="vanished">de: %1</translation>
-    </message>
-    <message>
-        <source>to: %1</source>
-        <translation type="vanished">a: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">estat: %1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">total enviat: %1 bytes</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">Total rebut: %1 bytes</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Contacte desconegut</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11952,48 +10905,12 @@ prevents the message to be forwarded to your friends.</source>
         <source>About</source>
         <translation>Sobre</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Retroshare és una plataforma descentralitzada&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;segura i privada de comunicacions, de codi obert i multi-plataforma. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Permet compartir tot el que vulguis amb seguretat amb amics &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt; utilitzant certificats per autenticar els contactes i OpenSSL per encriptar les comunicacions.&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Retroshare proporciona compartició d&apos;arxius, xat, missatgeria i canals.&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Enllaços externs útils amb més informació:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Pàgina web del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Viqui del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Fòrum del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Plana de projecte del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Bloc de l&apos;equip del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Twitter Desenvolupament Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+37"/>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -12009,7 +10926,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Autors</translation>
     </message>
@@ -12028,7 +10945,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -12041,38 +10958,6 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traducció Retroshare:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Plana web traductors Retroshare:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Alemany: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Keller&lt;/span&gt; &amp;lt;&lt;span style=&quot; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&amp;gt;&lt;/p&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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Català: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; Josep Creus&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;creus.informatic@gmail.com&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-weight:600;&quot;&gt;Polac: &lt;/span&gt;Maciej Mrug&lt;/p&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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Suec: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&gt;
-&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -12138,12 +11023,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+158"/>
+        <location line="+165"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12158,7 +11043,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12167,32 +11052,12 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Did you receive a certificate from a friend?</source>
-        <translation type="vanished">Has rebut un certificat de part d&apos;un amic?</translation>
-    </message>
-    <message>
-        <source>Add friends certificate</source>
-        <translation type="vanished">Afegir certificat d&apos;un amic</translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">Afegir arxiu de certificat</translation>
-    </message>
-    <message>
-        <source>Share your RetroShare Key</source>
-        <translation type="vanished">Comparteix la teva clau de Retroshare</translation>
-    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
-        <translation type="vanished">El text a sota és el teu certificat de Retroshare. Envia&apos;l als teus amic</translation>
-    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -12202,20 +11067,12 @@ private and secure decentralized communication platform.
 </translation>
     </message>
     <message>
-        <source>Launch startup wizard</source>
-        <translation type="vanished">Executar assistent d&apos;inici</translation>
-    </message>
-    <message>
-        <source>Do you need help with RetroShare?</source>
-        <translation type="vanished">Necessites ajuda amb el RetroShare?</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+134"/>
         <source>Open Web Help</source>
         <translation>Ajuda a la web oberta</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Copiar el teu certificat al porta-retalls</translation>
     </message>
@@ -12225,7 +11082,7 @@ private and secure decentralized communication platform.
         <translation>Desar el teu certificar a un arxiu</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>Enviar per correu</translation>
     </message>
@@ -12245,13 +11102,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12263,17 +11144,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+57"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12282,19 +11158,11 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Benvingut a Retroshare!&lt;/h1&gt; &#xa0;&lt;p&gt;Necessites &lt;b&gt;fer amics&lt;/b&gt;! Un cop hagis creat una xarxa de nodes de Retroshare, o t&apos;hagis unit a una xarxa existent,	 podràs intercanviar arxius, xatejar, parlar a fòrums, etc.&lt;/p&gt;&lt;div align=center&gt;&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;&lt;/div&gt;&lt;p&gt;Per fer-ho, copia el teu certificat d&apos;aquesta pàgina i envia&apos;l als teus amics, i afegeix aquí els certificats del teus amics.&lt;/p&gt;    &lt;p&gt;Una altra opció és cercar a internet per &quot;servidors de xat de Retroshare&quot; (administrats independentment). Els servidors et permeten intercanviar certificats amb un node de Retroshare dedicat, utilitzant-lo podràs trobar altres persones anònimament.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Invitació de RetroShare</translation>
     </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">S&apos;ha copiat el teu certificat al porta-retalls, enganxa&apos;l i envia&apos;l al teu amic per correu</translation>
-    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -12566,14 +11434,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Tot</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Reputació</translation>
     </message>
@@ -12583,12 +11451,12 @@ p, li { white-space: pre-wrap; }
         <translation>Cerca</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>Id anònim</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Crear nova identitat</translation>
     </message>
@@ -12598,7 +11466,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crear nou cercle</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>Persones</translation>
     </message>
@@ -12613,27 +11481,27 @@ p, li { white-space: pre-wrap; }
         <translation>Persona</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Tancar</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation>Opció-expulsar:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Expulsa automàticament totes les identitats signades pel mateix node</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation>Vots de l&apos;amic:</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Vots positius</translation>
     </message>
@@ -12649,29 +11517,39 @@ p, li { white-space: pre-wrap; }
         <translation>Vots negatius</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation>Estadístiques d&apos;ús</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Nom del cercle</translation>
     </message>
@@ -12691,18 +11569,20 @@ p, li { white-space: pre-wrap; }
         <translation>Cercles personals</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Editar identitat</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Esborrar identitat</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Xatejar amb aquest contacte</translation>
     </message>
@@ -12712,98 +11592,78 @@ p, li { white-space: pre-wrap; }
         <translation>Començar un xat distant amb aquest contacte</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>Id del node propietari:</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Nom de la identitat:</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>Id d&apos;identitat</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Enviar missatge</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Informació d&apos;identitat</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Id d&apos;identitat:</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Nom del node propietari:</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation>Crear nou...</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Tipus:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Enviar invitació</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La opinió mitjana dels nodes veïns sobre aquesta identitat. Negativa és dolent,&lt;/p&gt;&lt;p&gt;positiva és bo. Zero és neutre.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>La teva opinió:</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La teva opinió sobre una identitat controla la visibilitat d&apos;aquesta per tu i els teus nodes amics. La teva opinió es comparteix amb els teus amics i s&apos;utilitza per calcular una puntuació de reputació: Si la teva opinió sobre una identitat és neutre, la puntuació de reputació és la mitjana de l&apos;opinió dels teus amics. Si no, la teva opinió estableix la puntuació.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La puntuació total s&apos;utilitza en les sales de xat, fòrums i canals per decidir que fer amb cada identitat. Quan la puntuació està per sota de -1 la identitat és expulsada, tots els missatges, fòrums i canals per dita identitat no es reenvien, en cap sentit. Alguns fòrums tenen una opció anti-SPAM que obliga a tindre un nivell de reputació no negatiu, fent que siguin més sensibles a males reputacions. Les identitats expulsades van perdent gradualment la seva activitat i finalment desapareixent (després de 5 dies). &lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pots canviar aquests mínims i el temps d&apos;inactivitat per esborrar una identitat a Preferencies -&amp;gt; Gent. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Negatiu</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Neutre</translation>
     </message>
@@ -12814,17 +11674,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positiu</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La puntuació de reputació global, calculada amb les teves puntuacions i la dels teus amics.&lt;/p&gt;&lt;p&gt;Negativa és dolent, positiva és bo. Zero és neutre. Si la puntuació és massa baixa,&lt;/p&gt;&lt;p&gt;la identitat es marca com dolenta, i es filtrarà als fòrums, sales de xat,&lt;/p&gt;&lt;p&gt;canals, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Global:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anònim</translation>
     </message>
@@ -12839,24 +11699,24 @@ p, li { white-space: pre-wrap; }
         <translation>ID cerca</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Aquesta identitat és propietat teva</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>Les meves identitats</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>Els meus contactes</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation>Mostrar elements</translation>
     </message>
@@ -12871,7 +11731,12 @@ p, li { white-space: pre-wrap; }
         <translation>Associat al meu node</translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>Altres cercles</translation>
     </message>
@@ -12881,7 +11746,7 @@ p, li { white-space: pre-wrap; }
         <translation>Cercles als que pertanyo</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>ID Cercle:</translation>
     </message>
@@ -12956,7 +11821,7 @@ p, li { white-space: pre-wrap; }
         <translation>No ets membre (No tens accés a dades limitades a aquest cercle)</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>Id d&apos;identitat:</translation>
     </message>
@@ -12986,7 +11851,7 @@ p, li { white-space: pre-wrap; }
         <translation>desconegut</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>Convidat</translation>
     </message>
@@ -13001,7 +11866,7 @@ p, li { white-space: pre-wrap; }
         <translation>Membre</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>Editar cercle</translation>
     </message>
@@ -13049,7 +11914,7 @@ p, li { white-space: pre-wrap; }
         <translation>Permet pertinença</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -13060,7 +11925,7 @@ T&apos;hauries de lliurar d&apos;ella i utilitzar-ne una de nova.
 Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Node desconegut]</translation>
@@ -13103,7 +11968,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Identitat anònima</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13183,7 +12048,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation>informació</translation>
     </message>
@@ -13199,29 +12064,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Copiar identitat al porta-retalls</translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Enviar invitació?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Estàs segur de voler enviar una invitació amb el teu certificat?</translation>
-    </message>
-    <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Expulsat</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identitats&lt;/h1&gt;&lt;p&gt;En aquesta pestanya pots crear/editar identitats &lt;b&gt;pseudo-anònimes&lt;/b&gt; i &lt;b&gt;cercles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Les &lt;b&gt;Identitats&lt;/b&gt; s&apos;utilitzen per identificar les teves dades: signar missatges publicats a les sales de xat, fòrums i canals, rebre comentaris utilitzant el sistema intern de correu electrònic o publicar-ne a entrades dels canals, xatejar utilitzant túnels segurs, etc.&lt;/p&gt; &lt;p&gt;Les identitats poden estar &lt;b&gt;signades&lt;/b&gt; pel certificat del seu node de Rertoshare. És més fàcil confiar en identitats signades però es poden seguir fàcilment fins a la IP del node al que pertanyen.&lt;/p&gt; &lt;p&gt;Les &lt;b&gt;identitats anònimes&lt;/b&gt; et permetran interactuar amb altres usuaris de forma anònima. No es poden falsificar, però ningú pot provar qui té en realitat una determinada identitat.&lt;/p&gt; &lt;p&gt;Els &lt;b&gt;cercles&lt;/b&gt; són grups d&apos;identitats (anònimes o signades) que són compartides a certa distancia, salts entre nodes, per la xarxa. Es poden utilitzar per restringir la visibilitat de fòrums, canals, etc. &lt;/p&gt; 	&lt;p&gt;Un &lt;b&gt;cercle&lt;/b&gt; pot estar restringit a un altre cercle, limitant la visibilitat als membres d&apos;aquest cercle o inclús es pot auto-restringir, que vol dir que només es visible a membres invitats.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Unknown ID:</source>
-        <translation type="vanished">ID desconegut:</translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation>positiu</translation>
     </message>
@@ -13265,19 +12113,11 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>Forums</source>
         <translation>Fòrums</translation>
     </message>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Enviat</translation>
-    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Xat</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Desconegut</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13298,14 +12138,6 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>Creació de signatura d&apos;autor al servei %1</translation>
     </message>
-    <message>
-        <source>Message/vote/comment</source>
-        <translation type="vanished">Missatge/vot/comentari</translation>
-    </message>
-    <message>
-        <source>%1 in %2 tab</source>
-        <translation type="vanished">%1 a la pestanya %2</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -13326,19 +12158,11 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Signatura al sistema de túnel distant.</translation>
     </message>
-    <message>
-        <source>Update of identity data.</source>
-        <translation type="vanished">Actualització de dades d&apos;identitat</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Comprovació de signatura genèrica</translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">Signatura genèrica</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -13350,11 +12174,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Desencriptació genèrica</translation>
     </message>
     <message>
-        <source>Membership verification in circle %1.</source>
-        <translation type="vanished">Comprovació de pertinença al cercle %1.</translation>
-    </message>
-    <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation>Afegir a contactes</translation>
     </message>
@@ -13404,21 +12224,21 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Hola,&lt;br&gt; vull ser amic amb tu en el RetroShare.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Gent</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>El teu avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>Associat a nodes veïns</translation>
     </message>
@@ -13428,7 +12248,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Associat a nodes distants</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Associat a un node de RetroShare d&apos;un amic</translation>
     </message>
@@ -13443,7 +12263,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Associat a un node de RetroShare desconegut</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Xat amb aquesta persona</translation>
     </message>
@@ -13458,12 +12278,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Xat distant rebutjat amb aquesta persona.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Últim utilitzat:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP conegut</translation>
     </message>
@@ -13483,12 +12303,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Estàs segur de voler esborrar aquesta identitat?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Propietat de</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Nom del node:</translation>
     </message>
@@ -13498,7 +12318,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>ID node :</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>Segur que vols esborrar?</translation>
     </message>
@@ -13506,7 +12326,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Sobrenom</translation>
     </message>
@@ -13536,7 +12356,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Pseudònim</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13546,12 +12366,19 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Nova identitat</translation>
     </message>
@@ -13565,7 +12392,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13575,7 +12402,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Editar identitat</translation>
@@ -13586,27 +12418,27 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished">Actualitza</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13626,7 +12458,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13636,11 +12468,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Error obtenint clau!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Error de IDClau invàlida</translation>
     </message>
@@ -13655,7 +12483,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Nom real desconegut</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Crear nova identitat</translation>
     </message>
@@ -13665,10 +12493,15 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Tipus</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Treure</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13694,7 +12527,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Afegir</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
@@ -13704,17 +12537,13 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>El teu avatar</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Escull avatar</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>Associat al teu perfil</translation>
     </message>
@@ -13724,7 +12553,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Pots tindre una o més identitats. S&apos;utilitzen quan escrius en sales de xat, fòrums i comentes en canals. Funcionen també com a destinataris en xats distants i en el sistema de correu distant de RetroShare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>El sobrenom és massa curt. Si us plau, introdueix com a mínim %1 caràcters.</translation>
     </message>
@@ -13783,10 +12612,6 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>PGP name:</source>
         <translation>Nom PGP:</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">id GXS:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13802,7 +12627,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -13812,12 +12637,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Treure</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Marcar totes</translation>
     </message>
@@ -13836,26 +12661,38 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>Quote</source>
         <translation type="unfinished">Cita</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Enviar</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Desar imatge</translation>
     </message>
     <message>
         <location line="-7"/>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>No es pot guardar la imatge, nom de l&apos;arxiu invàlid</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>No és una imatge</translation>
     </message>
@@ -13873,27 +12710,32 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Estat:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13914,7 +12756,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13923,26 +12770,31 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Obrir arxiu</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Obrir directori</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Comprovant...</translation>
     </message>
@@ -13952,7 +12804,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>comprovar arxius</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation>Recomanar en un missatge a...</translation>
     </message>
@@ -13980,7 +12832,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Afegeix amic</translation>
     </message>
@@ -13996,7 +12848,8 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Opcions</translation>
     </message>
@@ -14017,7 +12870,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Sortir</translation>
     </message>
@@ -14028,12 +12881,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Auxiliar d&apos;inici ràpid</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 és una plataforma de comunicació segura descentralitzada</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Inacabat</translation>
     </message>
@@ -14060,11 +12913,12 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Estat</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Notificar</translation>
     </message>
@@ -14075,31 +12929,35 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Obrir Missatges</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Gràfic d&apos;ample de banda</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Aplicacions</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Minimitzar</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Maximitzar</translation>
     </message>
@@ -14114,7 +12972,12 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 missatges nous</translation>
     </message>
@@ -14144,7 +13007,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>%1 amics connectats</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Segur que vols sortir del RetroShare?</translation>
     </message>
@@ -14164,7 +13027,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Assegura&apos;t de que aquest enllaç no ha estat modificat per portar-te a un lloc web malicios.</translation>
     </message>
@@ -14209,12 +13072,13 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Taula de permisos dels serveis</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Estadístiques</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Mostrar interficie web</translation>
     </message>
@@ -14229,7 +13093,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>directori s&apos;està acabant (L&apos;actual límit és</translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>Segur que vols sortir ? </translation>
     </message>
@@ -14238,17 +13102,17 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Redacta</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Contactes</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Paràgraf</translation>
     </message>
@@ -14284,12 +13148,12 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Capçalera 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Mida del tipus de lletra</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Augmentar la mida del tipus de lletra</translation>
     </message>
@@ -14304,32 +13168,32 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Negreta</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Alineació</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Afegir una imatge</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Posa el tipus de lletra del text com si fos codi</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Subratllat</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Assumpte:</translation>
     </message>
@@ -14340,32 +13204,32 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Etiquetes</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>Llista d&apos;adreces:</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation>Recomanar aquest amic</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Estableix color de lletra</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Estableix color de fons de la lletra</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Arxius recomanats</translation>
     </message>
@@ -14435,7 +13299,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Afegir citació</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Enviar a:</translation>
     </message>
@@ -14459,10 +13323,6 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <source>&amp;Justify</source>
         <translation>&amp;Justificat</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">Totes les adreces (mesclades)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14474,7 +13334,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Els meus contactes</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hola,&lt;br&gt;Et recomano un bon amic meu; pots confiar en ell si confies en mi. &lt;br&gt;</translation>
     </message>
@@ -14494,18 +13354,18 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>vol ser amic teu al RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hola %1, &lt;br&gt;&lt;br&gt;%2 vol ser amic teu al RetroShare.&lt;br&gt;&lt;br&gt;Respondre ara:&lt;br&gt;%3 &lt;br&gt;&lt;br&gt;Gràcies,&lt;br&gt;L&apos;equip RetroShare</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Desar el missatge</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>El missatge no s&apos;ha enviat.
@@ -14517,7 +13377,17 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Enganxa l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Afegir a &quot;A&quot;</translation>
     </message>
@@ -14537,7 +13407,7 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Afegir com a recomanat</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Missatge original</translation>
     </message>
@@ -14547,21 +13417,21 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Des de</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Enviat</translation>
     </message>
@@ -14576,7 +13446,7 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>A %1, %2 va escriure:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -14586,30 +13456,30 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Reenvia:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Vols enviar el missatge sense especificar un assumpte?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Si us plau, introdueix almenys un destinatari.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>C/o</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Desconegut</translation>
     </message>
@@ -14724,13 +13594,13 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Detalls</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Obrir arxiu...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Arxius HTML (*.htm *.html);;Tots els arxius (*)</translation>
     </message>
@@ -14750,7 +13620,7 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Exportar a PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>El missatge no s&apos;ha enviat.
@@ -14772,7 +13642,7 @@ Voleu desar el missatge?</translation>
         <translation>Afegir arxiu extra</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Hola,&lt;br&gt; vull ser amic amb tu en el RetroShare.&lt;br&gt;</translation>
     </message>
@@ -14796,28 +13666,24 @@ Voleu desar el missatge?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">Tens una petició d&apos;amistat</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Respondre ara:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Tancar</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>Nodes de l&apos;amic</translation>
     </message>
@@ -14862,13 +13728,13 @@ Voleu desar el missatge?</translation>
         <translation>Llista ordenada (romanic ascendent)</translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Gràcies, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Identitat distant:</translation>
     </message>
@@ -14878,12 +13744,12 @@ Voleu desar el missatge?</translation>
         <translation>[Falta]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Si us plau, crea una identitat per signar missatges distants o treu els contactes distants de la llista de destinataris.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Nom i Id del node:</translation>
     </message>
@@ -14961,7 +13827,7 @@ Voleu desar el missatge?</translation>
         <translation>Per defecte</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Una pestanya nova</translation>
     </message>
@@ -14971,7 +13837,7 @@ Voleu desar el missatge?</translation>
         <translation>Una finestra nova</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Editar etiqueta</translation>
     </message>
@@ -14994,7 +13860,7 @@ Voleu desar el missatge?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Sub:</translation>
     </message>
@@ -15002,7 +13868,7 @@ Voleu desar el missatge?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Missatge</translation>
     </message>
@@ -15030,7 +13896,7 @@ Voleu desar el missatge?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Arxius recomanats</translation>
     </message>
@@ -15040,37 +13906,37 @@ Voleu desar el missatge?</translation>
         <translation>Descarregar tots els arxius recomanats</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Assumpte:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>CC:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>C/o:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Etiquetes:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Resposta</translation>
     </message>
@@ -15110,7 +13976,7 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>Envia invitació</translation>
     </message>
@@ -15162,7 +14028,7 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Confirma %1 com amic</translation>
     </message>
@@ -15172,12 +14038,12 @@ Voleu desar el missatge?</translation>
         <translation>Afegeix %1 com amic</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Sense assumpte</translation>
     </message>
@@ -15187,17 +14053,22 @@ Voleu desar el missatge?</translation>
         <translation>Descarregar</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15207,21 +14078,23 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Enviar invitació?</translation>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Estàs segur de voler enviar una invitació amb el teu certificat?</translation>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Descarregar tot</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Imprimir document</translation>
     </message>
@@ -15236,12 +14109,12 @@ Voleu desar el missatge?</translation>
         <translation>Arxius-HTML (*.htm *.html);;Tots els arxius (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Carregar sempre les imatges per aquest missatge</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Oculta el panell d&apos;adjunció</translation>
     </message>
@@ -15263,42 +14136,6 @@ Voleu desar el missatge?</translation>
         <source>Compose</source>
         <translation>Redacta</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Respon al missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Resposta</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Respondre a tothom del missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Respon a tothom</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Reenviar missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Endavant</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Esborra el missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Esborrar</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Imprimir el missatge seleccionat</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15377,7 +14214,7 @@ Voleu desar el missatge?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Missatge nou</translation>
     </message>
@@ -15387,60 +14224,16 @@ Voleu desar el missatge?</translation>
         <translation>Redacta</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Respon al missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Resposta</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Respon a tothom del missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Respon a tothom</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Reenviar missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Reenvia</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Esborra el missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Esborrar</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Imprimir el missatge seleccionat</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Impressió</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Mostra</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Etiquetes</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Safata d&apos;entrada</translation>
@@ -15470,21 +14263,17 @@ Voleu desar el missatge?</translation>
         <translation>Paperera</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Total safata d&apos;entrada:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Carpetes</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Vista ràpida</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Impressió...</translation>
@@ -15494,26 +14283,6 @@ Voleu desar el missatge?</translation>
         <source>Print Preview</source>
         <translation>Prèvia d&apos;impressió</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Botons: Només icona</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Botons: Text al costat de la icona</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Botons: amb text</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Botons: Text sota la icona</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Establir text sota la icona</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15535,7 +14304,7 @@ Voleu desar el missatge?</translation>
         <translation>Reenviar missatge</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Assumpte</translation>
     </message>
@@ -15545,7 +14314,7 @@ Voleu desar el missatge?</translation>
         <translation>Des de</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
@@ -15555,39 +14324,7 @@ Voleu desar el missatge?</translation>
         <translation>Contingut</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Clica per ordenar pels fitxers adjunts</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Clica per ordenar per assumptes</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Clica per ordenar per llegits</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Clica per ordenar pel remitent</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Clica per ordenar per data</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Clica per ordenar per etiquetes</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Clica per ordenar per marcats</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Reenviar missatge seleccionat</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Assumpte de la cerca</translation>
     </message>
@@ -15596,6 +14333,11 @@ Voleu desar el missatge?</translation>
         <source>Search From</source>
         <translation>Cerca de</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15622,14 +14364,14 @@ Voleu desar el missatge?</translation>
         <translation>Cerca adjunts</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Missatges&lt;/h1&gt; &lt;p&gt;Retroshare té el seu propi sistema de correu electrònic. Pots enviar/rebre correus de/a els nodes dels teus amics.&lt;/p&gt; &lt;p&gt;També és possible enviar missatges a identitats d&apos;altra gent utilitzant el sistema de encaminament global. Aquests missatges són sempre encriptats i reenviats per nodes intermediaris fins que arriben al seu destí. &lt;/p&gt; &lt;p&gt;Els missatges distants es queden a la teva bustia de sortints fins que no es rep confirmació d&apos;entrega.&lt;/p&gt; &lt;p&gt;Generalment s&apos;envien missatges per recomanar arxius a amics enviant els enllaços, recomanar nodes d&apos;amics a altres amics, per millorar la teva xarxa, o respostes a propietaris de canals.&lt;/p&gt;</translation>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Marcat</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15703,7 +14445,7 @@ Voleu desar el missatge?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15717,7 +14459,7 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15732,38 +14474,33 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Esborranys</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">No hi ha missatges marcats. Les marques et permeten donar als missatges un estat especial per trobar-los fàcilment. Per marcar un missatge clica a l&apos;estrella gris al costat del missatge.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">No hi ha missatges de sistema disponibles.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">A</translation>
+        <translation>A</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Clica per ordenar per destinatari</translation>
-    </message>
-    <message>
-        <source>This message goes to a distant person.</source>
-        <translation type="vanished">Aquest missatge va cap a una persona distant.</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15771,26 +14508,6 @@ Voleu desar el missatge?</translation>
         <source>Total:</source>
         <translation>Total:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Missatges</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Clica per ordenar per signatura</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Aquest missatge és firmat i la signatura vàlida</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Aquest missatge està signat però la signatura no és vàlida</translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">Aquest missatge prové d&apos;una persona distant.</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15818,7 +14535,17 @@ Voleu desar el missatge?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">Desar imatge</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Enganxa com a text pla</translation>
     </message>
@@ -15872,7 +14599,7 @@ Voleu desar el missatge?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -15882,7 +14609,7 @@ Voleu desar el missatge?</translation>
         <translation>Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation>des de</translation>
     </message>
@@ -15917,18 +14644,10 @@ Voleu desar el missatge?</translation>
         <translation>Msg pendent</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
-    <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Enviar invitació?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Estàs segur de voler enviar una invitació amb el teu certificat?</translation>
-    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -16066,7 +14785,7 @@ Voleu desar el missatge?</translation>
         <translation>ID del contacte</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Eliminar claus no utilitzades...</translation>
     </message>
@@ -16076,7 +14795,7 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Neteja el clauer</translation>
     </message>
@@ -16093,7 +14812,13 @@ Notes: Es guardarà una copia de seguretat del teu clauer antic.
 L&apos;eliminació potser falli si tens múltiples instancies de RetroShare a la mateixa màquina.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Informació del clauer</translation>
@@ -16128,18 +14853,13 @@ Per seguretat, s&apos;ha fet una copia de seguretat del teu clauer
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Inconsistència de dades al clauer. Això és probablement un &quot;bug&quot;. Si us plau, contacta amb els desenvolupadors.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>Exporta/Crea un node nou</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Només claus de confiança</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Cercar nom</translation>
     </message>
@@ -16149,12 +14869,12 @@ Per seguretat, s&apos;ha fet una copia de seguretat del teu clauer
         <translation>Cerca Id contacte</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>Detalls del perfil...</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -16163,13 +14883,6 @@ Reported error:</source>
 Error reportat:</translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Xarxa</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -16196,7 +14909,7 @@ Error reportat:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16217,7 +14930,7 @@ Error reportat:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Grups</translation>
     </message>
@@ -16247,19 +14960,19 @@ Error reportat:</translation>
         <translation type="unfinished">importar la teva llista d&apos;amics, incloent els grups</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished">ID cerca</translation>
     </message>
@@ -16269,12 +14982,12 @@ Error reportat:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished">Mostrar elements</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16284,7 +14997,7 @@ Error reportat:</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Grup</translation>
     </message>
@@ -16399,7 +15112,7 @@ Error reportat:</translation>
         <translation type="unfinished">Contreure tot</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Voleu suprimir aquest node?</translation>
     </message>
@@ -16409,7 +15122,7 @@ Error reportat:</translation>
         <translation type="unfinished">Voleu suprimir aquest amic?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Fet!</translation>
@@ -16523,11 +15236,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">Entrades en el registre</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16542,11 +15251,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Suprimeix-ho tot</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Això és un test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>El més nou a dalt</translation>
     </message>
@@ -16556,21 +15261,12 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>El més vell a dalt</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Novetats&lt;/h1&gt;
-&lt;p&gt;La font de noticies mostra els últims esdeveniments a la xarxa ordenats per hora de recepció. Això et proporciona un resum de l&apos;activitat dels teus amics. Pots triar quins esdeveniments es mostren a &lt;b&gt;Opcions&lt;/b&gt;. &lt;/p&gt; &lt;p&gt;Els esdeveniments mostrats són: &lt;ul&gt; &lt;li&gt;Intents de connexió (útil per fer amics amb gent nova i controlar qui està intentant connectar-te)&lt;/li&gt; &lt;li&gt;Publicacions a canals i fòrums&lt;/li&gt; &lt;li&gt;Nous canals i fòrums als que et pots subscriure&lt;/li&gt; &lt;li&gt;Missatges privats dels teus amics&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="vanished">Registre</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16625,10 +15321,6 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Blogs</source>
         <translation>Blocs</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Seguretat</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16650,10 +15342,6 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Message</source>
         <translation>Missatge</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Intent de connexió</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16670,10 +15358,6 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Ip security</source>
         <translation>Seguretat Ip</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Registre</translation>
-    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -16684,10 +15368,6 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Enllaços</translation>
-    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -16740,26 +15420,6 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Chat rooms</source>
         <translation>Sales de xat</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">Sales de xat</translation>
-    </message>
-    <message>
-        <source>Count occurrences of my current identity</source>
-        <translation type="vanished">Comptar quants cops hi ha la meva identitat actual</translation>
-    </message>
-    <message>
-        <source>Count occurrences of any of the following texts (separate by newlines):</source>
-        <translation type="vanished">Comptar coincidències de qualsevol dels texts següents (un per línia):</translation>
-    </message>
-    <message>
-        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
-        <translation type="vanished">Marca&apos;l si identitats i texts a la part superior han de coincidir en majúscules/minúscules pel comptador.</translation>
-    </message>
-    <message>
-        <source>Case sensitive</source>
-        <translation type="vanished">Diferenciar majúscules/minúscules</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16836,24 +15496,16 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Deshabilitar notificacions temporalment</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Font</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Àrea de notificació</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">Comptar tots els missatges no llegits</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation>Es requereix contrasenya</translation>
     </message>
@@ -16873,12 +15525,12 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Contrasenya incorrecta !</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Si us plau, introdueix la contrasenya del Retroshare</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Complement/Executable no registrat</translation>
     </message>
@@ -16893,19 +15545,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Si us plau, comprova l&apos;hora del sistema.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Examinant arxius compartits...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Calculant número de hash</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Desant índex de l&apos;arxiu...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -16916,17 +15556,19 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Títol desconegut</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Missatge encriptat</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Perquè aquestes sales de xat funcionin l&apos;hora en el teu ordinador ha de ser correcta. Si us plau, comprova que és el cas (És possible que una variació de varis minuts s&apos;hagi detectat respecte els teus amics).</translation>
     </message>
@@ -16934,7 +15576,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Amic en línia</translation>
     </message>
@@ -16986,10 +15628,6 @@ Tràfic baix: 10 %s del tràfic estàndard i PENDENT: posar en pausa totes les t
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Diàleg</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -17055,10 +15693,6 @@ Tràfic baix: 10 %s del tràfic estàndard i PENDENT: posar en pausa totes les t
         <source>This profile has signed your own profile key</source>
         <translation>Aquest perfil ha signat la clau del teu perfil</translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Signatures de la clau :</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17088,23 +15722,20 @@ p, li { white-space: pre-wrap; }
         <translation>Clau PGP</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation>Aquestes opcions s&apos;apliquen a tots els nodes del perfil:</translation>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signar la clau d&apos;un amic és una forma d&apos;expressar la teva confiança en aquest amic als teus altres amics. Els ajudarà a decidir si volen acceptar o no connexions d&apos;aquesta clau basant-se en la teva confiança. Signar una clau és completament opcional i no es pot desfer, fes-ho amb cura.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation>Aquestes opcions s&apos;apliquen a tots els nodes del perfil:</translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Signa clau PGP</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17141,12 +15772,7 @@ p, li { white-space: pre-wrap; }
         <translation>Inclou les signatures</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Opcions</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;El RetroShare periòdicament comprova la teva llista d&apos;amics per arxius navegables que coincideixin amb els mateixos que estàs descarregant, per establir una transferència directa. En aquest cas els teus amics sabran què descarregues.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Si no vols que això passi per algun amic en concret, desmarca aquesta casella. Encara podràs realitzar transferències directes si ho demanes explícitament, per exemple descarregant de la llista del teu amic directament. Això s&apos;aplicarà a totes les ubicacions del mateix node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -17160,10 +15786,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquesta opció et permet descarregar automàticament un arxiu recomanat en un missatge que provingui d&apos;aquest node. Això es pot utilitzar per exemple per enviar arxius entre els teus nodes. S&apos;aplica a totes les ubicacions del mateix node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -17196,21 +15818,21 @@ p, li { white-space: pre-wrap; }
         <translation>kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: no es poden obtenir detalls del contacte.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>L&apos;algorisme de la clau proporcionada no és suportada pel RetroShare
@@ -17231,7 +15853,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega directa com No.</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>El nivell de confiança és una forma d&apos;expressar la teva confiança en aquesta clau. No s&apos;utilitza pel programa ni es comparteix, però et pot ser útil per recordar claus bones/dolentes.</translation>
     </message>
@@ -17300,10 +15922,6 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Potser la contrasenya sigui incorrecta</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -17311,12 +15929,12 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>Perfil de Retroshare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Aquesta és la teva clau PGP i està signada per :</translation>
     </message>
@@ -17342,7 +15960,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Xat</translation>
     </message>
@@ -17363,7 +15981,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
@@ -17403,7 +16021,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>Diferencia de temps:</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Escriure missatge</translation>
     </message>
@@ -17417,10 +16035,6 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>Friend Connected</source>
         <translation>Amic connectat</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Intent de connexió</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17459,17 +16073,13 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>Unknown</source>
         <translation type="unfinished">Desconegut</translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Contacte desconegut</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Enviar missatge</translation>
     </message>
@@ -17521,10 +16131,6 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>Chat with this person as...</source>
         <translation>Xat amb aquesta persona com...</translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">Enviar un missatge a aquesta persona</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17583,10 +16189,6 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qualsevol de la teva llista de contactes tindrà automàticament una opinió positiva, si no ho canvies. Això permet que la reputació dels nodes en ús tinguin millor reputació.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
-        <translation type="vanished">donar automàticament una opinió &quot;Positiva&quot; als meus contactes</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -17644,13 +16246,6 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Per tal d&apos;evitar que identitats expulsades esborrades tornin perquè estan sent usades a fòrums o canals, se les manté en una llista durant un temps. Si després d&apos;aquest temps, s&apos;esborren de la llista però continuen sent usades, tornaran a propagar-se per fòrums, sales de xat, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulari</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17658,23 +16253,11 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Foto</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>EtiquetaTexte</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Comentari</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Resum</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17683,7 +16266,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
     <message>
         <location line="+99"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Detalls</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -17735,14 +16318,6 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Afegir comentari</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Escriure un comentari...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17813,10 +16388,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Crear àlbum</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Veure àlbum</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17838,17 +16409,17 @@ p, li { white-space: pre-wrap; }
         <translation>Presentació de diapositives</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Els meus àlbums</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Àlbums subscrits</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Àlbums compartits</translation>
     </message>
@@ -17878,7 +16449,7 @@ abans de demanar editar-lo!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Nom d&apos;àlbum</translation>
     </message>
@@ -17937,19 +16508,19 @@ abans de demanar editar-lo!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17985,12 +16556,12 @@ abans de demanar editar-lo!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>EtiquetaTexte</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Mostra més detalls sobre aquest complement</translation>
     </message>
@@ -18136,61 +16707,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Directoris on buscar complements</translation>
     </message>
-    <message>
-        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="vanished">Complement deshabilitat. Clica el botó d&apos;activació o reinicia el Retroshare</translation>
-    </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[desactivat]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">No s&apos;ha proporcionat número d&apos;API. Si us plau, llegeix el manual de desenvolupament de complements.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[problema de carrega]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">No s&apos;ha proporcionat número d&apos;SVN. Si us plau, llegeix el manual de desenvolupament de complements.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Error carregant.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Falten símbols. Versió equivocada?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Sense objecte del complement</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Complement carregat.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Estat desconegut.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Activa pels complements en desenvolupament.
-No se&apos;ls comprovarà el hash. No obstant, en 
-circumstancies normals, comprovar el hash et
-protegeix de l&apos;acció maliciosa de complements 
-modificats.</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Complements&lt;/h1&gt; &lt;p&gt;Els complements es carreguen dels directoris del llistat inferior.&lt;/p&gt; &lt;p&gt; Per raons de seguretat, els complements acceptats es carreguen automàticament mentre l&apos;executable principal del Retroshare o els complements no canviïn. En tal cas, l&apos;usuari haurà de confirmar-ho altre cop. Un cop el programa s&apos;ha iniciat, pots habilitar un complement manualment fent clic al botó &quot;Activa&quot; i després reiniciant el Retroshare.&lt;/p&gt; &lt;p&gt;Si vols desenvolupar els teus propis complements contacta amb els desenvolupadors i estaran contents d&apos;ajudar-te!&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -18260,12 +16776,27 @@ modificats.</translation>
         <translation>Posar la finestra per damunt</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">Expulsa aquesta persona (Emet una opinió negativa)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished">Opinió neutre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished">Opinió positiva</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -18299,22 +16830,6 @@ modificats.</translation>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The person you are talking to has deleted the secured chat tunnel.</source>
-        <translation type="vanished">La persona amb qui estaves parlant ha esborrat el túnel de xat segur.</translation>
-    </message>
-    <message>
-        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
-        <translation type="vanished">El company de xat ha esborrat el túnel segur, els missatges s&apos;entregaran el més aviat possible.</translation>
-    </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Tancar aquesta finestra finalitzarà la conversa, notifica-ho al contacte i esborra el túnel encriptat.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Matar el túnel?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -18334,7 +16849,7 @@ modificats.</translation>
         <translation type="unfinished">Nou</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positiu</translation>
     </message>
@@ -18354,8 +16869,8 @@ modificats.</translation>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Comentaris</translation>
     </message>
@@ -18380,13 +16895,13 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Comentari</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished">Comentaris</translation>
     </message>
@@ -18414,20 +16929,12 @@ modificats.</translation>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Signat per:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Notes</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -18442,12 +16949,22 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Carrega arxiu d&apos;imatge</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18463,7 +16980,17 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18473,23 +17000,7 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Publica entrada</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">Estàs enviant un enllaç. La clau per a que tingui èxit és un contingut interessant i un títol descriptiu.</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Publica</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Publica una entrada nova</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Si us plau, afegeix un títol</translation>
     </message>
@@ -18509,12 +17020,22 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18529,7 +17050,7 @@ modificats.</translation>
         <translation type="unfinished">Publica com</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18540,7 +17061,7 @@ modificats.</translation>
         <translation type="unfinished">Imatge</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18550,7 +17071,7 @@ modificats.</translation>
         <translation>Títol</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Enllaç</translation>
     </message>
@@ -18558,44 +17079,12 @@ modificats.</translation>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Enllaços publicats</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Publicacions&lt;/h1&gt; &lt;p&gt;El servei de publicacions et permet compartir enllaços d&apos;Internet que es distribueixen entre els nodes de Retroshare com si fos un fòrum o 	 canal&lt;/p&gt; 	 &lt;p&gt;Els enllaços poden ser comentats pels usuaris subscrits. També hi ha un sistema de promoció que permet  	 destacar enllaços importants.&lt;/p&gt; 	 &lt;p&gt;No hi ha cap restricció en quins enllaços es comparteixen. Sigues curós al fer clic en ells.&lt;/p&gt; &lt;p&gt;Els enllaços publicats es mantenen durant %1 dies i es sincronitzen durant els últims %2 dies, a no ser que ho canviïs.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Crear tema</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Els meus temes</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Temes subscrits</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Temes populars</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Altres temes</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Enllaços</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18629,31 +17118,7 @@ modificats.</translation>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Tema publicat</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Afegir administradors de tema</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Seleccionar administradors de tema</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Crear nou tema</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Editar tema</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Actualitzar tema</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18691,7 +17156,17 @@ modificats.</translation>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>Subscriure&apos;s als publicats</translation>
     </message>
@@ -18707,7 +17182,7 @@ modificats.</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -18722,24 +17197,17 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">Descripció dels publicats</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Carregant</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">Publicats nous</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">Mai</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18752,22 +17220,18 @@ modificats.</translation>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Lloc</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Comentaris</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
@@ -18778,12 +17242,12 @@ modificats.</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Comentari</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished">Comentaris</translation>
     </message>
@@ -18793,7 +17257,7 @@ modificats.</translation>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L&apos;autor d&apos;aquest missatge (amb Id %1) està expulsat.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18803,21 +17267,17 @@ modificats.</translation>
         <translation type="unfinished">Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Votar positiu</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Votar negatiu</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Marcar com llegit i eliminar l&apos;element</translation>
     </message>
@@ -18827,7 +17287,7 @@ modificats.</translation>
         <translation>Nou</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Nou comentari:</translation>
     </message>
@@ -18837,7 +17297,7 @@ modificats.</translation>
         <translation>Valor del comentari</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -18878,77 +17338,10 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Carregant</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Per</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulari</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Calent</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nou</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Capdamunt</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Avui</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Ahir</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Aquesta setmana</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Aquest mes</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Aquest any</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Publica una entrada nova</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Següent</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Si us plau, crea o escull una Id signant abans de votar</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Previ</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18960,7 +17353,7 @@ modificats.</translation>
     <message>
         <location line="+13"/>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Detalls</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -18968,7 +17361,17 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18978,15 +17381,15 @@ modificats.</translation>
         <translation type="unfinished">Administrador:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">desconegut</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">Distribució:</translation>
     </message>
@@ -18996,42 +17399,42 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">Publicacions</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19051,7 +17454,7 @@ modificats.</translation>
         <translation type="unfinished">Calent</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19081,17 +17484,17 @@ modificats.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19106,12 +17509,17 @@ modificats.</translation>
         <translation type="unfinished">Buit</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19121,27 +17529,31 @@ modificats.</translation>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished">informació</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19156,7 +17568,7 @@ modificats.</translation>
         <translation type="unfinished">Subscriure&apos;s</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Mai</translation>
     </message>
@@ -19230,6 +17642,16 @@ modificats.</translation>
         <source>No Channel Selected</source>
         <translation type="unfinished">No hi ha canal seleccionat</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -19238,14 +17660,6 @@ modificats.</translation>
         <source>Tabs</source>
         <translation>Pestanyes</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Obrir cada tema en una nova pestanya</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Enllaços</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -19259,10 +17673,6 @@ modificats.</translation>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Enviat</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -19331,25 +17741,17 @@ modificats.</translation>
         <translation>Directori de perfils</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Ubuntu&apos;; font-size:11pt; 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;Selecciona una clau de node de RetroShare de la llista inferior per ser utilitzada en un altre ordinador, i prem &amp;quot;Exportar clau seleccionada.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Per crear una nova ubicació en un altre ordinador, selecciona el gestor de identitats en el diàleg d&apos;entrada. Des d&apos;allà podràs importar l&apos;arxiu de clau i crear una nova ubicació per aquella clau.&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Crear un node nou amb la mateixa clau fa que els nodes dels teus amics acceptin el nou node automàticament.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -19459,7 +17861,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Editar missatge d&apos;estat</translation>
@@ -19475,7 +17877,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Directori de perfils</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Informació pública</translation>
     </message>
@@ -19510,12 +17912,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>En línia des de:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Altra informació</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>La meva adreça</translation>
     </message>
@@ -19559,51 +17961,27 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Entrada de:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Compte 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Compte 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Compte 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Afegir al Pols</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">filtre</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">Afegidor d&apos;URL</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Mostra com</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19613,12 +17991,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished">De:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19648,13 +18026,13 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished">Negatiu</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19666,12 +18044,22 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19680,17 +18068,13 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Publica Pols a Wire</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19705,34 +18089,24 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Des de</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Data</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Carrega arxiu d&apos;imatge</translation>
     </message>
 </context>
 <context>
@@ -19743,7 +18117,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished">Formulari</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19762,7 +18136,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19772,7 +18146,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19799,7 +18173,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19809,7 +18183,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19829,7 +18203,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19945,7 +18319,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19953,37 +18327,42 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -20015,7 +18394,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20023,8 +18402,8 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Confirmació</translation>
     </message>
@@ -20295,12 +18674,12 @@ Els caràcters &lt;b&gt;&quot;,|,/,\,&amp;lt;&amp;gt;,*,?&lt;/b&gt; es substitui
         <translation>Detalls del contacte</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Petició d&apos;arxiu cancel·lada</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Aquesta versió de RetroShare utilitza l&apos;OpenPGP-SDK. Com a efecte secundari no utilitza el clauer PGP del sistema, sinó un clauer compartit per totes les instancies de RetroShare. &lt;br&gt;&lt;br&gt;No sembla que tinguis aquest clauer, tot i que tens claus PGP als comptes existents de RetroShare, probablement perquè acabes de canviar a aquesta nova versió del programa.</translation>
     </message>
@@ -20331,7 +18710,7 @@ Els caràcters &lt;b&gt;&quot;,|,/,\,&amp;lt;&amp;gt;,*,?&lt;/b&gt; es substitui
         <translation>S&apos;ha produït un error inesperat. Si us plau, informa &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation>No es pot iniciar &quot;Tor Manager&quot;!</translation>
     </message>
@@ -20369,7 +18748,7 @@ L&apos;error reportat és:&quot;</translation>
         <translation>No ha estat possible iniciar un servei ocult.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Múltiples instancies</translation>
@@ -20390,6 +18769,26 @@ Arxiu bloquejant:\n</translation>
         <translation>Hi ha hagut un error inesperat quan el RetroShare intentava obtenir el bloqueig d&apos;instància única
 Arxiu de bloqueig:\n</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20410,14 +18809,6 @@ Arxiu de bloqueig:\n</translation>
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
-        <translation type="vanished">Túnel pendent... Els missatges s&apos;entregaran el més aviat possible</translation>
-    </message>
-    <message>
-        <source>Secured tunnel is working. Messages are delivered immediately!</source>
-        <translation type="vanished">Túnel segur establert. Els missatges s&apos;entregaran immediatament!</translation>
-    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -20480,7 +18871,7 @@ L&apos;error reportat és:
         <translation>Dades reenviades</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Sembla que tens nodes associats a claus DSA:</translation>
     </message>
@@ -20490,7 +18881,7 @@ L&apos;error reportat és:
         <translation>Les claus DSA encara no són suportades en aquesta versió de RetroShare. Tots aquests nodes no es podran utilitzar. Ho sentim molt.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>activat</translation>
     </message>
@@ -20500,7 +18891,7 @@ L&apos;error reportat és:
         <translation>desactivat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Mou la IP %1 a la llista blanca</translation>
     </message>
@@ -20516,7 +18907,7 @@ L&apos;error reportat és:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>fa %1 segons</translation>
     </message>
@@ -20584,7 +18975,7 @@ Security: no anonymous IDs</source>
 Seguretat: IDs anònimes no</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation>Afegeix-te a la sala de xat</translation>
     </message>
@@ -20612,7 +19003,7 @@ Seguretat: IDs anònimes no</translation>
         <translation>no s&apos;ha pogut interpretar l&apos;arxiu XML!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation>Indefinidament</translation>
     </message>
@@ -20792,13 +19183,29 @@ Seguretat: IDs anònimes no</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Node</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished">Adreça</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Estat</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20991,10 +19398,6 @@ Seguretat: IDs anònimes no</translation>
         <source>Click to resume the hashing process</source>
         <translation>Clica per continuar amb el càlcul de hash</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Aquest certificat conté:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -21045,6 +19448,18 @@ Seguretat: IDs anònimes no</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -21207,7 +19622,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Tota la xarxa</translation>
     </message>
@@ -21390,7 +19805,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>La càrrega d&apos;imatges incrustades està bloquejada.</translation>
     </message>
@@ -21403,7 +19818,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Permès per defecte</translation>
     </message>
@@ -21576,12 +19991,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Desar imatge</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21589,12 +20014,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation>Opcions de la vista d&apos;arbre</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21624,14 +20049,6 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">Mostrar columna...</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[sense títol]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -22294,7 +20711,7 @@ Si creus que és correcta, treu la línia corresponent de l&apos;arxiu i torna&a
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nom</translation>
@@ -22415,7 +20832,7 @@ Si creus que és correcta, treu la línia corresponent de l&apos;arxiu i torna&a
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -22435,7 +20852,7 @@ Si creus que és correcta, treu la línia corresponent de l&apos;arxiu i torna&a
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22491,7 +20908,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished">El missatge es propagarà als teus amics.</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Missatge modificat ... ]</translation>
     </message>
@@ -22505,11 +20922,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[Desconegut]</translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Missatge perdut ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22523,6 +20935,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Des de</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">A</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22545,13 +20962,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Clica per ordenar per llegits</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Clica per ordenar pel remitent</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22574,7 +20996,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22595,7 +21019,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Reinicialitza TOTS les valors de configuració del RetroShare.</translation>
     </message>
@@ -22656,7 +21080,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Defineix la llengua del RetroShare.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Incapaç d&apos;obrir l&apos;arxiu de registre &apos;%1&apos;: %2</translation>
     </message>
@@ -22677,11 +21101,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>No s&apos;ha pogut crear el directori de dades: %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Revisió</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation>ModeOp</translation>
     </message>
@@ -22711,7 +21131,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Informació d&apos;ús de la IGU de RetroShare</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>El codi d&apos;idioma especificat no és vàlid: </translation>
     </message>
@@ -22729,7 +21149,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Error d&apos;accés al registre. Potser necessitis drets d&apos;administrador.</translation>
@@ -22746,12 +21166,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Inserir una paraula clau aquí (com a mínim 3 caràcters de longitud)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Iniciar cerca</translation>
     </message>
@@ -22813,7 +21233,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Neteja</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Paraules Clau</translation>
     </message>
@@ -22828,7 +21248,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Id cerca</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Nom d&apos;arxiu</translation>
     </message>
@@ -22928,23 +21348,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Descarregar seleccionats</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Nom d&apos;arxiu</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Descarregar</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Enviar enllaç RetroShare</translation>
     </message>
@@ -22954,7 +21374,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Avís de descarrega</translation>
     </message>
@@ -22991,7 +21411,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Suprimeix-ho tot</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Directori</translation>
@@ -23002,17 +21422,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Enllaç(os) RetroShare nou(s)</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Obrir directori</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Crear col·lecció...</translation>
     </message>
@@ -23032,7 +21452,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Descarregar d&apos;arxiu de col·lecció...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Col·lecció</translation>
     </message>
@@ -23040,7 +21460,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Detalls del contacte</translation>
     </message>
@@ -23056,22 +21476,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>Adreça IP:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>ID del contacte:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Ubicació:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Nom del contacte:</translation>
     </message>
@@ -23088,7 +21508,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation>però reportat:</translation>
     </message>
@@ -23113,8 +21533,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Aquesta és la IP que el teu amic diu estar connectat. Si just has canviat d&apos;IP això és un fals avís. Si no, significa que la teva connexió amb aquest amic està sent encaminada per un contacte intermig, que seria sospitós.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquest avís apareix per protegir-te contra atacs de reenviament. En tal cas, l&apos;amic amb qui estàs connectat veurà la IP de l&apos;atacant, no la teva IP externa.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;No obstant, si acabes de canviar la teva IP per qualsevol motiu (alguns proveïdors forcen el canvi d&apos;IP regularment) aquest avís només t&apos;indica que t&apos;has connectat amb el teu amic abans que el RetroShare hagi notat el canvi d&apos;IP. Res malament en tal cas.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Pots evitar fàcilment els falsos avisos afegint a la llista blanca les teves IPs (Ex.:El rang d&apos;IPs del teu proveïdor) o deshabilitant completament aquests avisos a Opcions-&amp;gt;Notificar-&amp;gt;Novetats.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23122,7 +21542,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>vol ser amic teu al RetroShare</translation>
     </message>
@@ -23153,7 +21573,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -23198,12 +21618,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Estat:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Escriure missatge</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Intent de connexió</translation>
     </message>
@@ -23223,17 +21643,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Intent de connexió (Sortint) desconegut</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Problema de seguretat desconegut</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished">Desconegut</translation>
     </message>
@@ -23243,11 +21668,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Contacte desconegut</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
@@ -23257,7 +21678,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Voleu suprimir aquest amic?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>El certificat té una signatura incorrecta!! Aquest contacte no és qui diu ser.</translation>
     </message>
@@ -23267,12 +21688,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Certificat perdut/danyat. No és un usuari de RetroShare.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>El certificat a provocat un error intern.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>El contacte/node no és a la llista d&apos;amics (Id PGP=</translation>
     </message>
@@ -23331,12 +21752,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Adreça local</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -23357,22 +21778,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Xarxa local</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Cercador d&apos;adreça IP externa</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Conegudes / IPs previes:</translation>
     </message>
@@ -23388,21 +21809,16 @@ connectar-te quan tens pocs amics. També ajuda si estàs darrera
 d&apos;un tallafocs o una VPN.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Permet que el RetroShare pregunti la meva IP a aquests llocs web:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>El rang de ports acceptats va de 10 fins 65535. Normalment els ports per sota 1024 estan reservats pel teu sistema.</translation>
     </message>
@@ -23412,23 +21828,46 @@ d&apos;un tallafocs o una VPN.</translation>
         <translation>El rang de ports acceptables va de 1024 a 65535. Els ports per sota 1024 estan reservats pel teu sistema.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Adreça Onion</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Descobriment activat (Recomanat)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>S&apos;ha configurat Tor automàticament per part de Retroshare. No hauria de fer falta que canviessis res aquí.</translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Descobriment desactivat</translation>
     </message>
@@ -23438,7 +21877,7 @@ d&apos;un tallafocs o una VPN.</translation>
         <translation>Ocult - Mira la configuració</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>Adreça I2P</translation>
     </message>
@@ -23463,41 +21902,95 @@ d&apos;un tallafocs o una VPN.</translation>
         <translation>Entrants correctes</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>El repetidor sembla que funciona</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>El repetidor I2P no està activat</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
-        <translation>BOB està en funcionament i accessible</translation>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
-        <translation>No es pot accedir a BOB! Està en funcionament?</translation>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
-        <translation>RetroShare utilitza BOB per establir a %1 túnel a %2:%3 (anomenat %4)
-
-Quan es canvien opcions (per exemple el port) utilitza els botons inferiors per reiniciar BOB.
-
-</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation>client</translation>
     </message>
@@ -23512,73 +22005,7 @@ Quan es canvien opcions (per exemple el port) utilitza els botons inferiors per
         <translation>desconegut</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation>BOB està processant una petició</translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation>comprovació de connectivitat</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation>generant clau</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation>iniciant</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation>apagant</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation>BOB està processant una petició: %1</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation>BOB està trencat
-</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation>BOB ha trobat un error:
-</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation>El túnel BOB està funcionant</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation>BOB funciona correctament: túnel establert</translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation>El túnel BOB no està funcionant</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation>BOB és inactiu: túnel tancat</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation>demana una clau nova de servidor</translation>
     </message>
@@ -23588,22 +22015,7 @@ Quan es canvien opcions (per exemple el port) utilitza els botons inferiors per
         <translation>carrega una clau de servidor de base64</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation>para el túnel BOB per generar abans una clau nova</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation>Para túnel BOB abans per carregar una clau</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation>para el túnel BOB abans per desactivar BOB</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Se&apos;t pot contactar a través d&apos;un servei ocult.</translation>
     </message>
@@ -23617,12 +22029,12 @@ Estan tots els serveis funcionant correctament??
 Comprova els teus ports!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Node ocult]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Això buida la llista d&apos;adreces conegudes. Això és útil si per alguna rao la teva llista d&apos;adreces conté una adreça invàlida/irrellevant/caducada que vols evitar passar als teus amics com una adreça de contacte.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23632,7 +22044,7 @@ Comprova els teus ports!</translation>
         <translation>Neteja</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>Límit de baixada (KiB/s)</translation>
     </message>
@@ -23647,24 +22059,24 @@ Comprova els teus ports!</translation>
         <translation>Límit de pujada (KiB/s)</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El límit de pujada afecta a tota l&apos;aplicació. Un límit de pujada massa baix pot bloquejar eventualment serveis de baixa prioritat (Fòrums, canals). El valor mínim recomanat és de 50 KiB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation>AVÍS:
 Aquests valors no tenen en compte els Repetidors.</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23681,17 +22093,7 @@ Ara introdueix l&apos;adreça (e.g. 127.0.0.1) i el port que has escullit abans
 Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, així que perquè no configurar Tor i/o I2P?</translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation>I2P/BOB automàtic</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation>Activa I2P BOB - canviar això necessita que reiniciïs per tindre efecte</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation>activar opcions avançades</translation>
     </message>
@@ -23701,12 +22103,7 @@ Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, aix
         <translation>mode avançat</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation>Pont Obert I2P Bàsic</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation>Adreça instancia I2P</translation>
     </message>
@@ -23716,17 +22113,7 @@ Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, aix
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation>Port del proxy I2P</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation>BOB accessible</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation>Adreça</translation>
     </message>
@@ -23766,7 +22153,7 @@ Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, aix
         <translation>carrega clau</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation>Començar</translation>
     </message>
@@ -23781,12 +22168,7 @@ Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, aix
         <translation>Atura</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation>Estat del BOB</translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation>Entrants</translation>
     </message>
@@ -23834,7 +22216,32 @@ Finalment assegurat que els ports coincideixen amb la configuració.
 Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.</translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation>Repetidor</translation>
     </message>
@@ -23889,7 +22296,7 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Total:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation>Avís: Aquest ample de banda es sumarà a l&apos;ample de banda màxim.</translation>
     </message>
@@ -23914,7 +22321,7 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Eliminar servidor</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23928,7 +22335,7 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Xarxa</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>Filtres IP</translation>
     </message>
@@ -23951,7 +22358,7 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Estat</translation>
     </message>
@@ -24011,17 +22418,28 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Afegir a la llista blanca</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Configuració dels serveis ocults</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;/p&gt;Aquest és el port cap al repetidor Socks de Tor. El teu node de Retroshare pot utilitzar-lo per connectar a&lt;/p&gt;&lt;p&gt;nodes Ocults. El llum de la dreta es tornarà verd quan el port estigui actiu en el teu ordinador.&lt;/p&gt;&lt;p&gt;Això no significa que el transit del teu Retroshare vagi per Tor. Només ho farà si &lt;/p&gt;&lt;p&gt;connectes contra nodes Ocults o estàs corrent un node Ocult tu mateix.&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El llum de l&apos;esquerra serà verd quan el port d&apos;entrada estigui actiu en el teu ordinador. No indica&lt;/p&gt;&lt;p&gt;que el teu transit de Retroshare vagi per Tor. Només ho farà si&lt;/p&gt;&lt;p&gt;et connectes a nodes Ocults, o si estàs corrent un node ocult tu mateix.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24037,18 +22455,18 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El llum de l&apos;esquerra serà verd quan el port d&apos;entrada estigui actiu en el teu ordinador. No indica&lt;/p&gt;&lt;p&gt;que el teu transit de Retroshare vagi per I2P. Només ho farà si&lt;/p&gt;&lt;p&gt;et connectes a nodes Ocults, o si estàs corrent un node ocult tu mateix.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>Sortints I2P correctes</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Adreça del servei</translation>
     </message>
@@ -24083,12 +22501,12 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Si us plau, escriu una adreça de servei</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>Rang IP</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Anunciat per DHT per enmascarament IP</translation>
     </message>
@@ -24111,12 +22529,12 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Afegit per tu</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mentre que les IPs llistades s&apos;obtenen de les fonts següents: IPs d&apos;un certificat intercanviat manualment, rangs d&apos;IPs introduïts per tu en aquesta finestra o en els elements de seguretat de novetats&lt;/p&gt;&lt;p&gt;El comportament per defecte del Retroshare és (1) sempre permetre connexions a contactes amb una IP a la llista blanca, encara que també apareguin a la llista negra; (2) opcionalment es pot forçar a que les IPs hagin d&apos;estar a la llista blanca. Pots canviar aquest comportament per cada contacte a la finestra &amp;quot;Detalls&amp;quot; de cada node de Retroshare.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La DHT et permet respondre les peticions 
 de connexió dels teus amics utilitzant el protocol
@@ -24124,12 +22542,12 @@ de connexió dels teus amics utilitzant el protocol
 &lt;/p&gt;&lt;p&gt;El servei de descobriment envia els noms dels nodes i les identitats dels teus contactes de confiança als nodes contactats, per ajudar a que escullin amics nous. No obstant, l&apos;amistat mai és automàtica i els dos contactes encara haurien de confiar entre ells per permetre la connexió. </translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L&apos;indicador es torna verd quan el Retroshare aconsegueix obtindre la teva pròpia IP d&apos;una de les webs llistades, si ho tens activat. El Retroshare intentarà també utilitzar altres mètodes per obtenir la teva IP.</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquesta llista s&apos;omple automàticament amb informació recopilada des de múltiples fonts: contactes que fan masquerading anunciats per DHT, rangs d&apos;IP entrats per tu, i rangs d&apos;IP anunciats pels teus amics. La configuració per defecte hauria de protegir-te contra repetidors de tràfic massius.&lt;/p&gt;&lt;p&gt;Detectar automàticament IPs que fan masquerading pot acabar posant IPs amigues a la llista negra. En tal cas, utilitza el menú contextual per afegir-los a la llista blanca.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24164,26 +22582,22 @@ de connexió dels teus amics utilitzant el protocol
         <translation>Expulsa automàticament els rangs d&apos;IP fent reenviament DHT començant a </translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation>Tor/I2P sortint manual</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configura el teu proxy SOCKS per Tor i I2P aquí.&lt;br/&gt;Si prefereixes utilitzar BOB per controlar automàticament l&apos;I2P comprova l&apos;altra pestanya.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Repetidor socks TOR</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Sortints Tor correcte</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>El repetidor Tor no està activat</translation>
     </message>
@@ -24263,7 +22677,7 @@ de connexió dels teus amics utilitzant el protocol
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>comprovar els contactes amb qui t&apos;agradaria compartir les claus de publicació</translation>
     </message>
@@ -24273,12 +22687,12 @@ de connexió dels teus amics utilitzant el protocol
         <translation>Compartit amb els amics</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Compartir</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Pots fer que els teus amics sàpiguen del teu canal compartint-lo amb ells.
@@ -24299,7 +22713,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Directori de directoris compartits</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation>Directori compartit</translation>
     </message>
@@ -24319,17 +22733,17 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Visibilitat</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation>Afegir nou</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Afegeix un directori compartit</translation>
     </message>
@@ -24339,7 +22753,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Treure</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Aplicar i tancar</translation>
     </message>
@@ -24430,7 +22844,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Directori no trobat o nom del directori no acceptat.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Aquesta és una llista dels directoris compartits. Pots afegir-ne i treure&apos;n utilitzant els botons a la part inferior. Quan afegeixes un nou directori inicialment tots els seus arxius es comparteixen. Pots especificar permisos específics per cada directori.</translation>
     </message>
@@ -24438,7 +22852,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Arxius</translation>
     </message>
@@ -24489,11 +22903,16 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>comprovar arxius</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Descarregar seleccionats</translation>
     </message>
@@ -24503,7 +22922,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Descarregar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Copiar enllaç RetroShare al porta-retalls</translation>
     </message>
@@ -24518,7 +22937,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Enviar enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation>Alguns arxius s&apos;han omès</translation>
     </message>
@@ -24534,7 +22953,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Consell(s)</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Crear col·lecció...</translation>
     </message>
@@ -24559,7 +22978,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Descarregar d&apos;arxiu de col·lecció...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Alguns arxius s&apos;han omès perquè encara no han estat indexats.</translation>
     </message>
@@ -24702,12 +23121,12 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Carrega configuració</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Crear interfície</translation>
     </message>
@@ -24731,7 +23150,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Recordar contrasenya</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Validar-se</translation>
     </message>
@@ -25088,7 +23507,7 @@ Això es pot canviar a les opcions de configuració.</translation>
         <translation>Missatge d&apos;estat</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Missatge:</translation>
     </message>
@@ -25333,7 +23752,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Eliminar totes les etiquetes</translation>
     </message>
@@ -25369,12 +23788,15 @@ p, li { white-space: pre-wrap; }
         <translation>Configura Tor...</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation>Estat Tor:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation>Desconegut</translation>
     </message>
@@ -25384,18 +23806,13 @@ p, li { white-space: pre-wrap; }
         <translation>No iniciat</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
-        <translation>Adreça del servei ocult:</translation>
+        <location line="+13"/>
+        <source>Hidden address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation>Estat bootstrap de Tor:</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation>No configurat</translation>
     </message>
@@ -25405,12 +23822,57 @@ p, li { white-space: pre-wrap; }
         <translation>Adreça Onion:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">No connectat</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation>Comprova que Tor és accessible a les rutes d&apos;executables</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation>[Esperant al Tor...]</translation>
     </message>
@@ -25418,21 +23880,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Aquesta versió de Retroshare utilitza Tor per connectar amb els teus amics.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation>Tor és fora de línia</translation>
     </message>
@@ -25443,11 +23901,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Sense configuració Tor</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25475,7 +23934,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Opcions de transferència</translation>
@@ -25486,7 +23945,7 @@ p, li { white-space: pre-wrap; }
         <translation>Màxim de descarregues simultànies:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation>Directoris compartits</translation>
     </message>
@@ -25496,22 +23955,27 @@ p, li { white-space: pre-wrap; }
         <translation>Compartir automàticament directori entrant (recomanat)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation>Editar compartits</translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished">Configura els directoris compartits</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation>Auto-comprova els directoris compartits cada</translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation>minut(s)</translation>
     </message>
@@ -25596,7 +24060,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25605,7 +24069,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Màxim de pujades simultànies per amic (0 = il·limitades)</translation>
     </message>
@@ -25630,7 +24099,12 @@ p, li { white-space: pre-wrap; }
         <translation>Permetre descarregues directes:</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>En flux</translation>
     </message>
@@ -25689,38 +24163,13 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Retroshare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; és capaç de transferir dades i peticions de cerca entre contactes que no necessàriament siguin amics. No obstant, aquest tràfic només passa entre els amics connectats i és anònima.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;Pots especificar per separat els permisos de compartició per cada directori compartit a la finestra d&apos;arxius compartits:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Navegables pels amics:&lt;/span&gt;: Els arxius són vistos pels teus amics.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Compartits anònimament&lt;/span&gt;: Els arxius es poden descarregar a través de túnels anònims distants.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Màxim de peticions de túnels reenviades per segon:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;En flux&lt;/span&gt;fa que la transferència es faci en fragments de 1 MiB per ordre, facilitant la previsualització mentre es descarrega. &lt;span style=&quot; font-weight:600;&quot;&gt;Aleatori&lt;/span&gt;és completament aleatori i afavoreix el comportament en eixam. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressiu&lt;/span&gt;és un compromís, sol·licitant el proper fragment aleatòriament dins dels propers 50 MiB següents al final de l&apos;arxiu parcial. Això permet aleatorietat i a la vegada evita temps llargs d&apos;inicialització amb els arxius grossos.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El Retroshare pausarà totes les transferències i gravacions de configuració al disc si l&apos;espai lliure queda per sota d&apos;aquest llindar. Això evita la pèrdua d&apos;informació en alguns sistemes. Una finestra de notificació t&apos;avisarà quan això passi.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -25732,7 +24181,17 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
 &lt;/p&gt;&lt;p&gt;El valor per defecte és 20. Si no n&apos;estàs segur, deixa-ho així.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Avís</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation>Establir el directori d&apos;entrants</translation>
     </message>
@@ -25760,7 +24219,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Descarrega completa</translation>
     </message>
@@ -25784,39 +24243,23 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Tens %1 descarregues completes</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Tens %1 descarrega completa</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 descarregues completades</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 descarrega completada</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Descarregues</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Pujades</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nom</translation>
@@ -26023,11 +24466,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Especificar...</translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Transferència d&apos;arxiu&lt;/h1&gt; &lt;p&gt;Retroshare contempla dues formes de fer això: transferències directes dels teus amics, i transferències distants amb túnels anònims. A més amés, les transferències d&apos;arxius són multi-origen i permet fer-les en eixam (pots ser origen mentre descarregues)&lt;/p&gt; &lt;p&gt;Pots compartir arxius amb &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; la icona de la barra lateral esquerra. Aquests arxius es llistaran a la pestanya els meus arxius. Pots triar per cada grup d&apos;amics si poden o no veure&apos;l a la pestanya arxius d&apos;amics.&lt;/p&gt; &lt;p&gt;La pestanya cerca dona resultats pels arxius del teus amics i arxius que es poden accedir distants anònimament utilitzant el sistema de túnels multi-salt.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+253"/>
+        <location line="+262"/>
         <source>Move in Queue...</source>
         <translation>Moure a la cua...</translation>
     </message>
@@ -26052,7 +24491,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Escull directori</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Túnel anònim encriptat d&apos;extrem a extrem 0x</translation>
     </message>
@@ -26073,7 +24512,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -26106,7 +24545,17 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>L&apos;arxiu %1 no s&apos;ha completat. Si es un fitxer multimèdia intenta una prèvia.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Avís</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Canviar el nom de l&apos;arxiu</translation>
     </message>
@@ -26121,7 +24570,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Si us plau, introdueix un nou--i vàlid--nom d&apos;arxiu</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Expandeix tot</translation>
@@ -26248,23 +24697,18 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Columnes</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Transferències d&apos;arxius</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
@@ -26274,7 +24718,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Mostra columna de ruta</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>No s&apos;ha pogut esborrar l&apos;arxiu de previsualització</translation>
     </message>
@@ -26284,7 +24728,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Tornar-ho a intentar?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Crear col·lecció...</translation>
     </message>
@@ -26299,7 +24743,12 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Veure col·lecció...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+74"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
         <source>Collection</source>
         <translation>Col·lecció</translation>
     </message>
@@ -26309,7 +24758,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>%1 túnels</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Túnel anònim 0x</translation>
     </message>
@@ -26530,10 +24979,6 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">Túnels anònims</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26727,12 +25172,17 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Habilita la interfície WEB del RetroShare</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Estat:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Paràmetres web</translation>
     </message>
@@ -26766,35 +25216,33 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Port:</source>
-        <translation type="vanished">Port:</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation>Permetre accés des de qualsevol adreça IP (Per defecte: només connexió local)</translation>
     </message>
     <message>
-        <source>Apply setting and start browser</source>
-        <translation type="vanished">Aplicar opcions i iniciar navegador</translation>
-    </message>
-    <message>
-        <source>Note: these settings do not affect retroshare-nogui. Retroshare-nogui has a command line switch to activate the web interface.</source>
-        <translation type="vanished">Nota: Aquestes opcions no afecten al Retroshare-nogui. Retroshare-nogui té un paràmetre en línia de comanda per activar la interfície web.</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Interfície web&lt;/h1&gt; &lt;p&gt;La interfície web et permet controlar el Retroshare des del navegador. Múltiples dispositius poden compartir el control sobre una instancia de Retroshare. Per tan pots començar una conversa en una tauleta i més tard utilitzar un ordinador d&apos;escriptori per continuar-la.&lt;/p&gt;&lt;p&gt;Avís: no exposis la teva interfície web a Internet, perquè no hi ha control d&apos;accés ni encriptació. Si vols utilitzar la interfície web des d&apos;Internet utilitza un túnel SSH o un repetidor per assegurar la connexió.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>Interfície Web no habilitada</translation>
     </message>
@@ -26804,12 +25252,12 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>La interfície web no està activada. Activa-la a Configuració -&gt; Interfície web.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>Fallo al iniciar interfície Web</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Interfície Web</translation>
     </message>
@@ -26946,11 +25394,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Pàgines wiki</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Nou grup</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Nom de pàgina</translation>
     </message>
@@ -26965,7 +25409,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Id d&apos;origen</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -27053,7 +25497,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Historial d&apos;edició de la pàgina</translation>
     </message>
@@ -27088,7 +25532,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>IdPàgina</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -27118,14 +25562,18 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Etiquetes</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Històric</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Mostra historial d&apos;edició</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Estat</translation>
     </message>
@@ -27146,7 +25594,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Desfés</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Publica</translation>
     </message>
@@ -27218,10 +25666,6 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">Rang de temps</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -27233,16 +25677,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Refrescar</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27257,7 +25692,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished">Altres</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27277,7 +25712,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27307,85 +25742,17 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">L&apos;últim mes</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">L&apos;ultima setmana</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Avui</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nou</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">des de</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">fins</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Cercar/Filtrar</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Tota la xarxa</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Controlar comptes</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Mostrant:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Tu mateix</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Amics</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Seguint</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Personalitzat</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Compte 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Compte 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Compte 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">Casella de selecció</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Publica Pols a Wire</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -27448,35 +25815,42 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished">Formulari</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Treure</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Ubicació:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -27521,11 +25895,41 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Seguint</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Desconegut</translation>
@@ -27603,7 +26007,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>%1y any %2d</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -27636,15 +26040,11 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Imatges (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation>Acceptes connexions signades amb aquest perfil?</translation>
     </message>
@@ -27653,10 +26053,6 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>Name of the profile</source>
         <translation>Nom del perfil</translation>
     </message>
-    <message>
-        <source>This column indicates trust level and whether you signed the profile PGP key</source>
-        <translation type="vanished">Aquesta columna indica el nivell de confiança i si has signat la clau de perfil PGP</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
@@ -27767,10 +26163,6 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> - </source>
-        <translation type="vanished">-</translation>
-    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_cs.ts b/retroshare-gui/src/lang/retroshare_cs.ts
index 24f243cde..b0c0c123b 100644
--- a/retroshare-gui/src/lang/retroshare_cs.ts
+++ b/retroshare-gui/src/lang/retroshare_cs.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Přidat komentář</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare:  rozšířené hledání</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Kritéria pro vyhledávání</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Přidat další kriterium pro vyhledávání</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Vymazat kritéria pro vyhledávání</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Zrušit hledání.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Hledat</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Vytvořit album</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Jméno alba:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Kategorie:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Zvířata</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Rodina</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Kontakty</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Květiny</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Prázdniny</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Krajiny</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Domácí mazlíčci</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Portréty</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Cestování</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Práce</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Náhodné</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Nadpis:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Kde:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotograf:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Popis:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Sdílet nastavení</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Pravidla</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Kvalita:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Komentáře:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Identita:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Veřejné</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Omezené</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Zmenšit obrázky (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Zmenšit obrázky (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Poslat původní obrázky</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Zakázat komentáře</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Pouze autentizované komentáře</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Kdokoliv může komentovat</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Publikovat pod identitou</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Táhni &amp;amp; Pusť pro vložení obrázku. Klikni na obrázek pro změnu detailů.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Zpět</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Přidat fotografie</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Publikovat album</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Bezejmenné album</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Ohodnotit toto album...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Kde byly vyfoceny?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Nahrád náhled alba</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Album</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Náhled alba</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Shrnutí</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>legenda</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Kde:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Kdy</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Popis:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Možnsti sdílení</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Komentáře</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Zveřejnit identitu</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Viditelnost</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Varování: Zdejší služby jsou testovací, pomožte nám je otestovat.
@@ -783,14 +569,6 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <source>Circles</source>
         <translation>Okruhy lidí</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">Fóra</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">Kanály</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation>Fotografie</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -842,17 +633,13 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Přidat fotku</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Odebrat</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Zobrazit fotku</translation>
     </message>
@@ -871,10 +658,6 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Načíst fotku</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation>Reset</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Rychlost stahování</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Rychlost odesílání</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Podržet nad ostatními</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Styl</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <source>% Opaque</source>
         <translation>% Opaque</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Uložit</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Zrušit</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Od:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Skrýt nastavení</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,7 +822,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Komentáře</translation>
     </message>
@@ -1093,12 +852,12 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1126,7 +885,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1184,7 +943,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Označit zprávu za přečtenou</translation>
     </message>
@@ -1224,7 +983,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished">Nový</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
@@ -1232,12 +991,12 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Rozbalit</translation>
     </message>
@@ -1283,12 +1042,12 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,17 +1216,17 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Kanály</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Záložky</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
@@ -1477,11 +1236,17 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Načítat příspěvky na pozadí</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Stahování</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Otevřít nový kanál v nové záložce</translation>
     </message>
@@ -1489,7 +1254,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1537,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Rozbalit</translation>
     </message>
@@ -1563,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1573,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Komentáře</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Skrýt</translation>
     </message>
@@ -1591,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1782,7 +1537,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Ukázat konverzační místnost</translation>
     </message>
@@ -1794,22 +1549,6 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Máte %1 nových zpráv</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Máte %1 novou zprávu</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 nových zpráv</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 nová zpráva</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1831,13 +1570,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Neznámá místnost</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Smazat vše</translation>
     </message>
@@ -1845,13 +1585,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Počet</translation>
     </message>
@@ -1861,29 +1601,7 @@ into the image, so as to
         <translation>Téma</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1893,7 +1611,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1950,12 +1668,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1965,31 +1683,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Vytvořit konverzační místnost</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[nebylo poskytnuto žádné téma]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Informace o místnosti</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Soukromé</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Veřejné</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>Anonymní ID přijato</translation>
     </message>
@@ -1999,42 +1717,25 @@ Double click a chat room to enter and chat.</source>
         <translation>Odstranit automatické přihlašování</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Automaticky přihlásit</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Hledat místnost</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Hledat</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Přihlášen</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Sloupce</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Ano</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Ne</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2046,47 +1747,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Téma:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Bezpečnost:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Počet uživatelů:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
@@ -2101,13 +1802,24 @@ Double click a chat room to enter and chat.</source>
         <translation>Bez anonymních ID</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Ukázat</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>sloupec</translation>
@@ -2121,7 +1833,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Odstranit předmět</translation>
     </message>
@@ -2166,46 +1878,22 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Vzdálený chat</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Všichni</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Kontakty</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Nikdo</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Přijmout šifrovaný vzdálený chat od</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Nastavení chatu</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Povolit smajlíky v soukromém chatu</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Používat smajlíky ve skupinovém chatu</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Povolit vlastní fonty</translation>
     </message>
@@ -2214,10 +1902,6 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>Povolit vlastní velikost fontů</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Minimální velikost fontu</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2229,7 +1913,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Povolit latinku</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2254,11 +1938,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished">Načíst vložené obrázky</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Konverzace</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Ikona upozornění</translation>
     </message>
@@ -2267,10 +1947,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Soukromý chat</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2292,11 +1968,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Font chatu</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Změnit font chatu</translation>
     </message>
@@ -2306,14 +1978,10 @@ Double click a chat room to enter and chat.</source>
         <translation>Font chatu:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Historie</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Styl</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2328,17 +1996,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Skupinový chat</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Soukromý chat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2402,22 +2066,28 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Zde se nastavuje uchovávání historie na vašem HDD pro různé druhy chatu. Zprávy staršího data budou smazány, aby nedošlo k přesycení sítě (např. pro konverzační místnosti a vzdálený chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Konverzační místnosti</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Aktivováno:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2427,7 +2097,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2524,11 +2204,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Neukládat starší než...dní (0 = bez omezení)</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Defaultní hledání</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Citlivost velikost písmen</translation>
     </message>
@@ -2567,10 +2243,6 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation>Práh automatického vyhledávání</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Výchozí identita pro konverzační místnost:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2638,7 +2310,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Zobrazit chat</translation>
     </message>
@@ -2674,7 +2346,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
@@ -2709,12 +2381,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Kurzíva</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2794,11 +2466,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2836,7 +2503,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>píše...</translation>
     </message>
@@ -2858,7 +2525,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Chcete opravdu vymazati historii z počítače?</translation>
     </message>
@@ -2908,7 +2575,7 @@ after HTML conversion.</source>
         <translation>je zaneprázdněn a může se stát, že neodpoví</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Hledat s rozlišením malých a velkých písmen</translation>
     </message>
@@ -2930,7 +2597,7 @@ after HTML conversion.</source>
         <translation>Nezastavovat vybarvování po X nálezech (vyšší zátěž CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Hledat předchozí &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2945,16 +2612,12 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Hledat &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Status)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Nastav typ a barvu písma</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Přiožit soubor</translation>
     </message>
@@ -2970,12 +2633,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Označ vybraný text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2986,12 +2649,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>Nalezeno.</translation>
     </message>
@@ -3011,7 +2674,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Zde napiš zprávu...</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Nezastavovat vybarvování po</translation>
     </message>
@@ -3037,7 +2700,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Ukazuji detaily:</translation>
     </message>
@@ -3059,7 +2722,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Osobní Kruhy</translation>
     </message>
@@ -3085,7 +2748,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Kontakty</translation>
     </message>
@@ -3145,7 +2808,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Kontakty kontaktů</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Externí Kruhy (Admin)</translation>
     </message>
@@ -3161,7 +2824,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Okruhy lidí</translation>
     </message>
@@ -3213,43 +2876,48 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Chyba : nemohu získat údaje kontaktu</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3261,7 +2929,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Šifrování</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>Nespojen</translation>
     </message>
@@ -3343,25 +3011,17 @@ Double click on it to add his name on text writer.</source>
         <translation>žádný</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Tento certifikát obsahuje</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;a &lt;b&gt;ID uzlu&lt;/b&gt; a &lt;b&gt;jméno&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">&lt;b&gt;onion (TOR) adresa&lt;/b&gt; a &lt;b&gt;port&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">an &lt;b&gt;IP adresa&lt;/b&gt; a &lt;b&gt;port&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tento certifikát musíš předat svým budoucím kontaktům. Použij emailu nebo jiné komunikační platformy.&lt;/p&gt;</translation>
     </message>
@@ -3376,7 +3036,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Šifrovcí metoda použitá &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. Spojení s kontakty&lt;/p&gt;&lt;p&gt;je vždy silně šifrováno a pokud je použito DHE, spojení navíc využívá&lt;/p&gt;&lt;p&gt;&amp;quot;zabezpečené přeposílání&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>s</translation>
     </message>
@@ -3393,104 +3053,16 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Průvodce přidáním kontaktu</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Přidat kontakt</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Nahrát soubor s certifikátem kontaktu (který vám například přišel emailem s pozvánkou).</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">Přidat vybrané důvěryhodné kontakty mých důveryhodných kontaktů</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Zahrnout podpisy</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Kopírovat váš certifikát do schránky</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Uložit váš certifikát do souboru</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Spustit emailový klient</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Soubory certifikátu</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Nahrát PGP certifikáty ze souboru.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Importovat certifikát kontaktu...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Musíte vygenerovat soubor s certifikátem a předat jej vašemu kontaktu. Můžete také použít již existující dříve vytvořený soubor.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Exportovat můj certifikát...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Přetáhněte certifikát kontaktu do tohoto okna a nebo zadejte cestu k tomu souboru do pole níže</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Procházet</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Kontakty kontaktů</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Vyberte koho chcete přidat mezi své kontakty.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Ukaž mi:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Přidat tyto protějšky do kontaktů</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare ID</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Použít RetroShareID k přidání kontaktu dostupného ve vaší síti.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Přidat kontakty RetroShare ID...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Vložte RetroShare ID vašich kontaktů do textového pole níže</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Zadejte RetroShare ID vašeho kontaktu, např. Franta@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3532,27 +3104,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Pozvěte kontakty emailem</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Zadejte emailové adresy vašich kontaktů oddělené středníkem.</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Emailové adresy vašich kontaktů:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Vložte emailové adresy vašich kontaktů</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Předmět:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3568,40 +3120,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Podrobnosti požadavku</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Podrobnosti o kontaktu</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Email:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Uzel:</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Přidat do skupiny:</translation>
     </message>
@@ -3611,7 +3155,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Autentizovat kontakt (podepsat PGP klíč), potvrzuje vaši plnou důvěru,nelze vzít zpět!</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3636,16 +3180,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Přidat jako kontakt pro přímé spojení</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Klikni na &quot;Finish&quot; pro přidání kontaktu</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Je to smutné, ale došlo k nějaké chybě</translation>
     </message>
@@ -3665,32 +3215,27 @@ Double click on it to add his name on text writer.</source>
         <translation>Detaily vašeho kontaktu:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Validita klíče:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Podepsali</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Tento protějšek se již nachází ve vašem seznamu kontaktů. Jeho opětovné přidání může nanejvýš nastavit jeho novou IP adresu.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3736,45 +3281,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Načítání certifikátu selhalo</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Nelze získat podrobnost o PGP klíči %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Nepodepsané kontakty</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Kontakty kontaktů které mi již důvěřují</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Podepsané protějšky zobrazené jako odmítnuté</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Jméno protějšku</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Podepsán také (kým):</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">ID protějšku</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Pozvánka do RetroShare -  sociální P2P sítě zaměřené především na sdílení souborů.</translation>
     </message>
@@ -3794,12 +3311,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3807,7 +3324,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3847,7 +3364,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Žádost o přidání do kontaktu od: </translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3872,7 +3389,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3882,55 +3399,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Načtení certifikátu selhalo: soubor %1 nebyl nalezen</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Protějšek %1 není ve vaší síti dostupný.</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Nyní je používán starý (zpětně kompatibilní) formát certifikátu (kliknutím přepnete na nový).</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Nyní je používán nový formát certifikátu (bezpečnější a odolnější).</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Odstranit podpisy</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">Pozvánka do RetroShare</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Informace</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">V horní části okna průvodce se nachází váš PGP certifikát, který musíte nějakým způsobem poslat vašemu kontaktu, například pomocí emailu, skypu, facebooku, výměnou na fóru nebo jakkoliv jinak, můžete použít cokoliv čím si posíláte textové zprávy. Váš kontakt vám rovněž musí zaslat svůj certifikát, takže si je vlastně vyměníte. Vy zkopírujete a vložíte jeho certifikát do textového pole v dolní části obrazovky průvodce, a on udělá to samé s váším certifikátem. Pokud vše funguje jak má, mělo by se vám podařit navázat přímé spojení.
-
-O vašem PGP certifikátu: Váš PGP který obsahuje jedinečný veřejný klíč vaší identity, a ve spodní části také vaší lokální a veřejnou IP adresu a umístění. Kontaktu jemuž tento certifikát pošlete byste proto měli alespoň elementárně důvěřovat. Podle účelu použití tohoto programu se může jednat o členy vaší rodiny, přátele či obchodní kontakty, ale také třeba lidi z druhého konce světa, o kterých jediné co s jistotou víte je, že sdílíte společné zájmy.
-
-Spojení: Abyste se mohli spojit, musí alespoň jeden z vás mít veřejnou IP adresu, případně musíte být napojeni na někoho kdo ji má a poslouží jako prostředník (tzv. proxy) pro přeposílání zpráv, souborů a ostatních typů dat.
-
-Program RetroShare vám umožňuje vytvořit si vlastní sociální síť, která vám zajistí lepší soukromí, protože vaše data nejsou ukládána v počítačích velkých firem, ale pouze u vás a vašich kontaktů. Protože si ji ale musíte vybudovat vy sami pěkně od píky, je dobré k získávání nových kontaktů využít existujících sociálních a komunikačních služeb které již užíváte.
-
-RetroShare neaspiruje na to být nejlepší sociální sítí, má své mouchy a problémy, ale jeho hlavní devizou je právě možnost vytvořit částečně anonymní P2P síť, v níž můžete relativně bezpečně sdílet soubory a diskutovat, při vhodné volbě přezdívky a kontaktů dokonce získáte i jistou míru anonymity.</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Váš certifikát byl zkopírován do schránky, vložte ho do zprávy kterou pošlete vašemu kontaktu emailem či jiným způsobem.</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Uložit jako...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3969,11 +3438,7 @@ RetroShare neaspiruje na to být nejlepší sociální sítí, má své mouchy a
         <translation>*** Nic ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Stahovat přímo od pokud možno</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3983,7 +3448,7 @@ RetroShare neaspiruje na to být nejlepší sociální sítí, má své mouchy a
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4002,41 +3467,13 @@ RetroShare neaspiruje na to být nejlepší sociální sítí, má své mouchy a
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Doporučit kontakty jiným kontaktům</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Doporučené kontakty</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Zpráva:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Doporučit kontakty</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Pro</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Prosím zvol alespoň jeden kontakt pro doporučení</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Prosím zvol alespoň jednoho příjemce</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Přidat klíč do klíčenky</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Tento klíč je již v klíčence</translation>
     </message>
@@ -4052,7 +3489,7 @@ pro posílání např. zpráv uzlům,
 které nemáte přímo v kontaktech.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Nesprávná verze certifikátu. RetroShare verze 0,6 a 0,5 jsou vzájemně nekompatibilní.</translation>
     </message>
@@ -4087,7 +3524,7 @@ které nemáte přímo v kontaktech.</translation>
         <translation>Přidat IP do whitelist</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>V certifikátu není IP adresa!</translation>
     </message>
@@ -4097,27 +3534,10 @@ které nemáte přímo v kontaktech.</translation>
         <translation>&lt;p&gt;V certifikátu není IP adresa. Discovery a DHT se ji pokusí najít. Po jejím nalezení se v Událostech objeví bezpečnostní upozornění, pomocí kterého můžete tuto adresu přidat do whitelist pro úspěšné spojení.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Přidán s certifikátem od %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Vložit certifikát vašeho kontaktu ze schránky</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Načtení certifikátu selhalo: nemůžu přečíst soubor %1</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Načtení certifikátu selhalo: něco je špatně s %1</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4179,7 +3599,7 @@ které nemáte přímo v kontaktech.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>Zkouším UDP</translation>
     </message>
@@ -4207,7 +3627,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Pokus o spojení - informace</translation>
     </message>
@@ -4217,17 +3637,20 @@ p, li { white-space: pre-wrap; }
         <translation>Neplatné ID kontaktu</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Neznámý stav</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Odpojen</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Za symetrickým NAT</translation>
     </message>
@@ -4237,12 +3660,14 @@ p, li { white-space: pre-wrap; }
         <translation>Za NAT &amp; bez DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>NET Restart</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>Za NAT</translation>
     </message>
@@ -4252,7 +3677,8 @@ p, li { white-space: pre-wrap; }
         <translation>Bez DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>STAV SÍTĚ V POŘÁDKU</translation>
     </message>
@@ -4277,7 +3703,7 @@ p, li { white-space: pre-wrap; }
         <translation>Hledám RS uzly</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Vyžaduje zapnuté DHT</translation>
     </message>
@@ -4569,7 +3995,7 @@ p, li { white-space: pre-wrap; }
         <translation>Prosím zopakujte import kompletního certifikátu</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4577,7 +4003,8 @@ p, li { white-space: pre-wrap; }
         <translation>nedostupné</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>NEOVĚŘITELNÝ FORWARD!</translation>
     </message>
@@ -4587,7 +4014,7 @@ p, li { white-space: pre-wrap; }
         <translation>NEOVĚŘITELNÝ FORWARD &amp; BEZ DHT!</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Vyhledávám</translation>
     </message>
@@ -4623,12 +4050,12 @@ p, li { white-space: pre-wrap; }
         <translation>Detail Kruhu</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4648,7 +4075,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4668,18 +4095,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtr</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Přezdívka</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4694,15 +4121,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Typ</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Jméno:</translation>
     </message>
@@ -4742,19 +4161,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Nastavte prosím jméno vašeho Kruhu</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Nevybráno žádné omezení Kruhu</translation>
     </message>
@@ -4764,12 +4183,24 @@ p, li { white-space: pre-wrap; }
         <translation>Nevybrány žádné limity Kruhu</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
@@ -4779,7 +4210,7 @@ p, li { white-space: pre-wrap; }
         <translation>Odstranit </translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Hledat</translation>
@@ -4794,10 +4225,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Podepsáno</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Podepsáno známými uzly</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4814,10 +4241,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP identita</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Anonymní ID</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4840,17 +4263,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">Vytvořit</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP link ID</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4869,7 +4288,7 @@ p, li { white-space: pre-wrap; }
         <translation>Vytvořit skupinu</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished">Jméno skupiny:</translation>
     </message>
@@ -4904,7 +4323,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Přidat příspěvek</translation>
     </message>
@@ -4914,7 +4333,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zpráva</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4975,23 +4394,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Přetáhni soubory zde nebo klikni na Přidat soubory.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Zkopíruj/Vlož RetroShare odkazy ze svých sdílení&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Přiložit soubor</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Nastavit obrázek</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Zpráva</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Předmět:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5077,17 +4484,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5106,17 +4513,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Soubor je již přidán a zatříděn</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Prosím zadejte předmět</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Nahrát miniaturu</translation>
     </message>
@@ -5131,18 +4539,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Generovat hromadné údaje</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Opravdu chcete vygenerovat %1 zpráv?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Chcete přidat soubory, které však přímo nesdílíte. Opravdu?</translation>
     </message>
@@ -5176,7 +4578,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Odeslat příspěvek na fórum</translation>
     </message>
@@ -5185,10 +4587,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Fórum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Předmět</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5209,8 +4607,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5229,7 +4627,7 @@ p, li { white-space: pre-wrap; }
         <translation>Přetáhnutím do tohoto okna můžete přiložit soubory </translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5259,17 +4657,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Žádné fórum</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>Reakce na</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Nadpis</translation>
     </message>
@@ -5322,7 +4720,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Nahrát soubor s obrázkem</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5332,8 +4730,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Generovat hromadné údaje</translation>
     </message>
@@ -5342,10 +4740,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Opravdu chcete vygenerovat %1 zpráv?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Odeslat</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5360,23 +4754,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Vytvořit konverzační místnost</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Konverzační místnosti jsou decentralizované a anonymní konverzační skupiny (chat). Všichni účastníci obdrží vždy všechny zprávy. Jakmile je skupina vytvořena, můžete pozvat další kontakty (v záložce Kontakty).</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Jméno místnosti:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Téma konverzace:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5411,7 +4789,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Vytvořit</translation>
     </message>
@@ -5421,7 +4799,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5436,11 +4814,7 @@ Do you want to discard this message?</source>
         <translation>Zvolte kontakty, s nimiž chcete uskutečnit skupinovou konverzaci</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Pozvané kontakty</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -5461,7 +4835,7 @@ Do you want to discard this message?</source>
         <translation>Kontakty:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Použitá identita:</translation>
     </message>
@@ -5469,17 +4843,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Veřejné informace</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
@@ -5489,12 +4863,12 @@ Do you want to discard this message?</source>
         <translation>ID lokace:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Verze RetroShare :</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Připojen od:</translation>
     </message>
@@ -5514,12 +4888,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5529,7 +4898,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Další informace</translation>
     </message>
@@ -5539,17 +4908,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Certifikát</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5559,11 +4923,7 @@ Do you want to discard this message?</source>
         <translation>Zahrnout podpisy</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Uložit klíč do souboru</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exportovat identitu</translation>
     </message>
@@ -5637,33 +4997,33 @@ tam ji importujte.</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP otisk:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Informace o uzlu</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP ID :</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5702,14 +5062,6 @@ tam ji importujte.</translation>
         <source>Node</source>
         <translation>Uzel</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Vytvořte nový uzel...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">Zobrazit statistiky</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5761,7 +5113,7 @@ tam ji importujte.</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6429,7 +5781,7 @@ tam ji importujte.</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Spustit soubor</translation>
     </message>
@@ -6437,38 +5789,38 @@ tam ji importujte.</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>pro</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>ignorovat případy</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>dd.MM.yyyy</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6476,12 +5828,12 @@ tam ji importujte.</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Výrazný Widget</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Odstranit tento výraz</translation>
     </message>
@@ -6643,7 +5995,7 @@ tam ji importujte.</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Obrázek</translation>
     </message>
@@ -6653,7 +6005,7 @@ tam ji importujte.</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6713,11 +6065,21 @@ tam ji importujte.</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Sdílené soubory a složky mých kontaktů</translation>
     </message>
@@ -6839,7 +6201,7 @@ tam ji importujte.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6881,7 +6243,7 @@ tam ji importujte.</translation>
         <translation>Zobrazit skupiny</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
@@ -6917,7 +6279,7 @@ tam ji importujte.</translation>
         <translation>Přidat do skupiny</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6933,7 +6295,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7170,7 +6532,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Potvrdit přidání kontaktu</translation>
     </message>
@@ -7187,10 +6549,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Hledat :</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7212,7 +6570,7 @@ at least one peer was not added to a group</source>
         <translation>Hledat kontakty</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished">Označit vše</translation>
     </message>
@@ -7223,16 +6581,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Přidat kontakt</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Editovat status</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Rozhlas</translation>
     </message>
@@ -7315,33 +6789,38 @@ at least one peer was not added to a group</source>
         <translation>Nastavit výchozí font</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Klíčenka</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>RetroShare rozhlas: zpráva je odeslána všem připojeným kontaktům.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Síť</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Síťový graf</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Zde napiš svůj status.</translation>
     </message>
@@ -7359,7 +6838,17 @@ at least one peer was not added to a group</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Všechny prvky vyžadují zadání alespoň tří znaků.</translation>
     </message>
@@ -7369,17 +6858,12 @@ at least one peer was not added to a group</source>
         <translation>Hesla nejsou stejná</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Heslo pro PGP</translation>
@@ -7400,38 +6884,38 @@ at least one peer was not added to a group</source>
         <translation>Nemůžu vygenerovat nový certifikát, možná jste špatně napsali PGP heslo!</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7451,12 +6935,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7466,42 +6950,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Pokročilé volby</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Váš profil je spojen s PGP párem klíčů. V současné době RetroShare ignoruje DSA klíče.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Port pro komunikaci.&lt;/p&gt;&lt;p&gt;Hodnota mezi 1024 a 65535 &lt;/p&gt;&lt;p&gt;by měla být OK. Můžete to změnit pak později.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7549,13 +7034,13 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation>Profil se nepodařilo uložit, protože nastala chyba.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importovat profil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7565,7 +7050,7 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7600,7 +7085,7 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7610,12 +7095,7 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7625,12 +7105,7 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7856,36 +7331,13 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation>Začínáme</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Pozvat přátelé</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Bez kontaktů nestojí RetroShare za nic. Klikněte na tlačítko a pozvěte nové lidi!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Pošlete pozvánku s vaším &amp;quot;certifikátem&amp;quot; vašim přátelům.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Ujistěte se, že vám také pošlou pozvánku... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Můžete se spojit pouze tehdy, pokud jste se do kontaktů přidali navzájem.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Přidat tvoje přátele do Retroshare</translation>
     </message>
@@ -7895,89 +7347,103 @@ p, li { white-space: pre-wrap; }
         <translation>Přidat přátele</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Připojit k přátelům</translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+76"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Pokročílé: Otevřený Port Firewallu</translation>
+    </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Připojit k přátelům</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Pokročílé: Otevřený Port Firewallu</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Další pomoc a podpora</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Otevřít webovou stránku RetroShare</translation>
     </message>
@@ -8002,7 +7468,7 @@ p, li { white-space: pre-wrap; }
         <translation>Emailová zpětná vazba</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>Pozvánka do RetroShare</translation>
     </message>
@@ -8056,12 +7522,12 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>RetroShare zpětná vazba</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>RetroShare Podpora</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8185,7 +7651,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Zobrazit skupinovou konverzaci</translation>
     </message>
@@ -8193,7 +7659,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8363,7 +7829,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Nadpis</translation>
     </message>
@@ -8376,12 +7842,12 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8406,19 +7872,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Seřadit podle jména</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Seřadit podle oblíbenosti</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Seřadit podle posledního příspěvku</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8433,14 +7887,14 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Poslední příspěvek</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -8451,17 +7905,13 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished">Popularita</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Zobrazit</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8474,7 +7924,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>a</translation>
     </message>
@@ -8610,7 +8060,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanály</translation>
@@ -8621,22 +8071,22 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Vytvořit kanál</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Zapnout automatické stahování</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Moje kanály</translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Odebírané kanály</translation>
     </message>
@@ -8656,12 +8106,12 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Vypnout automatické stahování</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8696,22 +8146,22 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Přehrát</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
@@ -8731,17 +8181,17 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Přehrát soubor</translation>
     </message>
@@ -8751,33 +8201,10 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished">Soubor %1 neexistuje.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulář</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Jméno souboru</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Velikost</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Nadpis</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Status</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Vytvořit nový kanál</translation>
     </message>
@@ -8815,9 +8242,19 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Odebírat kanál</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Textový popisek</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8831,7 +8268,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -8846,7 +8283,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Popis kanálu</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Nahrávám</translation>
     </message>
@@ -8861,8 +8298,9 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Nový kanál</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8873,7 +8311,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8894,7 +8332,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
@@ -8956,18 +8394,18 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Komentáře</translation>
     </message>
@@ -8982,21 +8420,17 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Nahrávám</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9021,67 +8455,16 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Přehrát</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Přidat příspěvek do kanálu</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Nahrávám</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Nadpis</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Hledat podle jména fóra</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Text příspěvku</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Jméno souboru</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Není vybrán žádný kanál</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Vypnout automatické stahování</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Zapnout automatické stahování</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Kanály</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Soubory</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Popis:</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Přidat příspěvek do kanálu</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9151,7 +8534,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9187,7 +8570,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Komentáře</translation>
     </message>
@@ -9202,13 +8585,13 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished">Kanály</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9223,7 +8606,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9238,7 +8621,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9298,12 +8681,22 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9378,12 +8771,13 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Přihlášen</translation>
     </message>
@@ -9434,17 +8828,17 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9559,7 +8953,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9572,7 +8966,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Formulář</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9602,7 +8996,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Komentáře</translation>
@@ -9641,7 +9035,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Reagovat na komentář</translation>
     </message>
@@ -9665,6 +9059,21 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <source>Vote Down</source>
         <translation>Palec dolu</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9674,7 +9083,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9703,7 +9112,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9734,7 +9143,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9785,7 +9194,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Odebírat fórum</translation>
     </message>
@@ -9801,7 +9210,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -9821,8 +9230,9 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Nahrávám</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9853,13 +9263,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Předmět: </translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Neodebírat fórum</translation>
     </message>
@@ -9870,7 +9280,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -9890,21 +9300,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Nahrávám</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
@@ -9917,63 +9323,66 @@ before you can comment</source>
         <translation>Formulář</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Založit nové vlákno ve vybraném fóru</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Hledat ve fórech</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Poslední příspěvek</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>podle vláken</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Vše za sebou</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Nadpis</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Načítám</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9983,12 +9392,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Odpovědět na příspěvek</translation>
     </message>
@@ -10012,10 +9416,6 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Stáhnout všechny soubory</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Další nepřečtený</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10032,31 +9432,23 @@ before you can comment</source>
         <translation>Hledat podle autora</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Obsah</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Hledat v obsahu zprávy</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Bez jména</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Odpovědět</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10099,16 +9491,12 @@ before you can comment</source>
         <translation>Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Rozbalit</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10138,8 +9526,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10153,22 +9541,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anonymní sdílení</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">podepsáno</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">žádný</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... chybějící zpráva ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10238,12 +9610,12 @@ before you can comment</source>
         <translation>Původní zpráva</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">Editovat</translation>
     </message>
@@ -10304,7 +9676,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10324,7 +9696,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10376,7 +9748,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10386,7 +9758,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,7 +9773,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10467,12 +9839,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Fórum</translation>
@@ -10503,31 +9875,16 @@ This message is missing. You should receive it later.</source>
         <translation>Ostatní fóra</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Čekám</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Stahuji</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Načítám</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Jméno uživatele</translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10536,22 +9893,14 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">zaškrtněte protějšky s nimiž chcete sdílet soukromý klíč k publikačnímu právu</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Sdílet klíč s</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10559,7 +9908,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Veřejné</translation>
     </message>
@@ -10619,7 +9968,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished">Komentáře:</translation>
     </message>
@@ -10642,7 +9991,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10658,12 +10007,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10680,23 +10029,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10712,22 +10061,28 @@ This message is missing. You should receive it later.</source>
         <translation>Detaily</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10737,12 +10092,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10752,7 +10107,7 @@ This message is missing. You should receive it later.</source>
         <translation>Poslední příspěvek</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10827,7 +10182,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Popularita</translation>
     </message>
@@ -10843,27 +10203,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Vytvořit</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Autor</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10871,7 +10226,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Nahrávám</translation>
     </message>
@@ -10931,7 +10286,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10988,12 +10343,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopírovat RetroShare odkaz</translation>
     </message>
@@ -11016,7 +10371,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11029,18 +10384,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Nahrávám</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11050,7 +10401,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11060,7 +10411,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11080,6 +10436,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11091,7 +10455,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11139,17 +10503,13 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Nahrávám</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11530,7 +10890,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11546,7 +10906,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Autoři</translation>
     </message>
@@ -11565,7 +10925,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11639,7 +10999,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulář</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11649,7 +11009,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11677,7 +11037,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11687,7 +11047,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Kopírovat váš certifikát do schránky</translation>
     </message>
@@ -11697,7 +11057,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Uložit váš certifikát do souboru</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11717,13 +11077,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11735,12 +11119,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11755,12 +11139,7 @@ new short format</source>
         <translation type="unfinished">Pozvánka do RetroShare</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished">Uložit jako...</translation>
     </message>
@@ -12025,14 +11404,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12042,12 +11421,12 @@ p, li { white-space: pre-wrap; }
         <translation>Hledat</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Vytvořit novou identitu</translation>
     </message>
@@ -12057,7 +11436,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12072,27 +11451,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished">Zavřít</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12108,29 +11487,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Okruhy lidí</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12150,18 +11539,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Osobní Kruhy</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12171,78 +11562,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Odeslat zprávu</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12253,17 +11644,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anonymní sdílení</translation>
     </message>
@@ -12278,24 +11669,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12310,7 +11701,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12320,7 +11716,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12395,7 +11791,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,7 +11821,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">neznámé</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12440,7 +11836,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished">Upravit Kruh</translation>
     </message>
@@ -12488,7 +11884,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12496,7 +11892,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -12539,7 +11935,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12581,7 +11977,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+2"/>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zpráva</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12619,7 +12015,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12635,17 +12031,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12750,7 +12141,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12800,21 +12191,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12824,7 +12215,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12839,7 +12230,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12854,12 +12245,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12879,12 +12270,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12894,7 +12285,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12902,7 +12293,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Přezdívka</translation>
     </message>
@@ -12932,7 +12323,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12946,7 +12343,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12956,7 +12353,12 @@ These identities will soon be not supported anymore.</source>
         <translation>nedostupné</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12967,27 +12369,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13007,7 +12409,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13017,12 +12419,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13032,12 +12440,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13047,7 +12450,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13057,10 +12460,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Odebrat</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13086,7 +12494,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Přidat</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Vytvořit</translation>
     </message>
@@ -13096,13 +12504,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13112,7 +12520,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13186,7 +12594,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
@@ -13196,12 +12604,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Odebrat</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Označit vše</translation>
     </message>
@@ -13220,26 +12628,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Citovat</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Odeslat</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13257,27 +12677,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13298,7 +12723,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13307,26 +12737,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Otevřít složku</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Kontroluji...</translation>
     </message>
@@ -13336,7 +12771,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Zkontrolovat soubory</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13364,7 +12799,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Přidat kontakt</translation>
     </message>
@@ -13380,7 +12815,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Nastavení</translation>
     </message>
@@ -13401,7 +12837,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Ukončit</translation>
     </message>
@@ -13412,12 +12848,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Průvodce nastavením</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 - bezpečná decentralizovaná komunikační platforma</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Nedokončeno</translation>
     </message>
@@ -13442,11 +12878,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Upozornit</translation>
     </message>
@@ -13457,31 +12894,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Zobrazit zprávy</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Graf přenosové rychlosti</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Aplikace</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Minimalizovat</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Maximalizovat</translation>
     </message>
@@ -13496,7 +12937,12 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 nová zpráva</translation>
     </message>
@@ -13526,7 +12972,7 @@ These identities will soon be not supported anymore.</source>
         <translation>%1 kontaktů připojeno</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Opravdu chcete ukončit RetroShare?</translation>
     </message>
@@ -13546,7 +12992,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Ujistěte se, že tento odkaz nebyl zfalšován za účelem dostat vás na škodlivé webové stránky.</translation>
     </message>
@@ -13591,12 +13037,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13611,7 +13058,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13620,17 +13067,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Napsat zprávu</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Odstavec</translation>
     </message>
@@ -13666,12 +13113,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Nadpis 6. úrovně</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Velikost fontu</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Zvětšit velikost fontu</translation>
     </message>
@@ -13686,32 +13133,32 @@ These identities will soon be not supported anymore.</source>
         <translation>Tučné</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Kurzíva</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Zarovnání</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Vložit obrázek</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Zdrojový kód (nastaví neproporcionální font)</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Podtržené</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Předmět:</translation>
     </message>
@@ -13722,32 +13169,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Štítky</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Doporučené soubory</translation>
     </message>
@@ -13817,7 +13264,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Odsadí citaci</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Odeslat komu:</translation>
     </message>
@@ -13857,7 +13304,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Ahoj,&lt;br&gt;doporučuji ti tento kontakt. Když důvěřuješ mě, můžeš důvěřovat také tomuto kontaktu. &lt;br&gt;</translation>
     </message>
@@ -13877,18 +13324,18 @@ These identities will soon be not supported anymore.</source>
         <translation>si vás chce přidat do kontaktů.</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Ahoj %1,&lt;br&gt;&lt;br&gt;%2 si vás chce přidat do kontaktů.&lt;br&gt;&lt;br&gt;Odpovězte nyní:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Děkujeme,&lt;br&gt;Tým RetroShare</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Uložit zprávu</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Zpráva nebyla odeslána.
@@ -13900,7 +13347,17 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Vložit RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Přidat do &quot;Komu&quot;</translation>
     </message>
@@ -13920,7 +13377,7 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Doporučit</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Původní zpráva</translation>
     </message>
@@ -13930,21 +13387,21 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Od</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Komu</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Odesláno</translation>
     </message>
@@ -13959,7 +13416,7 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Na %1, %2 odpověděl:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13969,30 +13426,30 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Fwd:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Chcete odeslat zprávu bez předmětu?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Prosím zadejte alespoň jednoho příjemce.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
@@ -14107,13 +13564,13 @@ Chcete ji uložit jako koncept?</translation>
         <translation type="unfinished">Detaily</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Otevřít soubor...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML soubory (*.htm *.html);;Všechny soubory (*)</translation>
     </message>
@@ -14133,7 +13590,7 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Exportovat do PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Zpráva nebyla odeslána. Chcete ji uložit?</translation>
@@ -14154,7 +13611,7 @@ Do you want to save message ?</source>
         <translation>Přidat další soubor</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14184,18 +13641,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14235,13 +13692,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14251,12 +13708,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14334,7 +13791,7 @@ Do you want to save message ?</source>
         <translation>Výchozí</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Nová karta</translation>
     </message>
@@ -14344,7 +13801,7 @@ Do you want to save message ?</source>
         <translation>Nové okno</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Editovat štítek</translation>
     </message>
@@ -14367,7 +13824,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14375,7 +13832,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
@@ -14403,7 +13860,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Doporučené soubory</translation>
     </message>
@@ -14413,37 +13870,37 @@ Do you want to save message ?</source>
         <translation>Stáhnou všechny doporučené soubory</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Předmět:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Pro:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Štítky:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Odpovědět</translation>
     </message>
@@ -14483,7 +13940,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14535,7 +13992,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14545,12 +14002,12 @@ Do you want to save message ?</source>
         <translation>Přidat %1 do kontaktů</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Bez předmětu</translation>
     </message>
@@ -14560,17 +14017,22 @@ Do you want to save message ?</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14579,14 +14041,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Stáhnout vše</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Vytisknout dokument</translation>
     </message>
@@ -14601,12 +14073,12 @@ Do you want to save message ?</source>
         <translation>HTML soubory (*.htm *.html);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14628,42 +14100,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Napsat</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Odpovědět na označenou zprávu</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Odpovědět</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Odpovědět na označené zprávy</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Odpovědět všem</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Přeposlat označenou zprávu</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Vpřed</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Odstranit označenou zprávu</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Smazat</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Vytisknout označenou zprávu</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14742,7 +14178,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Nová zpráva</translation>
     </message>
@@ -14752,60 +14188,16 @@ Do you want to save message ?</source>
         <translation>Napsat</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Odpovědět na označenou zprávu</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Odpovědět</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Odpovědět na označené zprávy</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Odpovědět všem</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Přeposlat označenou zprávu</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Přeposlat</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Odstranit označenou zprávu</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Smazat</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Vytisknout označenou zprávu</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Tisknout</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Zobrazit</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Štítky</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Příchozí</translation>
@@ -14835,21 +14227,17 @@ Do you want to save message ?</source>
         <translation>Koš</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Příchozí celkem:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Složky</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Zobrazit pouze</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Tisknout...</translation>
@@ -14880,7 +14268,7 @@ Do you want to save message ?</source>
         <translation>Přeposlat zprávu</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Předmět</translation>
     </message>
@@ -14890,7 +14278,7 @@ Do you want to save message ?</source>
         <translation>Od</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -14900,39 +14288,7 @@ Do you want to save message ?</source>
         <translation>Obsah</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Seřazení podle příloh</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Seřadit podle předmětu</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Seřadit podle přečtených</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Seřadit podle odesílatele</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Seřadit podle datumu</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Seřadit podle štítků</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Seřadit podle ohvězdičkování</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Přeposlat označenou zprávu</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Hledat v předmětu zprávy</translation>
     </message>
@@ -14941,6 +14297,11 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Hledat podle odesílatele</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14967,14 +14328,14 @@ Do you want to save message ?</source>
         <translation>Hledat v přílohách</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Ohvězdičkované</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15048,7 +14409,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15062,7 +14423,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15077,34 +14438,33 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Koncepty</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Nemáte ohvězdičkované žádné zprávy. Ohvězdičkování slouží ke zvýraznění zpráv, abyste je mohli snáze najít. Zprávu ohvězdičkujete kliknutím na světle šedou hvezdičku kterékoliv zprávy nebo pomocí kontextového menu, ktere otevřete tím, že na ni kliknete pravým tlačítkem myši.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Nemáte žádné zprávy systému.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Pro</translation>
+        <translation>Pro</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Pro seřazení klikněte</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15112,10 +14472,6 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Celkem:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Zprávy</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15143,7 +14499,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15197,7 +14563,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -15207,7 +14573,7 @@ Do you want to save message ?</source>
         <translation>Odstranit položku</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15242,7 +14608,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
@@ -15383,7 +14749,7 @@ Do you want to save message ?</source>
         <translation>ID certifikátu</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15393,7 +14759,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15407,7 +14773,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -15440,18 +14812,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15461,25 +14828,18 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Síť</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -15506,7 +14866,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15527,7 +14887,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Skupiny</translation>
     </message>
@@ -15557,19 +14917,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15579,12 +14939,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15594,7 +14954,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Skupina</translation>
     </message>
@@ -15709,7 +15069,7 @@ Reported error:</source>
         <translation type="unfinished">Zabalit vše</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Chcete odstranit tento node?</translation>
     </message>
@@ -15719,7 +15079,7 @@ Reported error:</source>
         <translation type="unfinished">Opravdu chcete odstranit tento kontakt?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15826,7 +15186,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15841,11 +15201,7 @@ at least one peer was not added to a group</source>
         <translation>Smazat vše</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Toto je test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15855,12 +15211,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15915,10 +15271,6 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Blogy</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Bezpečnost</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15940,10 +15292,6 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Pokus o připojení</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16097,10 +15445,6 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Kanál</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -16110,7 +15454,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16130,12 +15474,12 @@ at least one peer was not added to a group</source>
         <translation>Chybné heslo!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Nezaregistrovaný plugin či program</translation>
     </message>
@@ -16150,19 +15494,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Prohledávám sdílené soubory...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Počítám kryptografickou sumu (hash) souboru.</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Ukládám index souborů...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -16173,17 +15505,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16191,7 +15525,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Kontakt je online</translation>
     </message>
@@ -16330,7 +15664,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16339,10 +15678,6 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Podepsat PGP klíč</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16379,12 +15714,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zahrnout podpisy</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16430,21 +15760,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Chyba : nemohu získat údaje kontaktu</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -16462,7 +15792,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16531,10 +15861,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Možná že bylo špatně zadané heslo</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -16542,12 +15868,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16573,7 +15899,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Konverzace</translation>
     </message>
@@ -16594,7 +15920,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Odstranit položku</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
@@ -16634,7 +15960,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Napsat zprávu</translation>
     </message>
@@ -16648,10 +15974,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>se připojil.</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">se pokusil připojit.</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16690,17 +16012,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Neznámý protějšek</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Poslat zprávu</translation>
     </message>
@@ -16867,13 +16185,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulář</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16886,14 +16197,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Komentáře</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Shrnutí</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16954,10 +16257,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Přidat komentář</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17041,17 +16340,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17080,7 +16379,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Jméno alba:</translation>
     </message>
@@ -17139,19 +16438,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17187,12 +16486,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17403,12 +16702,27 @@ p, li { white-space: pre-wrap; }
         <translation>Podržet okno nad ostatními</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -17461,7 +16775,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nový</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17481,8 +16795,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Komentáře</translation>
     </message>
@@ -17507,13 +16821,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Komentáře</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17541,12 +16855,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -17561,12 +16875,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Nahrát soubor s obrázkem</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -17582,7 +16906,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17592,7 +16926,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17612,12 +16946,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17632,7 +16976,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Psát jako</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17643,7 +16987,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17653,7 +16997,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nadpis</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17661,16 +17005,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Odeslané odkazy</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17704,7 +17044,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17742,7 +17082,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Textový popisek</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17758,7 +17108,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -17773,16 +17123,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Nahrávám</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17795,18 +17146,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Komentáře</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
@@ -17817,12 +17168,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Komentáře</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17832,7 +17183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17842,17 +17193,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Označit za přečtené a odstranit položku</translation>
     </message>
@@ -17862,7 +17213,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nový</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17872,7 +17223,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17913,34 +17264,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Nahrávám</translation>
     </message>
 </context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulář</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nový</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Nahoře</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Další</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17959,7 +17287,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17969,15 +17307,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">neznámé</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17987,42 +17325,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18042,7 +17380,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18072,17 +17410,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18097,12 +17435,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18112,27 +17455,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Editovat</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18147,7 +17494,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Odebírat</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18221,6 +17568,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Není vybrán žádný kanál</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -18310,16 +17667,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -18431,7 +17788,7 @@ tam ji importujte.</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Editovat status</translation>
@@ -18447,7 +17804,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Veřejné informace</translation>
     </message>
@@ -18482,12 +17839,12 @@ tam ji importujte.</translation>
         <translation>Připojen od:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Další informace</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18531,27 +17888,27 @@ tam ji importujte.</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18561,12 +17918,12 @@ tam ji importujte.</translation>
         <translation type="unfinished">Od:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18596,13 +17953,13 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18614,12 +17971,22 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18634,7 +18001,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18649,34 +18016,24 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Od</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Datum</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Nahrát soubor s obrázkem</translation>
     </message>
 </context>
 <context>
@@ -18687,7 +18044,7 @@ tam ji importujte.</translation>
         <translation type="unfinished">Formulář</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18706,7 +18063,7 @@ tam ji importujte.</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18716,7 +18073,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18743,7 +18100,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18753,7 +18110,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18773,7 +18130,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18889,7 +18246,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18897,37 +18254,42 @@ tam ji importujte.</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18959,7 +18321,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18967,8 +18329,8 @@ tam ji importujte.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Potvrzení</translation>
     </message>
@@ -19236,12 +18598,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Peer detaily</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Požadavek o stáhnutí souboru byl zrušen.</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -19272,7 +18634,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Nastala neočekávaná chyba. Prosím pošlete hlášení &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19306,7 +18668,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Běží několik isntancí</translation>
@@ -19325,6 +18687,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -19404,7 +18786,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19414,7 +18796,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19424,7 +18806,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19440,7 +18822,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19507,7 +18889,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19535,7 +18917,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19715,13 +19097,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Uzel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19914,10 +19312,6 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Tento certifikát obsahuje</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19968,6 +19362,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -20117,7 +19523,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20284,7 +19690,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulář</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20297,7 +19703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20470,12 +19876,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20483,12 +19899,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21176,7 +20592,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -21297,7 +20713,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21317,7 +20733,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21373,7 +20789,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21387,11 +20803,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... chybějící zpráva ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -21405,6 +20816,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Od</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -21427,13 +20843,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Seřadit podle přečtených</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Seřadit podle odesílatele</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21456,7 +20877,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21477,7 +20900,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Obnoví všechna(!) uložená nastavení RetroShare na výchozí.</translation>
     </message>
@@ -21538,7 +20961,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Nastaví použitý jazyk.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Nemohu otevřít log soubor &apos;%1&apos;: %2</translation>
     </message>
@@ -21559,7 +20982,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21589,7 +21012,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21607,7 +21030,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21624,12 +21047,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Zadejkte klíčové slovo (alespoň 3 znaky dlouhé, např. mkv)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Začít vyhledávat</translation>
     </message>
@@ -21691,7 +21114,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Smazat</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Klíčová slova</translation>
     </message>
@@ -21706,7 +21129,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Identifikátor dotazu</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Jméno souboru</translation>
     </message>
@@ -21806,23 +21229,23 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Stáhnout vybrané</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Jméno souboru</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Poslat odkaz RetroShare</translation>
     </message>
@@ -21832,7 +21255,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Stáhnout poznámku</translation>
     </message>
@@ -21869,7 +21292,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Odebrat vše</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Složka</translation>
@@ -21880,17 +21303,17 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nový odkaz RetroShare (1 či více)</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished">Otevřít složku</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21910,7 +21333,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Stáhnou podle souboru kolekce...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Kolekce</translation>
     </message>
@@ -21918,7 +21341,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Podrobnosti o kontaktu</translation>
     </message>
@@ -21934,22 +21357,22 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Odstranit položku</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>ID protějšku:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21966,7 +21389,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21991,8 +21414,8 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22000,7 +21423,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>si vás chce přidat do kontaktů.</translation>
     </message>
@@ -22031,7 +21454,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -22076,12 +21499,12 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Napsat zprávu</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Pokus o připojení</translation>
     </message>
@@ -22101,17 +21524,22 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Neznámý (odchozí) pokus o připojení</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Neznámá bezpečnostní událost</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22121,11 +21549,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Neznámý Peer</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
@@ -22135,7 +21559,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Opravdu chcete odstranit tento kontakt?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22145,12 +21569,12 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22209,12 +21633,12 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Lokální adresa</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22235,22 +21659,22 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Mapa sítě</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Vyhledávač externích IP adres</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22263,21 +21687,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Pro zjištění mé veřejné IP adresy použít následující strány:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22287,23 +21706,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22313,7 +21755,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22338,37 +21780,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22383,71 +21883,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">neznámé</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22457,22 +21893,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22484,12 +21905,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22499,7 +21920,7 @@ Also check your ports!</source>
         <translation>Vymazat</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22514,23 +21935,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22541,17 +21962,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22561,12 +21972,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22576,17 +21982,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22626,7 +22022,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22641,12 +22037,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">Příchozí</translation>
     </message>
@@ -22682,7 +22073,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22737,7 +22153,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Celkem:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22762,7 +22178,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22774,7 +22190,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Síť</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22797,7 +22213,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -22857,17 +22273,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22883,18 +22310,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22929,12 +22356,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22957,22 +22384,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23007,7 +22434,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23017,12 +22444,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23102,7 +22529,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>zaškrtněte protějšky s nimiž chcete sdílet soukromý klíč k publikačnímu právu</translation>
     </message>
@@ -23112,12 +22539,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -23136,7 +22563,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Sdílení složek a souborů v nich obsažených</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23156,17 +22583,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished">Viditelnost</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Přidat sdílenou složku</translation>
     </message>
@@ -23176,7 +22603,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Odebrat</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Uložit a zavřít</translation>
     </message>
@@ -23267,7 +22694,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Složka nebyla nalezena nebo její jméno je neplatné.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23275,7 +22702,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Soubory</translation>
     </message>
@@ -23326,11 +22753,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>Zkontrolovat soubory</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Stáhnout vybrané</translation>
     </message>
@@ -23340,7 +22772,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Zkopírovat RetrosShare odkazy do schránky</translation>
     </message>
@@ -23355,7 +22787,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Poslat RetroShare odkazy</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23371,7 +22803,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Doporučení</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23396,7 +22828,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Stáhnou podle souboru kolekce...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23456,7 +22888,7 @@ Select the Friends with which you want to Share your Channel.</source>
     <message>
         <location line="+1"/>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zpráva</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -23539,12 +22971,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Načítám nastavení</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Vytvářím rozhraní</translation>
     </message>
@@ -23568,7 +23000,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Zapamatovat heslo</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Přihlásit se</translation>
     </message>
@@ -23909,7 +23341,7 @@ This choice can be reverted in settings.</source>
         <translation>Zpráva o statusu</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Zpráva:</translation>
     </message>
@@ -24146,7 +23578,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Odstranit všechny štítky</translation>
     </message>
@@ -24182,12 +23614,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24197,18 +23632,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24218,12 +23648,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Chyba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Nespojen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24231,7 +23706,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24241,7 +23716,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24252,11 +23727,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24284,7 +23760,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -24295,7 +23771,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maximální počet současných stahování:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24305,22 +23781,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Automaticky sdílet příchozí adresář (doporučeno)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24405,7 +23886,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24414,7 +23895,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24439,7 +23925,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Streamování</translation>
     </message>
@@ -24504,12 +23995,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24519,7 +24005,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Upozornění</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24547,7 +24043,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Stahování dokončeno</translation>
     </message>
@@ -24575,19 +24071,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Stahování</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Odesílání</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Jméno</translation>
@@ -24794,7 +24290,12 @@ p, li { white-space: pre-wrap; }
         <translation>Zvolit...</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation>Přesunout do fronty...</translation>
     </message>
@@ -24819,7 +24320,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zvolte adresář</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24840,7 +24341,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24873,7 +24374,17 @@ p, li { white-space: pre-wrap; }
         <translation>Stahování souboru %1 ještě není dokončeno. Pokud jde o soubor médií (hudba, filmy, ...), můžete se zkusit podívat na jeho náhled.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Upozornění</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Změnit jméno souboru</translation>
     </message>
@@ -24888,7 +24399,7 @@ p, li { white-space: pre-wrap; }
         <translation>Prosím vložte nové--a platné--jméno souboru</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Rozbalit vše</translation>
@@ -25015,23 +24526,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Sloupce</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Cesta</translation>
     </message>
@@ -25041,7 +24547,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25051,7 +24557,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25066,7 +24572,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation>Kolekce</translation>
     </message>
@@ -25076,7 +24582,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25490,12 +24996,17 @@ p, li { white-space: pre-wrap; }
         <translation>Formulář</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25535,17 +25046,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25555,12 +25076,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25697,11 +25218,7 @@ p, li { white-space: pre-wrap; }
         <translation>Stránky Wiki</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Nová skupina</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25716,7 +25233,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25804,7 +25321,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25839,7 +25356,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25869,14 +25386,18 @@ p, li { white-space: pre-wrap; }
         <translation>Štítky</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Historie</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -25897,7 +25418,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25980,16 +25501,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26004,7 +25516,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ostatní</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26024,7 +25536,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26054,25 +25566,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="vanished">Nový</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Kontakty</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -26135,35 +25639,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulář</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Odebrat</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Umístění:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -26208,11 +25719,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">nedostupné</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Neznámý</translation>
@@ -26290,7 +25831,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 r. %2 d.</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26327,7 +25868,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_da.ts b/retroshare-gui/src/lang/retroshare_da.ts
index 41f99845c..ffd7a7c0e 100644
--- a/retroshare-gui/src/lang/retroshare_da.ts
+++ b/retroshare-gui/src/lang/retroshare_da.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,10 +566,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -612,7 +625,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -699,7 +712,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -718,10 +731,6 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Annuller</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
@@ -799,7 +808,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -829,12 +838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -842,7 +851,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -862,7 +871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -900,7 +909,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -920,7 +929,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -950,7 +959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -960,7 +969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -968,12 +977,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -993,18 +1002,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1019,12 +1028,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1193,17 +1202,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1213,7 +1222,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1221,7 +1240,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1244,7 +1263,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1269,18 +1288,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1295,7 +1314,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -1305,17 +1324,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1323,7 +1332,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -1514,7 +1523,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1547,13 +1556,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1561,13 +1571,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1577,29 +1587,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1609,7 +1597,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1666,12 +1654,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1681,23 +1669,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-240"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-564"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1707,27 +1714,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1742,47 +1744,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1797,7 +1799,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
@@ -1817,7 +1819,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1862,7 +1864,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1877,7 +1879,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1897,7 +1899,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1922,7 +1924,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1952,7 +1954,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1962,7 +1964,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1986,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2056,12 +2058,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2071,7 +2083,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2168,7 +2190,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Forskel på store og små bogstaver</translation>
     </message>
@@ -2274,7 +2296,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2310,7 +2332,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2345,12 +2367,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2430,11 +2452,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2472,7 +2489,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2494,7 +2511,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2544,7 +2561,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2566,7 +2583,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2581,12 +2598,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2602,12 +2619,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2618,12 +2635,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2643,7 +2660,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2669,7 +2686,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2691,7 +2708,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2717,7 +2734,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2777,7 +2794,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2793,7 +2810,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2845,45 +2862,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2893,7 +2910,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2975,12 +2992,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3000,7 +3022,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3068,7 +3090,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3084,12 +3106,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
@@ -3099,17 +3121,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3119,7 +3141,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3144,12 +3166,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3169,32 +3201,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3240,17 +3267,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3270,12 +3297,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3283,7 +3310,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3323,7 +3350,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3348,7 +3375,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3358,7 +3385,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3397,7 +3424,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3407,7 +3434,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3432,7 +3459,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3445,7 +3472,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3480,7 +3507,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3490,12 +3517,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3560,7 +3582,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3588,7 +3610,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3598,17 +3620,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3618,12 +3643,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3633,7 +3660,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3658,7 +3686,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3950,7 +3978,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3958,7 +3986,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3968,7 +3997,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4004,12 +4033,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4029,7 +4058,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4049,18 +4078,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4075,7 +4104,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Navn:</translation>
     </message>
@@ -4115,19 +4144,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4137,12 +4166,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4152,7 +4193,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4205,13 +4246,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4230,7 +4271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4265,7 +4306,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4275,7 +4316,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4420,17 +4461,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4455,7 +4496,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4470,18 +4516,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4515,7 +4555,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4525,7 +4565,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+31"/>
+        <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;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4540,16 +4589,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+114"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4564,7 +4604,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4594,17 +4634,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4657,7 +4697,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4667,8 +4707,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4691,7 +4731,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4726,7 +4766,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4736,7 +4776,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4751,7 +4791,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4772,7 +4812,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4780,17 +4820,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4800,12 +4840,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4825,12 +4865,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,7 +4875,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4850,17 +4885,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4870,7 +4900,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4940,33 +4970,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5056,7 +5086,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5724,7 +5754,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5732,38 +5762,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5771,12 +5801,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5938,7 +5968,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5948,7 +5978,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6008,11 +6038,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6134,7 +6174,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6176,7 +6216,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6212,7 +6252,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6228,7 +6268,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6465,7 +6505,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6503,7 +6543,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6514,16 +6554,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Navn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6606,33 +6762,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6650,7 +6811,17 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6660,17 +6831,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6691,38 +6857,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6742,12 +6908,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6757,38 +6923,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6832,13 +7003,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6848,7 +7019,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6883,7 +7054,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6893,12 +7064,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6908,12 +7074,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7139,27 +7300,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7169,39 +7316,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7209,49 +7374,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7276,7 +7437,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7326,12 +7487,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7455,7 +7616,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7463,7 +7624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7633,7 +7794,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7646,12 +7807,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7676,7 +7837,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7691,14 +7852,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
@@ -7709,13 +7870,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7728,7 +7889,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7864,7 +8025,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -7875,22 +8036,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7910,12 +8071,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7950,22 +8111,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7985,17 +8146,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8008,7 +8169,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8046,8 +8207,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8062,7 +8233,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8077,7 +8248,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8091,6 +8262,11 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8100,7 +8276,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8121,7 +8297,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8183,18 +8359,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8209,17 +8385,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8247,13 +8423,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8323,7 +8499,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8359,7 +8535,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8374,13 +8550,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8395,7 +8571,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8410,7 +8586,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8470,12 +8646,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8550,12 +8736,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8606,17 +8793,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8731,7 +8918,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8744,7 +8931,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8774,7 +8961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -8813,7 +9000,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8837,6 +9024,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -8846,7 +9048,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -8875,7 +9077,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8906,7 +9108,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8957,7 +9159,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8973,7 +9175,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8992,6 +9194,11 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9021,13 +9228,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9038,7 +9245,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9058,17 +9265,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9081,59 +9288,66 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9143,12 +9357,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9188,23 +9397,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9247,12 +9456,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9282,8 +9491,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9366,12 +9575,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9432,7 +9641,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9452,7 +9661,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9504,7 +9713,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9514,7 +9723,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9529,7 +9738,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9595,12 +9804,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9635,12 +9844,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9651,12 +9860,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9664,7 +9873,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9724,7 +9933,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9747,7 +9956,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9763,12 +9972,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9785,23 +9994,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9817,22 +10026,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9842,12 +10057,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9857,7 +10072,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9932,7 +10147,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9948,27 +10168,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9976,7 +10191,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10036,7 +10251,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10093,12 +10308,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10121,7 +10336,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10134,14 +10349,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10151,7 +10366,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10161,7 +10376,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10181,6 +10401,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10192,7 +10420,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10240,7 +10468,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10627,7 +10855,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10643,7 +10871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10662,7 +10890,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10736,7 +10964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10746,7 +10974,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10774,7 +11002,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10784,7 +11012,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10794,7 +11022,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10814,13 +11042,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10832,12 +11084,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10852,12 +11104,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11122,14 +11369,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11139,12 +11386,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11154,7 +11401,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11169,27 +11416,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11205,29 +11452,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11247,18 +11504,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11268,78 +11527,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11350,17 +11609,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11375,24 +11634,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11407,7 +11666,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11417,7 +11681,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11492,7 +11756,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11522,7 +11786,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11537,7 +11801,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11585,7 +11849,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11593,7 +11857,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11636,7 +11900,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11716,7 +11980,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11732,17 +11996,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11847,7 +12106,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11897,21 +12156,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11921,7 +12180,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11936,7 +12195,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11951,12 +12210,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11976,12 +12235,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11991,7 +12250,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11999,7 +12258,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12029,7 +12288,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12043,7 +12308,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12053,7 +12318,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12064,27 +12334,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12104,7 +12374,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12114,12 +12384,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12129,12 +12405,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12144,7 +12415,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12154,10 +12425,15 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12183,7 +12459,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12193,13 +12469,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12209,7 +12485,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12283,7 +12559,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
@@ -12293,12 +12569,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12321,18 +12597,34 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12350,27 +12642,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12391,7 +12688,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12400,26 +12702,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12429,7 +12736,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12457,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12473,7 +12780,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
@@ -12494,7 +12802,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12505,12 +12813,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12535,11 +12843,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12550,31 +12859,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12589,7 +12902,12 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12619,7 +12937,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12639,7 +12957,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12684,12 +13002,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12704,7 +13023,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12713,17 +13032,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12759,12 +13078,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12779,32 +13098,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12815,32 +13134,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12910,7 +13229,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12950,7 +13269,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12970,18 +13289,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -12992,7 +13311,17 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13012,7 +13341,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13022,21 +13351,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13051,7 +13380,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13061,30 +13390,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13199,13 +13528,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished">Detaljer</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13225,7 +13554,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13246,7 +13575,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13276,18 +13605,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Fra:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13327,13 +13656,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13343,12 +13672,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13426,7 +13755,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13436,7 +13765,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13459,7 +13788,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13467,7 +13796,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13495,7 +13824,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13505,37 +13834,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Fra:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Til:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13575,7 +13904,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13627,7 +13956,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13637,12 +13966,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13652,17 +13981,22 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13671,14 +14005,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13693,12 +14037,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13798,7 +14142,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13808,16 +14152,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -13847,17 +14191,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -13888,7 +14232,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13898,7 +14242,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13908,7 +14252,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13917,6 +14261,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -13943,13 +14297,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14024,7 +14378,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14038,7 +14392,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14053,18 +14407,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14099,7 +14463,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14153,7 +14527,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14163,7 +14537,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14198,7 +14572,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14339,7 +14713,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14349,7 +14723,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14363,7 +14737,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14396,18 +14776,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14417,12 +14792,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14455,7 +14830,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14476,7 +14851,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14506,19 +14881,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14528,12 +14903,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14543,7 +14918,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14658,7 +15033,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14668,7 +15043,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -14775,7 +15150,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14790,7 +15165,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14800,12 +15175,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15043,7 +15418,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15063,12 +15438,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15083,7 +15458,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15094,17 +15469,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15112,7 +15489,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15251,7 +15628,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15296,12 +15678,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Indstillinger</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15347,21 +15724,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15379,7 +15756,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15448,10 +15825,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Måske password er forkert</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15459,12 +15832,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15490,7 +15863,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15511,7 +15884,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
@@ -15551,7 +15924,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15609,7 +15982,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15927,17 +16300,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15966,7 +16339,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16025,19 +16398,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16073,12 +16446,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16289,12 +16662,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16347,7 +16735,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16367,8 +16755,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16393,13 +16781,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16427,12 +16815,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16447,12 +16835,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16468,7 +16866,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16478,7 +16886,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16498,12 +16906,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16518,7 +16936,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16529,7 +16947,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16539,7 +16957,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16547,12 +16965,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -16586,7 +17004,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16624,7 +17042,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16640,7 +17068,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16655,12 +17083,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16673,18 +17106,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16695,12 +17128,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16710,7 +17143,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16720,17 +17153,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16740,7 +17173,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16750,7 +17183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -16791,18 +17224,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -16821,7 +17247,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16831,15 +17267,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16849,42 +17285,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16904,7 +17340,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16934,17 +17370,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16959,12 +17395,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16974,27 +17415,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17009,7 +17454,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17083,6 +17528,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17172,16 +17627,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17289,7 +17744,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17305,7 +17760,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17340,12 +17795,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17389,27 +17844,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17419,12 +17874,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Fra:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17454,13 +17909,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17472,12 +17927,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17492,7 +17957,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17507,20 +17972,25 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PulseMessage</name>
@@ -17530,7 +18000,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -17549,7 +18019,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17559,7 +18029,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17586,7 +18056,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17596,7 +18066,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17616,7 +18086,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17732,7 +18202,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17740,37 +18210,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17802,7 +18277,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17810,8 +18285,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18079,12 +18554,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18115,7 +18590,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18149,7 +18624,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18168,6 +18643,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18247,7 +18742,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18257,7 +18752,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18267,7 +18762,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18283,7 +18778,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18350,7 +18845,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18378,7 +18873,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18558,13 +19053,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Navn</translation>
+    </message>
     <message>
         <location line="+1"/>
-        <source>Status</source>
+        <source>Node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18807,6 +19318,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -18946,7 +19469,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19113,7 +19636,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19126,7 +19649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19299,12 +19822,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19312,12 +19845,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20005,7 +20538,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Navn</translation>
@@ -20126,7 +20659,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -20146,7 +20679,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20202,7 +20735,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20216,11 +20749,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20234,6 +20762,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20256,12 +20789,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20285,7 +20823,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20306,7 +20846,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20367,7 +20907,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20388,7 +20928,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20418,7 +20958,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20436,7 +20976,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20453,12 +20993,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20519,7 +21059,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20534,7 +21074,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20634,23 +21174,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20660,7 +21200,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20697,7 +21237,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -20708,17 +21248,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20738,7 +21278,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20746,7 +21286,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20762,22 +21302,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20794,7 +21334,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20819,8 +21359,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20828,7 +21368,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20859,7 +21399,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20904,12 +21444,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20929,17 +21469,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20949,7 +21484,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20959,7 +21504,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20969,12 +21514,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21033,12 +21578,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Lokale Adresse</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21059,22 +21604,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21087,21 +21632,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21111,23 +21651,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21137,7 +21700,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21162,37 +21725,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21207,71 +21828,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21281,22 +21838,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21308,12 +21850,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21323,7 +21865,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21338,23 +21880,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21365,17 +21907,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21385,12 +21917,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21400,17 +21927,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21450,7 +21967,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21465,12 +21982,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21506,7 +22018,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21561,7 +22098,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21586,7 +22123,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -21598,7 +22135,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21621,7 +22158,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21681,17 +22218,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21707,18 +22255,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21753,12 +22301,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21781,22 +22329,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21831,7 +22379,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21841,12 +22389,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21926,7 +22474,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21936,12 +22484,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -21960,7 +22508,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21980,17 +22528,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22000,7 +22548,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22091,7 +22639,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22099,7 +22647,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22150,11 +22698,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22164,7 +22717,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22179,7 +22732,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22195,7 +22748,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22220,7 +22773,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22363,12 +22916,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22392,7 +22945,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Log ind</translation>
     </message>
@@ -22731,7 +23284,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22968,7 +23521,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23004,12 +23557,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23019,18 +23575,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23040,12 +23591,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23053,7 +23649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23063,7 +23659,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23074,11 +23670,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23106,7 +23703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23117,7 +23714,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23127,22 +23724,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23227,7 +23829,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23236,7 +23838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23261,7 +23868,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23326,12 +23938,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23341,7 +23948,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23369,7 +23986,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23397,19 +24014,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Navn</translation>
@@ -23616,7 +24233,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23641,7 +24263,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23662,7 +24284,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -23695,7 +24317,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23710,7 +24342,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -23837,23 +24469,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23863,7 +24490,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23873,7 +24500,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23888,7 +24515,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23898,7 +24525,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24312,12 +24939,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24357,17 +24989,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24377,12 +25019,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24519,7 +25161,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24534,7 +25176,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24622,7 +25264,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24657,7 +25299,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24687,14 +25329,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24715,7 +25361,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24798,12 +25444,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24818,7 +25459,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24838,7 +25479,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24868,7 +25509,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24878,7 +25519,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -24941,35 +25582,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25014,11 +25662,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25096,7 +25774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25133,7 +25811,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index 8c2ee9aa1171ccebc28512b3c02f18738ab85c58..fc57cf06d6ccc52c4909dac76b364d79c1febdc2 100644
GIT binary patch
delta 93165
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

delta 52536
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
ZRi+$$RFw%wWfDE6)1qlHC|V@s{{d<H?(zTt

diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index 4fa1bb85b..c2a832a1e 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -56,7 +56,7 @@
     <message>
         <location filename="../gui/AboutWidget.cpp" line="-148"/>
         <source>Max score: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Höchstpunktzahl: %1</translation>
     </message>
     <message>
         <location line="+47"/>
@@ -81,14 +81,7 @@
     <message>
         <location line="+793"/>
         <source>Only Hidden Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Kommentar hinzufügen</translation>
+        <translation>Nur Hidden knoten</translation>
     </message>
 </context>
 <context>
@@ -129,12 +122,12 @@
         <translation>RetroShare: Erweiterte Suche</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Suchkriterien</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Ein weiteres Suchkriterium hinzufügen.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Suchkriterien zurücksetzen.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Bricht die Suche ab.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Suchen</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Album erstellen</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Albumname</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Kategorie:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Tiere</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Familie</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Freunde</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Blumen</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Urlaub</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Landschaften</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Haustiere</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Porträts</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Reise</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Arbeit</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Zufall</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Überschrift:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Wo:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotograf:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beschreibung:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Freigabeeinstellungen</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Richtlinie:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Qualität:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Kommentare</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Identität</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Öffentlich</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Eingeschränkt</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Bildgröße ändern (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Bildgröße ändern (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Originalbilder senden</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Keine Kommentare erlaubt</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Authentifizierte Kommentare</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Jegliche Kommentare erlaubt</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Mit Identität veröffentlichen</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Füge Bilder per Drag &apos;n&apos; Drop ein. Klicke auf ein Bild, um die darunter stehenden Details zu bearbeiten.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Zurück</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Fotos hinzufügen</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Album veröffentlichen</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Albumtitel entfernen</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Sage etwas über dieses Album...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Wo wurden diese aufgenommen?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Albumvorschau laden</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Album</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Albumvorschau</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Zusammenfassung</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -364,41 +178,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-14"/>
         <source>Category:</source>
-        <translation>Kategorie</translation>
+        <translation>Kategorie:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Caption</source>
         <translation>Überschrift</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Wo:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Wann:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beschreibung</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Freigabeeinstellungen</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Kommentare</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Veröffentlichungsidentität</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Sichtbarkeit</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -438,57 +224,57 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/PhotoShare/AlbumExtra.ui" line="+20"/>
         <source>Form</source>
-        <translation type="unfinished">Formular</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Quality:</source>
-        <translation type="unfinished">Qualität:</translation>
+        <translation>Qualität:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Embedded Only (&lt;50Kb)</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur eingebettet (&lt;50 KB)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Share Original Images</source>
-        <translation type="unfinished"></translation>
+        <translation>Orginal Bild teilen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Copy Original Images (extra disk space)</source>
-        <translation type="unfinished"></translation>
+        <translation>Originalbilder kopieren (zusätzlicher Speicherplatz)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Resize Images (&lt; 200Kb)</source>
-        <translation type="unfinished">Bildgröße ändern (&lt; 10Mb) {200K?}</translation>
+        <translation>Bildgröße ändern (&lt; 10Mb) {200K?}</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="unfinished">Bildgröße ändern (&lt; 1Mb)</translation>
+        <translation>Bildgröße ändern (&lt; 1Mb)</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Caption:</source>
-        <translation type="unfinished">Überschrift:</translation>
+        <translation>Überschrift:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Photographer:</source>
-        <translation type="unfinished">Fotograf:</translation>
+        <translation>Fotograf:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Where:</source>
-        <translation type="unfinished">Wo:</translation>
+        <translation>Wo:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>When:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wann:</translation>
     </message>
 </context>
 <context>
@@ -496,37 +282,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/PhotoShare/AlbumGroupDialog.cpp" line="+81"/>
         <source>Create New Album</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Album erstellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create</source>
-        <translation type="unfinished">Erstellen</translation>
+        <translation>Erstellen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Album</source>
-        <translation type="unfinished">Album</translation>
+        <translation>Album</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Edit ALbum</source>
-        <translation type="unfinished"></translation>
+        <translation>Album bearbeiten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update Album</source>
-        <translation type="unfinished"></translation>
+        <translation>Album aktualisieren</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Album Admins</source>
-        <translation type="unfinished"></translation>
+        <translation>Album-Administratoren hinzufügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select Album Admins</source>
-        <translation type="unfinished"></translation>
+        <translation>Album-Admins auswählen</translation>
     </message>
 </context>
 <context>
@@ -635,7 +421,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+14"/>
         <source>Choose the style of Tool Buttons.</source>
-        <translation>Wähle den Stil für die Werkzeugschaltflächen</translation>
+        <translation>Wähle den Stil für die Werkzeugschaltflächen.</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -670,22 +456,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+12"/>
         <source>Show Toaster Disable</source>
-        <translation type="unfinished"></translation>
+        <translation>Toaster-Deaktivierung anzeigen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Show Sound Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Sound Status anzeigen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Show Network Rate Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Netzwerkrate anzeigen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Show Discovery Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Entdeckungsstatus anzeigen</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -695,7 +481,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-52"/>
         <source>Show Hashing Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Hashing Status anzeigen</translation>
     </message>
     <message>
         <location line="+38"/>
@@ -705,17 +491,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-31"/>
         <source>Show Peer Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Peer Status anzeigen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Show Status ComboBox</source>
-        <translation type="unfinished"></translation>
+        <translation>Status ComboBox anzeigen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Remove surplus text in status bar.</source>
-        <translation>Überschüssigen Text aus Statusleiste entfernen</translation>
+        <translation>Überschüssigen Text aus Statusleiste entfernen.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -725,7 +511,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+21"/>
         <source>Show Operating Mode Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Betriebsmodusstatus anzeigen</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -735,12 +521,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-28"/>
         <source>Disable SysTray ToolTip</source>
-        <translation type="unfinished"></translation>
+        <translation>SysTray Kurzinfo deaktivieren</translation>
     </message>
     <message>
         <location line="-225"/>
         <source>Main page items:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hauptseitenelemente:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -750,7 +536,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Item list</source>
-        <translation type="unfinished"></translation>
+        <translation>Item Liste</translation>
     </message>
     <message>
         <location line="+104"/>
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Warnung: Diese Dienste sind experimentell. Bitte hilf uns sie zu testen.
@@ -783,14 +569,6 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <source>Circles</source>
         <translation>Kreise</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">Gxs-Foren</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">Gxs-Kanäle</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <translation>Fotos</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation>Bild speichern</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation>Bild kopieren</translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p KiB</translation>
     </message>
@@ -830,7 +621,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+52"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -840,11 +631,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+10"/>
         <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Avatar hinzufügen</translation>
+        <translation>Durchsuchen...</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -852,28 +639,24 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Dein Avatarbild festlegen</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Import image</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild importieren</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Image files (*.jpg *.png);;All files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilddateien (*.jpg *.png);;Alle Dateien (*)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Avatar laden</translation>
+        <translation>Benutzen Sie die Maus, um das Bild für Ihren Avatar zu vergrößern und anzupassen.</translation>
     </message>
 </context>
 <context>
@@ -910,22 +693,22 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+47"/>
         <source>PushButton</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Up</source>
-        <translation type="unfinished">Hoch</translation>
+        <translation>Hoch</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Down</source>
-        <translation type="unfinished">Herunter</translation>
+        <translation>Herunter</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Clears the graph</source>
-        <translation type="unfinished"></translation>
+        <translation>Grafik zurücksetzen</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -935,7 +718,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+23"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="-30"/>
@@ -943,22 +726,10 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Empfangsrate</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Senderate</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Immer im Vordergrund</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stil</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <source>% Opaque</source>
         <translation>% undurchsichtig</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Speichern</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Abbrechen</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Seit:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Einstellungen verbergen</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1024,7 +783,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+9"/>
         <source>Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Insgesamt</translation>
     </message>
 </context>
 <context>
@@ -1037,275 +796,275 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+26"/>
         <source>Filename</source>
-        <translation type="unfinished">Dateiname</translation>
+        <translation>Dateiname</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hash</source>
-        <translation type="unfinished">Prüfsumme</translation>
+        <translation>Prüfsumme</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Size</source>
-        <translation type="unfinished">Größe</translation>
+        <translation>Größe</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Banned since...</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesperrt seit...</translation>
     </message>
     <message>
         <location filename="../gui/FileTransfer/BannedFilesDialog.cpp" line="+64"/>
         <source>Remove</source>
-        <translation type="unfinished">Entfernen</translation>
+        <translation>Entfernen</translation>
     </message>
 </context>
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation>Kommentar</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>1 comment</source>
-        <translation type="unfinished"></translation>
+        <translation>1 Kommentar</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 comments</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Kommentare</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>No comments yet. Click to add one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Noch keine Kommentare. Klicken Sie, um einen hinzuzufügen.</translation>
     </message>
     <message>
         <location line="+85"/>
         <source>Loading</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Der Autor dieser Nachricht (mit der ID %1) ist gesperrt.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
-        <translation type="unfinished"></translation>
+        <translation>vor</translation>
     </message>
 </context>
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
-        <translation type="unfinished">Daumen hoch</translation>
+        <translation>Daumen hoch</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Vote down</source>
-        <translation type="unfinished">Daumen runter</translation>
+        <translation>Daumen runter</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>\/</source>
-        <translation type="unfinished">\/</translation>
+        <translation>\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
-        <translation type="unfinished"></translation>
+        <translation>Gepostet von</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Toggle Message Read Status</source>
-        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
+        <translation>Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>PictureLabel</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+25"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Comments</source>
-        <translation type="unfinished">Kommentare</translation>
+        <translation>Kommentare</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation>Teilen</translation>
     </message>
 </context>
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
-        <translation type="unfinished">Daumen hoch</translation>
+        <translation>Daumen hoch</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Vote down</source>
-        <translation type="unfinished">Daumen runter</translation>
+        <translation>Daumen runter</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>\/</source>
-        <translation type="unfinished">\/</translation>
+        <translation>\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
-        <translation type="unfinished"></translation>
+        <translation>Zum Betrachten des Bildes anklicken</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>PictureLabel_compact</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Posted by</source>
-        <translation type="unfinished"></translation>
+        <translation>Gepostet von</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Comments</source>
-        <translation type="unfinished">Kommentare</translation>
+        <translation>Kommentare</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Expand</source>
-        <translation type="unfinished">Erweitern</translation>
+        <translation>Erweitern</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation>Teilen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
-        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
+        <translation>Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
 </context>
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
-        <translation type="unfinished">Das gefällt mir</translation>
+        <translation>Das gefällt mir</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>I dislike this</source>
-        <translation type="unfinished">Das gefällt mir nicht</translation>
+        <translation>Das gefällt mir nicht</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Toggle Message Read Status</source>
-        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
+        <translation>Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Avatar</source>
-        <translation type="unfinished">Avatar</translation>
+        <translation>Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer Kommentar</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
-        <translation type="unfinished">Erweitern</translation>
+        <translation>Erweitern</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Set as read and remove item</source>
-        <translation type="unfinished">Als gelesen markieren und Eintrag entfernen</translation>
+        <translation>Als gelesen markieren und Eintrag entfernen</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Remove Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Eintrag entfernen</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="-116"/>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation>Kommentar</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Comments </source>
-        <translation type="unfinished"></translation>
+        <translation>Kommentare </translation>
     </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
-        <translation type="unfinished">Verbergen</translation>
+        <translation>Verbergen</translation>
     </message>
 </context>
 <context>
@@ -1426,17 +1185,17 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+10"/>
         <source>Legend:</source>
-        <translation type="unfinished"></translation>
+        <translation>Legende:</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Current</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuell</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Total</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesamt</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1446,57 +1205,63 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+8"/>
         <source>Default</source>
-        <translation type="unfinished">Standard</translation>
+        <translation>Standard</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Dark</source>
-        <translation type="unfinished"></translation>
+        <translation>Dunkel</translation>
     </message>
 </context>
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Kanäle</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Load Emoticons</source>
-        <translation type="unfinished"></translation>
+        <translation>Emoticons laden</translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Beiträge im Hintergrund laden (Thread)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation>Downloads</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation>Maximale Größe des automatischen Downloads (in GB)</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
-        <translation>Jeden Kanal in einem neuen Reiter öffnen.</translation>
+        <translation>Jeden Kanal in einem neuen Reiter öffnen</translation>
     </message>
 </context>
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>file</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei</translation>
     </message>
 </context>
 <context>
@@ -1506,66 +1271,68 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <source>Use mouse to center and zoom
 into the image, so as to
  crop it for your post.</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzen Sie die Maus zum Zentrieren und Zoomen
+in das Bild hinein, um es für
+ um es für Ihren Beitrag anzupassen.</translation>
     </message>
 </context>
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
-        <translation type="unfinished">Das gefällt mir</translation>
+        <translation>Das gefällt mir</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>I dislike this</source>
-        <translation type="unfinished">Das gefällt mir nicht</translation>
+        <translation>Das gefällt mir nicht</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Toggle Message Read Status</source>
-        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
+        <translation>Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Avatar</source>
-        <translation type="unfinished">Avatar</translation>
+        <translation>Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer Kommentar</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
-        <translation type="unfinished">Erweitern</translation>
+        <translation>Erweitern</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Set as read and remove item</source>
-        <translation type="unfinished">Als gelesen markieren und Eintrag entfernen</translation>
+        <translation>Als gelesen markieren und Eintrag entfernen</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Remove Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Artikel entfernen</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -1573,25 +1340,15 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
-        <translation type="unfinished">Verbergen</translation>
+        <translation>Verbergen</translation>
     </message>
 </context>
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
@@ -1608,7 +1365,7 @@ into the image, so as to
     <message>
         <location line="+1"/>
         <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Person verbannen (setzt negative Meinung)</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1673,17 +1430,17 @@ into the image, so as to
     <message>
         <location line="-2"/>
         <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
+        <translation>Neutrale Meinung abgeben</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
+        <translation>Eine positive Meinung abgeben</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show author in people tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Autor auf der Registerkarte Personen anzeigen</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -1693,18 +1450,18 @@ into the image, so as to
     <message>
         <location line="+67"/>
         <source>Leave this chat room (Unsubscribe)</source>
-        <translation type="unfinished"></translation>
+        <translation>Diesen Chatraum verlassen (Abmelden)</translation>
     </message>
     <message>
         <location line="+197"/>
         <source>Welcome to chat room %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Willkommen im Chatraum %1</translation>
     </message>
     <message>
         <location line="+164"/>
         <location line="+2"/>
         <source>Room chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Chatraum</translation>
     </message>
     <message>
         <location line="+191"/>
@@ -1751,7 +1508,7 @@ into the image, so as to
         <location line="+5"/>
         <location line="+21"/>
         <source>Chat room management</source>
-        <translation type="unfinished"></translation>
+        <translation>Chatraum-Verwaltung</translation>
     </message>
     <message>
         <location line="-21"/>
@@ -1766,23 +1523,23 @@ into the image, so as to
     <message>
         <location line="+0"/>
         <source>Do you want to unsubscribe to this chat room?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie sich von diesem Chatraum abmelden?</translation>
     </message>
     <message>
         <location line="+75"/>
         <source>Redock to Main window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zurückdocken zum Hauptfenster</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Undock to a new window</source>
-        <translation type="unfinished"></translation>
+        <translation>Abdocken in ein neues Fenster</translation>
     </message>
 </context>
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Chatlobby anzeigen</translation>
     </message>
@@ -1794,50 +1551,35 @@ into the image, so as to
         <source>Chats</source>
         <translation>Chats</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Du hast %1 neue Nachrichten</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Du hast %1 neue Nachricht</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 neue Nachrichten</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 neue Nachricht</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 Erwähnungen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 mention</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 Erwähnung</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 mentions</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Erwähnungen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 mention</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Erwähnung</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Unbekannte Lobby</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Alle entfernen</translation>
     </message>
@@ -1845,13 +1587,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Anzahl</translation>
     </message>
@@ -1861,29 +1603,7 @@ into the image, so as to
         <translation>Thema</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Private Chaträume</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Öffentliche Chaträume</translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Chatraum erstellen</translation>
     </message>
@@ -1893,14 +1613,14 @@ into the image, so as to
         <translation>Diesen Raum verlassen</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Create an identity and enter this chat room</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellen Sie eine Identität und betreten Sie diesen Chatraum</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1910,12 +1630,12 @@ into the image, so as to
     <message>
         <location line="+5"/>
         <source>Enter this chat room as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Diesen Chatraum betreten als...</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+516"/>
@@ -1950,12 +1670,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 lädt dich in den Chatraum namens %2 ein</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1965,31 +1685,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Chatlobby erstellen</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Kein Thema angegeben]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Info zur ausgewählten Lobby</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Privat</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Öffentlich</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>Anonyme Kennungen akzeptiert</translation>
     </message>
@@ -1999,42 +1719,25 @@ Double click a chat room to enter and chat.</source>
         <translation>Autom. Abonnement entfernen</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Autom. Abonnement hinzufügen</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Chatlobbys durchsuchen</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Name durchsuchen</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Abonniert</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Spalten</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Nein</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2046,47 +1749,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Chatraumname:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>Chatraumkennung:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Thema:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Sicherheit:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Nachbarn:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
@@ -2101,13 +1804,24 @@ Double click a chat room to enter and chat.</source>
         <translation>Keine anonymen Kennungen</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation>Privat abonniert</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation>Öffentlich abonniert</translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>Spalte</translation>
@@ -2121,7 +1835,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Eintrag entfernen</translation>
     </message>
@@ -2166,46 +1880,22 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Fernchat</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Jeder</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Kontakte</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Niemand</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Verschlüsselten Fernchat annehmen von</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Chat-Einstellungen</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Emoticons für privaten Chat</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Emoticons für Gruppenchat</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Angepasste Schriftarten aktivieren</translation>
     </message>
@@ -2214,10 +1904,6 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>Angepasste Schriftgröße aktivieren</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Minimale Schriftgröße</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2229,9 +1915,9 @@ Double click a chat room to enter and chat.</source>
         <translation>Kursivschrift aktivieren</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Allgemeine Einstellungen</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -2254,22 +1940,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Eingebettete Bilder laden</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Chatlobby</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Blinkendes Reitersymbol</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>Do not send typing notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Privater Chat</translation>
+        <translation>Senden Sie keine Tippbenachrichtigungen</translation>
     </message>
     <message>
         <location line="+206"/>
@@ -2292,11 +1970,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Blinkendes Fenster/Reitersymbol</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Chat-Schriftart</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Chat-Schriftart wählen</translation>
     </message>
@@ -2306,14 +1980,10 @@ Double click a chat room to enter and chat.</source>
         <translation>Chat-Schriftart:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Verlauf</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stil</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2328,19 +1998,15 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation>Variante:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Gruppenchat</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Privater Chat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie Ihre Standardschriftart für Chat.</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -2402,35 +2068,51 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In diesem Tab kannst du für die verschiedenen Chatsysteme festlegen, wieviele Nachrichten RetroShare auf Festplatte gespeichert hält, und wieviel der vorangehenden Unterhaltung angezeigt wird. Die maximale Speicherzeit erlaubt das Verwerfen alter Nachrichten und verhindert das unberechenbare Füllen des Unterhaltungsverlaufs (z. B. Chatlobbys und Fernchat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Chatlobbys</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Aktiviert:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation>Suchen</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+97"/>
         <source>Minimum displayed font size</source>
+        <translation>Angezeigte Mindestschriftgröße</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
-        <translation type="unfinished">Chaträume</translation>
+        <translation>Chaträume</translation>
     </message>
     <message>
         <location line="-470"/>
@@ -2440,7 +2122,7 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+3"/>
         <source>Case sensitive search</source>
-        <translation type="unfinished"></translation>
+        <translation>Groß- und Kleinschreibung beachten</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2467,30 +2149,30 @@ Double click a chat room to enter and chat.</source>
         <location line="+202"/>
         <location line="+451"/>
         <source>Author:</source>
-        <translation type="unfinished"></translation>
+        <translation>Autor:</translation>
     </message>
     <message>
         <location line="-629"/>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschreibung:</translation>
     </message>
     <message>
         <location line="-605"/>
         <source>Accept chat from:</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptiere Chat von:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Contacts only</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur Kontakte</translation>
     </message>
     <message>
         <location line="+43"/>
         <location line="+137"/>
         <source>Enable Emoticons</source>
-        <translation type="unfinished"></translation>
+        <translation>Emoticons aktivieren</translation>
     </message>
     <message>
         <location line="-6"/>
@@ -2511,7 +2193,7 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+62"/>
         <source>Number of messages restored  (0 = off):</source>
-        <translation>Anzahl wiederhergestelter Nachrichten (0 = aus)</translation>
+        <translation>Anzahl wiederhergestellter Nachrichten (0 = aus):</translation>
     </message>
     <message>
         <location line="+74"/>
@@ -2524,11 +2206,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Maximale Speicherzeit in Tagen (0 = alle behalten)</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Suchgrundeinstellung</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Groß-/Kleinschreibung unterscheiden</translation>
     </message>
@@ -2567,10 +2245,6 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation>Grenzwert für automatische Suche</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Standardidentität für Chatlobbys</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2599,7 +2273,7 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location filename="../gui/settings/ChatPage.h" line="+44"/>
         <source>Chats</source>
-        <translation type="unfinished">Chats</translation>
+        <translation>Chats</translation>
     </message>
 </context>
 <context>
@@ -2638,7 +2312,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Chat anzeigen</translation>
     </message>
@@ -2653,40 +2327,40 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+28"/>
         <source>You have %1 mentions</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 Erwähnungen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 mention</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 Erwähnung</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 mentions</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Erwähnungen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 mention</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Erwähnung</translation>
     </message>
 </context>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
         <location line="+207"/>
         <source>Insert sticker</source>
-        <translation type="unfinished"></translation>
+        <translation>Sticker einfügen</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>Set font &amp; color</source>
-        <translation type="unfinished"></translation>
+        <translation>Schriftart und Farbe einstellen</translation>
     </message>
     <message>
         <location line="+69"/>
@@ -2709,14 +2383,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat-Menü&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
-        <translation type="unfinished"></translation>
+        <translation>Emoticon einfügen</translation>
     </message>
     <message>
         <location line="+49"/>
@@ -2794,15 +2468,10 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation>Horizontale Linie einfügen</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Bild speichern</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
-        <translation type="unfinished"></translation>
+        <translation>Sticker importieren</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -2818,7 +2487,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+12"/>
         <location line="+3"/>
         <source>Don&apos;t replace tag with Emote Icon.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ersetzen Sie den Tag nicht durch das Emote-Symbol.</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2828,15 +2497,15 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+12"/>
         <source>Send as CommonMark</source>
-        <translation type="unfinished"></translation>
+        <translation>Als CommonMark senden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Text will be formatted using CommonMark.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Text wird mit CommonMark formatiert.</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>tippt...</translation>
     </message>
@@ -2851,15 +2520,16 @@ nach der HTML-Konvertierung.</translation>
         <location line="+2"/>
         <source>Warning: This message is too big of %1 characters
 after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß
+nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+274"/>
         <source>Choose your font.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie Ihre Schriftart.</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Möchtest du wirklich den Nachrichtenverlauf löschen?</translation>
     </message>
@@ -2891,7 +2561,7 @@ after HTML conversion.</source>
     <message>
         <location line="+0"/>
         <source>Messages you send will be delivered after Friend is again Online.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die von Ihnen gesendeten Nachrichten werden zugestellt, sobald Ihr Freund wieder online ist.</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2909,7 +2579,7 @@ after HTML conversion.</source>
         <translation>antwortet möglicherweise nicht, da der Status auf &quot;Beschäftigt&quot; gesetzt wurde</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Unter Berücksichtigung von Groß-/Kleinschreibung suchen</translation>
     </message>
@@ -2931,7 +2601,7 @@ after HTML conversion.</source>
         <translation>Nach Finden von X Elementen mit dem Einfärben nicht aufhören (benötigt mehr CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Vorherige finden &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Strg+Umschalt+G&lt;/i&gt;</translation>
     </message>
@@ -2946,16 +2616,12 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Finden &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Strg+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Status)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Schriftart &amp; Textfarbe festlegen</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Datei anhängen</translation>
     </message>
@@ -2971,28 +2637,29 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Markiere diesen ausgewählten Text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Strg+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
-        <translation type="unfinished"></translation>
+        <translation>Personen-ID: </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 Double click on it to add his name on text writer.</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
-        <translation type="unfinished"></translation>
+        <translation> Nicht signiert</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>Elemente gefunden.</translation>
     </message>
@@ -3012,7 +2679,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Hier eine Nachricht eingeben</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Nach Finden von</translation>
     </message>
@@ -3038,7 +2705,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Detailanzeige:</translation>
     </message>
@@ -3060,7 +2727,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Persönliche Kreise</translation>
     </message>
@@ -3086,7 +2753,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Freunde</translation>
     </message>
@@ -3146,7 +2813,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Freunde von Freunden</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Externe Kreise (Admin)</translation>
     </message>
@@ -3162,7 +2829,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Kreise</translation>
     </message>
@@ -3193,7 +2860,7 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location line="+187"/>
         <source>Current address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuelle Adresse:</translation>
     </message>
     <message>
         <location line="+37"/>
@@ -3214,47 +2881,52 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Fehler: Kann Nachbardetails nicht ermitteln.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Diese Retroshare-ID enthält:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Sie können diese Retroshare ID verwenden, um neue Freunde zu bekommen. Schicken Sie sie per E-Mail, oder geben Sie sie von Hand zu Hand.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../gui/connect/ConfCertDialog.ui" line="-212"/>
@@ -3262,7 +2934,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Verschlüsselung</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>Nicht verbunden</translation>
     </message>
@@ -3309,12 +2981,12 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location line="+59"/>
         <source>Connectivity</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnektivität</translation>
     </message>
     <message>
         <location line="+95"/>
         <source>List of known addresses:</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste bekannter Adressen:</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -3325,12 +2997,12 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location line="+18"/>
         <source>short format</source>
-        <translation type="unfinished"></translation>
+        <translation>Kurzformat</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Include IP history</source>
-        <translation type="unfinished"></translation>
+        <translation>IP-Verlauf einbeziehen</translation>
     </message>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-104"/>
@@ -3344,25 +3016,17 @@ Double click on it to add his name on text writer.</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Dieses Zertifikat enthält:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;eine &lt;b&gt;Netzknoten-ID&lt;/b&gt; und &lt;b&gt;Name&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">eine &lt;b&gt;Onion-Adresse&lt;/b&gt; und &lt;b&gt;Port&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">eine &lt;b&gt;IP-Adresse&lt;/b&gt; und &lt;b&gt;Port&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>Du kannst dieses Zertifikat zum Schließen von neuen Freundschaften verwenden. Versende es per E-Mail oder gib es von Hand zu Hand.</translation>
     </message>
@@ -3377,7 +3041,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dies ist die Verschlüsselungsmethode die von &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt; benutzt wird. Die Verbindung zu befreundeten Netzknoten ist immer stark verschlüsselt.&lt;/p&gt;&lt;p&gt;Und wenn DHE vorhanden ist dann verwendet die Verbindung noch dazu&lt;/p&gt;&lt;p&gt;&amp;quot;Perfect Forward Secrecy&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>mit</translation>
     </message>
@@ -3394,104 +3058,16 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Assistent um sich zu einem Freund zu verbinden</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Einen neuen Freund hinzufügen</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Du hast eine Datei mit einem Zertifikat deines Freund bekommen</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">Ausgewählte Freunde von Freunden hinzu&amp;fügen</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Signaturen einschließen</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Dein Zertifikat in die Zwischenablage kopieren</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Zertifikat als Datei speichern</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Das Standard-E-Mailprogramm starten</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Zertifikat-Dateien</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">In Dateien gespeicherte PGP Zertifikate benutzen.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Zertifikat eines Freundes importieren...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Du musst eine Datei mit deinem Zertifikat erstellen und deinem Freund zukommen lassen. Alternativ kannst Du auch eine Datei verwenden, die Du zuvor erstellt hast.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Mein Zertifikat exportieren...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Gib die Datei mit dem Zertifikat ein oder ziehe sie per Drag&apos;n&apos;Drop in das Fenster</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Durchsuchen</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Freunde von Freunden</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Wähle nun aus, wen du als Freund hinzufügen möchtest.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Zeige mir: </translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Diese Nachbarn zu deinen Freunden hinzufügen</translation>
+        <translation>Öffnen Sie das Zertifikat Ihres Freundes von der Datei</translation>
     </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare-ID</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">RetroShare-ID benutzen, um einen Freund aus deinem Netzwerk hinzuzufügen.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">RetroShare-ID des Freundes einfügen...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">RetroShare-ID des Freundes in das Feld unten einfügen</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">RetroShare-ID des Freundes eingeben, z. B. Nachbar@BDE8D16A46D938CF </translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3500,7 +3076,7 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location line="+3"/>
         <source>Invite your Friends from other Networks to RetroShare.</source>
-        <translation type="unfinished"></translation>
+        <translation>Laden Sie Ihre Freunde aus anderen Netzwerken zu RetroShare ein.</translation>
     </message>
     <message>
         <location line="+39"/>
@@ -3533,27 +3109,7 @@ Double click on it to add his name on text writer.</source>
         <translation>E-Mail</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Freunde per E-Mail einladen</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Gib die E-Mail-Adressen deines Freundes an (mehrere Adressen müssen mit Semikolon getrennt werden)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">E-Mail-Adresse deines Freundes:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Gib die E-Mail-Adresse deines Freundes ein</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Betreff:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3569,60 +3125,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Details der Anfrage</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Nachbardetails</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">E-Mail:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Netzknoten:</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Zertifikat manuell eingeben</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">RetroShare-Kennung manuell eingeben</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Viele Freunde einander empfehlen</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">RetroShare-Zertifikat</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Zertifikat einfügen</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Freund zur Gruppe hinzufügen:</translation>
     </message>
@@ -3632,48 +3160,54 @@ Double click on it to add his name on text writer.</source>
         <translation>Freund authentifizieren (PGP-Schlüssel unterzeichnen)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte fügen Sie unten die Retroshare-ID Ihres Freundes ein</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Paste ID of your friend from Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>ID eines Freundes aus der Zwischenablage einfügen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfügen</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Please, paste your friend&apos;s Retroshare ID into the box below</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte fügen Sie die Retroshare-ID Ihres Freundes in das unten stehende Feld ein</translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation>Unterzeichner:</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation>Bekannte IP:</translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Als Freund hinzufügen, zu dem verbunden wird</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Abschließen-Knopf anklicken, um die Anfrage zu akzeptieren</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Entschuldigung, es trat ein Fehler auf</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Here is the error message:</source>
-        <translation>Dies ist die Fehlermeldung: </translation>
+        <translation>Dies ist die Fehlermeldung:</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -3686,39 +3220,34 @@ Double click on it to add his name on text writer.</source>
         <translation>Details über deinen Freund:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Schlüssel-Gültigkeit:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Unterzeichner</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Dieser Nachbar ist bereits in deiner Freundliste vorhanden. Das nochmalige Hinzufügen ändert nur seine IP.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
-        <translation type="unfinished"></translation>
+        <translation>Um die Freundschaftsanfrage anzunehmen, klicken Sie auf die Schaltfläche Annehmen.</translation>
     </message>
     <message>
         <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-123"/>
         <source>Abnormal size read is bigger than memory block.</source>
-        <translation>Größe der eingehenden Daten ist größer als Speicherblock</translation>
+        <translation>Größe der eingehenden Daten ist größer als Speicherblock.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3757,49 +3286,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Das Zertifikat konnte nicht geladen werden</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Kann Nachbardetails von PGP-Schlüssel %1 nicht abrufen</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Jeden Nachbarn, den ich nicht unterzeichnet habe</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Freunde meiner Freunde, welche mir schon vertrauen</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Unterzeichnete Nachbarn, die geblockt sind</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Nachbarname</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Auch unterzeichnet von</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Nachbar-ID</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">Zertifikat scheint gültig zu sein</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Kein gültiges RetroShare-Zertifikat!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare-Einladung</translation>
     </message>
@@ -3819,27 +3316,27 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
         <source>Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptieren</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>You have already signed this key</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben diesen Schlüssel bereits unterzeichnet</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3872,82 +3369,42 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Du hast eine Freundschaftsanfrage von</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Identity creation failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Identitätserstellung fehlgeschlagen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ohne Ihr Profilpasswort können Sie keine mit Ihrem Profil verknüpfte Identität erstellen.</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Signature failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterschrift fehlgeschlagen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Signature failed. Uncheck the key signature box if you want to make friends without signing the friends&apos; certificate</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur fehlgeschlagen. Deaktivieren Sie das Kontrollkästchen für die Schlüsselsignatur, wenn Sie Freundschaften schließen möchten, ohne das Zertifikat der Freunde zu signieren</translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Gültige Retroshare-ID</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Valid certificate</source>
-        <translation type="unfinished"></translation>
+        <translation>Gültiges Zertifikat</translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Fehler beim Laden des Zertifikats: Datei %1 nicht gefunden</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Der Nutzer %1 ist nicht in deinem Netzwerk verfügbar</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Neues Zertifikatsformat benutzen (sicherer und robuster)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Altes (rückwärtskompatibles) Zertifikatsformat benutzen</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Signaturen entfernen</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">RetroShare-Einladung</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Verbindungshilfe</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Du kannst diesen Text kopieren und an deinen Freund per E-Mail senden oder über einen anderen Weg zukommen lassen</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Dein Zertifikat wurde in die Zwischenablage kopiert. Du kannst es per E-Mail oder auf andere Weise an deinen Freund senden.</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Speichern unter...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3986,11 +3443,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Keine ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Wenn verfügbar als direkte Quelle nutzen</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>IP-Adr.:</translation>
     </message>
@@ -4000,7 +3453,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP-Adresse</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Erweiterte Optionen anzeigen</translation>
     </message>
@@ -4019,41 +3472,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Viele Freunde einander empfehlen</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Freundempfehlungen</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Nachricht:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Freunde empfehlen</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">An</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Bitte mindestens einen Freund als Empfehlung wählen.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Bitte mindestens einen Empfänger wählen.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Schlüssel zum Schlüsselbund hinzufügen.</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Schlüssel ist bereits in deinem Schlüsselbund.</translation>
     </message>
@@ -4067,7 +3492,7 @@ even if you don&apos;t make friends.</source>
 Selbst wenn ihr euch nicht anfreundet, könnte es nützlich sein, um Fernnachrichten an diesen Teilnehmer zu senden.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>
 Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netze inkompatibel sind.</translation>
@@ -4103,7 +3528,7 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
         <translation>IP zu Whitelist hinzufügen</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>Zertifikat enthält keine IP!</translation>
     </message>
@@ -4113,27 +3538,10 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
         <translation>&lt;p&gt;Dieses Zertifikat enthält keine IP. Du wirst auf Discovery und DHT angewiesen sein un sie herauszufinden. Da du  Whitelist-Freigabe forderst wird der Nachbar eine Sicherheitswarnung im Neuigkeitenreiter auslösen. Von dort kannst die die IP freigeben.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished">[Unbekannt]</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Hinzugefügt mit Zertifikat von %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Zertifikat deines Freundes aus der Zwischenablage einfügen</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Fehler beim Laden des Zertifikats: Datei %1 konnte nicht gelesen werden</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Fehler beim Laden des Zertifikats: Mit %1 stimmt etwas nicht</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4195,7 +3603,7 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>UDP-Aufbau</translation>
     </message>
@@ -4207,7 +3615,7 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
     <message>
         <location line="+132"/>
         <source>Status</source>
-        <translation type="unfinished">Status</translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -4223,7 +3631,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Verbindungsassistent</translation>
     </message>
@@ -4233,17 +3641,20 @@ p, li { white-space: pre-wrap; }
         <translation>Ungültige Peer-ID</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Unbekannter Zustand</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Hinter Symmetrischem NAT</translation>
     </message>
@@ -4253,12 +3664,14 @@ p, li { white-space: pre-wrap; }
         <translation>Hinter NAT &amp; kein DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Netzneustart</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>Hinter NAT</translation>
     </message>
@@ -4268,7 +3681,8 @@ p, li { white-space: pre-wrap; }
         <translation>Kein DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>NETZZUSTAND GUT!</translation>
     </message>
@@ -4293,7 +3707,7 @@ p, li { white-space: pre-wrap; }
         <translation>RS-Nachbarn werden gesucht</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Suche erfordert DHT</translation>
     </message>
@@ -4585,7 +3999,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bitte versuche noch einmal ein vollständiges Zertifikat zu importieren</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4593,7 +4007,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/V</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>NICHT VERIFIZIERBARE WEITERLEITUNG!</translation>
     </message>
@@ -4603,7 +4018,7 @@ p, li { white-space: pre-wrap; }
         <translation>NICHT VERIFIZIERBARE WEITERLEITUNG &amp; KEIN DHT</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Suchen</translation>
     </message>
@@ -4639,12 +4054,12 @@ p, li { white-space: pre-wrap; }
         <translation>Kreisdetails</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4661,22 +4076,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+40"/>
         <source>Only &amp;visible to members of:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur &amp; sichtbar für Mitglieder von:</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>IDs</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Signed by friend node</source>
-        <translation type="unfinished"></translation>
+        <translation>Signiert von Freund Knoten</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -4684,18 +4099,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filter</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Eingeladene Mitglieder</translation>
     </message>
@@ -4710,15 +4125,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bekannte Personen</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Typ</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
@@ -4740,7 +4147,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Publicly distributed circles are visible to your friends, which will get to know the circle data (Creator, members, etc)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Öffentlich verteilte Kreise sind für deine Freunde sichtbar, die dadurch die Daten des Kreises ( Ersteller, Mitglieder, etc)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -4758,23 +4165,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Nur sichtbar für Mitglieder von:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Bitte einen Namen für deinen Kreis vergeben.</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Kein Einschränkungskreis ausgewählt</translation>
     </message>
@@ -4784,12 +4187,24 @@ p, li { white-space: pre-wrap; }
         <translation>Keine Einschränkungen für Kreis gewählt</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Unbekannt]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
@@ -4799,7 +4214,7 @@ p, li { white-space: pre-wrap; }
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Suchen</translation>
@@ -4814,10 +4229,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Unterzeichnet</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Von bekannten Netzknoten unterzeichnet</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4834,10 +4245,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP-Identität</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Anonyme ID</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4860,17 +4267,13 @@ p, li { white-space: pre-wrap; }
         <translation>Neuen Kreis erstellen</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Erstellen</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP-verknüpfte ID</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Mitglied hinzufügen</translation>
     </message>
@@ -4889,7 +4292,7 @@ p, li { white-space: pre-wrap; }
         <translation>Gruppe erstellen</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Gruppenname:</translation>
     </message>
@@ -4906,7 +4309,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/groups/CreateGroup.cpp" line="-32"/>
         <source>To be defined</source>
-        <translation type="unfinished"></translation>
+        <translation>Noch zu definieren</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4924,7 +4327,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Neuer Kanalbeitrag</translation>
     </message>
@@ -4934,44 +4337,44 @@ p, li { white-space: pre-wrap; }
         <translation>Kanalbeitrag</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
-        <translation type="unfinished"></translation>
+        <translation>Posten</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+89"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose aspect ratio policy. In &apos;Auto&apos; mode, the most suitable aspect ratio is chosen for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wählen Sie das Seitenverhältnis. Im Modus &quot;Auto&quot; wird das am besten geeignete Seitenverhältnis für Sie ausgewählt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Auto</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>1:1</source>
-        <translation type="unfinished">1:1</translation>
+        <translation>1:1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>3:4</source>
-        <translation type="unfinished">3:4</translation>
+        <translation>3:4</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>16:9</source>
-        <translation type="unfinished">16:9</translation>
+        <translation>16:9</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove Thumbnail&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vorschaubild entfernen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+57"/>
@@ -4995,23 +4398,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Benutze Drag &amp; Drop / Datei hinzufügen Knopf, um Hashwert für neue Dateien zu erstellen.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; RetroShare-Links von deinen Freigaben kopieren/einfügen&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Datei hinzufügen</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Miniaturbild hinzufügen</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Nachricht</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Betreff:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5027,27 +4418,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-116"/>
         <source>Title</source>
-        <translation type="unfinished">Titel</translation>
+        <translation>Titel</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hide&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ausblenden&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add File&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Datei hinzufügen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paste retroshare link(s) from clipboard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare-Link(s) aus der Zwischenablage einfügen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove File&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Datei entfernen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -5088,7 +4479,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+128"/>
         <source>Attachments (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhänge (%1)</translation>
     </message>
     <message>
         <location line="+47"/>
@@ -5097,38 +4488,34 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Datei ist bereits in diesem Beitrag enthalten:</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
-        <translation type="unfinished"></translation>
+        <translation>Post bezieht sich auf nicht freigegebene Dateien</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This post contains files that you are currently not sharing. Do you still want to post?</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Beitrag enthält Dateien, die Sie derzeit nicht freigeben. Möchten Sie trotzdem posten?</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Post refers to temporary shared files</source>
-        <translation type="unfinished"></translation>
+        <translation>Beitrag bezieht sich auf temporäre freigegebene Dateien</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Datei wurde schon hinzugefügt und gehasht</translation>
+        <translation>Die folgenden Dateien werden nur für 30 Tage freigegeben. Denken Sie darüber nach, sie in ein freigegebenes Verzeichnis aufzunehmen.</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -5136,55 +4523,54 @@ p, li { white-space: pre-wrap; }
         <translation>Bitte einen Betreff hinzufügen</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation>Beitrag kann nicht veröffentlicht werden</translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Miniaturbild laden</translation>
     </message>
     <message>
         <location line="+119"/>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Hide</source>
-        <translation type="unfinished">Verbergen</translation>
+        <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Massendaten erzeugen</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Möchtest du wirklich %1 Nachrichten erzeugen?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Du bist dabei, Dateien hinzuzufügen, die du nicht freigegeben hast. Willst du das wirklich tun?</translation>
     </message>
     <message>
         <location line="-171"/>
         <source>Edit Channel Post</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalbeitrag bearbeiten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update</source>
-        <translation type="unfinished">Aktualisieren</translation>
+        <translation>Aktualisieren</translation>
     </message>
     <message>
         <location line="+110"/>
         <source>Close this window?</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses Fenster schließen?</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Do you really want to discard your post?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wollen Sie Ihren Beitrag wirklich verwerfen?</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -5196,7 +4582,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Forumsnachricht veröffentlichen</translation>
     </message>
@@ -5205,10 +4591,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Betreff</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5229,14 +4611,14 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+93"/>
         <source>Attach a Picture</source>
-        <translation type="unfinished">Bild anhängen</translation>
+        <translation>Bild anhängen</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -5249,14 +4631,14 @@ p, li { white-space: pre-wrap; }
         <translation>Du kannst Dateien mit Drag&apos;n&apos;Drop anhängen</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
-        <translation type="unfinished"></translation>
+        <translation>Posten</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+0"/>
@@ -5266,42 +4648,42 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>Edit Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht bearbeiten</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Update</source>
-        <translation type="unfinished">Aktualisieren</translation>
+        <translation>Aktualisieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Kein Forum</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>Als Antwort auf</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
-        <translation type="unfinished">Titel</translation>
+        <translation>Titel</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -5323,13 +4705,14 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+41"/>
         <source>Cancel Forum Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Forum-Nachricht abbrechen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Forum Message has not been sent yet!
 Do you want to discard this message?</source>
-        <translation type="unfinished"></translation>
+        <translation>Forum Nachricht wurde noch nicht gesendet!
+Möchten Sie diese Nachricht verwerfen?</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -5339,21 +4722,21 @@ Do you want to discard this message?</source>
     <message>
         <location line="+9"/>
         <source>Load Picture File</source>
-        <translation type="unfinished">Bilddatei laden</translation>
+        <translation>Bilddatei laden</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>Keine kompatible Kennung für dieses Forum</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>None of your identities is allowed to post in this forum. This could be due to the forum being limited to a circle that contains none of your identities, or forum flags requiring a PGP-signed identity.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Ihrer Identitäten darf in diesem Forum schreiben. Dies könnte daran liegen, dass das Forum auf einen Kreis beschränkt ist, der keine Ihrer Identitäten enthält, oder dass Forum-Flags eine PGP-signierte Identität erfordern.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Massendaten erzeugen</translation>
     </message>
@@ -5362,10 +4745,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Möchtest du wirklich %1 Nachrichten erzeugen?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Senden</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5380,25 +4759,9 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Chatlobby erstellen</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Eine Chatlobby ist eine dezentralisierte und anonyme Chatgruppe. Alle Teilnehmer sehen alle Nachrichten. Wenn die Lobby erstellt wurde, kannst du Freunde über den &quot;Freunde&quot;-Reiter einladen.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Lobbyname:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Lobbythema:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein Chatroom ist eine dezentralisierte und anonyme Chatgruppe. Alle Teilnehmer erhalten alle Nachrichten. Sobald der Raum erstellt ist, Siekönnen  andere Freundesknoten mit der Schaltfläche &quot;Einladen&quot; oben rechts einladen.</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -5431,17 +4794,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
-        <translation type="unfinished">Erstellen</translation>
+        <translation>Erstellen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>erfordert PGP-signierte Identitäten</translation>
     </message>
@@ -5456,11 +4819,7 @@ Do you want to discard this message?</source>
         <translation>Wähle die Freunde mit denen du chatten möchtest.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Freunde einladen</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Chatraum erstellen</translation>
@@ -5468,12 +4827,12 @@ Do you want to discard this message?</source>
     <message>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+8"/>
         <source>Put a sensible chat room name here</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie hier einen sinnvollen Chatroom-Namen ein</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Set a descriptive topic here</source>
-        <translation type="unfinished"></translation>
+        <translation>Legen Sie hier ein beschreibendes Thema fest</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -5481,7 +4840,7 @@ Do you want to discard this message?</source>
         <translation>Kontakte:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Zu verwendende Identität:</translation>
     </message>
@@ -5489,17 +4848,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Öffentliche Information</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
@@ -5509,12 +4868,12 @@ Do you want to discard this message?</source>
         <translation>Ort-ID:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Softwareversion:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Online seit:</translation>
     </message>
@@ -5534,12 +4893,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5549,7 +4903,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Andere Informationen</translation>
     </message>
@@ -5559,17 +4913,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished">Profil</translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Zertifikat</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5579,11 +4928,7 @@ Do you want to discard this message?</source>
         <translation>Signaturen einschließen</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Schlüssel in Datei sichern</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Identität exportieren</translation>
     </message>
@@ -5657,33 +5002,33 @@ und den Import zum Laden verwenden</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP-Fingerabdruck</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Netzknoteninformation</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP-ID :</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Freundknoten:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5700,7 +5045,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>Include IP history</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">IP-Verlauf einbeziehen</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -5722,14 +5067,6 @@ und den Import zum Laden verwenden</translation>
         <source>Node</source>
         <translation>Netzknoten</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Neuen Netzknoten erstellen...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">Statistikfenster anzeigen</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5775,13 +5112,13 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+14"/>
         <source>No peer found in DHT</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Peer in DHT gefunden</translation>
     </message>
 </context>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5803,7 +5140,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+156"/>
         <source>Faster</source>
-        <translation type="unfinished">Schneller</translation>
+        <translation>Schneller</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5813,7 +5150,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source>Slower</source>
-        <translation type="unfinished">Langsamer</translation>
+        <translation>Langsamer</translation>
     </message>
     <message>
         <location line="+64"/>
@@ -6055,7 +5392,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>Restarting</source>
-        <translation type="unfinished"></translation>
+        <translation>Neustart</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -6415,7 +5752,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+59"/>
         <source>Relay</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+58"/>
@@ -6449,7 +5786,7 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Datei ausführen</translation>
     </message>
@@ -6457,38 +5794,38 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>bis</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>Groß-/Kleinschreibung ignorieren</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>TT.MM.JJJJ</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KiB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MiB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GiB</translation>
     </message>
@@ -6496,12 +5833,12 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Ausdruck Oberfläche</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Diesen Ausdruck löschen</translation>
     </message>
@@ -6663,7 +6000,7 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Bild</translation>
     </message>
@@ -6673,7 +6010,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6733,11 +6070,21 @@ und den Import zum Laden verwenden</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Dateien von Freunden</translation>
     </message>
@@ -6749,7 +6096,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source># Files</source>
-        <translation type="unfinished"></translation>
+        <translation># Dateien</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6817,17 +6164,17 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>Load emoticons (costly)</source>
-        <translation type="unfinished"></translation>
+        <translation>Emoticons laden (kostspielig)</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Minimum font size</source>
-        <translation type="unfinished">Minimale Schriftgröße</translation>
+        <translation>Minimale Schriftgröße</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Minimum text contrast</source>
-        <translation type="unfinished">Minimaler Text-Kontrast</translation>
+        <translation>Minimaler Text-Kontrast</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -6842,7 +6189,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location filename="../gui/settings/ForumPage.h" line="+40"/>
         <source>Forums</source>
-        <translation type="unfinished">Foren</translation>
+        <translation>Foren</translation>
     </message>
 </context>
 <context>
@@ -6859,7 +6206,7 @@ und den Import zum Laden verwenden</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6876,7 +6223,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>export your friendlist including groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportieren Sie Ihre Freundesliste einschließlich Gruppen</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -6886,7 +6233,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>import your friendlist including groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Importieren Sie Ihre Freundesliste einschließlich Gruppen</translation>
     </message>
     <message>
         <location line="-30"/>
@@ -6901,7 +6248,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Gruppen anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
@@ -6937,7 +6284,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Zu Gruppe hinzufügen</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Suchen</translation>
@@ -6953,7 +6300,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Nach Status sortieren</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Profildetails</translation>
     </message>
@@ -7034,7 +6381,8 @@ und den Import zum Laden verwenden</translation>
         <location line="+1"/>
         <source>
 (keep in mind that the file is unencrypted!)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+(Beachten Sie, dass die Datei unverschlüsselt ist!)</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -7053,23 +6401,25 @@ und den Import zum Laden verwenden</translation>
         <location line="+2"/>
         <source>
 at least one peer was not added</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+Mindestens ein Peer wurde nicht hinzugefügt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 at least one peer was not added to a group</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Select file for importing your friendlist from</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wählen Sie die Datei aus, aus der Sie Ihre Freundesliste importieren möchten</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Select a file for exporting your friendlist to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wählen Sie eine Datei aus, in die Sie Ihre Freundesliste exportieren möchten</translation>
     </message>
     <message>
         <location line="-6"/>
@@ -7194,7 +6544,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Freundschaftsanfrage bestätigen</translation>
     </message>
@@ -7211,10 +6561,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Suchen:</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7223,7 +6569,7 @@ at least one peer was not added to a group</source>
     <message>
         <location line="+4"/>
         <source>Filter only connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur verbundene Filtern</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -7236,7 +6582,7 @@ at least one peer was not added to a group</source>
         <translation>Freunde suchen</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Alle markieren</translation>
     </message>
@@ -7247,16 +6593,132 @@ at least one peer was not added to a group</source>
         <translation>Keine markieren</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished">Adresse</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Freund hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Statusnachricht bearbeiten</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Rundschreiben</translation>
     </message>
@@ -7339,33 +6801,38 @@ at least one peer was not added to a group</source>
         <translation>Schriftart auf den Standard setzen</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Schlüsselbund</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>RetroShare-Rundschreiben: Nachrichten werden an alle verbundenen Freunde gesendet.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation>Freundes-Server</translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Netzwerkgraph</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Stelle hier deine Statusmeldung ein.</translation>
     </message>
@@ -7383,7 +6850,17 @@ at least one peer was not added to a group</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation>SAMv3-Unterstützung ist nicht verfügbar</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Alle Felder sind mit min. 3 Zeichen zu versehen</translation>
     </message>
@@ -7393,17 +6870,12 @@ at least one peer was not added to a group</source>
         <translation>Passwörter stimmen nicht überein.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Das ist das Passwort für PGP</translation>
@@ -7424,42 +6896,38 @@ at least one peer was not added to a group</source>
         <translation>Das Erzeugen deines neuen Zertifikats ist fehlgeschlagen. Vielleicht ist das PGP-Passwort falsch?</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
-        <translation type="unfinished"></translation>
+        <translation>PGP-Schlüssellänge</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Standardknoten</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">TOR/I2P Versteckter Knoten</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Knotenname</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7476,60 +6944,61 @@ at least one peer was not added to a group</source>
     <message>
         <location line="+8"/>
         <source>advanced options</source>
-        <translation type="unfinished"></translation>
+        <translation>erweiterte Optionen</translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Dieses Profil exportieren</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Use existing profile...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorhandenes Profil verwenden...</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation>I2P verwenden</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>Los!</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Erweiterte Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>versteckte Adresse</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Dein Profil ist mit einem PGP-Schlüsselpaar verknüpft. RetroShare ignoriert derzeit DSA-Schlüssel.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dies ist dein Verbindungsport.&lt;/p&gt;&lt;p&gt;Ein Wert zwischen 1024 und 65535 &lt;/p&gt;&lt;p&gt;sollte ok sein. Du kannst ihn später ändern.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7577,30 +7046,30 @@ und den Import zum Laden verwenden</translation>
         <translation>Dein Profil wurde nicht gespeichert. Ein Fehler ist aufgetreten.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Profil importieren</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Profil und neuen Retroshare-Knoten erstellen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Create new Retroshare node</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuen Retroshare-Knoten erstellen</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor/I2P-Adresse</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzername</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7610,7 +7079,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source>Password again</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort wiederholen</translation>
     </message>
     <message>
         <location line="+107"/>
@@ -7628,7 +7097,7 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7638,12 +7107,7 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7653,12 +7117,7 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7695,22 +7154,22 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+31"/>
         <source>The GXS nickname is too short. Please input at least %1 characters.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der GXS-Spitzname ist zu kurz. Bitte geben Sie mindestens %1 Zeichen ein.</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>The GXS nickname is too long. Please reduce the length to %1 characters.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der GXS-Spitzname ist zu lang. Bitte reduzieren Sie die Länge auf %1 Zeichen.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Tor is not available</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor ist nicht verfügbar</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>No Tor executable has been found on your system. You need to install Tor before creating a hidden identity.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es wurde keine ausführbare Tor-Datei auf deinem System gefunden. Du musst Tor installieren, bevor du eine hidden Identität erstellen kannst.</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -7806,7 +7265,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>!!!The RetroShare&apos;s desktop file is missing or wrong!!!</source>
-        <translation type="unfinished"></translation>
+        <translation>!!!Die Desktop-Datei von RetroShare fehlt oder ist falsch!!!</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -7884,36 +7343,13 @@ und den Import zum Laden verwenden</translation>
         <translation>Erste Schritte</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Freunde einladen</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare ist nichts ohne deine Freunde. Klicke auf &amp;quot;Freunde einladen&amp;quot; um den Prozess zu starten.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Schicke eine Einladungsmail mit deinem &amp;quot;Zertifikat&amp;quot; an deine Freunde.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Versichere dich ihre Einladung zurück zu bekommen... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Du kannst dich nur zu deinen Freunden verbinden, wenn ihr euch gegenseitig hinzugefügt habt.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Füge deine Freunde zu RetroShare hinzu</translation>
     </message>
@@ -7923,89 +7359,103 @@ p, li { white-space: pre-wrap; }
         <translation>Freunde hinzufügen</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Zu Freunden verbinden</translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+76"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Erweitert: Öffne Firewall Port</translation>
+    </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Zu Freunden verbinden</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Erweitert: Öffne Firewall Port</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Weitere Hilfe und Support</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>RS-Website öffnen</translation>
     </message>
@@ -8030,7 +7480,7 @@ p, li { white-space: pre-wrap; }
         <translation>E-Mail-Feedback</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare-Einladung</translation>
     </message>
@@ -8080,12 +7530,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare Feedback</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>RetroShare Support</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Es hat viele Funktionen wie Chat, Nachrichten,</translation>
     </message>
@@ -8135,12 +7585,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+10"/>
         <source>Receive time</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfangszeit</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Sending time</source>
-        <translation type="unfinished"></translation>
+        <translation>Sendezeit</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -8155,7 +7605,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-25"/>
         <source>Data hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Datenhash</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -8209,7 +7659,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Gruppenchat anzeigen</translation>
     </message>
@@ -8217,7 +7667,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[Unbekannt]</translation>
     </message>
@@ -8351,22 +7801,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+34"/>
         <source>Share channel publish permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Teilen Sie die Veröffentlichungsberechtigung für dieses Kanal</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can allow your friends to publish in your channel, or send the publish permissions to another Retroshare instance of yours. Select the friends which you want to be allowed to publish in this channel. Note: it is currently not possible to revoke channel publish permissions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie können Ihren Freunden erlauben, in Ihrem Kanal zu veröffentlichen, oder die Veröffentlichungsberechtigung an eine andere Retroshare-Instanz von Ihnen senden. Wählen Sie die Freunde aus, denen Sie erlauben wollen, in diesem Kanal zu veröffentlichen. Hinweis: Es ist derzeit nicht möglich, die Veröffentlichungsberechtigung für den Kanal zu widerrufen.</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Share board admin permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Teilen Sie die Veröffentlichungsberechtigung für dieses Board</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can allow your friends to edit the board. Select them in the list below. Note: it is not possible to revoke Board admin permissions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie können Ihren Freunden erlauben, das Board zu bearbeiten. Wählen Sie sie in der Liste unten aus. Hinweis: Es ist nicht möglich, die Administratorrechte für das Board zu entziehen.</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -8383,19 +7833,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Du kannst deine Freunde von deinem Forum wissen lassen, indem du es mit ihnen teilst. Wähle die Freunde, mit denen du das Forum teilen willst.</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">Thema-Administratorrechte teilen</translation>
-    </message>
-    <message>
-        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
-        <translation type="vanished">Du kannst deinen Freunden die Bearbeitung des Themas erlauben, indem du sie in der Liste unten auswählst. Hinweis: Der Widerruf von Posted-Administratorrechten ist nicht möglich.</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
@@ -8408,12 +7850,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8435,67 +7877,51 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Search entire network...</source>
-        <translation type="unfinished"></translation>
+        <translation>Suche im gesamten Netzwerk...</translation>
     </message>
     <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Nach Name sortieren</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Nach Beliebtheit sortieren</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Nach letztem Beitrag sortieren</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie sind Administrator (ändern Sie Namen und Beschreibung über das Menü Bearbeiten)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You have been granted as publisher (you can post here!)</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie wurden als Publisher zugelassen (Sie können hier posten!)</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Id</source>
-        <translation type="unfinished">ID</translation>
+        <translation>ID</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Letzter Beitrag</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Popularity</source>
-        <translation type="unfinished">Beliebtheit</translation>
+        <translation>Beliebtheit</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sucht ein einzelnes Schlüsselwort im erreichbaren Netz.&lt;/p&gt;&lt;p&gt;Objekte, die bereits von befreundeten Knoten bereitgestellt wurden, werden nicht gemeldet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../gui/common/GroupTreeWidget.cpp" line="+4"/>
@@ -8506,7 +7932,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>und</translation>
     </message>
@@ -8642,7 +8068,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanäle</translation>
@@ -8653,22 +8079,22 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal erstellen</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Auto-Download aktivieren</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Eigene Kanäle</translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Abonnierte Kanäle</translation>
     </message>
@@ -8688,12 +8114,12 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal-Download-Verzeichnis auswählen</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Auto-Download deaktivieren</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>Herunterladeverzeichnis festlegen</translation>
     </message>
@@ -8728,22 +8154,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Abspielen</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Ordner öffnen</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
@@ -8763,17 +8189,17 @@ p, li { white-space: pre-wrap; }
         <translation>Überprüfe</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Möchtest du wirklich abbrechen und die Datei löschen?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Kann Ordnder nicht öffnen</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Datei abspielen</translation>
     </message>
@@ -8783,37 +8209,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Datei %1 existiert nicht.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formular</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Dateiname</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Größe</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Titel</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Veröffentlicht</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Status</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Neuen Kanal erstellen</translation>
     </message>
@@ -8851,9 +8250,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Kanal abonnieren</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished">Letzte Aktivität</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">TextLabel</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8867,7 +8276,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -8882,7 +8291,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanalbeschreibung</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Lade</translation>
     </message>
@@ -8897,8 +8306,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Neuer Kanal</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8909,7 +8319,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Neuer Kommentar:</translation>
     </message>
@@ -8930,7 +8340,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
@@ -8986,28 +8396,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Dateien</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Warnung! Du hast weniger als %1 Stunden und %2 Minuten bevor die Datei gelöscht wird. Denke daran, sie zu speichern.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
@@ -9022,23 +8428,19 @@ p, li { white-space: pre-wrap; }
         <translation>Das gefällt mir nicht</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Lade</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lade...</translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kommentare </translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Posten</translation>
     </message>
     <message>
         <location line="+112"/>
@@ -9061,131 +8463,16 @@ p, li { white-space: pre-wrap; }
         <translation>Medium abspielen</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">In Kanal veröffentlichen</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Lade</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Kanäle durchsuchen</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Titel</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Titel durchsuchen</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Nachricht</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Nachricht suchen</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Dateiname</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Dateiname suchen</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Keinen Kanal gewählt</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Nie</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Öffentlich</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle &quot;</source>
-        <translation type="vanished">Beschränkt auf Mitglieder des Kreises &quot;</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle </source>
-        <translation type="vanished">Beschränkt auf Mitglieder des Kreises </translation>
-    </message>
-    <message>
-        <source>Your eyes only</source>
-        <translation type="vanished">Nur Ihre Augen</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Auto-Download deaktivieren</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Auto-Download aktivieren</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Zeige Feeds</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Zeige Dateien</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Administrator:</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Letzter Beitrag:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">unbekannt</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Verteilung:</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Feeds</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Dateien</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Abonnenten</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beschreibung:</translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">Beiträge (bei Nachbarknoten)</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">In Kanal veröffentlichen</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9193,7 +8480,7 @@ p, li { white-space: pre-wrap; }
         <location line="+39"/>
         <location line="+10"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">...</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -9246,7 +8533,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Last activity:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Letzte Aktivität:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -9255,7 +8542,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9291,7 +8578,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentare</translation>
     </message>
@@ -9306,13 +8593,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Feeds</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9327,7 +8614,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9342,7 +8629,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9402,12 +8689,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished">Lade...</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9482,12 +8779,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Abonniert</translation>
     </message>
@@ -9538,20 +8836,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Akzeptieren</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -9587,7 +8885,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Grant membership</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mitgliedschaft gewähren</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9663,7 +8961,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Kommentarcontainer</translation>
     </message>
@@ -9676,7 +8974,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9706,7 +9004,7 @@ p, li { white-space: pre-wrap; }
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
@@ -9745,7 +9043,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Auf Kommentar antworten</translation>
     </message>
@@ -9769,6 +9067,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Dagegen stimmen</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9778,7 +9091,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kommentieren</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9807,25 +9120,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Kommentar&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Unterzeichnet von</translation>
+        <translation type="unfinished">Posten</translation>
     </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
@@ -9855,14 +9152,14 @@ before you can comment</source>
 bevor du kommentieren kannst.</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
     </message>
 </context>
 <context>
@@ -9897,14 +9194,6 @@ bevor du kommentieren kannst.</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Forum-Administratoren hinzufügen</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Forum-Administratoren auswählen</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9914,7 +9203,7 @@ bevor du kommentieren kannst.</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Forum abonnieren</translation>
     </message>
@@ -9930,7 +9219,7 @@ bevor du kommentieren kannst.</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -9950,13 +9239,14 @@ bevor du kommentieren kannst.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Lade</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lade...</translation>
     </message>
     <message>
         <location line="+103"/>
@@ -9982,24 +9272,24 @@ bevor du kommentieren kannst.</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Betreff:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Forum abbestellen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unsubscribe</source>
-        <translation type="unfinished">Abbestellen</translation>
+        <translation>Abbestellen</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -10019,21 +9309,17 @@ bevor du kommentieren kannst.</translation>
         <translation>Als Antwort auf:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Lade</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade...</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Forumfeed</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
@@ -10046,63 +9332,66 @@ bevor du kommentieren kannst.</translation>
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Ein neues Thema im ausgewählten Forum starten</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Foren durchsuchen</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Letzter Beitrag</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished">Neues Thema</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Hierarchische Ansicht</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Ebene Ansicht</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Bild speichern</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Lade</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10112,12 +9401,7 @@ bevor du kommentieren kannst.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Auf Nachricht antworten</translation>
     </message>
@@ -10141,10 +9425,6 @@ bevor du kommentieren kannst.</translation>
         <source>Download all files</source>
         <translation>Alle Dateien herunterladen</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Nächste ungelesene</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10161,33 +9441,25 @@ bevor du kommentieren kannst.</translation>
         <translation>Autor durchsuchen</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Inhalt</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Inhalt durchsuchen</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Kein Name</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lade...</translation>
     </message>
     <message>
         <location line="+150"/>
@@ -10228,20 +9500,12 @@ bevor du kommentieren kannst.</translation>
         <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Erweitern</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Gebannt]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[unbekannt]</translation>
     </message>
@@ -10271,8 +9535,8 @@ bevor du kommentieren kannst.</translation>
         <translation>Nur Ihre Augen</translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation>Verteilung</translation>
     </message>
@@ -10286,26 +9550,6 @@ bevor du kommentieren kannst.</translation>
         <source>Anti-spam</source>
         <translation>Anti-Spam</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Redigierte Nachricht ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anonym</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">unterzeichnet</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">keine</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Fehlende Nachricht ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10375,12 +9619,12 @@ bevor du kommentieren kannst.</translation>
         <translation>Ursprüngliche Nachricht</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">Bearbeiten</translation>
     </message>
@@ -10413,7 +9657,7 @@ bevor du kommentieren kannst.</translation>
     <message>
         <location line="-6"/>
         <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Neutrale Meinung abgeben</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10433,7 +9677,7 @@ bevor du kommentieren kannst.</translation>
     <message>
         <location line="+19"/>
         <source>Show author in people tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Autor auf der Registerkarte Personen anzeigen</translation>
     </message>
     <message>
         <location line="+99"/>
@@ -10441,7 +9685,7 @@ bevor du kommentieren kannst.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10461,7 +9705,7 @@ bevor du kommentieren kannst.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10513,17 +9757,17 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kein Ergebnis.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Found %1 results.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 Ergebnisse gefunden.</translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10538,7 +9782,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10604,12 +9848,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Foren</translation>
@@ -10640,35 +9884,16 @@ This message is missing. You should receive it later.</source>
         <translation>Andere Foren</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Warten</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Abrufen</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Icon hinzufügen</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Schlüsselempfänger können in eingeschränkten Gruppen veröffentlichen und können private Kanäle ansehen und darin veröffentlichen</translation>
     </message>
@@ -10677,22 +9902,14 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Veröffentlichungsschlüssel freigeben</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">Markiere die Nachbarn, an welche du den privaten Veröffentlichungsschlüssel verteilen willst</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Schlüssel verteilen an</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Nachrichtenverteilung</translation>
     </message>
@@ -10700,7 +9917,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Öffentlich</translation>
     </message>
@@ -10719,14 +9936,6 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Neues Thema</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Notwendig</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Verschlüsselte Nachr.</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10768,7 +9977,7 @@ This message is missing. You should receive it later.</source>
         <translation>Spamschutz</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Kommentare:</translation>
     </message>
@@ -10791,7 +10000,7 @@ This message is missing. You should receive it later.</source>
         <translation>Anti-Spam:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10807,12 +10016,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation>Beschränkt auf Kreis:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10829,23 +10038,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>Nachrichtenverfolggung</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>PGP-Signatur erforderlich</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10861,30 +10070,28 @@ This message is missing. You should receive it later.</source>
         <translation>Bitte Name hinzufügen</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>PGP-Signatur aus bekannter Kennung erforderlich</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished">[Keine]</translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Gruppenlogo laden</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Gruppenänderungen übermitteln</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Aufbereiten der Gruppenmetadaten fehlgeschlagen - bitte überprüfen</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Wird zum Senden von Rückmeldungen genutzt werden</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Eigentümer:</translation>
     </message>
@@ -10894,12 +10101,12 @@ This message is missing. You should receive it later.</source>
         <translation>Gib hier eine aussagekräftige Beschreibung ein</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10909,7 +10116,7 @@ This message is missing. You should receive it later.</source>
         <translation>Letzter Beitrag</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10984,7 +10191,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished">Autor:</translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Beliebtheit</translation>
     </message>
@@ -11000,27 +10212,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Erstellt</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Erstellen</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Autor</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>GxsIdLabel</translation>
     </message>
@@ -11028,7 +10235,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Lade</translation>
     </message>
@@ -11088,7 +10295,7 @@ This message is missing. You should receive it later.</source>
         <translation>Details bearbeiten</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11145,12 +10352,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare-Link kopieren</translation>
     </message>
@@ -11173,7 +10380,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Keine Signatur</translation>
     </message>
@@ -11186,50 +10393,39 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Lade</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Nicht gefunden</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Keine Signatur</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Gebannt]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Authentifizierung</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>unbekannter Schlüssel</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">anonym</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade...</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>[None]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Keine]</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation>[Niemand]</translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Identitätsname</translation>
     </message>
@@ -11241,11 +10437,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+5"/>
         <source>Node</source>
-        <translation type="unfinished">Netzknoten</translation>
-    </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">Unterzeichnet&amp;nbsp;von</translation>
+        <translation>Knoten</translation>
     </message>
     <message>
         <location line="-14"/>
@@ -11253,18 +10445,26 @@ This message is missing. You should receive it later.</source>
         <translation>[Unbekannt]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation>[Niemand]</translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
         <location filename="../gui/statistics/GxsIdStatistics.ui" line="+14"/>
         <source>Router Statistics</source>
-        <translation type="unfinished">Routerstatistiken</translation>
+        <translation>Routerstatistiken</translation>
     </message>
 </context>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11312,21 +10512,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
-        <translation type="unfinished">[Unbekannt]</translation>
+        <translation>[Unbekannt]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade...</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11397,12 +10593,12 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+5"/>
         <source>Data hash</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Datenhash</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Sending time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sendezeit</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11486,41 +10682,6 @@ This message is missing. You should receive it later.</source>
         <translation>Nein</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">Authentifizierte Tunnel:</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">Tunnelkennung: %1</translation>
-    </message>
-    <message>
-        <source>from: %1</source>
-        <translation type="vanished">von: %1</translation>
-    </message>
-    <message>
-        <source>to: %1</source>
-        <translation type="vanished">an: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">Status: %1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">Gesendet gesamt: %1 bytes</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">Empfangen gesamt: %1 bytes</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Unbekannter Nachbar</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11738,7 +10899,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11754,7 +10915,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Autoren</translation>
     </message>
@@ -11773,7 +10934,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11851,28 +11012,24 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
-        <translation type="unfinished"></translation>
+        <translation>Freund hinzufügen</translation>
     </message>
     <message>
         <location line="+112"/>
         <source>Do you need help with Retroshare?</source>
-        <translation type="unfinished"></translation>
+        <translation>Benötigen Sie Hilfe bei Retroshare?</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Teilen Sie Ihre RetroShare-ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="-63"/>
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">Zertifikatsdatei hinzufügen</translation>
+        <translation>Dies ist Ihre Retroshare-ID. Kopieren Sie es und teilen Sie es mit Ihren Freunden!</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11883,19 +11040,20 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-3"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kopieren Sie Ihre RetroShare-ID in die Zwischenablage&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Open Source cross-platform, 
 private and secure decentralized communication platform.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Plattformübergreifendes Open Source,
+Private und sichere dezentrale Kommunikationsplattform.</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
-        <translation type="unfinished"></translation>
+        <translation>Haben Sie eine Retroshare-ID von einem Freund erhalten?</translation>
     </message>
     <message>
         <location line="+47"/>
@@ -11903,17 +11061,17 @@ private and secure decentralized communication platform.
         <translation>Webhilfe öffnen</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
-        <translation type="unfinished">Dein Zertifikat in die Zwischenablage kopieren</translation>
+        <translation>Dein Zertifikat in die Zwischenablage kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Save your Cert into a File</source>
-        <translation type="unfinished">Zertifikat als Datei speichern</translation>
+        <translation>Zertifikat als Datei speichern</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>Über E-Mail senden</translation>
     </message>
@@ -11925,65 +11083,84 @@ private and secure decentralized communication platform.
     <message>
         <location line="+3"/>
         <source>Recommend friends to each others</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfehlen Sie einander Freunde weiter</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Copy your Retroshare ID to Clipboard</source>
+        <translation>Kopieren Sie Ihre Retroshare-ID in die Zwischenablage</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation>Aktuelle lokale IP einschließen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation>Aktuelle externe IP einschließen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation>Meinen DNS einbeziehen</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation>Beziehen Sie den gesamten IP-Verlauf ein</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie alle Ihre bekannten IP-Adressen an</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwenden Sie das alte Zertifikatsformat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Displays the certificate format used up to version 0.6.5
 Old Retroshare nodes will not understand the
 new short format</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwenden Sie das neue (kurze) Zertifikatsformat</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihr Retroshare-Zertifikat wurde in die Zwischenablage kopiert, fügen Sie es ein und senden Sie es per E-Mail oder auf andere Weise an Ihren Freund</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihre Retroshare-ID wurde in die Zwischenablage kopiert, fügen Sie es ein und senden Sie es per E-Mail oder auf andere Weise an Ihren Freund</translation>
     </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
-        <translation type="unfinished">RetroShare-Einladung</translation>
+        <translation>RetroShare-Einladung</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation>Speichern als...</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
-        <translation type="unfinished">RetroShare-Zertifikat (*.rsc );;Alle Dateien (*)</translation>
+        <translation>RetroShare-Zertifikat (*.rsc );;Alle Dateien (*)</translation>
     </message>
     <message>
         <location filename="../gui/HomePage.h" line="+46"/>
@@ -12056,7 +11233,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+17"/>
         <source>Auto-Ban all identities signed by the same node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Auto-Ban aller Identitäten, die von demselben Knoten unterzeichnet wurden</translation>
     </message>
     <message>
         <location line="+83"/>
@@ -12205,17 +11382,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+12"/>
         <source>Negative (Banned by you)</source>
-        <translation type="unfinished"></translation>
+        <translation>Negativ (von Ihnen verbannt)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Positive (according to your friends)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Positiv (nach Meinung Ihrer Freunde)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Negative (according to your friends)</source>
-        <translation type="unfinished"></translation>
+        <translation>Negativ (nach Meinung Ihrer Freunde)</translation>
     </message>
     <message>
         <location line="+99"/>
@@ -12241,14 +11418,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Reputation</translation>
     </message>
@@ -12258,12 +11435,12 @@ p, li { white-space: pre-wrap; }
         <translation>Suchen</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>Anonyme ID</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Neue Identität erstellen</translation>
     </message>
@@ -12273,7 +11450,7 @@ p, li { white-space: pre-wrap; }
         <translation>Neuen Kreis erstellen</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>Personen</translation>
     </message>
@@ -12288,27 +11465,27 @@ p, li { white-space: pre-wrap; }
         <translation>Person</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto-Ban aller Identitäten, die von demselben Knoten unterzeichnet wurden</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Freund Bewertungen:</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Positive Stimmen</translation>
     </message>
@@ -12324,29 +11501,39 @@ p, li { white-space: pre-wrap; }
         <translation>Negative Stimmen</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellt am:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation>Auto-Ban-Profil</translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation>Identität editieren</translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>Nutzungsstatistiken</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Kreise</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Kreisname</translation>
     </message>
@@ -12366,18 +11553,20 @@ p, li { white-space: pre-wrap; }
         <translation>Persönliche Kreise</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Identität bearbeiten</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Identität löschen</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Chatte mit diesem Nachbarn</translation>
     </message>
@@ -12387,78 +11576,78 @@ p, li { white-space: pre-wrap; }
         <translation>Stellt einen Fernchat mit diesem Nachbarn her</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
-        <translation>Eigentümerknoten-ID</translation>
+        <translation>Eigentümerknoten-ID :</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Identitätsname :</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>Identitäts-ID</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Nachricht senden</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Identitätsinformationen</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Identitäts-ID :</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Eigentümerknotenname :</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu erstellen...</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Einladung senden</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>Deine Meinung:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Negativ</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Neutral</translation>
     </message>
@@ -12469,17 +11658,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positiv</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Insgesamt:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anonym</translation>
     </message>
@@ -12494,24 +11683,24 @@ p, li { white-space: pre-wrap; }
         <translation>Kennung suchen</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Diese Identität gehört dir</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
-        <translation>Meine eigenen Identitäten</translation>
+        <translation>Meine Identitäten</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>Meine Kontakte</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12523,10 +11712,15 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Linked to my node</source>
+        <translation>Verknüpft mit meinem Knoten</translation>
+    </message>
+    <message>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>Andere Kreise</translation>
     </message>
@@ -12536,7 +11730,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>Kreiskennung:</translation>
     </message>
@@ -12573,17 +11767,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>User (Can only request membership).</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzer (kann nur die Mitgliedschaft beantragen).</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Distribution: </source>
-        <translation>Verteilung:</translation>
+        <translation>Verteilung: </translation>
     </message>
     <message>
         <location line="+2"/>
         <source>subscribed (Receive/forward membership requests from others and invite list).</source>
-        <translation type="unfinished"></translation>
+        <translation>abonniert (Empfang/Weiterleitung von Beitrittsanfragen anderer und Einladungsliste).</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -12603,7 +11797,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Full member (you have access to data limited to this circle)</source>
-        <translation type="unfinished"></translation>
+        <translation>Vollmitglied (Sie haben Zugang zu Daten, die auf diesen Kreis beschränkt sind)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12611,7 +11805,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>Identitätskennung: </translation>
     </message>
@@ -12633,7 +11827,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Subscription request pending</source>
-        <translation type="unfinished"></translation>
+        <translation>Abonnementanforderung ausstehend</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12641,14 +11835,14 @@ p, li { white-space: pre-wrap; }
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>Eingeladen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Subscription pending</source>
-        <translation type="unfinished"></translation>
+        <translation>Abonnement ausstehend</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -12656,7 +11850,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mitglied</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>Kreis bearbeiten</translation>
     </message>
@@ -12668,12 +11862,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+41"/>
         <source>Request subscription</source>
-        <translation type="unfinished"></translation>
+        <translation>Abonnement anfordern</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Accept circle invitation</source>
-        <translation type="unfinished"></translation>
+        <translation>Kreiseinladung annehmen</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -12683,7 +11877,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>Cancel subscribe request</source>
-        <translation type="unfinished"></translation>
+        <translation>Abo-Anfrage abbrechen</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -12691,7 +11885,7 @@ p, li { white-space: pre-wrap; }
         <location line="+26"/>
         <location line="+2"/>
         <source>for identity </source>
-        <translation>für Identität</translation>
+        <translation>für Identität </translation>
     </message>
     <message>
         <location line="+27"/>
@@ -12701,10 +11895,10 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Grant membership</source>
-        <translation type="unfinished"></translation>
+        <translation>Mitgliedschaft gewähren</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12712,7 +11906,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Unbekannter Knoten]</translation>
@@ -12721,7 +11915,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-227"/>
         <location line="+1"/>
         <source>Unverified signature from node </source>
-        <translation type="unfinished"></translation>
+        <translation>Ungeprüfte Signatur vom Knoten </translation>
     </message>
     <message>
         <location line="+4"/>
@@ -12742,7 +11936,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+3"/>
         <source>Identity owned by you, linked to your Retroshare node but not yet validated</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität, die Ihnen gehört und mit Ihrem Retroshare-Knoten verknüpft, aber noch nicht validiert ist</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12755,19 +11949,19 @@ These identities will soon be not supported anymore.</source>
         <translation>Anonyme Identität</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>GxsMail author </source>
-        <translation type="unfinished"></translation>
+        <translation>GxsMail Autor</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>GxsCircles</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -12782,7 +11976,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+3"/>
         <source>Group author for group %1 in service %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Gruppenautor für Gruppe %1 im Dienst %2</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -12797,7 +11991,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+2"/>
         <source>Message</source>
-        <translation type="unfinished">Nachricht</translation>
+        <translation>Nachricht</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12807,7 +12001,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+8"/>
         <source>Message in chat room %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht im Chatraum %1</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -12827,48 +12021,43 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+8"/>
         <source>Membership verification in circle &quot;%1&quot; (%2).</source>
-        <translation type="unfinished"></translation>
+        <translation>Verifizierung der Mitgliedschaft im Kreis &quot;%1&quot; (%2).</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Membership verification in circle (ID=%1).</source>
-        <translation type="unfinished"></translation>
+        <translation>Verifizierung der Mitgliedschaft im Kreis (ID=%1).</translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This identity link was copied to your clipboard. Paste it in a mail, or a message to transmit the identity to someone.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Identitätslink wurde in Ihre Zwischenablage kopiert. Fügen Sie ihn in eine E-Mail oder eine Nachricht ein, um die Identität an jemanden zu übermitteln.</translation>
     </message>
     <message>
         <location line="-84"/>
         <location line="+21"/>
         <source>Copy identity to clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität in die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Gebannt</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
-        <translation> positiv</translation>
+        <translation> positiv </translation>
     </message>
     <message>
         <location line="+1"/>
         <source> negative </source>
-        <translation> negativ</translation>
+        <translation> negativ </translation>
     </message>
     <message>
         <location line="+3"/>
@@ -12878,17 +12067,17 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+12"/>
         <source>Negative (Banned by you)</source>
-        <translation type="unfinished"></translation>
+        <translation>Negativ (von Ihnen verbannt)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Positive (according to your friends)</source>
-        <translation type="unfinished"></translation>
+        <translation>Positiv (nach Meinung Ihrer Freunde)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Negative (according to your friends)</source>
-        <translation type="unfinished"></translation>
+        <translation>Negativ (nach Meinung Ihrer Freunde)</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -12905,19 +12094,11 @@ These identities will soon be not supported anymore.</source>
         <source>Forums</source>
         <translation>Foren</translation>
     </message>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Veröffentlicht</translation>
-    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Unbekannt</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12938,10 +12119,6 @@ These identities will soon be not supported anymore.</source>
         <source>Creation of author signature in service %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Message/vote/comment</source>
-        <translation type="vanished">Nachricht/Stimme/Kommentar</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12955,22 +12132,18 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+4"/>
         <source>Signature validation in distant tunnel system.</source>
-        <translation type="unfinished"></translation>
+        <translation>Signaturvalidierung im entfernten Tunnelsystem.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Signature in distant tunnel system.</source>
-        <translation type="unfinished"></translation>
+        <translation>Signatur im entfernten Tunnelsystem.</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">Generische Signatur.</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12982,7 +12155,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Generische Entschlüsselung.</translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation>Zu Kontakte hinzufügen</translation>
     </message>
@@ -13019,7 +12192,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+11"/>
         <source>Too many identities</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu viele Identitäten</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -13032,21 +12205,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Leute</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Dein Avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>Mit Nachbarknoten verknüpft</translation>
     </message>
@@ -13056,7 +12229,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Mit entfernten Netzknoten verknüpft</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Mit befreundetem RetroShare-Netzknoten verknüpft</translation>
     </message>
@@ -13071,7 +12244,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Mit unbekanntem RetroShare-Netzknoten verknüpft</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Mit dieser Person chatten</translation>
     </message>
@@ -13086,12 +12259,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Fernchat mit dieser Person abgelehnt.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Zuletzt verwendet:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP bekannt</translation>
     </message>
@@ -13111,12 +12284,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Möchtest du diese Identität wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Im Besitz von</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Netzknotenname:</translation>
     </message>
@@ -13126,7 +12299,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Netzknoten-ID :</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>Wirklich löschen?</translation>
     </message>
@@ -13134,7 +12307,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
@@ -13164,22 +12337,29 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudonym</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bild importieren</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Image files (*.jpg *.png);;All files (*)</source>
+        <translation type="unfinished">Bilddateien (*.jpg *.png);;Alle Dateien (*)</translation>
+    </message>
+    <message>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Neue Identität</translation>
     </message>
@@ -13193,7 +12373,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13203,7 +12383,12 @@ These identities will soon be not supported anymore.</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Identität bearbeiten</translation>
@@ -13214,27 +12399,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Aktualisieren</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Identitätserstellung fehlgeschlagen</translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ohne Ihr Profilpasswort können Sie keine mit Ihrem Profil verknüpfte Identität erstellen.</translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13254,7 +12439,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13264,11 +12449,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Fehler beim Holen des Schlüssels!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Fehler Schlüssel-ID ungültig</translation>
     </message>
@@ -13283,7 +12464,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Unbekannter Klarname</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Neue Identität erstellen</translation>
     </message>
@@ -13293,10 +12474,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Entfernen</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13322,7 +12508,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Erstellen</translation>
     </message>
@@ -13332,17 +12518,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Dein Avatar</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Avatar festlegen</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>Mit deinem Profil verknüpft</translation>
     </message>
@@ -13352,7 +12534,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Du kannst eine oder mehrere Identitäten haben. Sie werden genutzt, um in Chatlobbys, Foren und Kanalkommentaren zu schreiben. Sie dienen als Zieladresse für Fernchat und das RetroShare-Fernnachrichtensystem.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Der Spitzname ist zu kurz. Bitte mindestens %1 Zeichen eingeben.</translation>
     </message>
@@ -13382,18 +12564,18 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+75"/>
         <source>Positive votes</source>
-        <translation type="unfinished">Positive Stimmen</translation>
+        <translation>Positive Stimmen</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+41"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Negative votes</source>
-        <translation type="unfinished">Negative Stimmen</translation>
+        <translation>Negative Stimmen</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -13411,10 +12593,6 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>PGP-Name:</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">GXS-ID:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13430,7 +12608,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
@@ -13440,12 +12618,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Alle markieren</translation>
     </message>
@@ -13464,26 +12642,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Senden</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Bild speichern</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished">Bild kopieren</translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>Kein Bild</translation>
     </message>
@@ -13501,27 +12691,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13542,35 +12737,45 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Apply settings</source>
+        <translation type="unfinished">Einstellungen übernehmen</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
-        <source>JSON API</source>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Ordner öffnen</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Überprüfe...</translation>
     </message>
@@ -13580,19 +12785,19 @@ These identities will soon be not supported anymore.</source>
         <translation>Dateien überprüfen</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfehlen Sie in einer Nachricht an...</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Share on channel...</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Kanal teilen...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Share on forum...</source>
-        <translation type="unfinished"></translation>
+        <translation>Im Forum teilen...</translation>
     </message>
     <message>
         <location line="+111"/>
@@ -13608,7 +12813,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Freund hinzufügen</translation>
     </message>
@@ -13624,7 +12829,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
@@ -13645,7 +12851,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Schließen</translation>
     </message>
@@ -13656,12 +12862,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Schnellstart-Assistent</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 - eine sichere und dezentralisierte Kommunikationsplattform</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>unfertig</translation>
     </message>
@@ -13690,11 +12896,12 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Meldungen</translation>
     </message>
@@ -13705,31 +12912,35 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Nachrichten öffnen</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Bandbreiten-Graph</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Minimieren</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Maximieren</translation>
     </message>
@@ -13744,7 +12955,12 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 neue Nachricht</translation>
     </message>
@@ -13774,7 +12990,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>%1 Freunde verbunden</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Möchtest du RetroShare wirklich beenden?</translation>
     </message>
@@ -13794,7 +13010,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Vergewissere dich, dass dieser Link nicht gefälscht ist, um dich auf eine bösartige Webseite zu locken.</translation>
     </message>
@@ -13839,12 +13055,13 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Serviceberechtigungsmatrix</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Weboberfläche anzeigen</translation>
     </message>
@@ -13859,7 +13076,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Ordner ist sehr gering (Die aktuelle Grenze ist</translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>Wirklich beenden?</translation>
     </message>
@@ -13868,17 +13085,17 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Verfassen</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Absatz</translation>
     </message>
@@ -13914,12 +13131,12 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Überschrift 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Schriftgröße</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Schrift vergrößern</translation>
     </message>
@@ -13934,32 +13151,32 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Fett</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Ausrichtung</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Ein Bild hinzufügen</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Setzt Schriftart auf Codestil</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Unterstrichen</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Betreff:</translation>
     </message>
@@ -13970,32 +13187,32 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Schlagwörter</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>Adressliste:</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation>Diesen Freund empfehlen</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Textfarbe festlegen</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Texthintergrundfarbe festlegen</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Empfohlene Dateien</translation>
     </message>
@@ -14065,7 +13282,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Blockquote hinzufügen</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Senden an:</translation>
     </message>
@@ -14089,10 +13306,6 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <source>&amp;Justify</source>
         <translation>&amp;Blocksatz</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">Alle Adressen (gemischt)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14104,7 +13317,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Meine Kontakte</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hallo, &lt;br&gt; ich empfehle dir einen guten Freund von mir. Du kannst ihm vertrauen, wenn du mir vertraust. &lt;br&gt;</translation>
     </message>
@@ -14124,18 +13337,18 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>möchte mit dir in RetroShare befreundet sein</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hallo %1,&lt;br&gt;&lt;br&gt;%2 möchte mit dir in RetroShare befreundet sein.&lt;br&gt;&lt;br&gt;Jetzt antworten:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Grüße,&lt;br&gt;Das RetroShare Team</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Nachricht speichern</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Nachricht wurde noch nicht gesendet.
@@ -14147,7 +13360,17 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>RetroShare Link einfügen</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Zu &quot;An&quot; hinzufügen</translation>
     </message>
@@ -14167,7 +13390,7 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Als empfohlen hinzufügen</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Ursprüngliche Nachricht</translation>
     </message>
@@ -14177,21 +13400,21 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Gesendet</translation>
     </message>
@@ -14206,7 +13429,7 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Am %1, schrieb %2:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -14216,30 +13439,30 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Fwd:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Möchtest du die Nachricht ohne Betreff senden ?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Bitte gib mindestens einen Empfänger ein.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -14354,13 +13577,13 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Details</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Datei öffnen...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation>
     </message>
@@ -14380,7 +13603,7 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>PDF exportieren</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Nachricht noch nicht versandt.
@@ -14402,7 +13625,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Zusätzliche Datei hinzufügen</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14424,26 +13647,26 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+7"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Von:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2610"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2645"/>
         <source>Friend Nodes</source>
         <translation>Befreundete Netzknoten</translation>
     </message>
@@ -14488,13 +13711,13 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Geordnete Liste (Römisch groß)</translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Danke, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Fernidentität:</translation>
     </message>
@@ -14504,12 +13727,12 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>[Fehlend]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Bitte erstelle eine Identität, um Fernnachrichten zu signieren oder entferne die fernen Nachbarn aus der Zieladressliste.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Netzknotenname &amp; ID:</translation>
     </message>
@@ -14554,7 +13777,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+19"/>
         <source>Load Emoticons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Emoticons laden</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14587,7 +13810,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Neuem Tab</translation>
     </message>
@@ -14597,7 +13820,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Neuem Fenster</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Schlagwort bearbeiten</translation>
     </message>
@@ -14620,7 +13843,7 @@ Möchtest du die Nachricht speichern ?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Betreff:</translation>
     </message>
@@ -14628,35 +13851,35 @@ Möchtest du die Nachricht speichern ?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>You have %1 new mails</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 neue Mails</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 neue Mail</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 new mails</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 neue Mails</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 neue Mail</translation>
     </message>
 </context>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Empfohlene Dateien</translation>
     </message>
@@ -14666,84 +13889,84 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Alle Dateien herunterladen</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Betreff:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Von:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>An:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Schlagwörter:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Antworten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reply to All&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allen antworten&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Reply all</source>
-        <translation type="unfinished">Allen antworten</translation>
+        <translation>Allen antworten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forward selected Message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ausgewählte Nachricht weiterleiten&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished">Vorwärts</translation>
+        <translation>Weiterleiten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Delete</source>
-        <translation type="unfinished">Löschen</translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;More actions&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Weitere Aktionen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>More</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
-        <translation type="unfinished">Einladung senden</translation>
+        <translation>Einladung senden</translation>
     </message>
     <message>
         <location line="+115"/>
         <source>Message Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachrichtengröße:</translation>
     </message>
     <message>
         <location line="+58"/>
@@ -14774,21 +13997,21 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+5"/>
         <source>Save as</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern unter</translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+3"/>
         <source>Buttons Text Beside Icon</source>
-        <translation type="unfinished">Button Text neben Icon</translation>
+        <translation>Button Text neben Icon</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Buttons Icon only</source>
-        <translation type="unfinished"></translation>
+        <translation>Button nur mit Icon</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>%1 als Freund bestätigen</translation>
     </message>
@@ -14798,12 +14021,12 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>%1 als Freund hinzufügen</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelle anzeigen</translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Kein Betreff</translation>
     </message>
@@ -14813,33 +14036,48 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du hast eine Freundschaftseinladung erhalten! Du kannst diese Anfrage annehmen.</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben eine Einladung erhalten, um Freunde zu werden! Sie können diese Anfrage annehmen und Ihr eigenes Zertifikat zurückschicken</translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation>mehr</translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelle des Dokuments</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation>Weniger anzeigen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation>Mehr anzeigen</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Alle herunterladen</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Dokument drucken</translation>
     </message>
@@ -14854,12 +14092,12 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Bilde für diese Nachricht immer laden</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Anhangsansicht verstecken</translation>
     </message>
@@ -14881,42 +14119,6 @@ Möchtest du die Nachricht speichern ?</translation>
         <source>Compose</source>
         <translation>Verfassen</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Auf gewählte Nachricht antworten</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Antwort</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Auf gewählte Nachricht an alle Empfänger antworten</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Allen antworten</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Gewählte Nachricht weiterleiten</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Vorwärts</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Gewählte Nachricht entfernen</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Löschen</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Gewählte Nachricht drucken</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14995,7 +14197,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Neue Nachricht</translation>
     </message>
@@ -15005,60 +14207,16 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Verfassen</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Auf gewählte Nachricht antworten</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Antworten</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Auf gewählte Nachricht an alle Empfänger antworten</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Allen antworten</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Gewählte Nachricht weiterleiten</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Weiterleiten</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Gewählte Nachricht entfernen</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Löschen</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Gewählte Nachricht drucken</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Drucken</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Anzeigen</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Schlagwörter</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Posteingang</translation>
@@ -15088,21 +14246,17 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Papierkorb</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Posteingang gesamt:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Ordner</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Schnellansicht</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Drucken...</translation>
@@ -15112,26 +14266,6 @@ Möchtest du die Nachricht speichern ?</translation>
         <source>Print Preview</source>
         <translation>Druckvorschau</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Buttons nur mit Icon</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Button Text neben Icon</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Buttons mit Text</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Buttons Text unter dem Icon</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Text unter dem Icon</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15153,7 +14287,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Weiterleiten</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
@@ -15163,7 +14297,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Von</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -15173,39 +14307,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Inhalt</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Klicken, um nach Anhang zu sortieren</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Klicken, um nach Betreff zu sortieren</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Klicken, um nach Gelesen / Ungelesen zu sortieren</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Klicken, um nach Von zu sortieren</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Klicken, um nach Datum zu sortieren</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Klicken, um nach Schlagwörter zu sortieren</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Klicken, um nach Kennzeichnung zu sortieren</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Gewählte Nachricht weiterleiten</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Betreff durchsuchen</translation>
     </message>
@@ -15214,6 +14316,11 @@ Möchtest du die Nachricht speichern ?</translation>
         <source>Search From</source>
         <translation>Von durchsuchen</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15240,14 +14347,14 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Anhänge durchsuchen</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Gekennzeichnet</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15257,12 +14364,12 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+10"/>
         <source>Spam</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhang</translation>
     </message>
     <message>
         <location line="+136"/>
@@ -15292,7 +14399,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+5"/>
         <source>Mark as Junk</source>
-        <translation type="unfinished"></translation>
+        <translation>Als Junk markieren</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -15321,7 +14428,7 @@ Möchtest du die Nachricht speichern ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15335,7 +14442,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15350,38 +14457,33 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Entwürfe</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Es sind keine gekennzeichneten Nachrichten vorhanden. Durch die Kennzeichnung kannst du Nachrichten mit einem speziellen Status versehen, sodass sie leichter zu finden sind. Klicke zum Kennzeichnen einer Nachricht auf den hellgrauen Stern neben der jeweiligen Nachricht.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Keine Systemnachrichten vorhanden.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">An</translation>
+        <translation>An</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Klicken, um nach Empfänger zu sortieren</translation>
-    </message>
-    <message>
-        <source>This message goes to a distant person.</source>
-        <translation type="vanished">Diese Nachricht geht zu einer entfernten Person.</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15389,26 +14491,6 @@ Möchtest du die Nachricht speichern ?</translation>
         <source>Total:</source>
         <translation>Gesamt:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Nachrichten</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Anklicken, um nach Signatur zu sortieren</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Diese Nachricht wurde signiert und die Signatur stimmt überein.</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Diese Nachricht wurde signiert und die Signatur stimmt nicht überein.</translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">Diese Nachricht kommt von einer entfernten Person.</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15436,7 +14518,17 @@ Möchtest du die Nachricht speichern ?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation>Bild speichern</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation>Bild kopieren</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Als Klartext einfügen</translation>
     </message>
@@ -15448,7 +14540,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+1"/>
         <source>Select text to hide, then push this button</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie den auszublendenden Text aus und drücken Sie dann diese Taste</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -15466,7 +14558,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location filename="../gui/feeds/MsgItem.ui" line="+149"/>
         <source>Send Invite</source>
-        <translation type="unfinished">Einladung senden</translation>
+        <translation>Einladung senden</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15490,7 +14582,7 @@ Möchtest du die Nachricht speichern ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -15500,19 +14592,19 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Element entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
-        <translation type="unfinished">von</translation>
+        <translation>von</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Reply to invite</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Einladung antworten</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>This message invites you to make friend! You may accept this request.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht lädt Sie ein, Freundschaft zu schließen! Sie können diese Anfrage annehmen.</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -15535,7 +14627,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Wartend</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
@@ -15676,7 +14768,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Nachbar-ID</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Unbenutzte Schlüssel entfernen...</translation>
     </message>
@@ -15686,7 +14778,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Schlüsselbund bereinigen</translation>
     </message>
@@ -15704,7 +14796,13 @@ Anmerkungen: Dein alter Schlüsselbund wird gesichert.
  Die Entfernung kann fehlschlagen, wenn mehrere Instanzen von Retroshare auf der selben Maschine laufen.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Schlüsselbund-Informationen</translation>
@@ -15740,18 +14838,13 @@ Der Schlüsselbund wurde aus Sicherheitsgründen zuvor in einer Datei gesichert.
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Dateninkonsistenz im Schlüsselbund. Dies ist wahrscheinlich ein Bug. Bitte die Entwickler kontaktieren.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>Einen neuen Netzknoten exportieren/erstellen</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Nur vertrauenswürdige Schlüssel</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Name suchen</translation>
     </message>
@@ -15761,12 +14854,12 @@ Der Schlüsselbund wurde aus Sicherheitsgründen zuvor in einer Datei gesichert.
         <translation>Nachbar-ID suchen</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>Profildetails...</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -15775,13 +14868,6 @@ Reported error:</source>
  Gemeldeter Fehler:</translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Netzwerk</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -15808,107 +14894,107 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Offline-Freunde</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Offline Friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Offline-Freunde anzeigen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Status</source>
-        <translation type="unfinished">Status</translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show status</source>
-        <translation type="unfinished"></translation>
+        <translation>Status anzeigen</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
-        <translation type="unfinished">Gruppen</translation>
+        <translation>Gruppen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige Gruppen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>export friendlist</source>
-        <translation type="unfinished">Freundesliste exportieren</translation>
+        <translation>Freundesliste exportieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>export your friendlist including groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportieren Sie Ihre Freundesliste einschließlich Gruppen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>import friendlist</source>
-        <translation type="unfinished">Freundesliste importieren</translation>
+        <translation>Freundesliste importieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>import your friendlist including groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Importieren Sie Ihre Freundesliste einschließlich Gruppen</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation>Suchen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished">Kennung suchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Online friends on top</source>
-        <translation type="unfinished"></translation>
+        <translation>Online-Freunde an der Spitze</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
-        <translation type="unfinished"></translation>
+        <translation>Letzter Kontakt</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>IP</source>
-        <translation type="unfinished">IP</translation>
+        <translation>IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
-        <translation type="unfinished">Gruppe</translation>
+        <translation>Gruppe</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Friend</source>
-        <translation type="unfinished">Freund</translation>
+        <translation>Freund</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Node</source>
-        <translation type="unfinished">Netzknoten</translation>
+        <translation>Netzknoten</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -15918,186 +15004,189 @@ Reported error:</source>
     <message>
         <location line="+12"/>
         <source>Edit Group</source>
-        <translation type="unfinished">Gruppe ändern</translation>
+        <translation>Gruppe ändern</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove Group</source>
-        <translation type="unfinished">Gruppe entfernen</translation>
+        <translation>Gruppe entfernen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Profile details</source>
-        <translation type="unfinished">Profildetails</translation>
+        <translation>Profildetails</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Deny connections</source>
-        <translation type="unfinished">Verbindungen ablehnen</translation>
+        <translation>Verbindungen ablehnen</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Add to group</source>
-        <translation type="unfinished">Zu Gruppe hinzufügen</translation>
+        <translation>Zu Gruppe hinzufügen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Move to group</source>
-        <translation type="unfinished">In Gruppe verschieben</translation>
+        <translation>In Gruppe verschieben</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Create new group</source>
-        <translation type="unfinished">Neue Gruppe erstellen</translation>
+        <translation>Neue Gruppe erstellen</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Remove from group </source>
-        <translation type="unfinished"></translation>
+        <translation>Aus der Gruppe entfernen </translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove from all groups</source>
-        <translation type="unfinished">Aus allen Gruppen entfernen</translation>
+        <translation>Aus allen Gruppen entfernen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Chat</source>
-        <translation type="unfinished">Chat</translation>
+        <translation>Chat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Send message to this node</source>
-        <translation type="unfinished">Nachricht an diesen Knoten senden</translation>
+        <translation>Nachricht an diesen Knoten senden</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Node details</source>
-        <translation type="unfinished">Knotendetails</translation>
+        <translation>Knotendetails</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Recommend this node to...</source>
-        <translation type="unfinished">Diesen Knoten empfehlen an...</translation>
+        <translation>Diesen Knoten empfehlen an...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Attempt to connect</source>
-        <translation type="unfinished">Verbindung versuchen</translation>
+        <translation>Verbindung versuchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy certificate link</source>
-        <translation type="unfinished">Zertifikat-Link kopieren</translation>
+        <translation>Zertifikat-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Remove Friend Node</source>
-        <translation type="unfinished">Freundknoten entfernen</translation>
+        <translation>Freundknoten entfernen</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Paste certificate link</source>
-        <translation type="unfinished">Zertifikat-Link einfügen</translation>
+        <translation>Zertifikat-Link einfügen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Expand all</source>
-        <translation type="unfinished">Alle erweitern</translation>
+        <translation>Alle erweitern</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Collapse all</source>
-        <translation type="unfinished">Alle reduzieren</translation>
+        <translation>Alle reduzieren</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
-        <translation type="unfinished">Möchtest du diesen Netzknoten entfernen?</translation>
+        <translation>Möchtest du diesen Netzknoten entfernen?</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Do you want to remove this Friend?</source>
-        <translation type="unfinished">Möchtest du diesen Freund entfernen?</translation>
+        <translation>Möchtest du diesen Freund entfernen?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
-        <translation type="unfinished">Fertig!</translation>
+        <translation>Fertig!</translation>
     </message>
     <message>
         <location line="-17"/>
         <source>Your friendlist is stored at:
 </source>
-        <translation type="unfinished">Deine Freundesliste wird gespeichert unter:
+        <translation>Deine Freundesliste wird gespeichert unter:
 </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 (keep in mind that the file is unencrypted!)</source>
-        <translation type="unfinished"></translation>
+        <translation>
+(Beachten Sie, dass die Datei unverschlüsselt ist!)</translation>
     </message>
     <message>
         <location line="+17"/>
         <location line="+7"/>
         <source>Your friendlist was imported from:
 </source>
-        <translation type="unfinished">Deine Freundesliste wurde importiert aus:
+        <translation>Deine Freundesliste wurde importiert aus:
 </translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Done - but errors happened!</source>
-        <translation type="unfinished">Fertig - aber Fehler sind aufgetreten!</translation>
+        <translation>Fertig - aber Fehler sind aufgetreten!</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>
 at least one peer was not added</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Mindestens ein Peer wurde nicht hinzugefügt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 at least one peer was not added to a group</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Select file for importing your friendlist from</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie die Datei aus, aus der Sie Ihre Freundesliste importieren möchten</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+7"/>
         <source>XML File (*.xml);;All Files (*)</source>
-        <translation type="unfinished">XML-Datei (*.xml);;Alle Dateien (*)</translation>
+        <translation>XML-Datei (*.xml);;Alle Dateien (*)</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Select a file for exporting your friendlist to</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie eine Datei aus, in die Sie Ihre Freundesliste exportieren möchten</translation>
     </message>
     <message>
         <location line="+30"/>
         <location line="+116"/>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <location line="-115"/>
         <source>File is not writeable!
 </source>
-        <translation type="unfinished">Datei ist nicht schreibbar!
+        <translation>Datei ist nicht schreibbar!
 </translation>
     </message>
     <message>
         <location line="+116"/>
         <source>File is not readable!
 </source>
-        <translation type="unfinished">Datei ist nicht lesbar!
+        <translation>Datei ist nicht lesbar!
 </translation>
     </message>
 </context>
@@ -16132,13 +15221,9 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">Protokolleinträge</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivitätsstream</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -16151,11 +15236,7 @@ at least one peer was not added to a group</source>
         <translation>Alle entfernen</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Dies ist ein Test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>Neueste oben</translation>
     </message>
@@ -16165,18 +15246,14 @@ at least one peer was not added to a group</source>
         <translation>Älteste oben</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Log</source>
-        <translation type="vanished">Protokoll</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivität</translation>
     </message>
 </context>
 <context>
@@ -16229,10 +15306,6 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Sicherheit</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16254,10 +15327,6 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Verbindungsversuch</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16274,14 +15343,10 @@ at least one peer was not added to a group</source>
         <source>Ip security</source>
         <translation>IP-Sicherheit</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Protokoll</translation>
-    </message>
     <message>
         <location line="-92"/>
         <source>Activity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Aktivität</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -16340,10 +15405,6 @@ at least one peer was not added to a group</source>
         <source>Chat rooms</source>
         <translation>Chaträume</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">Chaträume</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16419,24 +15480,16 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation>Alle Hinweise vorübergehend deaktivieren</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Neuigkeiten</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Benachrichtigungsfeld</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">Alle ungelesenen Nachrichten zählen</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation>Passphrase erforderlich</translation>
     </message>
@@ -16456,12 +15509,12 @@ at least one peer was not added to a group</source>
         <translation>Falsches Passwort!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Nicht registriertes Plug-in/Programm</translation>
     </message>
@@ -16476,19 +15529,7 @@ at least one peer was not added to a group</source>
         <translation>Bitte überprüfe deine Systemuhr.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Prüfe freigegebene Dateien...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Erstelle Prüfsumme</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Speichere Dateiindex...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -16499,17 +15540,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Unbekannter Titel</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Verschlüsselte Nachr.</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Damit die Chatlobbys richtig funktionieren, muss auf deinem Computer die richtige Zeit eingestellt sein. Bitte prüfe ob dies der Fall ist. (Es wurde eine mögliche Zeitabweichung von mehreren Minuten gegenüber deinen Freunden festgestellt.)</translation>
     </message>
@@ -16517,7 +15560,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Freund Online</translation>
     </message>
@@ -16564,15 +15607,11 @@ Minimalmodus: 10% vom Standarddatenaufkommen und (unfertig) pausiert alle Datei
         <location line="+4"/>
         <location line="+5"/>
         <source>Turtle routing disabled!</source>
-        <translation type="unfinished"></translation>
+        <translation>Turtle-Routing deaktiviert!</translation>
     </message>
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Dialog</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -16638,10 +15677,6 @@ Minimalmodus: 10% vom Standarddatenaufkommen und (unfertig) pausiert alle Datei
         <source>This profile has signed your own profile key</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Schlüsselsignaturen :</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16667,7 +15702,12 @@ p, li { white-space: pre-wrap; }
         <translation>PGP-Schlüssel</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16676,10 +15716,6 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">PGP-Schlüssel unterzeichnen</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16716,12 +15752,7 @@ p, li { white-space: pre-wrap; }
         <translation>Signaturen einschließen</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Optionen</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16767,21 +15798,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Fehler: Kann Nachbardetails nicht ermitteln.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Der angegebene Schlüsselalgorithmus wird von RetroShare nicht unterstützt.
@@ -16800,7 +15831,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Das Vertrauensniveau drückt dein eigenes Vertrauen in diesen Schlüssel aus. Es wird weder von der Software genutzt noch geteilt, kann aber zum Merken guter bzw. schlechter Schlüssel nützlich sein.</translation>
     </message>
@@ -16852,12 +15883,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+2"/>
         <source>Identity creation failed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Identitätserstellung fehlgeschlagen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ohne Ihr Profilpasswort können Sie keine mit Ihrem Profil verknüpfte Identität erstellen.</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -16869,10 +15900,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Vielleicht ist das Passwort falsch</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -16880,12 +15907,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>RetroShare-Profil</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Dies ist dein eigener PGP-Schlüssel und er wurde signiert von:</translation>
     </message>
@@ -16911,7 +15938,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
@@ -16932,7 +15959,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Element entfernen</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
@@ -16972,7 +15999,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Nachricht schreiben</translation>
     </message>
@@ -16986,10 +16013,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Freund verbunden</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Verbindungsversuch</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17028,17 +16051,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished">Unbekannt</translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Unbekannter Nachbar</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Nachricht senden</translation>
     </message>
@@ -17090,10 +16109,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Chat with this person as...</source>
         <translation>Mit dieser Person chatten als...</translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">Nachricht an diese Person senden</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17102,17 +16117,17 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+45"/>
         <source>Send message</source>
-        <translation type="unfinished">Nachricht senden</translation>
+        <translation>Nachricht senden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Send invite</source>
-        <translation type="unfinished"></translation>
+        <translation>Einladung senden</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Add to Contacts</source>
-        <translation type="unfinished">Zu Kontakte hinzufügen</translation>
+        <translation>Zu Kontakte hinzufügen</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -17209,13 +16224,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formular</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17223,23 +16231,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Foto</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Kommentar</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Zusammenfassung</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17300,14 +16296,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Kommentar hinzufügen</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Schreibe einen Kommentar...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17378,10 +16366,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Album erstellen</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Album ansehen</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17403,17 +16387,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diaschau</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Eigene Alben</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Abonnierte Alben</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Freigegebene Alben</translation>
     </message>
@@ -17443,7 +16427,7 @@ kannst musst du eines auswählen!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Albumname</translation>
     </message>
@@ -17502,21 +16486,21 @@ kannst musst du eines auswählen!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gepostet von</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">vor</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -17550,12 +16534,12 @@ kannst musst du eines auswählen!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Mehr Details über dieses Plug-in anzeigen</translation>
     </message>
@@ -17701,51 +16685,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Plug-in Ordner</translation>
     </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[deaktivert]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Keine API-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[Ladeproblem]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Keine SVN-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Fehler beim Laden.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Fehlendes Symbol. Falsche Version?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Kein Plug-in Objekt</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Plug-in ist geladen.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Unbekannter Status.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Lies dies, um über die Plug-in-Entwicklung zu erfahren. Ihre Prüfsumme wird nicht überprüft, normalerweise
-schützt dich aber eine Überprüfung des Prüfsumme vor
-schädlichem Verhalten von Plug-ins.</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -17815,12 +16754,27 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation>Immer im Vordergrund</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
-        <source>Choose window color...</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation>Diese Person verbannen (setzt negative Meinung)</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation>Neutrale Meinung abgeben</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation>Positive Meinung abgeben</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Choose window color...</source>
+        <translation>Wählen Sie die Fensterfarbe...</translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -17854,21 +16808,13 @@ schädlichem Verhalten von Plug-ins.</translation>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Das Schließen dieses Fensters beendet die Unterhaltung, benachrichtigt den Gesprächspartner und löscht den verschlüsselten Tunnel.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Tunnel schließen?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
     <message>
         <location filename="../gui/Posted/PostedCardView.ui" line="+146"/>
         <source>Posted by</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gepostet von</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -17881,7 +16827,7 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished">Neu</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Daumen hoch</translation>
     </message>
@@ -17901,8 +16847,8 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentare</translation>
     </message>
@@ -17927,20 +16873,20 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentar</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kommentare </translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Loading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lade</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -17950,7 +16896,7 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location line="+3"/>
         <source>Show author in people tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Autor auf der Registerkarte Personen anzeigen</translation>
     </message>
     <message>
         <location line="+39"/>
@@ -17961,20 +16907,12 @@ schädlichem Verhalten von Plug-ins.</translation>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Unterzeichnet von:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Notizen</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -17989,12 +16927,22 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Bilddatei laden</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18010,33 +16958,27 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
-        <source>Close this window?</source>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <source>Do you really want to discard your post?</source>
+        <source>There is no image data in the clipboard to paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Beitrag einreichen</translation>
+        <location line="+51"/>
+        <source>Close this window?</source>
+        <translation type="unfinished">Dieses Fenster schließen?</translation>
     </message>
     <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">Du reichst einen Link ein. Der Schlüssel für einen erfolgreichen Beitrag ist interessanter Inhalt und eine passende Überschrift.</translation>
+        <location line="+0"/>
+        <source>Do you really want to discard your post?</source>
+        <translation type="unfinished">Wollen Sie Ihren Beitrag wirklich verwerfen?</translation>
     </message>
     <message>
-        <source>Submit</source>
-        <translation type="vanished">Einreichen</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Einen neuen Beitrag einreichen</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Bitte füge einen Titel hinzu</translation>
     </message>
@@ -18053,15 +16995,25 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location line="+66"/>
         <source>Add Picture</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bild hinzufügen</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18076,10 +17028,10 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished">Veröffentlichen als</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Posten</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -18087,7 +17039,7 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished">Bild</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18097,7 +17049,7 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Link</translation>
     </message>
@@ -18105,96 +17057,48 @@ schädlichem Verhalten von Plug-ins.</translation>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Veröffentlichte Links</translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Thema erstellen</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Eigene Themen</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Abonnierte Themen</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Beliebte Themen</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Andere Themen</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Create Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Board erstellen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>My Boards</source>
-        <translation type="unfinished"></translation>
+        <translation>Meine Boards</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Subscribed Boards</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbonnierte Boards</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Popular Boards</source>
-        <translation type="unfinished"></translation>
+        <translation>Populäre Boards</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Other Boards</source>
-        <translation type="unfinished"></translation>
+        <translation>Andere Boards</translation>
     </message>
 </context>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Posted-Thema</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Thema-Aministratoren hinzufügen</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Themenverwalter auswählen</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Neues Thema erstellen</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Thema bearbeiten</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Thema aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Board erstellen</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -18209,44 +17113,54 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location line="+3"/>
         <source>Edit Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Board bearbeiten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Board aktuallisieren</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Board Admins</source>
-        <translation type="unfinished"></translation>
+        <translation>Board-Admins hinzufügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select Board Admins</source>
-        <translation type="unfinished"></translation>
+        <translation>Board-Admins auswählen</translation>
     </message>
 </context>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation>Letzte Aktivität</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>Posted abonnieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Subscribe</source>
-        <translation type="unfinished">Abonnieren</translation>
+        <translation>Abonnieren</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -18258,29 +17172,22 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location line="+33"/>
         <source>Board Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Board Beschreibung</translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">Posted Beschreibung</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Lade</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">Neues Posted</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
-        <translation type="unfinished"></translation>
+        <translation>Lade...</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation>Nie</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer Board</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -18291,72 +17198,64 @@ schädlichem Verhalten von Plug-ins.</translation>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Site</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Kommentare</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show author in people tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Autor auf der Registerkarte Personen anzeigen</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
-        <translation type="unfinished"></translation>
+        <translation>Kommentare </translation>
     </message>
     <message>
         <location line="+18"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Der Autor dieser Mitteilung (mit ID %1) ist gesperrt.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
-        <translation type="unfinished"></translation>
+        <translation>Zum Betrachten des Bildes anklicken</translation>
     </message>
     <message>
         <location line="+147"/>
         <source>Hide</source>
-        <translation type="unfinished">Verbergen</translation>
+        <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Daumen hoch</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Daumen runter</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Als gelesen markieren und Eintrag entfernen</translation>
     </message>
@@ -18366,7 +17265,7 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation>Neu</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Neuer Kommentar:</translation>
     </message>
@@ -18376,20 +17275,20 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation>Kommentarwert</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Posted by</source>
-        <translation type="unfinished"></translation>
+        <translation>Gepostet von</translation>
     </message>
     <message>
         <location line="+87"/>
         <location filename="../gui/Posted/PostedItem.cpp" line="+6"/>
         <source>Expand</source>
-        <translation type="unfinished">Erweitern</translation>
+        <translation>Erweitern</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -18399,12 +17298,12 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location line="+56"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation>Teilen</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Notes</source>
-        <translation type="unfinished">Notizen</translation>
+        <translation>Notizen</translation>
     </message>
     <message>
         <location line="+50"/>
@@ -18414,80 +17313,13 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location line="+49"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Lade</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Von</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formular</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Heiß</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Neu</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Anfang</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Heute</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Gestern</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">diese Woche</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">diesen Monat</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">dieses Jahr</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Einen neuen Beitrag einreichen</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Nächstes</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Vor dem Abstimmen bitte eine Signier-ID erstellen oder auswählen</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Vorherige</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18507,7 +17339,17 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18517,60 +17359,60 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished">Administrator:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">unbekannt</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">Verteilung:</translation>
     </message>
     <message>
         <location line="-39"/>
         <source>Last activity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Letzte Aktivität:</translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellt</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
-        <translation type="unfinished"></translation>
+        <translation>Popularität:</translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
-        <source>Posts</source>
-        <translation type="unfinished">Beiträge</translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Create Post</source>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+166"/>
+        <source>Posts</source>
+        <translation>Beiträge</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>Create Post</source>
+        <translation>Beitrag erstellen</translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18590,9 +17432,9 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished">Heiß</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
-        <translation type="unfinished">Suchen</translation>
+        <translation>Suchen</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -18602,7 +17444,7 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location line="+25"/>
         <source>Previous</source>
-        <translation type="unfinished">Vorherige</translation>
+        <translation>Vorherige</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -18620,17 +17462,17 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18642,15 +17484,20 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location line="+31"/>
         <source>Empty</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Leer</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18660,27 +17507,31 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished">Bearbeiten</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18695,7 +17546,7 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation type="unfinished">Abonnieren</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Nie</translation>
     </message>
@@ -18769,6 +17620,16 @@ schädlichem Verhalten von Plug-ins.</translation>
         <source>No Channel Selected</source>
         <translation type="unfinished">Keinen Kanal gewählt</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -18777,10 +17638,6 @@ schädlichem Verhalten von Plug-ins.</translation>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Jedes Thema in einem neuen Reiter öffnen.</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -18794,10 +17651,6 @@ schädlichem Verhalten von Plug-ins.</translation>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Posted</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -18866,16 +17719,16 @@ schädlichem Verhalten von Plug-ins.</translation>
         <translation>Profil-Manager</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -18987,7 +17840,7 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Statusnachricht ändern</translation>
@@ -19003,7 +17856,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Profil-Manager</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Öffentliche Information</translation>
     </message>
@@ -19038,12 +17891,12 @@ und den Import zum Laden verwenden</translation>
         <translation>Online seit:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Andere Informationen</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Meine Adresse</translation>
     </message>
@@ -19087,51 +17940,27 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Beitrag von:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Konto 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Konto 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Konto 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Zu Puls hinzufügen</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">filtern</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">URL-Hinzufüger</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Anzeigen als</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19141,12 +17970,12 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished">Von:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19176,13 +18005,13 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished">Negativ</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19191,15 +18020,25 @@ und den Import zum Laden verwenden</translation>
         <location line="+4"/>
         <location line="+4"/>
         <source>Drag and Drop Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Drag and Drop Bild</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation>Entfernen Sie alle Bilder</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation>Bild hinzufügen</translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19208,17 +18047,13 @@ und den Import zum Laden verwenden</translation>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Puls an Wire senden</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Posten</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19233,34 +18068,24 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilder ausblenden</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PulseItem</name>
-    <message>
-        <source>From</source>
-        <translation type="vanished">Von</translation>
+        <translation>Bilder hinzufügen</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation type="vanished">Datum</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">…</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation>Bilddatei laden</translation>
     </message>
 </context>
 <context>
@@ -19268,15 +18093,15 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location filename="../gui/TheWire/PulseMessage.ui" line="+14"/>
         <source>Form</source>
-        <translation type="unfinished">Formular</translation>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
         <source>Click to view picture</source>
-        <translation type="unfinished"></translation>
+        <translation>Zum Betrachten des Bildes anklicken</translation>
     </message>
     <message>
         <location line="-54"/>
@@ -19284,13 +18109,13 @@ und den Import zum Laden verwenden</translation>
         <location line="+19"/>
         <location line="+19"/>
         <source>Image</source>
-        <translation type="unfinished">Bild</translation>
+        <translation>Bild</translation>
     </message>
 </context>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19300,9 +18125,9 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
-        <translation type="unfinished"></translation>
+        <translation>Antworten</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -19314,7 +18139,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="-71"/>
         <source>REPUBLISH</source>
-        <translation type="unfinished"></translation>
+        <translation>REPUBLIKIEREN</translation>
     </message>
     <message>
         <location line="+54"/>
@@ -19324,12 +18149,12 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+54"/>
         <source>SHOW</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigen</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
-        <translation type="unfinished"></translation>
+        <translation>Folgen</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -19337,7 +18162,7 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19357,7 +18182,7 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19387,7 +18212,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">...</translation>
     </message>
     <message>
         <location line="+79"/>
@@ -19448,7 +18273,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+78"/>
         <source>REPLY</source>
-        <translation type="unfinished"></translation>
+        <translation>Antworten</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -19460,7 +18285,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="-71"/>
         <source>REPUBLISH</source>
-        <translation type="unfinished"></translation>
+        <translation>REPUBLIKIEREN</translation>
     </message>
     <message>
         <location line="+54"/>
@@ -19470,48 +18295,53 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+54"/>
         <source>SHOW</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzeigen</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
-        <translation type="unfinished"></translation>
+        <translation>Folgen</translation>
     </message>
 </context>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Standort</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation>Profil editieren</translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19543,16 +18373,16 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
-        <translation type="unfinished"></translation>
+        <translation>Folgen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Bestätigung</translation>
     </message>
@@ -19768,7 +18598,7 @@ hinzufügen und den Assistent zum Hinzufügen von Freunden zu starten.
     <message>
         <location line="+17"/>
         <source>Chat room not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Chatraum nicht gefunden</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -19823,12 +18653,12 @@ Die Zeichen &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; werden durch &
         <translation>Nachbardetails</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Dateianforderung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Diese Version von RetroShare benutzt das OpenPGP-SDK. Der Schlüsselring des Systems wird nicht mehr verwendet, sondern ein eigener Schlüsselring für alle laufenden Instanzen.&lt;br&gt;&lt;br&gt;Du scheinst keinen solchen Schlüsselring zu besitzen, obwohl Schlüssel von existierenden RetroShare-Accounts benötigt werden. Vielleicht hast du auch gerade zu dieser Version gewechselt.</translation>
     </message>
@@ -19859,41 +18689,45 @@ Die Zeichen &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; werden durch &
         <translation>Ein unerwarteter Fehler ist aufgetreten. Bitte melde &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor Manager kann nicht gestartet werden!</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Tor cannot be started on your system: 
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Tor kann auf deinem System nicht gestartet werden:
+
+</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Cannot start Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor kann nicht gestartet werden</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Sorry but Tor cannot be started on your system!
 
 The error reported is:&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor kann auf deinem System leider nicht gestartet werden!
+
+Die Fehlermeldung lautet:&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cannot start a hidden tor service!</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann einen hidden Tor service nicht starten!</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>It was not possible to start a hidden service.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es war nicht möglich, einen hidden service zu starten.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Mehrere Instanzen</translation>
@@ -19912,7 +18746,29 @@ Lockdatei:
         <source>An unexpected error occurred when Retroshare tried to acquire the single instance lock
  Lock file:
 </source>
-        <translation>Ein unerwarteter Fehler während des &quot;Single instance lock&quot; ist aufgetreten</translation>
+        <translation>Ein ist ein unerwarteter Fehler während des &quot;Single instance lock&quot; aufgetreten
+Lock datei:
+</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation>Altes Zertifikat</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation>Dieser Knoten verwendet alte Zertifikatseinstellungen, die von Ihrer aktuellen OpenSSL-Bibliotheksversion als zu schwach angesehen wird. Sie müssen einen neuen Knoten erstellen, der möglicherweise das gleiche Profil verwendet.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation>Tor-Fehler</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation>Tor kann nicht ausgeführt/konfiguriert werden. Stellen Sie sicher, dass es auf Ihrem System installiert ist.</translation>
     </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
@@ -19922,17 +18778,17 @@ Lockdatei:
     <message>
         <location line="+11"/>
         <source>Tunnel is pending</source>
-        <translation type="unfinished"></translation>
+        <translation>Tunnel ist in Vorbereitung</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>(some undelivered messages)</source>
-        <translation type="unfinished"></translation>
+        <translation>(einige unzustellbare Nachrichten)</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>End-to-end encrypted conversation established</source>
-        <translation type="unfinished"></translation>
+        <translation>Ende-zu-Ende-verschlüsselte Konversation aufgebaut</translation>
     </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
@@ -19996,7 +18852,7 @@ Der gemeldete Fehler ist:
         <translation>Daten weiter</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Du scheinst Netzknoten zu besitzen, die mit DSA-Schlüsseln verknüpft sind:</translation>
     </message>
@@ -20006,7 +18862,7 @@ Der gemeldete Fehler ist:
         <translation>DSA-Schlüssel werden von dieser Version von RetroShare noch nicht unterstützt. Alle diese Netzknoten können nicht benutzt werden. Das tut uns sehr leid.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>aktiviert</translation>
     </message>
@@ -20016,7 +18872,7 @@ Der gemeldete Fehler ist:
         <translation>deaktivert</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>IP %1 in Whitelist verschieben</translation>
     </message>
@@ -20032,7 +18888,7 @@ Der gemeldete Fehler ist:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>Vor %1 Sekunden</translation>
     </message>
@@ -20100,7 +18956,7 @@ Security: no anonymous IDs</source>
 Sicherheit: keine anonymen Kennungen</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20125,12 +18981,12 @@ Sicherheit: keine anonymen Kennungen</translation>
         <location line="+1"/>
         <location filename="../gui/common/NewFriendList.cpp" line="+1"/>
         <source>unable to parse XML file!</source>
-        <translation type="unfinished"></translation>
+        <translation>XML-Datei kann nicht geparst werden!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbestimmt</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20170,12 +19026,12 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="-101"/>
         <source>Processing</source>
-        <translation type="unfinished"></translation>
+        <translation>Verarbeitung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Choosing group</source>
-        <translation type="unfinished"></translation>
+        <translation>Gruppe auswählen</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20230,42 +19086,42 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location filename="../gui/statistics/GxsIdStatistics.cpp" line="-418"/>
         <source>Discovery</source>
-        <translation type="unfinished">Discovery</translation>
+        <translation>Discovery</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Chat</source>
-        <translation type="unfinished">Chat</translation>
+        <translation>Chat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Messages</source>
-        <translation type="unfinished">Nachrichten</translation>
+        <translation>Nachrichten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Turtle</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heartbeat</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File transfer</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Global router</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File database</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei-Datenbank</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20281,7 +19137,7 @@ Sicherheit: keine anonymen Kennungen</translation>
         <location line="+1"/>
         <location line="+1"/>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20306,22 +19162,38 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>Ban list</source>
-        <translation type="unfinished"></translation>
+        <translation>Bannliste</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation>Knoten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation>Adresse</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
-        <translation type="unfinished">Status</translation>
+        <translation>Status</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Identities</source>
-        <translation type="unfinished">Identitäten</translation>
+        <translation>Identitäten</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20341,27 +19213,27 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>Forums</source>
-        <translation type="unfinished">Foren</translation>
+        <translation>Foren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Boards</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Channels</source>
-        <translation type="unfinished">Kanäle</translation>
+        <translation>Kanäle</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Circles</source>
-        <translation type="unfinished">Kreise</translation>
+        <translation>Kreise</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Reputation</source>
-        <translation type="unfinished">Reputation</translation>
+        <translation>Reputation</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20490,7 +19362,7 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>Circle membership checking</source>
-        <translation type="unfinished"></translation>
+        <translation>Überprüfung der Mitgliedschaft im Kreis</translation>
     </message>
     <message>
         <location filename="../gui/statusbar/hashingstatus.cpp" line="+25"/>
@@ -20507,10 +19379,6 @@ Sicherheit: keine anonymen Kennungen</translation>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Dieses Zertifikat enthält:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -20561,6 +19429,18 @@ Sicherheit: keine anonymen Kennungen</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -20724,7 +19604,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Netzwerkweit</translation>
     </message>
@@ -20907,7 +19787,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Das Laden eingebetteter Bilder ist blockiert.</translation>
     </message>
@@ -20920,7 +19800,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Standardmäßig erlaubt</translation>
     </message>
@@ -21093,25 +19973,35 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Bild speichern</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation>Bild kopieren</translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Quelle des Dokuments</translation>
     </message>
 </context>
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation>Baumansichtoptionen</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21141,14 +20031,6 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">Spalte anzeigen...</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[kein Titel]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -21183,7 +20065,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>Recommend in a message to...</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfehlen Sie in einer Nachricht an...</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -21196,12 +20078,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/RemoteDirModel.cpp" line="-668"/>
         <source>[All friend nodes]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Alle Freundesknoten]</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Only </source>
-        <translation>Nur</translation>
+        <translation>Nur </translation>
     </message>
     <message>
         <location line="+20"/>
@@ -21211,7 +20093,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+506"/>
         <source>This node hasn&apos;t sent any directory information yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Knoten hat noch keine Verzeichnisinformationen gesendet.</translation>
     </message>
 </context>
 <context>
@@ -21224,12 +20106,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+19"/>
         <source>Font size</source>
-        <translation type="unfinished">Schriftgröße</translation>
+        <translation>Schriftgröße</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Text foreground color</source>
-        <translation type="unfinished"></translation>
+        <translation>Vordergrundfarbe des Textes</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -21240,7 +20122,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-3"/>
         <source>Text background color</source>
-        <translation type="unfinished"></translation>
+        <translation>Text-Hintergrundfarbe</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -21276,7 +20158,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Copy</source>
-        <translation type="unfinished">Kopieren</translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -21286,7 +20168,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfügen</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -21301,7 +20183,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+33"/>
         <source>Bold</source>
-        <translation type="unfinished">Fett</translation>
+        <translation>Fett</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -21311,7 +20193,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Italic</source>
-        <translation type="unfinished">Kursiv</translation>
+        <translation>Kursiv</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -21416,7 +20298,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+69"/>
         <source>Document source</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Quelle des Dokuments</translation>
     </message>
     <message>
         <location line="+93"/>
@@ -21436,12 +20318,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+15"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -21516,32 +20398,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+167"/>
         <source>Save Collection File.</source>
-        <translation type="unfinished">Kollektionsdatei speichern.</translation>
+        <translation>Kollektionsdatei speichern.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File already exists.</source>
-        <translation type="unfinished">Datei existiert bereits.</translation>
+        <translation>Datei existiert bereits.</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>What do you want to do?</source>
-        <translation type="unfinished">Was willst du tun?</translation>
+        <translation>Was willst du tun?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Overwrite</source>
-        <translation type="unfinished">Überschreiben</translation>
+        <translation>Überschreiben</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Merge</source>
-        <translation type="unfinished">Zusammenfügen</translation>
+        <translation>Zusammenfügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -21564,12 +20446,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+310"/>
         <source>Destination:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ziel:</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Right click to change download directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechtsklick zum Ändern des Download-Verzeichnisses</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -21690,7 +20572,7 @@ Die betroffenen Dateien sind rot markiert</translation>
     <message>
         <location line="+13"/>
         <source>Choose directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnis wählen</translation>
     </message>
     <message>
         <location line="+256"/>
@@ -21737,7 +20619,7 @@ Die betroffenen Dateien sind rot markiert</translation>
     <message>
         <location line="+357"/>
         <source>Do you want to remove this file from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie diese Datei aus der Liste entfernen?</translation>
     </message>
     <message>
         <location line="-224"/>
@@ -21811,49 +20693,49 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Size</source>
         <comment>i.e: file size</comment>
-        <translation type="unfinished">Größe</translation>
+        <translation>Größe</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Completed</source>
-        <translation type="unfinished">Fertiggestellt</translation>
+        <translation>Fertiggestellt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Speed</source>
         <comment>i.e: Download speed</comment>
-        <translation type="unfinished">Geschwindigkeit</translation>
+        <translation>Geschwindigkeit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Progress / Availability</source>
         <comment>i.e: % downloaded</comment>
-        <translation type="unfinished">Fortschritt/Verfügbarkeit</translation>
+        <translation>Fortschritt/Verfügbarkeit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sources</source>
         <comment>i.e: Sources</comment>
-        <translation type="unfinished">Quellen</translation>
+        <translation>Quellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Status</source>
-        <translation type="unfinished">Status</translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Speed / Queue position</source>
-        <translation type="unfinished">Geschwindigkeit/Warteschlangenposition</translation>
+        <translation>Geschwindigkeit/Warteschlangenposition</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21864,12 +20746,12 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
         <location line="+1"/>
         <source>Download time</source>
         <comment>i.e: Estimated Time of Arrival / Time left</comment>
-        <translation type="unfinished">Restzeit</translation>
+        <translation>Restzeit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hash</source>
-        <translation type="unfinished">Prüfsumme</translation>
+        <translation>Prüfsumme</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21932,34 +20814,34 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Id</source>
-        <translation type="unfinished">ID</translation>
+        <translation>ID</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Last contact</source>
-        <translation type="unfinished"></translation>
+        <translation>Letzter Kontakt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>IP</source>
-        <translation type="unfinished">IP</translation>
+        <translation>IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
-        <translation type="unfinished"></translation>
+        <translation>Profil-ID </translation>
     </message>
     <message>
         <location line="+0"/>
         <source> (Not yet validated)</source>
-        <translation type="unfinished"></translation>
+        <translation> (Noch nicht bestätigt)</translation>
     </message>
 </context>
 <context>
@@ -21967,7 +20849,7 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
     <message>
         <location filename="../gui/gxsforums/GxsForumModel.cpp" line="+340"/>
         <source>Title</source>
-        <translation type="unfinished">Titel</translation>
+        <translation>Titel</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21977,55 +20859,53 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
     <message>
         <location line="+1"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Author</source>
-        <translation type="unfinished">Autor</translation>
+        <translation>Autor</translation>
     </message>
     <message>
         <location line="+206"/>
         <source>Information for this identity is currently missing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Informationen zu dieser Identität fehlen derzeit.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You have banned this ID. The message will not be
 displayed nor forwarded to your friends.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben diese ID verbannt. Die Nachricht wird weder
+angezeigt oder an Ihre Freunde weitergeleitet.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You have not set an opinion for this person,
  and your friends do not vote positively: Spam regulation 
 prevents the message to be forwarded to your friends.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben keine Meinung zu dieser Person abgegeben,
+ und Ihre Freunde stimmen nicht positiv ab: Die Spam-Verordnung 
+verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Message will be forwarded to your friends.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Nachricht wird an Ihre Freunde weitergeleitet.</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
-        <translation type="unfinished">[ ... Redigierte Nachricht ... ]</translation>
+        <translation>[ ... Redigierte Nachricht ... ]</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>[Notification]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Benachrichtigung]</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>[Unknown]</source>
-        <translation type="unfinished">[Unbekannt]</translation>
-    </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Fehlende Nachricht ... ]</translation>
+        <translation>[Unbekannt]</translation>
     </message>
 </context>
 <context>
@@ -22040,6 +20920,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Von</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">An</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22062,13 +20947,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Klicken, um nach Gelesen / Ungelesen zu sortieren</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Klicken, um nach Von zu sortieren</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22091,9 +20981,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">[Benachrichtigung]</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -22112,7 +21004,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Setzt alle RetroShare-Einstellungen zurück.</translation>
     </message>
@@ -22173,7 +21065,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Setzt die Sprache.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Logdatei &quot;%1&quot;: %2 kann nicht geöffnet werden</translation>
     </message>
@@ -22194,11 +21086,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Datenverzeichnis konnte nicht erstellt werden: %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Revision</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22228,7 +21116,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>Ungültige Sprach-Codierung ausgewählt:</translation>
     </message>
@@ -22246,10 +21134,10 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Zugriff auf die Registrierung. Möglicherweise benötigen Sie Administratorrechte.</translation>
     </message>
 </context>
 <context>
@@ -22263,12 +21151,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Gib einen Suchbegriff ein (min. 3 Zeichen)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Suche starten</translation>
     </message>
@@ -22330,7 +21218,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Leeren</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Schlüsselwörter</translation>
     </message>
@@ -22345,7 +21233,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Such-ID</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Dateiname</translation>
     </message>
@@ -22445,23 +21333,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Auswahl herunterladen</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Dateiname</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>RetroShare-Link senden</translation>
     </message>
@@ -22471,7 +21359,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Download-Hinweis</translation>
     </message>
@@ -22508,7 +21396,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Alle entfernen</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Ordner</translation>
@@ -22519,17 +21407,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Neu(e) RetroShare-Link(s)</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Ordner öffnen</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Kollektion erstellen...</translation>
     </message>
@@ -22549,7 +21437,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Von Kollektion herunterladen...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Kollektion</translation>
     </message>
@@ -22557,7 +21445,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Nachbardetails</translation>
     </message>
@@ -22573,22 +21461,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Element entfernen</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>IP-Adresse:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Nachbar-ID:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Nachbarname:</translation>
     </message>
@@ -22605,7 +21493,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation>aber gemeldet:</translation>
     </message>
@@ -22630,8 +21518,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Dies ist die IP, von der dein Freund behauptet, dass er mit ihr verbunden ist. Wenn du deine IP gerade geändert hast, ist dies ein Fehlalarm. Falls nicht, bedeutet dies, dass deine Verbindung zu diesem Freund durch einen zwischengeschalteten Nachbarn weitergeleitet wird, was verdächtig wäre.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Diese Warnung ist hier um dich vor Netzwerktrafficweiterleitungsattacken zu schützen. In so einem Fall sieht der Freund mit dem du verbunden bist nicht deine externe IP sondern die IP des Angreifers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Wenn du allerdings deine IP gerade geändert hast (einige Netzprovider erzwingen eine Änderung der IP in regelmäßigem Abstand), dann bedeutet diese Warnung, dass dein Freund sich zu deiner neuen IP verbunden hat, bevor Retroshare etwas über den IP-Wechsel herausgefunden hat. In diesem Fall ist nicht falsch.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Du kannst dies Warnung ganz einfach unterdrücken, indem du deine eigene IP zur Whitelist hinzufügst (z.B. den IP-Bereich deines Netzproviders) oder diese Warnung komplett in Optionen-&amp;gt;Meldungen-&amp;gt;Feed deaktivierst.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22639,7 +21527,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>möchte mit dir in RetroShare befreundet sein</translation>
     </message>
@@ -22670,7 +21558,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -22692,7 +21580,7 @@ prevents the message to be forwarded to your friends.</source>
     <message>
         <location line="+19"/>
         <source>Trust: </source>
-        <translation>Vertrauen:</translation>
+        <translation>Vertrauen: </translation>
     </message>
     <message>
         <location line="+13"/>
@@ -22715,12 +21603,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Nachricht schreiben</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Verbindungsversuch</translation>
     </message>
@@ -22740,31 +21628,32 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Unbekannter (ausgehender) Verbindungsversuch</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Unbekanntes Sicherheitsproblem</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation>Ein unbekannter Peer</translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
-        <translation type="unfinished">Unbekannt</translation>
+        <translation>Unbekannt</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Profile ID: </source>
-        <translation type="unfinished"></translation>
+        <translation>Profil-ID: </translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Unbekannter Nachbar</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
@@ -22774,7 +21663,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Möchtest du diesen Freund entfernen?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Zertifikat hat die falsche Signatur!! Dieser Nachbar ist nicht, wer er vorgibt zu sein.</translation>
     </message>
@@ -22784,12 +21673,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Fehlendes/beschädigtes SSL-Zertifikat. Kein echter Retroshare-Benutzer</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>Zertifikat verursachte einen internen Fehler.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Nachbar/Netzknoten nicht in Freundesliste (PGP-ID=</translation>
     </message>
@@ -22848,12 +21737,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Lokale Adresse</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22874,22 +21763,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Lokales Netz</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Externer IP Adressen Finder</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Bekannte / vorherige IPs:</translation>
     </message>
@@ -22905,21 +21794,16 @@ wird es helfen Verbindungen aufzubauen, trotz geringer Anzahl von Freunden.
 Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>RetroShare erlauben, folgende Webseiten nach deiner IP zu fragen:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>KiB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Akzeptable Ports reichen von 10 bis 65535. Normalerweise sind Ports unter 1024 von deinem System reserviert.</translation>
     </message>
@@ -22929,23 +21813,46 @@ Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
         <translation>Akzeptable Ports reichen von 10 bis 65535. Normalerweise sind Ports unter 1024 von deinem System reserviert.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Onion-Adresse</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Discovery Ein (empfohlen)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation>Externe</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Discovery Aus</translation>
     </message>
@@ -22955,7 +21862,7 @@ Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
         <translation>Versteckt - Siehe Konfiguration</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>I2P-Adresse</translation>
     </message>
@@ -22980,37 +21887,95 @@ Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
         <translation>eingehend in Ordnung</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>Proxy scheint zu funktionieren.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P-Proxy ist nicht aktiviert</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23025,71 +21990,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">unbekannt</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23099,22 +22000,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Du bist durch den versteckten Dienst erreichbar.</translation>
     </message>
@@ -23126,12 +22012,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Versteckter Modus]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dies löscht die Liste der bekannten Adressen. Diese Funktion ist nützlich, wenn deine Adressliste aus irgendeinem Grund ungültige/irrelevante/abgelaufene Adressen enthält, von denen du nicht willst, dass sie an deine Freunde als Kontaktadressen weitergegeben werden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23141,7 +22027,7 @@ Also check your ports!</source>
         <translation>Leeren</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>Download-Limit (KB/s) </translation>
     </message>
@@ -23156,23 +22042,23 @@ Also check your ports!</source>
         <translation>Upload-Limit (KB/s) </translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Die Uploadbegrenzung deckt die gesamte Saoftware ab. Eine zu kleine Uploadbegrenzung kann letztendlich Dienste mit niedriger Priorität (Foren, Kanäle) blockieren. Ein Minimumwert von 50KB/s wird empfohlen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Konfiguriere deinen Tor und I2P SOCKS Proxy hier. Damit kannst du dich auch mit hidden Knoten verbinden.&lt;/p&gt;&lt;p&gt; &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23183,32 +22069,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
-        <translation type="unfinished"></translation>
+        <translation>aktiviert  erweiterte Einstellungen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>advanced mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterter Modus</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23218,19 +22089,9 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -23240,7 +22101,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
     <message>
         <location line="+13"/>
         <source>generate new</source>
-        <translation type="unfinished"></translation>
+        <translation>neu erstellen</translation>
     </message>
     <message>
         <location line="+53"/>
@@ -23260,7 +22121,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
     <message>
         <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Server Key - When a key it set it will be used to setup a hidden&lt;br/&gt;service for I2P. Otherwise only a client tunnel is created.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Server Key - Wenn ein Key gesetzt wird, wird er verwendet um einen hidden&lt;br/&gt;Service für I2P einzurichten. Ansonsten wird nur ein Client-Tunnel erstellt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -23268,7 +22129,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
@@ -23283,19 +22144,14 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stop</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
-        <translation type="unfinished">Eingehend</translation>
+        <translation>Eingehend</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Setup your hidden address (and port if needed)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Einstellen der hidden Adresse (und Port, falls erforderlich)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -23324,14 +22180,39 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation>Automatisch I2P</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation>Aktivieren Sie I2P SAMv3 - eine Änderung dieser Einstellung erfordert einen Neustart, um vollständig wirksam zu werden</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Enable Relay Connections</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivieren von Relais-Verbindungen</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -23351,7 +22232,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="+20"/>
         <source>Bandwidth per link</source>
-        <translation type="unfinished"></translation>
+        <translation>Bandbreite pro Verbindung</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -23379,7 +22260,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Gesamt:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23404,7 +22285,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Server entfernen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23416,7 +22297,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>IP-Filter</translation>
     </message>
@@ -23439,7 +22320,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -23499,17 +22380,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Zu Whitelist hinzufügen</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Versteckte Dienstkonfiguration</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation>Erlauben Sie RetroShare, meine IP bei diesen DNS-Servern zu erfragen:</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23525,18 +22417,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Dienstadresse</translation>
     </message>
@@ -23571,12 +22463,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Bitte geben Sie eine Dienstadresse ein</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>IP-Bereich</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Von DHT für IP-Maskierung gemeldet</translation>
     </message>
@@ -23599,22 +22491,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Von dir hinzugefügt</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;IPs auf der Whitelist werden aus folgenden Quellen gesammelt: IPs eines manuell ausgetauschten Zertifikats, von dir in diesem Fenster oder in den Sicherheitseingabeelementen eingegebene IP-Bereiche.&lt;/p&gt;&lt;p&gt;Das Standardverhalten von RetroShare ist (1) Verbindungen zu Nachbarn mit IP-Adressen in der Whitelist immer zulassen, auch wenn die IP ebenfalls in der Blacklist eingetragen ist;  (2) optional erfordern, dass die IPs in der Whitelist eingetragen sind. Du kannst dieses Verhalten für jeden Nachbarn im &amp;quot;Details&amp;quot;-Fenster eines jeden RetroShare-Netzknotens ändern.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT erlaubt es dir Verbindungdsanfragen von deinen Freunden mit Hilfe von BitTorrent&apos;s DHT zu beantworten. Es verbessert die Konnektivität enorm. Im DHT werden keine Informationen gespeichert. Es dient nur als Proxysystem um Verbindung mit anderen Retroshare Netzknoten aufzunehmen.&lt;/p&gt;&lt;p&gt;Der Discovery Dienst sendet node namen und ids deiner vertreuenswürdigen Konakte an verbundene Nachbarn, um ihnen bei der Wahl neuer Freunde zu helfen. Die Freundschaft wird jedoch nie automatisch hergestellt und beide Nachbarn müssen sich immer noch gegenseitig vertrauen, um eine Verbindung zu erlauben. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Die Kugel wird grün, sobald es RetroShare gelingt, deine eigene IP von den unten aufgeführten Webseiten zu bekommen - sofern du diese Aktion aktiviert hast. RetroShare nutzt auch noch andere Wege, um deine IP herauszufinden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Diese Liste wird automatisch mit Informationen aus veschiedenen Quellen gefüllt: Maskierte Nachbarn gemeldet vom DHT, von dir eingetragene IP Bereiche und von deinen Freunden übermittelte IP Bereiche. Die Grundeinstellung sollte dich gegen groß angelegte Verbindungsweiterleitungsattacken schützen.&lt;/p&gt;&lt;p&gt;Automatisches eintragen von markierten IPs kan die IPs deiner Freunde auf die Blacklist setzen. Benutze in diesem Fall das Kontextmenü, um sie auf die Whitelist zu verschieben.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23649,7 +22541,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Automatisch Bereiche DHT-maskierender IPs sperren, beginnend ab</translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23659,12 +22551,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks Proxy</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor ausgehend o. k.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor-Proxy ist nicht aktiviert</translation>
     </message>
@@ -23744,7 +22636,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Wähle die Nachbarn, mit denen du den privaten Veröffentlichungsschlüssel teilen möchtest</translation>
     </message>
@@ -23754,12 +22646,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Für Freund teilen</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Teilen</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Du kannst deine Freunde von deinem Kanal wissen lassen, indem du ihn mit ihnen teilst.
@@ -23779,9 +22671,9 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Ordnerfreigabe-Manager</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Freigegebenes Verzeichnis</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -23799,17 +22691,17 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Sichtbarkeit</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu hinzufügen</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Freigabe hinzufügen</translation>
     </message>
@@ -23819,7 +22711,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Anwenden und Schließen</translation>
     </message>
@@ -23841,7 +22733,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+1"/>
         <source>Choose directory to share...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnis zum Freigeben auswählen...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -23851,32 +22743,32 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+48"/>
         <source>[Unset] (Double click to change)</source>
-        <translation type="unfinished"></translation>
+        <translation>[Ungesetzt] (Doppelklick zum Ändern)</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Double click to select which groups of friends can see the files</source>
-        <translation type="unfinished"></translation>
+        <translation>Doppelklick, um auszuwählen, welche Gruppen von Freunden die Dateien sehen dürfen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double click to change the name that friends will see.</source>
-        <translation type="unfinished"></translation>
+        <translation>Doppelklicken Sie darauf, um den Namen zu ändern, den Ihre Freunde sehen werden.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Double click to change shared directory path</source>
-        <translation type="unfinished"></translation>
+        <translation>Doppelklick zum Ändern des gemeinsamen Verzeichnispfades</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Directory does not exist! Double click to change shared directory path</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Verzeichnis existiert nicht! Doppelklicken Sie, um den Pfad zum gemeinsamen Verzeichnis zu ändern</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>[All friend nodes]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Alle Freundesknoten]</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -23891,7 +22783,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+21"/>
         <source>Choose a directory to share</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie ein Verzeichnis zur Freigabe</translation>
     </message>
     <message>
         <location line="+64"/>
@@ -23910,7 +22802,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Ordner nicht gefunden oder Ordnername nicht akzeptiert.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Dies ist eine Liste freigegebener Ordner. Du kannst mit den Knöpfen unten Ordner hinzufügen und entfernen. Wenn du einen neuen Ordner hinzufügst sind alle Dateien darin von Anfang an freigegeben. Du kannst für jeden freigegebenen Ordner die Freigabeflags separat festlegen.</translation>
     </message>
@@ -23918,14 +22810,14 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Dateien</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
+        <translation>Freigegebene Verzeichnisse konfigurieren</translation>
     </message>
     <message>
         <location line="+73"/>
@@ -23969,11 +22861,16 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>Dateien prüfen</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Auswahl herunterladen</translation>
     </message>
@@ -23983,7 +22880,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>RetroShare-Links in die Zwischenablage kopieren</translation>
     </message>
@@ -23998,9 +22895,9 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>RetroShare-Links senden</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
-        <translation type="unfinished"></translation>
+        <translation>Einige Dateien wurden ausgelassen</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -24014,14 +22911,14 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Empfehlung(en)</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Kollektion erstellen...</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Stop sharing this file</source>
-        <translation type="unfinished"></translation>
+        <translation>Freigabe dieser Datei beenden</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -24039,14 +22936,14 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Von Kollektion herunterladen...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Einige Dateien wurden ausgelassen, weil sie noch nicht indexiert wurden.</translation>
     </message>
     <message>
         <location line="+682"/>
         <source>Search string should be at least 3 characters long.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Suchbegriff sollte mindestens 3 Zeichen lang sein.</translation>
     </message>
     <message>
         <location line="+44"/>
@@ -24056,12 +22953,12 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+36"/>
         <source>Warning: You reach max (%1) files in flat list. No more will be added.</source>
-        <translation type="unfinished"></translation>
+        <translation>Warnung: Sie haben die maximale Anzahl (%1) von Dateien in der Flat-Liste erreicht. Es werden keine weiteren hinzugefügt.</translation>
     </message>
     <message>
         <location line="+157"/>
         <source>No result.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Ergebnis.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -24071,7 +22968,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+2"/>
         <source>Found %1 results.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Ergebnisse gefunden.</translation>
     </message>
 </context>
 <context>
@@ -24182,12 +23079,12 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Konfiguration laden</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Oberfläche erstellen</translation>
     </message>
@@ -24211,7 +23108,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Passwort speichern</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Anmelden</translation>
     </message>
@@ -24231,7 +23128,11 @@ Die aktuellen Identitäten/Orte werden nicht geändert.</translation>
 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;New Profile/Node&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&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;Neues Profil/Knoten&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../gui/StartDialog.cpp" line="+17"/>
@@ -24371,7 +23272,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
     <message>
         <location line="+3"/>
         <source>Identities</source>
-        <translation type="unfinished">Identitäten</translation>
+        <translation>Identitäten</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -24381,7 +23282,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
     <message>
         <location line="+3"/>
         <source>Gxs Transport</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -24564,7 +23465,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
         <translation>Statusnachricht</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Nachricht:</translation>
     </message>
@@ -24809,7 +23710,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Alle Schlagwörter entfernen</translation>
     </message>
@@ -24837,117 +23738,161 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../TorControl/TorControlWindow.ui" line="+20"/>
         <source>Dialog</source>
-        <translation type="unfinished">Dialog</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Setting up Tor...</source>
-        <translation type="unfinished"></translation>
+        <translation>Einrichten von Tor...</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Not started</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht gestartet</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
-        <translation type="unfinished"></translation>
+        <location line="+13"/>
+        <source>Hidden address:</source>
+        <translation>Hidden adresse:</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht festgelegt</translation>
     </message>
     <message>
         <location line="-10"/>
         <source>Onion address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Onion adresse:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation>Nicht verbunden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation>Verbinde</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation>Socket verbunden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation>Authentifizierung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation>Authentifiziert</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation>Hidden Service bereit</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation>Tor bereit</translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
-        <translation type="unfinished"></translation>
+        <translation>Prüfe, ob Tor in deinem ausführbaren Pfad zugänglich ist</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Warten auf Tor...]</translation>
     </message>
 </context>
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Diese Version von Retroshare benutzt Tor, um sich mit deinen vertrauenswürdigen Knoten zu verbinden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor ist derzeit offline</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Tor is OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor ist OK</translation>
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Tor-Konfiguration</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor-Proxy ist OK</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Tor proxy is not available</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor-Proxy ist nicht verfügbar</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>I2P</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>i2p proxy is OK</source>
-        <translation type="unfinished"></translation>
+        <translation>i2p-Proxy ist OK</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>i2p proxy is not available</source>
-        <translation type="unfinished"></translation>
+        <translation>i2p-Proxy ist nicht verfügbar</translation>
     </message>
 </context>
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Übertragungsoptionen</translation>
@@ -24958,32 +23903,37 @@ p, li { white-space: pre-wrap; }
         <translation>Maximale gleichzeitige Downloads:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
-        <translation type="unfinished"></translation>
+        <translation>Freigegebene Verzeichnisse</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Automatically share incoming directory (Recommended)</source>
-        <translation type="unfinished">Eingehende Ordner automatisch freigeben (Empfohlen)</translation>
+        <translation>Eingehende Ordner automatisch freigeben (Empfohlen)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnisse</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation>Freigegebene Verzeichnisse konfigurieren</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
-        <translation type="unfinished"></translation>
+        <translation>Freigegebene Verzeichnisse automatisch überprüfen </translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation> Minute(n)</translation>
     </message>
@@ -24995,7 +23945,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>follow symbolic links</source>
-        <translation type="unfinished"></translation>
+        <translation>symbolischen Links folgen</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -25005,7 +23955,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Ignore duplicate files/directories</source>
-        <translation type="unfinished"></translation>
+        <translation>Doppelte Dateien/Verzeichnisse ignorieren</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -25020,7 +23970,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+11"/>
         <source>Ignore files ending with:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ignoriere Dateien, die mit:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -25030,7 +23980,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+11"/>
         <source>ignore files starting with:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien ignorieren, die mit:</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -25056,19 +24006,19 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Automatically donwload RsCollection file content (Not recommended)</source>
-        <translation type="unfinished"></translation>
+        <translation>Inhalt der RsCollection-Datei automatisch herunterladen (nicht empfohlen)</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Partials Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Partials-Verzeichnis</translation>
     </message>
     <message>
         <location line="+51"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25077,7 +24027,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation>Mindestschriftgröße für freigegebene Dateien</translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25099,10 +24054,15 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Allow direct download:</source>
+        <translation>Direkten Download zulassen:</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -25154,12 +24114,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Per user</source>
-        <translation type="unfinished"></translation>
+        <translation>Pro Benutzer</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Trust friend nodes with banned files</source>
-        <translation type="unfinished"></translation>
+        <translation>Vertrauen Sie befreundeten Knoten mit gebannten Dateien</translation>
     </message>
     <message>
         <location line="-153"/>
@@ -25167,14 +24127,9 @@ p, li { white-space: pre-wrap; }
         <translation>Max. weiterzuleitende Tunnelanfragen pro Sekunde:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;bewirkt dass die Übertragung 1MB große Dateistücke in aufsteigender Ordnung anfordert, so dass eine Vorschau während des Downloads ermögllicht wird. &lt;span style=&quot; font-weight:600;&quot;&gt;Zufällig&lt;/span&gt; ist rein zufällig und begünstigt Schwarmverhalten. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressiv&lt;/span&gt; ist ein Kompromiss der das nächste Teilstück zufällig innerhalb von weniger als 50 MB nach dem Ende der patiellen Datei auswählt. Das erlaubt etwas Zufälligket während es hohe Initialisationzeiten für leere Dateien vehindert.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RetroShare wird alle Übertragungen und das Speichern von Konfigurationsdaten aussetzen, wenn der freie Festplattenspeicher unter dieses Limit fällt. Auf einigen Systemen verhindert dies Informationsverlust. Ein Hinweisfenster wird dich warnen, wenn das passiert.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RetroShare wird alle Übertragungen und das Speichern von Konfigurationsdaten aussetzen, wenn der freie Festplattenspeicher unter dieses Limit fällt. Auf einigen Systemen verhindert dies Informationsverlust. Ein Hinweisfenster wird dich warnen, wenn das passiert.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -25182,24 +24137,34 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dieser Wert kontrolliert, wie viele Tunnel-Anfragen dein Nachbar pro Sekunde weiterleiten darf.&lt;/p&gt;&lt;p&gt;Wenn du eine große Internet-Bandbreite hast, kannst du diesen auf 30–40 erhöhen, um statistisch längere Tunnel zu ermöglichen. Vorsicht! Dies erzeugt viele kleine Pakete die deine eigenen Dateitransfers merklich verlangsamen können.&lt;/p&gt;&lt;p&gt;Voreinstellung ist 20. Wenn du dir nicht sicher bist, belasse es dabei.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
-        <source>Set Incoming Directory</source>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+34"/>
+        <source>Set Incoming Directory</source>
+        <translation>Eingehendes Verzeichnis festlegen</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Invalid Input. Have you got the right to write on it?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültige Eingabe. Haben Sie die Rechte, darauf zu schreiben?</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Set Partials Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Partialverzeichnis festlegen</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Invalid Input. It can&apos;t be an already shared directory.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültige Eingabe. Es kann sich nicht um ein bereits freigegebenes Verzeichnis handeln.</translation>
     </message>
     <message>
         <location filename="../gui/settings/TransferPage.h" line="+42"/>
@@ -25210,63 +24175,47 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Download abgeschlossen</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>You have %1 completed transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 transfer abgeschlossen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 completed transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 transfer abgeschlossen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 completed transfers</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 transfers abgeschlossen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 completed transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Du hast %1 fertige Downloads</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Du hast %1 fertigen Download</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 fertige Downloads</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 fertiger Download</translation>
+        <translation>%1 transfer abgeschlossen</translation>
     </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Uploads</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Name</translation>
@@ -25353,7 +24302,7 @@ p, li { white-space: pre-wrap; }
         <location line="-58"/>
         <source>Peer</source>
         <comment>i.e: user name / tunnel id</comment>
-        <translation type="unfinished">Nachbar</translation>
+        <translation>Nachbar</translation>
     </message>
     <message>
         <location line="+61"/>
@@ -25473,7 +24422,12 @@ p, li { white-space: pre-wrap; }
         <translation>Spezifizieren...</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation>In Warteschlange verschieben...</translation>
     </message>
@@ -25498,7 +24452,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ordner auswählen</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Anonymer Ende-zu-Ende-verschlüsselter Tunnel 0x</translation>
     </message>
@@ -25506,7 +24460,7 @@ p, li { white-space: pre-wrap; }
         <location line="+1"/>
         <location line="+5"/>
         <source>Tunnel</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+26"/>
@@ -25519,7 +24473,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -25552,7 +24506,17 @@ p, li { white-space: pre-wrap; }
         <translation>Datei %1 ist nicht komplett. Falls es eine Mediadatei ist, dann versuche &quot;Vorschau&quot;.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Dateinamen ändern</translation>
     </message>
@@ -25567,7 +24531,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bitte gib einen neuen -- und gültigen -- Dateinamen ein</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Alle erweitern</translation>
@@ -25670,47 +24634,42 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Peer</source>
-        <translation type="unfinished">Nachbar</translation>
+        <translation>Nachbar</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+3"/>
         <source>Show Peer Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Peer-Spalte anzeigen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Transferred Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Übertragene Spalte anzeigen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Progress</source>
-        <translation type="unfinished">Fortschritt</translation>
+        <translation>Fortschritt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show Progress Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Fortschrittsspalte anzeigen</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Spalten</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Dateiübertragungen</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Pfad</translation>
     </message>
@@ -25720,7 +24679,7 @@ p, li { white-space: pre-wrap; }
         <translation>Pfadspalte anzeigen</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>Konnte Vorschaudatei nicht löschen</translation>
     </message>
@@ -25730,7 +24689,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nochmal versuchen?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Kollektion erstellen...</translation>
     </message>
@@ -25745,17 +24704,17 @@ p, li { white-space: pre-wrap; }
         <translation>Kollektion ansehen...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation>Kollektion</translation>
     </message>
     <message>
         <location line="+302"/>
         <source>%1 tunnels</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Tunnel</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Anonymer Tunnel 0x</translation>
     </message>
@@ -25788,12 +24747,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-485"/>
         <source>Show Empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Leere anzeigen</translation>
     </message>
     <message>
         <location line="+392"/>
         <source>Temporary shared files</source>
-        <translation type="unfinished"></translation>
+        <translation>Temporäre freigegebene Dateien</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -25804,7 +24763,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-74"/>
         <source>Empty</source>
-        <translation type="unfinished"></translation>
+        <translation>Leer</translation>
     </message>
     <message>
         <location line="+85"/>
@@ -25815,7 +24774,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+169"/>
         <source>Friends Directories [updating...]</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnisse von Freunden [Aktualisierung...]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -25825,7 +24784,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>My Directories [updating...]</source>
-        <translation type="unfinished"></translation>
+        <translation>Meine Verzeichnisse [Aktualisierung...]</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -25835,7 +24794,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source># Files</source>
-        <translation type="unfinished"></translation>
+        <translation># Dateien</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -25884,7 +24843,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-190"/>
         <location line="+19"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished">Unbekannter Nachbar</translation>
+        <translation>Unbekannter Nachbar</translation>
     </message>
 </context>
 <context>
@@ -25928,7 +24887,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+20"/>
         <source>Request id: %1	 %3 secs ago	 from  %2	 %4 (%5 hits)</source>
-        <translation type="unfinished"></translation>
+        <translation>Anfrage-ID: vor %1 %3 Sekunden von %2 %4 (%5 Treffer)</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -25974,11 +24933,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+48"/>
         <source>File transfer tunnels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">Anonyme Tunnel</translation>
+        <translation>Dateiübertragungstunnel</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -25988,7 +24943,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>GXS sync tunnels</source>
-        <translation type="unfinished"></translation>
+        <translation>GXS sync Tunnel</translation>
     </message>
     <message>
         <location line="+76"/>
@@ -26173,48 +25128,49 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>RetroShare-Weboberfläche aktivieren</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation>Status:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Web-Parameter</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Web interface directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzeichnis der Webschnittstelle:</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select directory for webinterface files (advanced)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Verzeichnis für Webinterface-Dateien auswählen (erweitert)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Apply settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen übernehmen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Start web browser</source>
-        <translation type="unfinished"></translation>
+        <translation>Starten Sie den Webbrowser</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="vanished">Port:</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hinweis: Diese Einstellungen haben keinen Einfluss auf den retroshare-Service, der über einen Kommandozeilenschalter verfügt, um die Web-Schnittstelle zu aktivieren und den Listening-Port auszuwählen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="-28"/>
@@ -26222,21 +25178,27 @@ p, li { white-space: pre-wrap; }
         <translation>Zugriff von allen IP-Adressen erlauben (standardmäßig nur localhost)</translation>
     </message>
     <message>
-        <source>Apply setting and start browser</source>
-        <translation type="vanished">Einstellung anwenden und Browser starten</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie das Verzeichnis aus, in dem sich die retroshare webui dateien befinden</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation>Passwort fehlt</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation>Bitte legen Sie eine Passwort fest, um den Zugriff auf die WEB-Schnittstelle zu schützen.</translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>Weboberfläche nicht aktiviert</translation>
     </message>
@@ -26246,12 +25208,12 @@ p, li { white-space: pre-wrap; }
         <translation>Die Weboberfläche ist nicht aktiviert. Aktivieren Sie sie unter Einstellungen -&gt; Weboberfläche.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>Start der Weboberfläche fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Weboberfläche</translation>
     </message>
@@ -26388,11 +25350,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki-Seiten</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Neue Gruppe</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Seitenname</translation>
     </message>
@@ -26407,7 +25365,7 @@ p, li { white-space: pre-wrap; }
         <translation>Orig. ID</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26464,7 +25422,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Create Group</source>
-        <translation type="unfinished">Gruppe erstellen</translation>
+        <translation>Gruppe erstellen</translation>
     </message>
     <message>
         <location line="+493"/>
@@ -26495,7 +25453,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Bearbeitungsverlauf der Seite</translation>
     </message>
@@ -26530,7 +25488,7 @@ p, li { white-space: pre-wrap; }
         <translation>Seiten-ID</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -26560,14 +25518,18 @@ p, li { white-space: pre-wrap; }
         <translation>Schlagwörter</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation>Verlauf</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Bearbeitungsverlauf anzeigen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -26588,7 +25550,7 @@ p, li { white-space: pre-wrap; }
         <translation>Rückgängig machen</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Absenden</translation>
     </message>
@@ -26660,29 +25622,20 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">TimeRange</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Account erstellen</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Post Pulse</source>
-        <translation type="unfinished"></translation>
+        <translation>Beitrag erstellen</translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Aktualisieren</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -26692,152 +25645,84 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+15"/>
         <source>Others</source>
-        <translation type="unfinished">Andere</translation>
+        <translation>Andere</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
-        <translation type="unfinished"></translation>
+        <translation>Wem folgen</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>HomePage</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+24"/>
         <source>&lt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Show Posts from </source>
-        <translation type="unfinished"></translation>
+        <translation>Beiträge anzeigen von </translation>
     </message>
     <message>
         <location line="+14"/>
         <source> All Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Allzeit</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Last 24 hours</source>
-        <translation type="unfinished"></translation>
+        <translation>Letzte 24 Stunden</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Last 7 days</source>
-        <translation type="unfinished"></translation>
+        <translation>Letzte 7 Tage</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Last 30 days</source>
-        <translation type="unfinished"></translation>
+        <translation>Letzte 30 Tage</translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Letzter Monat</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Letzte Woche</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Heute</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Neu</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">von</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">bis</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Suchen/Filtern</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Netzwerkweit</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Konten verwalten</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Zeige:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Du</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Freunde</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Folgend</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Benutzerdefiniert</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Konto 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Konto 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Konto 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">CheckBox</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Puls an Wire senden</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
-        <translation type="unfinished">RetroShare</translation>
+        <translation>RetroShare</translation>
     </message>
     <message>
         <location line="-93"/>
         <location line="+93"/>
         <source>Please create or choose Wire Groupd first</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte erstelle oder wählen Sie ihr Wire Account</translation>
     </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.h" line="+80"/>
         <source>The Wire</source>
-        <translation type="unfinished">The Wire</translation>
+        <translation>The Wire</translation>
     </message>
 </context>
 <context>
@@ -26845,37 +25730,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/TheWire/WireGroupDialog.cpp" line="+78"/>
         <source>Create New Wire</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuen Account erstellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create</source>
-        <translation type="unfinished">Erstellen</translation>
+        <translation>Erstellen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Wire</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Edit Wire</source>
-        <translation type="unfinished"></translation>
+        <translation>Account bearbeiten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update Wire</source>
-        <translation type="unfinished"></translation>
+        <translation>Account aktualisieren</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Wire Admins</source>
-        <translation type="unfinished"></translation>
+        <translation>Admins hinzufügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select Wire Admins</source>
-        <translation type="unfinished"></translation>
+        <translation>Admins auswählen</translation>
     </message>
 </context>
 <context>
@@ -26883,37 +25768,44 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/TheWire/WireGroupExtra.ui" line="+20"/>
         <source>Form</source>
-        <translation type="unfinished">Formular</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
+        <translation>Formular</translation>
     </message>
     <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrundbild</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild auswählen</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlagwort:</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Location:</source>
-        <translation type="unfinished">Ort:</translation>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location line="+7"/>
+        <source>Location:</source>
+        <translation>Ort:</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrund Bild</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation>Benutzen Sie die Maus, um das Bild zu zoomen und für Ihren Hintergrund anzupassen.</translation>
     </message>
 </context>
 <context>
@@ -26921,13 +25813,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/TheWire/WireGroupItem.ui" line="+14"/>
         <source>Form</source>
-        <translation type="unfinished">Formular</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location line="+53"/>
         <location line="+65"/>
         <source>Avatar</source>
-        <translation type="unfinished">Avatar</translation>
+        <translation>Avatar</translation>
     </message>
     <message>
         <location line="-49"/>
@@ -26937,12 +25829,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+20"/>
         <source>Type</source>
-        <translation type="unfinished">Typ</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>\/</source>
-        <translation type="unfinished">\/</translation>
+        <translation>\/</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -26957,13 +25849,43 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Edit Profile</source>
+        <translation>Profil editieren</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation>Eigene</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation>Folgend</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation>Entfolgen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation>Andere</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation>Folgen</translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Unbekannt</translation>
@@ -27041,7 +25963,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1J %2T</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>Ki</translation>
@@ -27072,17 +25994,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+23"/>
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Bilder (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+        <translation>Bilder (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</translation>
     </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27199,7 +26117,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>Denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Verweigert</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -27218,17 +26136,17 @@ Right-click and select &apos;make friend&apos; to be able to connect.</source>
     <message>
         <location filename="../gui/settings/PluginsPage.cpp" line="+62"/>
         <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="unfinished"></translation>
+        <translation>Plugin deaktiviert. Klicken Sie auf die Schaltfläche &quot;Aktivieren&quot; und starten Sie Retroshare neu</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>[disabled]</source>
-        <translation type="unfinished">[deaktivert]</translation>
+        <translation>[deaktivert]</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="unfinished">Keine API-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
+        <translation>Keine API-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -27237,37 +26155,37 @@ Right-click and select &apos;make friend&apos; to be able to connect.</source>
         <location line="+4"/>
         <location line="+4"/>
         <source>[loading problem]</source>
-        <translation type="unfinished">[Ladeproblem]</translation>
+        <translation>[Ladeproblem]</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="unfinished">Keine SVN-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
+        <translation>Keine SVN-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Loading error.</source>
-        <translation type="unfinished">Fehler beim Laden.</translation>
+        <translation>Fehler beim Laden.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Missing symbol. Wrong version?</source>
-        <translation type="unfinished">Fehlendes Symbol. Falsche Version?</translation>
+        <translation>Fehlendes Symbol. Falsche Version?</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>No plugin object</source>
-        <translation type="unfinished">Kein Plug-in Objekt</translation>
+        <translation>Kein Plug-in Objekt</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Plugins is loaded.</source>
-        <translation type="unfinished">Plug-in ist geladen.</translation>
+        <translation>Plug-in ist geladen.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unknown status.</source>
-        <translation type="unfinished">Unbekannter Status.</translation>
+        <translation>Unbekannter Status.</translation>
     </message>
     <message>
         <location line="+67"/>
@@ -27287,7 +26205,7 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location filename="../gui/settings/PluginsPage.h" line="+41"/>
         <source>Plugins</source>
-        <translation type="unfinished">Plug-ins</translation>
+        <translation>Plug-ins</translation>
     </message>
 </context>
 </TS>
diff --git a/retroshare-gui/src/lang/retroshare_el.ts b/retroshare-gui/src/lang/retroshare_el.ts
index a334a32f9..82ed18b46 100644
--- a/retroshare-gui/src/lang/retroshare_el.ts
+++ b/retroshare-gui/src/lang/retroshare_el.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Προσθήκη σχολίου</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: Σύνθετη Αναζήτηση </translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Κριτήρια αναζήτησης</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Προσθήκη κριτηρίου αναζήτησης</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Επαναφορά κριτηρίου αναζήτησης</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Διακοπη αναζητησης</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Αναζήτηση</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Δημιουργία άλμπουμ</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Όνομα άλμπουμ:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Κατηγορία:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Ζώα</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Οικογένεια</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Φίλοι</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Λουλούδια</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Διακοπές</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Τοπία</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Κατοικίδια ζώα</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Πορτρέτα</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Ταξίδια</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Εργασία</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Τυχαία</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Λεζάντα:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Όπου:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Φωτογράφος:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Περιγραφή:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Μοιρασμα ρυθμισεων</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Πολιτική:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Ποιότητα:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Σχόλια:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Ταυτότητα:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Δημοσια</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Περιορισμένη</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Αλλαγή μεγέθους εικόνων (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Αλλαγή μεγέθους εικόνων (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Αποστολή αυθεντικών εικόνων</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Δεν επιτρέπονται σχόλια</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Επικυρωμένα σχόλια</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Επιτρέπονται όλα τα σχόλια</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Δημοσίευση με ταυτότητα</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Πίσω</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Προσθήκη φωτογραφιών</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Δημοσίευση άλμπουμ</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Ατιτλο άλμπουμ</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Πειτε κατι σχετικά με αυτό το άλμπουμ...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Πού τραβήχτηκαν αυτές;</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Φορτωση εικονιδιων του άλμπουμ</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }⏎
         <source>Album</source>
         <translation>Άλμπουμ</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Εικονιδια του άλμπουμ</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Ετικέτα Κειμένου</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Περίληψη</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>Caption</source>
         <translation>Λεζάντα</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Πού:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Πότε</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Περιγραφή:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Ρυθμίσεις Διαμοιρασμού</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Σχόλια</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Δημοσιεύση ταυτότητας</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Ορατότητα</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -483,7 +269,7 @@ p, li { white-space: pre-wrap; }⏎
     <message>
         <location line="+10"/>
         <source>Where:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Όπου:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation> Προειδοποίηση: Οι υπηρεσίες εδώ είναι πειραματικές. Βοηθήστε μας να τις δοκιμάσουμε. 
@@ -783,14 +569,6 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>Κύκλοι</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">GxsForums</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">GxsChannels</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ p, li { white-space: pre-wrap; }
         <translation>Φωτογραφίες</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -842,17 +633,13 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Προσθήκη Άβαταρ</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Μετακινηση</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Ορισμός εικόνας Avatar</translation>
     </message>
@@ -871,10 +658,6 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Μεταφόρτωση μικρογραφίας</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ p, li { white-space: pre-wrap; }
         <translation>Επαναφορά</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished"> Rate ελλειφθει</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Αποστολη Rate</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Παντα μπροστα</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Στιλ</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% Αδιαφανεια</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Αποθήκευση</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Διακοπη</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Από:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Απόκρυψη ρυθμίσεων</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,9 +822,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Σχόλιο</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1093,12 +852,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1126,7 +885,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1184,7 +943,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Αναγνωση καταστασης της εναλλαγης μυνηματος</translation>
     </message>
@@ -1224,7 +983,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1232,12 +991,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Μου αρέσει</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Εικονιδιο</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1283,19 +1042,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="-116"/>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Σχόλιο</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1457,17 +1216,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Κανάλια</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Καρτέλες</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
@@ -1477,7 +1236,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Λήψεις</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Άνοιγμα κάθε καναλιού σε νέα καρτέλα</translation>
     </message>
@@ -1485,7 +1254,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1508,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Μου αρέσει</translation>
     </message>
@@ -1533,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">Εικονιδιο</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1559,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1569,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1778,7 +1537,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Εμφανιση του προθαλαμου συνομιλιων</translation>
     </message>
@@ -1790,22 +1549,6 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Έχετε %1 νέα μηνύματα</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Έχετε %1 νέο μήνυμα</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 νέα μηνύματα</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 νέο μήνυμα</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1827,13 +1570,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Άγνωστη Αίθουσα</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Αφαίρεση Όλων</translation>
     </message>
@@ -1841,13 +1585,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Υπολογισμος</translation>
     </message>
@@ -1857,29 +1601,7 @@ into the image, so as to
         <translation>Θέμα</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1889,7 +1611,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1946,12 +1668,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1961,31 +1683,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Δημιουργια προθαλαμου συνομιλιων</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Δεν υπαρχει κανενα θεμα]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Πληροφοριες επιλεγμενου προθαλαμου συνομιλιων</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Ιδιωτικα</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Δημοσια</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1995,42 +1717,25 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Αναζήτηση στις Αίθουσες Συνομιλίας</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Ανζήτηση Ονόματος</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Εγγεγραμμένος</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Στήλες</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Ναι</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Όχι</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2042,47 +1747,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Θέμα:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Τυπος:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Ασφάλεια:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Ετικετα κειμενου</translation>
     </message>
@@ -2097,13 +1802,24 @@ Double click a chat room to enter and chat.</source>
         <translation>Δεν υπάρχουν ανώνυμες ταυτότητες</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Εμφάνιση</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>στήλη</translation>
@@ -2117,7 +1833,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Απομακρυνση στοιχειου</translation>
     </message>
@@ -2162,7 +1878,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
@@ -2177,19 +1893,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Ρυθμισεις συνομιλιων</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Ενεργοποίηση Emoticons Private Chat</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Ενεργοποιηση της ομαδικης συνομιλιας με εικονιδια</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Ενεργοποίηση προσαρμοσμένων γραμματοσειρων</translation>
     </message>
@@ -2198,10 +1902,6 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>Ενεργοποίηση προσαρμοσμένου μέγεθους γραμματοσειρων</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Ελάχιστο μέγεθος γραμματοσειράς</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2213,7 +1913,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Ενεργοποίηση πλάγιας γραφής</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2238,11 +1938,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Chat λόμπι</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Αναβοσβήνει το εικονίδιο στηλοθέτη</translation>
     </message>
@@ -2251,10 +1947,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Ιδιωτικη συνομιλια</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2276,11 +1968,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Αναβοσβήνει το εικονίδιο παράθυρου/tab</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Γραμματοσειρά συνομιλίας</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Αλλαγή της γραμματοσειράς της συνομιλίας</translation>
     </message>
@@ -2290,14 +1978,10 @@ Double click a chat room to enter and chat.</source>
         <translation>Γραμματοσειρά συνομιλίας:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Ιστορικό</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Στιλ</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2312,17 +1996,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Ομαδική συνομιλία</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Ιδιωτική συνομιλία</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2392,12 +2072,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2407,7 +2097,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2454,7 +2154,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Περιγραφη:</translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2504,11 +2204,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Μέγιστη περίοδος αποθήκευσης, σε μέρες (0 = κράτα όλα)</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Προκαθορισμένη Αναζήτηση</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Διάκριση πεζών-κεφαλαίων</translation>
     </message>
@@ -2547,10 +2243,6 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Προκαθορισμένη ταυτότητα για της αίθουσες συνομιλίας:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2618,7 +2310,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Εμφάνιση συνομιλίας</translation>
     </message>
@@ -2654,7 +2346,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Κλεισιμο</translation>
     </message>
@@ -2689,12 +2381,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Italic</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2774,11 +2466,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2816,7 +2503,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>γράφει...</translation>
     </message>
@@ -2838,7 +2525,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Θέλετε πραγματικά να διαγράψετε το ιστορικό;</translation>
     </message>
@@ -2888,7 +2575,7 @@ after HTML conversion.</source>
         <translation>Είναι απασχολημένος και δεν μπορεί να απαντήσει</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2910,7 +2597,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Εύρεση Προηγούμενου &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2925,16 +2612,12 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Εύρεση&lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Κατάσταση)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Καθορισμός γραμματοσειράς &amp; χρώματος κειμένου</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Επισύναψη αρχείου</translation>
     </message>
@@ -2950,12 +2633,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Επισήμανση επιλεγμένου κειμένου&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2966,12 +2649,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>στοιχεία βρέθηκαν.</translation>
     </message>
@@ -2991,7 +2674,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Πληκτρολογείστε μήνυμα εδώ</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3017,7 +2700,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Εμφάνιση λεπτομερειών: </translation>
     </message>
@@ -3039,7 +2722,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Προσωπικοί κύκλοι</translation>
     </message>
@@ -3065,7 +2748,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Φίλοι</translation>
     </message>
@@ -3125,7 +2808,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Φίλοι φίλων</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,7 +2824,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Κύκλοι</translation>
     </message>
@@ -3193,40 +2876,40 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Σφάλμα:  οι peer λεπτομέρειες δεν μπορουν να παρθουν.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3236,7 +2919,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Κρυπτογράφηση</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation>Μη συνδεδεμένος</translation>
     </message>
@@ -3318,17 +3001,22 @@ Double click on it to add his name on text writer.</source>
         <translation>κανένας</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Αυτό το πιστοποιητικό περιλαμβάνει:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;η &lt;b&gt;ταυτότητα του κόμβου&lt;/b&gt; και &lt;b&gt;όνομα&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3348,7 +3036,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>με</translation>
     </message>
@@ -3365,104 +3053,16 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Συνδεση με τον οδηγο φιλου</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Προσθήκη νέου φίλου</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp; Μπορείτε να πάρετε ένα αρχείο πιστοποιητικού από το φίλο σας</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;Δημιουργια φίλου με επιλεγμένους φίλους από τους φίλους μου</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Περιλαμβάνουν υπογραφές</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Αντιγράψετε σας Cert πρόχειρο</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Αποθηκεύσετε Cert σας σε ένα αρχείο</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Εκτελέστε το πρόγραμμα ηλεκτρονικού ταχυδρομείου</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Αρχεία πιστοποιητικού</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Χρήση πιστοποιητικών PGP αποθηκευμένα σε αρχεία.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Εισαγωγή πιστοποιητικού φιλων...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Θα πρέπει να δημιουργήσετε ένα αρχείο με το πιστοποιητικό σας και να το δώσετε στο φίλο σας. Επίσης, μπορείτε να χρησιμοποιήσετε ένα αρχείο που δημιουργείται πριν.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Εξαγωγή του πιστοποιητικό μου...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Σύρετε και να ρίξει το πιστοποιητικό τους φίλους σας σε αυτό το παράθυρο ή να καθορίσετε τη διαδρομή στο παρακάτω πλαίσιο</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Περιγραφη</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Φίλοι φίλων</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Τώρα επιλέξτε με ποιούς θέλετε να γίνεται φίλος/η.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Δείξε μου:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Γίνει φίλος με τους συμμαθητές αυτών</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare ID</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Χρήση RetroShare ID για την προσθήκη ενός φίλου που είναι διαθέσιμα στο δίκτυό σας.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Προσθηκη των RetroShare ID...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Επικόλληση τους φίλους eMule ομάδα + Ultra ID στο παρακάτω πλαίσιο</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Εισαγάγετε το RetroShare ID του φίλου σας, π.χ. Peer@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3504,27 +3104,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Πρόσκληση φίλων μέ Email</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Εισαγωγη email διευθύνσεων των φιλων σας (ξεχωριστά τον καθένα με ένα ερωτηματικό)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Η Email διευθυνση των φιλων σας:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Εισαγετε τις Email διευθυνσεις φιλων</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Θέμα:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3540,44 +3120,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Λεπτομέρειες σχετικά με το αίτημα</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Peer λεπτομέρειες</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Όνομα:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Email:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Κόμβος:</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Τοποθεσία:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Επιλογές</translation>
     </message>
     <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Εισάγεται το πιστοποιητικό χειρονακτικός</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Προσθηκη φίλου στην Ομάδα:</translation>
     </message>
@@ -3587,7 +3155,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Έλεγχος ταυτότητας φίλου (υπογραφη PGP κλειδίου)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3612,16 +3180,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Πρόσθηκη ως φίλο-για να συνδεθείτε με</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Για να αποδεχθείε την αίτηση του φίλου, πατήστε το πλαισιο Τέλος.</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Συγγνώμη, εμφανίστηκς κάποιο σφαλμα</translation>
     </message>
@@ -3641,32 +3215,27 @@ Double click on it to add his name on text writer.</source>
         <translation>Λεπτομέρειες σχετικά με τον φίλο σας:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Ισχύς κλειδιού:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Υπογράφοντες</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Αυτός ο ομότιμος είναι ήδη στην λιστα φιλων. Προσθέτοντας μπορεί να ρυθμιστεί μόνο η διεύθυνση ip.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3712,45 +3281,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Η φορτωση του πιστοποιητικου απετυχε</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Οι peer λεπτομέρειες του κλειδιου PGP key %1 δεν μπορουν να παρθουν.</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Κάθε φορέα που δεν έχω υπογράψει</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Φίλοι φίλων μου που με εμπιστευονται</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Υπεγράφη συμμαθητές δείχνει όπως αρνήθηκε</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Όνομα ομότιμης οντότητας</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Επίσης υπεγράφη από</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Peer id</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Πρόσκληση RetroShare</translation>
     </message>
@@ -3770,12 +3311,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3783,7 +3324,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3823,7 +3364,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Έχετε ένα αίτημα φίλιας από</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3848,7 +3389,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3858,47 +3399,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Η φορτωση του πιστοποιητικου απετυχε: αρχείο %1 δεν βρέθηκε</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Αυτός ο ομότιμος %1 δεν είναι διαθέσιμος στο δίκτυό σας</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Χρήση νέας μορφής πιστοποιητικού (ασφαλέστερη, πιο ισχυρή)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Χρήση παλιάς μορφής πιστοποιητικού (συμβατή)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Αφαιρέση υπογραφων</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">Πρόσκληση RetroShare</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Βοήθεια συνδεσης με φίλο</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Μπορείτε να αντιγράψετε το κείμενο και να το στείλετε σε φίλο σας μέσω email ή με κάποιο άλλον τρόπο</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Σας Cert αντιγράφεται στο Πρόχειρο, πάστα και να το στείλετε στο φίλο σας μέσω email ή κάποιο άλλο τρόπο</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Αποθηκευση ως...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3937,11 +3438,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Κανένας ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Use as direct source, when available</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3951,7 +3448,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Διεύθυνση IP</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3970,33 +3467,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Συστάσεις Φίλων</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Μήνυμα:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Προτείνετε φίλους</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Προς</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Παρακαλώ επιλέξτε τουλάχιστον ένα φίλο ως παραλήπτη.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4009,7 +3486,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4044,7 +3521,7 @@ even if you don&apos;t make friends.</source>
         <translation>Πρόσθεση του IP στην λίστα αποδοχής</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4054,12 +3531,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished">[Άγνωστο]</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4124,7 +3596,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4152,7 +3624,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4162,17 +3634,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Άγνωστη Κατάσταση</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Χωρίς σύνδεση</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4182,12 +3657,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4197,7 +3674,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4222,7 +3700,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4514,7 +3992,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4522,7 +4000,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4532,7 +4011,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Γίνεται αναζήτηση</translation>
     </message>
@@ -4568,12 +4047,12 @@ p, li { white-space: pre-wrap; }
         <translation> Λεπτομέρειες κύκλου</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4593,7 +4072,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>Ταυτότητες</translation>
     </message>
@@ -4613,18 +4092,18 @@ p, li { white-space: pre-wrap; }
         <translation>Φίλτρο</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Ψευδώνυμο</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4639,15 +4118,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Τυπος</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4687,19 +4158,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Ορίστε ένα όνομα για τον κύκλο σας</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Κανένας περιορισμός κύκλου εχει επιλέγθει</translation>
     </message>
@@ -4709,12 +4180,24 @@ p, li { white-space: pre-wrap; }
         <translation>Δεν υπάρχουν περιορισμοί επιλεγμένου Κύκλου</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Άγνωστο]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Προσθηκη</translation>
     </message>
@@ -4724,7 +4207,7 @@ p, li { white-space: pre-wrap; }
         <translation>Αφαίρεση</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Αναζητηση</translation>
@@ -4777,13 +4260,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4802,7 +4285,7 @@ p, li { white-space: pre-wrap; }
         <translation>Δημιουργια μιας ομαδας</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished">Όνομα ομάδας:</translation>
     </message>
@@ -4837,7 +4320,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Νεο ποσταρισμα στο καναλι</translation>
     </message>
@@ -4847,7 +4330,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ποσταρισμα στο καναλι</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4908,23 +4391,11 @@ p, li { white-space: pre-wrap; }⏎
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Use Drag and Drop / Add Files button, to Hash new files.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copy/Paste RetroShare links from your shares&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Προσθηκη αρχειου προς επισύναψη</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Προσθηκη εικονιδιου του καναλιού</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Μυνημα</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Θέμα:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5010,17 +4481,17 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5039,17 +4510,18 @@ p, li { white-space: pre-wrap; }⏎
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Το αρχείο εχει προσθέθει και κατακερματίζεται</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Παρακαλείσθε να προσθέσετε ένα θέμα</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Φορτωση εικονιδιου εικονας</translation>
     </message>
@@ -5064,18 +4536,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Είστε έτοιμοι να προσθέσετε τα αρχεία που στην πραγματικότητα δεν μοιράζεστε. Είστε βέβαιοι ότι θέλετε να συμβεί αυτό;</translation>
     </message>
@@ -5109,7 +4575,7 @@ p, li { white-space: pre-wrap; }⏎
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Ποσταρισμα μυνηματος στο φορουμ</translation>
     </message>
@@ -5118,10 +4584,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>Forum</source>
         <translation>Φορουμ</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Θέμα:</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5142,8 +4604,8 @@ p, li { white-space: pre-wrap; }⏎
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5162,7 +4624,7 @@ p, li { white-space: pre-wrap; }
         <translation>Μπορείτε να επισυνάψετε αρχεία μέσω drag and drop σε αυτό το παράθυρο</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5192,17 +4654,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Κανενα φόρουμ</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>Απάντηση στον</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Τίτλος</translation>
     </message>
@@ -5255,7 +4717,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Φορτωση αρχειου εικονας</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5265,8 +4727,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5275,10 +4737,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Αποστολη</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5293,23 +4751,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Δημιουργια προθαλαμου συνομιλιων</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Ένα chat λόμπι είναι μια αποκεντρωμένη και ανώνυμη συνομιλία ομάδας. Όλοι οι συμμετέχοντες δέχονται όλα τα μηνύματα. Αφού δημιουργηθεί το λόμπι μπορείτε να προσκαλέσετε άλλους φίλους από την καρτέλα &quot;φίλοι&quot;.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Ονομα προθαλαμου:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Θεμα προθαλαμου:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5344,7 +4786,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5354,7 +4796,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5369,11 +4811,7 @@ Do you want to discard this message?</source>
         <translation>Επιλέξτε τους φίλους με τους οποιους θέλετε να κανετε μια ομαδική συζήτηση.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Προσκληση φιλων</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -5394,7 +4832,7 @@ Do you want to discard this message?</source>
         <translation>Επαφες:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5402,17 +4840,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Δημοσιες πληροφοριες</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Ονομα:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Τοπος:</translation>
     </message>
@@ -5422,12 +4860,12 @@ Do you want to discard this message?</source>
         <translation>ID Τοπου:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Έκδοση λογισμικού:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Online από:</translation>
     </message>
@@ -5447,12 +4885,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5462,7 +4895,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Άλλες πληροφορίες</translation>
     </message>
@@ -5472,17 +4905,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Πιστοποιητικό</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5492,11 +4920,7 @@ Do you want to discard this message?</source>
         <translation>Περιλαμβάνουν υπογραφές</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Αποθηκεύστε το κλειδί σε ένα αρχείο</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Εξαγωγή ταυτότητας</translation>
     </message>
@@ -5566,33 +4990,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Ετικετα κειμενου</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5682,7 +5106,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>Β</translation>
     </message>
@@ -6350,7 +5774,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Έναρξη αρχείου</translation>
     </message>
@@ -6358,38 +5782,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>να</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>ανεξαρτήτως πεζών</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>ΑΔ.MM.yyyy</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6397,12 +5821,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Έκφραση Widget</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Διαγράφη αυτής της έκφρασης</translation>
     </message>
@@ -6564,7 +5988,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Εικονα</translation>
     </message>
@@ -6574,7 +5998,7 @@ and use the import button to load it</source>
         <translation>Βιντεο</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
@@ -6634,11 +6058,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation>C</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Καταλογοι φιλων</translation>
     </message>
@@ -6760,7 +6194,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6802,7 +6236,7 @@ and use the import button to load it</source>
         <translation>Εμφάνιση ομάδων</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Ομάδα</translation>
     </message>
@@ -6838,7 +6272,7 @@ and use the import button to load it</source>
         <translation>Προσθηκη σε ομαδα</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Αναζήτηση</translation>
@@ -6854,7 +6288,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7067,7 +6501,7 @@ at least one peer was not added to a group</source>
     <message>
         <location line="+5"/>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Στον</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -7093,7 +6527,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Επιβεβαίωση αίτημα φίλου</translation>
     </message>
@@ -7110,10 +6544,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Αναζητηση :</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7135,7 +6565,7 @@ at least one peer was not added to a group</source>
         <translation>Αναζήτηση φίλων</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished">Επισημάνση όλων</translation>
     </message>
@@ -7146,16 +6576,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Δημιουργια φιλου</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Επεξεργασια μήνυματος κατάστασης</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Ραδιοφωνική μετάδοση</translation>
     </message>
@@ -7238,33 +6784,38 @@ at least one peer was not added to a group</source>
         <translation>Επαναφορα της προεπιλεγμενης γραμματοσειρας</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Δίκτυο</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7282,7 +6833,17 @@ at least one peer was not added to a group</source>
         <translation>Κωδικος</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Τα πεδία είναι υποχρεωτικά με τουλάχιστον 3 χαρακτήρες</translation>
     </message>
@@ -7292,17 +6853,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Υποδοχη</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -7323,38 +6879,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7374,12 +6930,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7389,38 +6945,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7464,13 +7025,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7480,7 +7041,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7515,7 +7076,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7525,12 +7086,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7540,12 +7096,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7771,36 +7322,13 @@ and use the import button to load it</source>
         <translation>Ξεκινώντας</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Προσκληση φιλων</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt;&quot;&gt;This is a list of shared folders. You can add and remove folders using the buttons at the bottom.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;When you add a new folder, intially all files in that folder are shared.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory:&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;Browsable&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;: files are browsable from your direct friends.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;Network Wide&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;: files can be downloaded by anybody through anonymous tunnels.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
-</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Προσθεστε του φιλους σας στο RetroShare</translation>
     </message>
@@ -7810,89 +7338,103 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Προσθηκη φιλων</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Συνδεθείτε με τους φίλους</translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+76"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Για προχωρημένους: Ανοιγμα της υποδοχης του Firewall</translation>
+    </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Συνδεθείτε με τους φίλους</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Για προχωρημένους: Ανοιγμα της υποδοχης του Firewall</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Περαιτέρω βοήθεια και υποστήριξη</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Ανοιγμα της RS Ιστοσελιδας</translation>
     </message>
@@ -7917,7 +7459,7 @@ p, li { white-space: pre-wrap; }
         <translation>Email ανατροφοδότηση</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare Προσκληση</translation>
     </message>
@@ -7967,12 +7509,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare ανατροφοδότηση </translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>Υποστηριξη RetroShare</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8096,7 +7638,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Εμφάνιση ομαδικής συνομιλίας</translation>
     </message>
@@ -8104,7 +7646,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Άγνωστο]</translation>
     </message>
@@ -8274,7 +7816,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Τίτλος</translation>
     </message>
@@ -8287,12 +7829,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8317,19 +7859,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Ταξινόμηση κατά όνομα</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Ταξινόμηση κατά δημοτικότητα</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Ταξινόμηση κατά το τελευταιο ποσταρισμα</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8344,14 +7874,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Τελευταία Δημοσίευση</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -8362,17 +7892,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Δημοτικότητα </translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Εμφάνιση</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8385,7 +7911,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>και</translation>
     </message>
@@ -8521,7 +8047,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Κανάλια</translation>
@@ -8532,22 +8058,22 @@ p, li { white-space: pre-wrap; }
         <translation>Δημιουργία καναλιού</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Ενεργοποίηση αυτόματης λήψης</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Τα κανάλια μου</translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Εγγεγραμμένα Κανάλια </translation>
     </message>
@@ -8567,12 +8093,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Απενεργοποίηση της αυτόματης λήψης</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8607,22 +8133,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Παιξιμο</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Άνοιγμα φακέλου</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Σφαλμα</translation>
     </message>
@@ -8642,17 +8168,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Είστε βέβαιοι ότι θέλετε να ακυρώσετε και να διαγράψετε το αρχείο;</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Ο φάκελος δεν ανοίγει</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Αναπαραγωγή αρχείου</translation>
     </message>
@@ -8662,37 +8188,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Το αρχείο %1 δεν υπάρχει στην τοποθεσία.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Φόρμα</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Όνομα αρχείου</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Μέγεθος</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Τίτλος</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Δημοσιεύτηκε</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Κατάσταση</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Δημιουργία Νέου Καναλιού</translation>
     </message>
@@ -8730,9 +8229,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Εγγραφή στο Κανάλι</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8746,7 +8255,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Επέκταση</translation>
     </message>
@@ -8761,7 +8270,7 @@ p, li { white-space: pre-wrap; }
         <translation>Περιγραφή Καναλιού</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Φορτωση</translation>
     </message>
@@ -8776,8 +8285,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Νέο Κανάλι</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8788,7 +8298,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8809,7 +8319,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Παιξιμο</translation>
     </message>
@@ -8865,28 +8375,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Αρχεία</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Προειδοποίηση! Έχετε λιγότερο από ό, τι ώρες %1 και το %2 λεπτά πριν από αυτό το αρχείο έχει διαγραφεί θεωρούν αποθηκεύοντάς.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Απόκρυψη</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Νέο</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Σχόλιο</translation>
     </message>
@@ -8901,21 +8407,17 @@ p, li { white-space: pre-wrap; }
         <translation>Δεν μου αρέσει</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Φορτωση</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8940,83 +8442,16 @@ p, li { white-space: pre-wrap; }
         <translation>Παιξιμο πολυμεσων</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Ποσταρισμα στο καναλι</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Φορτωση</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Αναζήτηση καναλιών</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Τίτλος</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Αναζήτηση τίτλου</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Μήνυμα</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Αναζήτηση Μηνύματος</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Όνομα αρχείου</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Αναζήτηση Ονόματος Αρχείου</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Δεν υπάρχει επιλεγμένο κανάλι</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Απενεργοποίηση αυτόματης λήψης</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Ενεργοποίηση αυτόματης λήψης</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Εμφάνιση αρχείων</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Feeds</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Αρχεία</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Περιγραφή:</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Ποσταρισμα στο καναλι</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9086,7 +8521,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9122,7 +8557,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9137,13 +8572,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Feeds</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9158,7 +8593,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9173,7 +8608,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9233,12 +8668,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9313,12 +8758,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Εγγεγραμμένος</translation>
     </message>
@@ -9350,7 +8796,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+59"/>
         <source>Disable Auto-Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Απενεργοποίηση της αυτόματης λήψης</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -9369,17 +8815,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9494,7 +8940,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Σχόλιο </translation>
     </message>
@@ -9507,7 +8953,7 @@ p, li { white-space: pre-wrap; }
         <translation>Φόρμα</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9537,7 +8983,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ανανέωση</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Σχόλιο</translation>
@@ -9576,7 +9022,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Απάντηση στο σχόλιο</translation>
     </message>
@@ -9600,6 +9046,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Ψηφίστε κάτω</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9609,7 +9070,7 @@ p, li { white-space: pre-wrap; }
         <translation>Δημιουργια σχολιου</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9638,26 +9099,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Υπογράφεται από</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9685,7 +9130,7 @@ before you can comment</source>
         <translation>Πρέπει να δημιουργήσετε μια ταυτότητα για να μπορείτε να σχολιάσετε</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9736,7 +9181,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Εγγραφείτε στο φόρουμ</translation>
     </message>
@@ -9752,7 +9197,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -9772,8 +9217,9 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Φορτωση</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9804,13 +9250,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Θέμα: </translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Διαγραφείτε από το φόρουμ</translation>
     </message>
@@ -9821,7 +9267,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -9841,21 +9287,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Φορτωση</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Απόκρυψη</translation>
     </message>
@@ -9868,63 +9310,66 @@ before you can comment</source>
         <translation>Φόρμα</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Έναρξη νέας μηνυματοσειράς στο επιλεγμενο φόρουμ</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Αναζήτηση στα φόρουμ</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Τελευταιο ποστ</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished">Νέο θεμα</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Περασμένη κλωστή άποψη</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Επίπεδη προβολή</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Τίτλος</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Δημιουργος</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Φορτωση</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9934,12 +9379,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Μήνυμα απάντησης</translation>
     </message>
@@ -9963,10 +9403,6 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Λήψη όλων των αρχείων</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Επόμενο μη αναγνωσμένο</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9983,31 +9419,23 @@ before you can comment</source>
         <translation>Αναζήτηση συγγραφέα</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Περιεχόμενο</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Αναζήτηση περιεχομένου</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Δεν υπάρχει όνομα</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Απάντηση</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10050,16 +9478,12 @@ before you can comment</source>
         <translation>Αντιγραφη του Λινκ</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Απόκρυψη</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Επεκταση</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10089,8 +9513,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10104,22 +9528,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Ανώνυμος</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">υπέγραψε</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">κανένας</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Λείπει ενα μήνυμα...]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10189,12 +9597,12 @@ before you can comment</source>
         <translation>Αρχικό μήνυμα</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">Επεξεργασία</translation>
     </message>
@@ -10255,7 +9663,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10275,7 +9683,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10327,7 +9735,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10337,7 +9745,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10352,7 +9760,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10418,12 +9826,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Φόρουμ</translation>
@@ -10454,35 +9862,16 @@ This message is missing. You should receive it later.</source>
         <translation>Άλλα φόρουμ</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Αναμονή</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Ανάκτηση</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Φορτωση</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Προσθήκη εικονίδιου</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Οι βασικοι αποδέκτες μπορουν να δημοσιεύουν σε περιορίσμενοι ομαδα και μπορουν να βλεπουν και να δημοσιεύουν ιδιωτικόυ ΤΥΠΟΥ καναλια</translation>
     </message>
@@ -10491,22 +9880,14 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Μοιρασμα δημοσιου κλειδίου</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">Ελέγξτε τους ομοτυμους που θα θέλατε να μοιραστείτε το ιδιωτικο σας κλειδι δημοσιευσης</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Μοιρασμα κλειδιου με</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Μήνυμα διανομής</translation>
     </message>
@@ -10514,7 +9895,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Δημοσια</translation>
     </message>
@@ -10533,14 +9914,6 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Νέο θεμα</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Απαιτείται</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Κρυπτογραφημένα μηνύματα</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10582,7 +9955,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished">Σχόλια:</translation>
     </message>
@@ -10605,7 +9978,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10621,12 +9994,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10643,23 +10016,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10675,22 +10048,28 @@ This message is missing. You should receive it later.</source>
         <translation>Προσθέστε ένα όνομα</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Λογότυπο ομάδας φόρτωσης</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10700,12 +10079,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Πληροφορίες</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10715,7 +10094,7 @@ This message is missing. You should receive it later.</source>
         <translation>Τελευταία Δημοσίευση</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10790,7 +10169,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Δημοτικότητα </translation>
     </message>
@@ -10806,27 +10190,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Δημιουργος</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>GxsIdLabel</translation>
     </message>
@@ -10834,7 +10213,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Φορτωση</translation>
     </message>
@@ -10894,7 +10273,7 @@ This message is missing. You should receive it later.</source>
         <translation>Επεξεργασία Λεπτομερειών</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10951,12 +10330,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Αντιγραφή του RetroShare Συνδέσμου</translation>
     </message>
@@ -10979,7 +10358,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Καμία υπογραφή</translation>
     </message>
@@ -10992,22 +10371,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Φορτωση</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Δεν βρέθηκε</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Καμία υπογραφή </translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11017,7 +10388,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11027,7 +10398,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11047,6 +10423,14 @@ This message is missing. You should receive it later.</source>
         <translation>[Άγνωστο]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11058,7 +10442,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11106,17 +10490,13 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Άγνωστο]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Φορτωση</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11497,7 +10877,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11513,7 +10893,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Δημιουργοι</translation>
     </message>
@@ -11532,7 +10912,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11612,7 +10992,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11622,7 +11002,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11650,7 +11030,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11660,7 +11040,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Αντιγράψετε σας Cert πρόχειρο</translation>
     </message>
@@ -11670,7 +11050,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Αποθηκεύσετε Cert σας σε ένα αρχείο</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11690,13 +11070,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11708,12 +11112,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11728,12 +11132,7 @@ new short format</source>
         <translation type="unfinished">Πρόσκληση RetroShare</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11998,14 +11397,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Όλα</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Φήμη</translation>
     </message>
@@ -12015,12 +11414,12 @@ p, li { white-space: pre-wrap; }
         <translation>Αναζητηση</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Δημιουργια νέας ταυτότητας</translation>
     </message>
@@ -12030,7 +11429,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12045,27 +11444,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished">Κλεισιμο</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12081,29 +11480,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Κύκλοι</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12123,18 +11532,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Προσωπικοί κύκλοι</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Επεξεργασία Ταυτότητας</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Διαγραφή Ταυτότητας</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12144,78 +11555,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Αποστολή μηνύματος </translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Τυπος:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>Η άποψή σας:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Αρνητικό</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12226,17 +11637,17 @@ p, li { white-space: pre-wrap; }
         <translation>Θετικό</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Ανώνυμος</translation>
     </message>
@@ -12251,24 +11662,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12283,7 +11694,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12293,7 +11709,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12368,7 +11784,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12398,7 +11814,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Άγνωστο</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12413,7 +11829,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12461,7 +11877,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12469,7 +11885,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -12512,7 +11928,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12592,7 +12008,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12608,17 +12024,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12723,7 +12134,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12773,21 +12184,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Το άβατάρ σας</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12797,7 +12208,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12812,7 +12223,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12827,12 +12238,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12852,12 +12263,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12867,7 +12278,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12875,7 +12286,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Ψευδώνυμο</translation>
     </message>
@@ -12905,7 +12316,13 @@ These identities will soon be not supported anymore.</source>
         <translation>Ψευδώνυμο</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Νέα ταυτότητα</translation>
     </message>
@@ -12919,7 +12336,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12929,7 +12346,12 @@ These identities will soon be not supported anymore.</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Επεξεργασία Ταυτότητας </translation>
@@ -12940,27 +12362,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12980,7 +12402,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12990,12 +12412,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13005,12 +12433,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13020,7 +12443,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13030,10 +12453,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Τυπος</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Μετακινηση</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13059,7 +12487,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Προσθηκη</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13069,13 +12497,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Το άβατάρ σας</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13085,7 +12513,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13159,7 +12587,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Αντίγραφη</translation>
     </message>
@@ -13169,12 +12597,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Μετακινηση</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Επισημάνση όλων</translation>
     </message>
@@ -13193,26 +12621,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Απόσπασμα</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Αποστολη</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13230,27 +12670,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Υποδοχη:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Κατασταση:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13271,7 +12716,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13280,26 +12730,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Άνοιγμα αρχείου</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Άνοιγμα φακέλου</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Έλεγχος...</translation>
     </message>
@@ -13309,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Ελέγχος αρχειων</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13337,7 +12792,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Προσθήκη φίλου</translation>
     </message>
@@ -13353,7 +12808,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Επιλογές</translation>
     </message>
@@ -13374,7 +12830,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Αποχωρηση</translation>
     </message>
@@ -13385,12 +12841,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Οδηγός γρήγορης έναρξης</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>Το RetroShare %1 ειναι μια πλατφόρμα ασφαλούς αποκεντρωμένης επικοινωνίας</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Ημιτελής</translation>
     </message>
@@ -13419,11 +12875,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Κατασταση</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Κοινοποιηση</translation>
     </message>
@@ -13434,31 +12891,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Ανοιγμα μυνηματων</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Διάγραμμα εύρους ζώνης</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Εφαρμογές</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Βοήθεια</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Ελαχιστοποίηση</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Μεγιστοποίηση</translation>
     </message>
@@ -13473,7 +12934,12 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>νέο μήνυμα %1</translation>
     </message>
@@ -13503,7 +12969,7 @@ These identities will soon be not supported anymore.</source>
         <translation>%1 φίλοι που συνδέονται</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Θέλετε πραγματικά να αποχωρησετε απο το  RetroShare ? </translation>
     </message>
@@ -13523,7 +12989,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Εμφανιση</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Βεβαιωθείτε ότι αυτή η σύνδεση δεν σφυρηλατήθηκε για να σας σύρει σε μια κακόβουλη ιστοσελίδα.</translation>
     </message>
@@ -13568,12 +13034,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Στατιστικές</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13588,7 +13055,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13597,17 +13064,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Συνθέση</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Επαφές</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Παράγραφος</translation>
     </message>
@@ -13643,12 +13110,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Επικεφαλιδα 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Μέγεθος γραμματοσειράς</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Αύξηση μεγέθους γραμματοσειράς</translation>
     </message>
@@ -13663,32 +13130,32 @@ These identities will soon be not supported anymore.</source>
         <translation>Bold</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Italic</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Ευθυγράμμιση</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Προσθέστε μια εικόνα</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Ορίζει κώδικα στυλ γραμματοσειράς κειμένου</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Υπογράμμιση </translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Θέμα:</translation>
     </message>
@@ -13699,32 +13166,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Καθορίστε το χρώμα του κειμένου</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Συνιστάμενα αρχεία</translation>
     </message>
@@ -13794,7 +13261,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Προσθέστε Blockquote</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Αποστολή σε:</translation>
     </message>
@@ -13834,7 +13301,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Γεια σας, &lt;br&gt;θα ήθελα να σαςσυστήσω ένα καλό φίλο μου, μπορείτε να τον εμπιστευθείτε πάρα πολύ όταν μπορείτε και με εμπιστεύεσται. &lt;br&gt;</translation>
     </message>
@@ -13854,18 +13321,18 @@ These identities will soon be not supported anymore.</source>
         <translation>θέλει να είναι φίλος μαζί σας στο RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Γεια σου % 1, &lt;br&gt;&lt;br&gt;%2 θέλει να είναι φίλοι μαζί σας σχετικά στο RetroShare.&lt;br&gt;&lt;br&gt;Απάντηση τώρα: &lt;br&gt;%3 &lt;br&gt;&lt;br&gt;ευχαριστώ, &lt;br&gt;η ομάδα του   RetroShare </translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Αποθηκεύση μυνηματος</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Μήνυμα δεν έχει σταλεί.
@@ -13877,7 +13344,17 @@ Do you want to save message to draft box?</source>
         <translation>Επικολληση του Λινκ</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Προσθηκη του &quot;Σε&quot;</translation>
     </message>
@@ -13897,7 +13374,7 @@ Do you want to save message to draft box?</source>
         <translation>Προσθήκη ως προτείνομενο</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Αυθεντικο μήνυμα</translation>
     </message>
@@ -13907,21 +13384,21 @@ Do you want to save message to draft box?</source>
         <translation>Απο</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Στον</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Σταλθηκε</translation>
     </message>
@@ -13936,7 +13413,7 @@ Do you want to save message to draft box?</source>
         <translation>Στις % 1, %2 έγραψε:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13946,30 +13423,30 @@ Do you want to save message to draft box?</source>
         <translation>Fwd:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Θέλετε να στείλετε το μήνυμα χωρίς υποκείμενο;</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Παρακαλώ εισάγετε τουλάχιστον έναν παραλήπτη.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Άγνωστο</translation>
     </message>
@@ -14084,13 +13561,13 @@ Do you want to save message to draft box?</source>
         <translation>Λεπετομέρειες</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Ανοιγμα αρχειου...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Αρχεία HTML (*.htm * .html)??Όλα τα αρχεία (*)</translation>
     </message>
@@ -14110,7 +13587,7 @@ Do you want to save message to draft box?</source>
         <translation>Εξαγωγή PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Μήνυμα δεν έχει σταλεί.
@@ -14132,7 +13609,7 @@ Do you want to save message ?</source>
         <translation>Προσθηκη επιπλεον αρχειου</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14162,18 +13639,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Κλεισιμο</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Από:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14213,13 +13690,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Ευχαριστούμε, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14229,12 +13706,12 @@ Do you want to save message ?</source>
         <translation>[Λείπει]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14312,7 +13789,7 @@ Do you want to save message ?</source>
         <translation>Προεπιλογή</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Μια νέα καρτέλα</translation>
     </message>
@@ -14322,7 +13799,7 @@ Do you want to save message ?</source>
         <translation>Ένα νέο παράθυρο</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Επεξεργασια ετικέτας</translation>
     </message>
@@ -14345,7 +13822,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Θεμα:</translation>
     </message>
@@ -14353,7 +13830,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Μυνημα</translation>
     </message>
@@ -14381,7 +13858,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Συνιστάμενα αρχεία</translation>
     </message>
@@ -14391,37 +13868,37 @@ Do you want to save message ?</source>
         <translation>Λυψη ολων των συνιστωμενων αρχειων</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Θέμα:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Από:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Σε:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>CC:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>BCC:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Ετικέτες:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Απάντηση</translation>
     </message>
@@ -14461,7 +13938,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14505,7 +13982,7 @@ Do you want to save message ?</source>
         <location line="+5"/>
         <location line="+3"/>
         <source>Buttons Text Beside Icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Πλαισια κειμένου δίπλα από το εικονίδιο</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -14513,7 +13990,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Επιβεβαιώσει %1 ως φίλο</translation>
     </message>
@@ -14523,12 +14000,12 @@ Do you want to save message ?</source>
         <translation>Προσθήκη %1 ως φίλος</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Χωρις θεμα</translation>
     </message>
@@ -14538,17 +14015,22 @@ Do you want to save message ?</source>
         <translation>Λυψη</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14557,14 +14039,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Λυψη ολων</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Εκτύπωση εγγράφου</translation>
     </message>
@@ -14579,12 +14071,12 @@ Do you want to save message ?</source>
         <translation>Αρχεία HTML (*.htm * .html)??Όλα τα αρχεία (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14606,42 +14098,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Συνθέση</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Απαντήση σε επιλεγμένο μήνυμα</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Απάντηση</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Απάντηση όλα σε επιλεγμένο μήνυμα</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Απάντηση σε όλους</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Προώθηση του επιλεγμένου μηνύματος</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Προς τα εμπρός</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Κατάργηση του επιλεγμένου μηνύματος</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Διαγραφη</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Εκτύπωση επιλεγμένου μηνύματος</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14720,7 +14176,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Νέο μήνυμα</translation>
     </message>
@@ -14730,60 +14186,16 @@ Do you want to save message ?</source>
         <translation>Συνθέση</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Απαντήσετε σε επιλεγμένο μήνυμα</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Απάντηση</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Απάντηση όλα σε επιλεγμένο μήνυμα</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Απάντηση σε όλους</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Προώθηση του επιλεγμένου μηνύματος</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Foward</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Κατάργηση του επιλεγμένου μηνύματος</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Διαγραφη</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Εκτύπωση επιλεγμένου μηνύματος</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Εκτυπωση</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Οθονη</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>&quot;Εισερχόμενα&quot;</translation>
@@ -14813,21 +14225,17 @@ Do you want to save message ?</source>
         <translation>Σκουπίδια</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Συνολικός φάκελος&quot;Εισερχόμενα&quot;:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Φάκελοι</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>ΠΡΟΒΟΛΗ</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Εκτύπωση...</translation>
@@ -14837,26 +14245,6 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>Προεπισκόπηση εκτύπωσης</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Κουμπιά εικόνα μόνο</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Κουμπιά κειμένου δίπλα από το εικονίδιο</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Πλαισια με κείμενο</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Πλαισια κειμένου κάτω από το εικονίδιο</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Ορισμός κειμένου κάτω από το εικονίδιο</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14878,7 +14266,7 @@ Do you want to save message ?</source>
         <translation>Μήνυμα προς τα εμπρός</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Θέμα:</translation>
     </message>
@@ -14888,7 +14276,7 @@ Do you want to save message ?</source>
         <translation>Απο</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
@@ -14898,39 +14286,7 @@ Do you want to save message ?</source>
         <translation>Περιεχόμενο</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με συνημμένα</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με θέμα</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Κάντε κλικ για να ταξινομήσετε από read</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε από από</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Κάντε κλικ για να ταξινομήσετε κατά ημερομηνία</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με ετικέτες</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με αστέρι</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Προώθηση του επιλεγμένου μηνύματος</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Θέμα αναζήτησης</translation>
     </message>
@@ -14939,6 +14295,11 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Αναζήτηση από</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14965,14 +14326,14 @@ Do you want to save message ?</source>
         <translation>Αναζήτηση συνημμένων</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Πρωταγωνίστησε</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15046,7 +14407,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15060,7 +14421,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15075,34 +14436,33 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Σχέδια</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Δεν ειναι διαθέσιμα μηνύματα με αστέρι. Τα Αστέρια σας αφήνουν να δώσει μηνύματα, ένα ειδικό καθεστώς για να τους διευκολύνετε την εύρεση. Για να πρωταγωνιστήσει ένα μήνυμα, κάντε κλικ στο φως γκρι αστέρι δίπλα σε κάθε μήνυμα.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Χωρίς σύστημα μηνύματα διαθέσιμα.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Στον</translation>
+        <translation>Στον</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με βάση να</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15110,10 +14470,6 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Σύνολο:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Μηνύματα</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15141,7 +14497,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15195,7 +14561,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -15205,7 +14571,7 @@ Do you want to save message ?</source>
         <translation>Απομακρυνση στοιχειου</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished">από</translation>
     </message>
@@ -15240,7 +14606,7 @@ Do you want to save message ?</source>
         <translation>Msg σε εκκρεμότητα</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Αποκρυψη</translation>
     </message>
@@ -15381,7 +14747,7 @@ Do you want to save message ?</source>
         <translation>Peer  ID</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Κατάργηση αχρησιμοποίητων κλειδιών...</translation>
     </message>
@@ -15391,7 +14757,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Εκκαθαριση κλειδοθήκης</translation>
     </message>
@@ -15409,7 +14775,13 @@ Notes: Your old keyring will be backed up.
 Η αφαίρεση μπορεί να αποτύχει κατά την εκτέλεση πολλαπλών Retroshare παρουσίων στο ίδιο μηχάνημα.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Πληροφορίες κλειδοθήκων</translation>
@@ -15445,18 +14817,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Ασυνέπεια δεδομένων στην κλειδοθήκη. Αυτό είναι πιθανότατα ένα bug. Επικοινωνήστε με τους προγραμματιστές.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Αναζήτηση ονόματος</translation>
     </message>
@@ -15466,25 +14833,18 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Δίκτυο</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -15511,7 +14871,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15532,7 +14892,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Ομαδες</translation>
     </message>
@@ -15562,19 +14922,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15584,12 +14944,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15599,7 +14959,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Ομάδα</translation>
     </message>
@@ -15714,7 +15074,7 @@ Reported error:</source>
         <translation type="unfinished">Σύμπτυξη όλων</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15724,7 +15084,7 @@ Reported error:</source>
         <translation type="unfinished">Θέλετε να διαγραψετε αυτόν τον φίλο?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Έγινε!</translation>
@@ -15833,7 +15193,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15848,11 +15208,7 @@ at least one peer was not added to a group</source>
         <translation>Μετακινηση ολων</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Αυτό είναι μια δοκιμη.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15862,12 +15218,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15922,10 +15278,6 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Ιστολογια</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Ασφαλεια</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15947,10 +15299,6 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Μυνημα</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Συνδέση προσπάθειας</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16104,10 +15452,6 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Feed</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -16117,7 +15461,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16137,12 +15481,12 @@ at least one peer was not added to a group</source>
         <translation>Λάθος κωδικός!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Μη καταγεγραμμένου plugin/εκτελέσιμο</translation>
     </message>
@@ -16157,19 +15501,7 @@ at least one peer was not added to a group</source>
         <translation>Παρακαλώ ελέγξτε το ρολόι του συστήματός σας.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Εξέταση κοινόχρηστων αρχείων...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Κατακερματισμος αρχείου</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Αποθήκευση αρχείου ευρετηρίου...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Δοκιμή</translation>
     </message>
@@ -16180,17 +15512,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Άγνωστος τίτλος</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Κρυπτογραφημένο μήνυμα</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16198,7 +15532,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Φίλος Online</translation>
     </message>
@@ -16250,10 +15584,6 @@ Low Traffic: 10% standard traffic and TODO: pauses all file-transfers</translati
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Διαλόγος</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -16344,7 +15674,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16353,10 +15688,6 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Υπογραφη PGP κλειδίου</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16393,12 +15724,7 @@ p, li { white-space: pre-wrap; }
         <translation>Περιλαμβάνουν υπογραφές</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Επιλογές</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16444,21 +15770,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Σφάλμα:  οι peer λεπτομέρειες δεν μπορουν να παρθουν.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Ο παρεχόμενος αλγόριθμος κλειδιού δεν υποστηρίζεται από το RetroShare⏎ (κλειδιά RSA μόνο υποστηρίζονται προς το παρόν)</translation>
@@ -16476,7 +15802,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16545,10 +15871,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Μαλλον ο κωδικος ειναι λαθος</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -16556,12 +15878,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16587,7 +15909,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Συνομιλια</translation>
     </message>
@@ -16608,7 +15930,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Απομακρυνση στοιχειου</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Ονομα:</translation>
     </message>
@@ -16648,7 +15970,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Εισαγωγη μυνηματος</translation>
     </message>
@@ -16662,10 +15984,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Φίλος συνδεθηκε</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Συνδέση προσπάθειας</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16704,17 +16022,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished">Άγνωστο</translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Άγνωστο Peer</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Αποκρυψη</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Αποστολή Μηνύματος</translation>
     </message>
@@ -16881,13 +16195,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Φορμα</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16895,23 +16202,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Φωτογραφία</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Ετικετα κειμενου</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Σχολιο</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Περίληψη</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16972,14 +16267,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Προσθήκη σχολίου</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Γράψτε ένα σχόλιο...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17050,10 +16337,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>Create Album</source>
         <translation>Δημιουργία άλμπουμ</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Εμφανιση άλμπουμ</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17075,17 +16358,17 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Προβολή διαφανειών</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Τα αλμπουμ μου</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Εγγεγραμμένα Αλμπουμ</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Κοινόχρηστα άλμπουμ</translation>
     </message>
@@ -17114,7 +16397,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Όνομα άλμπουμ</translation>
     </message>
@@ -17173,19 +16456,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17221,12 +16504,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Ετικετα κειμενου</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Εμφανιση περισσότερων λεπτομέρειων σχετικά με αυτό το plugin</translation>
     </message>
@@ -17372,41 +16655,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>Plugin look-up directories</source>
         <translation>Plugin look-up καταλόγους</translation>
     </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Δεν περεχετε αριθμός API. Παρακαλώ διαβάστε το εγχειρίδιο ανάπτυξης plugin.</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Δεν παρεχετε αριθμός SVN. Παρακαλώ διαβάστε το εγχειρίδιο ανάπτυξης plugin.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Σφάλμα φόρτωσης.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Λείπει το σύμβολο. Λάθος έκδοση;</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Κανένα αντικείμενο plugin</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Plugins είναι φορτωμένο.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Άγνωστη κατάσταση.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Ελέγξτε αυτό για την ανάπτυξη των plugins. Αυτοί δεν θα ελεγχθεί για τον κατακερματισμό. Ωστόσο, υπό κανονικές συνθήκες, έλεγχος hash σας προστατεύει από κακόβουλη συμπεριφορά του δημιουργημένο plugins.</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -17476,12 +16724,27 @@ malicious behavior of crafted plugins.</source>
         <translation>Ορισμός παράθυρο στην κορυφή</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -17534,7 +16797,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17554,8 +16817,8 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17580,13 +16843,13 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Σχόλιο</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17614,20 +16877,12 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Υπογράφεται από: </translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Σημειώσεις</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -17642,12 +16897,22 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Φορτωση αρχειου εικονας</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -17663,7 +16928,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17673,15 +16948,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Υποβάλει θέσης</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Υποβολη</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Παρακαλώ προσθέστε Τίτλο</translation>
     </message>
@@ -17701,12 +16968,22 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17721,7 +16998,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Δημοσίευση ως</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17732,7 +17009,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Εικόνα</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17742,7 +17019,7 @@ malicious behavior of crafted plugins.</source>
         <translation>Τίτλος</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Σύνδεσμος</translation>
     </message>
@@ -17750,32 +17027,12 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Δημοσιεύθηκε συνδέσεις</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Τα θέματα μου</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Εγγεγραμμένα θέματα</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Δημοφιλής θέματα</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Άλλα θέματα</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17809,27 +17066,7 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Το θεμα καταχωρήθηκε </translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Προσθήκη θέματων διαχειριστων</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Επιλέξτε το θέμα Admins</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Δημιουργήστε Νέο Θέμα</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Επεξεργασία Θέματος</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17867,7 +17104,17 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17883,7 +17130,7 @@ malicious behavior of crafted plugins.</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -17898,16 +17145,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Φορτωση</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17920,22 +17168,18 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Τοποθεσία</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Σχολια</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17946,12 +17190,12 @@ malicious behavior of crafted plugins.</source>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Σχόλιο</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17961,7 +17205,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17971,21 +17215,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Ορισμος ως αναγνωσμένο και κατάργηση στοιχείου</translation>
     </message>
@@ -17995,7 +17235,7 @@ malicious behavior of crafted plugins.</source>
         <translation>Νεο</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18005,7 +17245,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18046,69 +17286,10 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Φορτωση</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Από</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Φορμα</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Ζεστό</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Νεο</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Κορυφή</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Σήμερα</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Χθες</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Αυτή την εβδομάδα</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Αυτό το μήνα</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Φέτος</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Επόμενο</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Δημιουργήστε ή επιλέξτε ένα Id υπογραφής πριν από την ψηφοφορία</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Προηγούμενη</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18128,7 +17309,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18138,15 +17329,15 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">Άγνωστο</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18156,42 +17347,42 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">Δημοσιεύσεις</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18211,7 +17402,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Ζεστό</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18241,17 +17432,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18266,12 +17457,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18281,27 +17477,31 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Επεξεργασία</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18316,7 +17516,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Εγγραφη</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18390,6 +17590,16 @@ malicious behavior of crafted plugins.</source>
         <source>No Channel Selected</source>
         <translation type="unfinished">Δεν υπάρχει επιλεγμένο κανάλι</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -18411,10 +17621,6 @@ malicious behavior of crafted plugins.</source>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Καταχωρήθηκε</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -18483,16 +17689,16 @@ malicious behavior of crafted plugins.</source>
         <translation>Διαχειριστης προφιλ</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -18600,7 +17806,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Επεξεργασια μήνυματος κατάστασης</translation>
@@ -18616,7 +17822,7 @@ and use the import button to load it</source>
         <translation>Διαχειριστης προφιλ</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Δημοσιες πληροφοριες</translation>
     </message>
@@ -18651,12 +17857,12 @@ and use the import button to load it</source>
         <translation>Online από:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Άλλες πληροφορίες</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Η διεύθυνσή μου</translation>
     </message>
@@ -18700,51 +17906,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Καταχώρηση από:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Λογαριασμός 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Λογαριασμος 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Λογαριασμός 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Προσθηκη στο Pulse</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">φίλτρο</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">URL αθροιστής</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Εμφάνιση ως</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18754,12 +17936,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Από:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18789,13 +17971,13 @@ and use the import button to load it</source>
         <translation type="unfinished">Αρνητικό</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18807,12 +17989,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18821,17 +18013,13 @@ and use the import button to load it</source>
         <source>Cancel</source>
         <translation>Διακοπη</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Θέση παλμό για σύρμα</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18846,34 +18034,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Απο</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Ημερομηνία</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Φορτωση αρχειου εικονας</translation>
     </message>
 </context>
 <context>
@@ -18884,7 +18062,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18903,7 +18081,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18913,7 +18091,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18940,7 +18118,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18950,7 +18128,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18970,7 +18148,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19086,7 +18264,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19094,37 +18272,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19156,7 +18339,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19164,8 +18347,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Επιβεβαίωση</translation>
     </message>
@@ -19435,12 +18618,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Peer λεπτομέρειες</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Ακυρώθηκε η αίτηση αρχειου</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Αυτή η έκδοση του RetroShare χρησιμοποιεί το OpenPGP-SDK. Ως παρενέργεια, δεν χρησιμοποιεί το κοινό σύστημα διαχείρισης κλειδιών του PGP, αλλά έχει είναι δική ΜΠΡΕΛΟΚ συμμερίζονται όλες οι παρουσίες RetroShare. &lt;br&gt;&lt;br&gt;Δεν φαίνεται να έχουν ένα τέτοιο μπρελόκ, αν και τα κλειδιά του PGP αναφέρονται από τους υπάρχοντες λογαριασμούς eMule ομάδα + Ultra, πιθανώς επειδή έχετε αλλάξει μόνο σε αυτήν την νέα έκδοση του λογισμικού.</translation>
     </message>
@@ -19471,7 +18654,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Παρουσιάστηκε μη αναμενόμενο σφάλμα. Παρακαλούμε να το αναφέρετε» RsInit::InitRetroShare απροσδόκητη επιστροφή κωδικός % 1».</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19505,7 +18688,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Πολλές εμφανίσεις</translation>
@@ -19526,6 +18709,26 @@ The error reported is:&quot;</source>
         <translation>Παρουσιάστηκε μη αναμενόμενο σφάλμα όταν το Retroshare προσπάθησε να αποκτήσει το μόνο παράδειγμα κλείδωμα κλειδωμένο αρχείο:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -19605,7 +18808,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19615,7 +18818,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>ενεργοποιημένο</translation>
     </message>
@@ -19625,7 +18828,7 @@ Reported error is:
         <translation>απενεργοποιημένο</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19641,7 +18844,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>%1 δευτερόλεπτα πριν</translation>
     </message>
@@ -19708,7 +18911,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19736,7 +18939,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19917,12 +19120,28 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Status</source>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20115,10 +19334,6 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Αυτό το πιστοποιητικό περιλαμβάνει:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -20169,6 +19384,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -20333,7 +19560,7 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Δίκτυο ευρείας</translation>
     </message>
@@ -20507,7 +19734,7 @@ p, li { white-space: pre-wrap; }
         <translation>Φορμα</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20520,7 +19747,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20693,12 +19920,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20706,12 +19943,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21401,7 +20638,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -21522,7 +20759,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21542,7 +20779,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21598,7 +20835,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21612,11 +20849,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[Άγνωστο]</translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Λείπει ενα μήνυμα...]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -21630,6 +20862,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">Στον</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -21652,13 +20889,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Κάντε κλικ για να ταξινομήσετε από read</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Κάντε κλικ στο κουμπί για να ταξινομήσετε από από</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21681,7 +20923,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21702,7 +20946,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Επαναφέρει όλα της αποθηκευμένα ρυθμίσεις της RetroShare. </translation>
     </message>
@@ -21763,7 +21007,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ορίζει το eMule ομάδα + Ultra του γλώσσα.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Δεν είναι δυνατή η ανοιχτό αρχείο καταγραφής &apos;% 1&apos;: %2</translation>
     </message>
@@ -21784,7 +21028,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21814,7 +21058,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21832,7 +21076,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21849,12 +21093,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Εισάγετε μια λέξη-κλειδί εδώ (τουλάχιστον 3 char μακρά)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Έναρξη αναζήτησης</translation>
     </message>
@@ -21915,7 +21159,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Εκκαθαριση</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Λέξεις-κλειδιά</translation>
     </message>
@@ -21930,7 +21174,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Αναγνωριστικό αναζήτησης</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Όνομα αρχείου</translation>
     </message>
@@ -22030,23 +21274,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Λυψη επιλεγμενου</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Ονομα αρχειου</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Λυψη</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Αντιγραφη του Λινκ</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Αποστολη ενος RetroShare λινκ</translation>
     </message>
@@ -22056,7 +21300,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Λυψη ανακοίνωσης</translation>
     </message>
@@ -22093,7 +21337,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Μετακινηση ολων</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Φάκελος</translation>
@@ -22104,17 +21348,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Νέα RetroShare Λινκ(s)</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Άνοιγμα Φακέλου</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Δημιουργία Συλλογής ...</translation>
     </message>
@@ -22134,7 +21378,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Λυψη απο συλλογη αρχειων...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Συλλογή</translation>
     </message>
@@ -22142,7 +21386,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Peer λεπτομέρειες</translation>
     </message>
@@ -22158,22 +21402,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Απομακρυνση στοιχειου</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>Διεύθυνση IP:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Peer ID:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Τοπος:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22190,7 +21434,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Αποκρυψη</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22215,8 +21459,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22224,7 +21468,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>θέλει να είναι φίλος μαζί σας στο RetroShare</translation>
     </message>
@@ -22255,7 +21499,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -22300,12 +21544,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Κατασταση:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Εισαγωγη μυνηματος</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Συνδέστε την προσπάθεια</translation>
     </message>
@@ -22325,17 +21569,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Άγνωστο (εξερχόμενη) σύνδεση προσπάθεια</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Αγνωστο θεμα ασφαλειας</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished">Άγνωστο</translation>
     </message>
@@ -22345,11 +21594,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Άγνωστο Peer</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Αποκρυψη</translation>
     </message>
@@ -22359,7 +21604,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Θέλετε να διαγραψετε αυτόν τον φίλο?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22369,12 +21614,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22433,12 +21678,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Τοπική διεύθυνση</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22459,22 +21704,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Υποδοχη:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Τοπικό δίκτυο</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Αναζητηση εξωτερικής ip διεύθυνσης </translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Γνωστα / προηγούμενα IPs:</translation>
     </message>
@@ -22487,21 +21732,16 @@ behind a firewall or a VPN.</source>
         <translation>Εάν καταργήσετε την επιλογή αυτή, το RetroShare μπορεί να καθορίσει μόνο IP σας όταν συνδέεστε σε κάποιον. Αφήνοντας αυτό ελέγχεται βοηθά τη σύνδεση όταν έχετε μερικούς φίλους. Βοηθά επίσης εάν είστε πίσω από ένα τείχος προστασίας ή ένα VPN.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Επιτρέπει το eMule ομάδα + Ultra να ρωτήσω ip μου σε αυτούς τους ιστοχώρους:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22511,23 +21751,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Διεύθυνση Onion</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22537,7 +21800,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22562,37 +21825,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22607,71 +21928,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">Άγνωστο</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22681,22 +21938,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22708,12 +21950,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22723,7 +21965,7 @@ Also check your ports!</source>
         <translation>Εκκαθαριση</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22738,23 +21980,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22765,17 +22007,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22785,12 +22017,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22800,17 +22027,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22850,7 +22067,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished">Εναρξη</translation>
     </message>
@@ -22865,12 +22082,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Παυση</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">Εισερχόμενα</translation>
     </message>
@@ -22906,7 +22118,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22961,7 +22198,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Σύνολο:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22986,7 +22223,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22998,7 +22235,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Δίκτυο</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23021,7 +22258,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Κατασταση</translation>
     </message>
@@ -23081,17 +22318,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23107,18 +22355,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23153,12 +22401,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23181,22 +22429,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Προστέθηκαν από εσάς</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23231,7 +22479,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23241,12 +22489,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23326,7 +22574,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Ελέγξτε τους ομοτυμους που θα θέλατε να μοιραστείτε το ιδιωτικο σας κλειδι δημοσιευσης</translation>
     </message>
@@ -23336,12 +22584,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Μερίδιο για φίλο</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -23360,7 +22608,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Μοιρασμα διαχειριστη</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23380,17 +22628,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished">Ορατότητα</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Προσθέστε έναν κατάλογο μεριδίου</translation>
     </message>
@@ -23400,7 +22648,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Μετακινηση</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Συσχέτιση και κλείσιμο</translation>
     </message>
@@ -23491,7 +22739,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Ο κατάλογος δεν βρέθηκε ή το όνομα καταλόγου δεν γίνετε δεκτο.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23499,7 +22747,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Αρχεια</translation>
     </message>
@@ -23550,11 +22798,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>Ελεγχος αρχειων</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Λυψη επιλεγμενου</translation>
     </message>
@@ -23564,7 +22817,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Λυψη</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Αντιγραφη των retroshare Λινκ στο Clipboard</translation>
     </message>
@@ -23579,7 +22832,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Αποστολη των retroshare Λινκ</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23595,7 +22848,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Recommendation(s)</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Δημιουργία Συλλογής ...</translation>
     </message>
@@ -23620,7 +22873,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Λυψη απο συλλογη αρχειων...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23763,12 +23016,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Ρύθμιση παραμέτρων </translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Δημιουργία διασύνδεσης </translation>
     </message>
@@ -23792,7 +23045,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Εκθυμηση του κωδικου</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Συνδέση</translation>
     </message>
@@ -24131,7 +23384,7 @@ This choice can be reverted in settings.</source>
         <translation>Μήνυμα κατάστασης</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Μήνυμα:</translation>
     </message>
@@ -24376,7 +23629,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Αφαιρέση ολων των ετικετων</translation>
     </message>
@@ -24412,12 +23665,15 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished">Άγνωστο</translation>
     </message>
@@ -24427,18 +23683,13 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24448,12 +23699,57 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Μη συνδεδεμένος</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24461,7 +23757,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24471,7 +23767,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24482,11 +23778,12 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24514,7 +23811,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Επιλογές μεταφοράς</translation>
@@ -24525,7 +23822,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Μέγιστη ταυτόχρονη λυψη:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24535,22 +23832,27 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Διαμοιράζονται αυτόματα τα Εισερχόμενα κατάλογο (συνιστάται)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24635,7 +23937,7 @@ p, li { white-space: pre-wrap; }⏎
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24644,7 +23946,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24669,7 +23976,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -24734,12 +24046,7 @@ p, li { white-space: pre-wrap; }
         <translation>Max. σήραγγα Αίτ. διαβιβάζονται ανά δευτερόλεπτο:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24749,7 +24056,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Προειδοποίηση</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24777,7 +24094,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Ολοκληρωση λυψης</translation>
     </message>
@@ -24801,39 +24118,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Έχετε %1 ολοκληρώμενη λυψη</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Η λήψη %1 ολοκληρώθηκε</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 ολοκληρώμενη λυψη</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 ολοκληρώμενη λυψη</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Λήψεις</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Προσθήκες</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Ονομα</translation>
@@ -25040,7 +24341,12 @@ p, li { white-space: pre-wrap; }
         <translation>Καθορίσμος...</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation>Μετακίνηση στην ουρά...</translation>
     </message>
@@ -25065,7 +24371,7 @@ p, li { white-space: pre-wrap; }
         <translation>Επιλογη κατάλογου</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25086,7 +24392,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -25119,7 +24425,17 @@ p, li { white-space: pre-wrap; }
         <translation>Το αρχείο %1 δεν έχει ολοκληρωθεί. Εάν είναι ένα αρχείο πολυμέσων, προσπαθήστε να κάνετε προεπισκόπηση.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Προειδοποίηση</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Αλλαγή όνοματος αρχείου</translation>
     </message>
@@ -25134,7 +24450,7 @@ p, li { white-space: pre-wrap; }
         <translation>Παρακαλούμε εισάγετε ένα νέο--και έγκυρο--όνομα αρχείου</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished">Επεκταση ολων</translation>
@@ -25261,23 +24577,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Στήλες</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Διαδρομή</translation>
     </message>
@@ -25287,7 +24598,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25297,7 +24608,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Δημιουργία Συλλογής ... </translation>
     </message>
@@ -25312,7 +24623,7 @@ p, li { white-space: pre-wrap; }
         <translation>Εμφάνιση Συλλογής ...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation>Συλλογή</translation>
     </message>
@@ -25322,7 +24633,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25736,12 +25047,17 @@ p, li { white-space: pre-wrap; }
         <translation>Φορμα</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Κατασταση:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Παράμετροι δικτύου</translation>
     </message>
@@ -25781,17 +25097,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25801,12 +25127,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25943,11 +25269,7 @@ p, li { white-space: pre-wrap; }
         <translation>Σελίδες wiki</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Νέα ομάδα</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Όνομα σελίδας</translation>
     </message>
@@ -25962,7 +25284,7 @@ p, li { white-space: pre-wrap; }
         <translation>Orig Id</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26050,7 +25372,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Σελίδα επεξεργασίας ιστορίκου</translation>
     </message>
@@ -26085,7 +25407,7 @@ p, li { white-space: pre-wrap; }
         <translation>PageId</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -26115,14 +25437,18 @@ p, li { white-space: pre-wrap; }
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Ιστορικό</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Εμφανιση ιστορικόυ</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Κατασταση</translation>
     </message>
@@ -26143,7 +25469,7 @@ p, li { white-space: pre-wrap; }
         <translation>Επαναφορά</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Υποβολη</translation>
     </message>
@@ -26215,10 +25541,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">TimeRange</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -26230,16 +25552,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Ανανέωση</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26254,7 +25567,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Άλλοι</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26274,7 +25587,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26304,85 +25617,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Περασμένος μήνας</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Προηγούμενη εβδομάδα</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Σήμερα</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Νεο</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">από</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">μέχρι</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Φίλτρο αναζήτησης </translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Δίκτυο ευρείας</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Διαχείριση λογαριασμών</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Εμφανιση:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>τον εαυτό σας</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Φίλοι</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Μετά</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Προσαρμογη</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Λογαριασμός 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Λογαριασμος 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Λογαριασμός 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">Πλαίσιο ελέγχου</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Θέση παλμό για σύρμα</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -26445,35 +25690,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Μετακινηση</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -26518,11 +25770,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Μετά</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Άγνωστο</translation>
@@ -26600,7 +25882,7 @@ p, li { white-space: pre-wrap; }
         <translation>% 1y % 2d</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26633,15 +25915,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Εικόνες (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts
index d11bfb453..0f9c08da7 100644
--- a/retroshare-gui/src/lang/retroshare_en.ts
+++ b/retroshare-gui/src/lang/retroshare_en.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,10 +566,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -612,7 +625,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -699,7 +712,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -795,7 +808,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -825,12 +838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,7 +851,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -858,7 +871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -896,7 +909,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -916,7 +929,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -946,7 +959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -956,7 +969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -964,12 +977,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -989,18 +1002,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1015,12 +1028,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1189,17 +1202,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1209,7 +1222,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1217,7 +1240,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1263,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1265,18 +1288,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1291,7 +1314,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1301,17 +1324,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1319,7 +1332,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1510,7 +1523,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1543,13 +1556,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1557,13 +1571,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1573,29 +1587,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1605,7 +1597,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1662,12 +1654,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1677,23 +1669,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-240"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-564"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1703,27 +1714,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1738,47 +1744,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1793,7 +1799,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
@@ -1813,7 +1819,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1858,7 +1864,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1873,7 +1879,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1893,7 +1899,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1918,7 +1924,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1948,7 +1954,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1958,7 +1964,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1982,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2052,12 +2058,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2067,7 +2083,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2164,7 +2190,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2270,7 +2296,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2306,7 +2332,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2341,12 +2367,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2426,11 +2452,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2468,7 +2489,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2490,7 +2511,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2540,7 +2561,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2562,7 +2583,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2577,12 +2598,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2598,12 +2619,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2614,12 +2635,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2639,7 +2660,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2665,7 +2686,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2687,7 +2708,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2713,7 +2734,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2773,7 +2794,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2789,7 +2810,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2841,45 +2862,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2889,7 +2910,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2971,12 +2992,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2996,7 +3022,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3064,7 +3090,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3080,12 +3106,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3095,17 +3121,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3115,7 +3141,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3140,12 +3166,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3165,32 +3201,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3236,17 +3267,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3266,12 +3297,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3279,7 +3310,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3319,7 +3350,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3344,7 +3375,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3354,7 +3385,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3393,7 +3424,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3403,7 +3434,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3428,7 +3459,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3441,7 +3472,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3476,7 +3507,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3486,12 +3517,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3556,7 +3582,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3584,7 +3610,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3594,17 +3620,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3614,12 +3643,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3629,7 +3660,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3654,7 +3686,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3946,7 +3978,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3954,7 +3986,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3964,7 +3997,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4000,12 +4033,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4025,7 +4058,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4045,18 +4078,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4071,7 +4104,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4111,19 +4144,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4133,12 +4166,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4148,7 +4193,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4201,13 +4246,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4226,7 +4271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4261,7 +4306,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,7 +4316,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4416,17 +4461,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4451,7 +4496,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4466,18 +4516,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4511,7 +4555,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4521,7 +4565,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+31"/>
+        <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;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4536,16 +4589,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+114"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4560,7 +4604,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4590,17 +4634,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4653,7 +4697,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4663,8 +4707,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4687,7 +4731,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4722,7 +4766,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4732,7 +4776,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4747,7 +4791,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4768,7 +4812,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4776,17 +4820,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4796,12 +4840,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4821,12 +4865,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4836,7 +4875,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4846,17 +4885,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4866,7 +4900,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4936,33 +4970,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5052,7 +5086,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5720,7 +5754,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5728,38 +5762,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5767,12 +5801,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5934,7 +5968,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5944,7 +5978,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6004,11 +6038,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6130,7 +6174,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6172,7 +6216,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6208,7 +6252,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6224,7 +6268,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6461,7 +6505,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6499,7 +6543,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6510,16 +6554,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6602,33 +6762,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6646,7 +6811,17 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6656,17 +6831,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6687,38 +6857,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6738,12 +6908,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6753,38 +6923,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6828,13 +7003,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6844,7 +7019,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6879,7 +7054,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6889,12 +7064,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6904,12 +7074,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7135,27 +7300,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7165,39 +7316,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7205,49 +7374,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7272,7 +7437,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7322,12 +7487,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7451,7 +7616,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7459,7 +7624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7629,7 +7794,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7642,12 +7807,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7672,7 +7837,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7687,14 +7852,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7705,13 +7870,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7724,7 +7889,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7860,7 +8025,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -7871,22 +8036,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7906,12 +8071,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7946,22 +8111,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7981,17 +8146,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8004,7 +8169,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8042,8 +8207,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8058,7 +8233,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8073,7 +8248,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8087,6 +8262,11 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8096,7 +8276,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8117,7 +8297,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8179,18 +8359,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8205,17 +8385,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8243,13 +8423,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8319,7 +8499,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8355,7 +8535,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8370,13 +8550,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8391,7 +8571,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8406,7 +8586,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8466,12 +8646,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8546,12 +8736,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8602,17 +8793,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8727,7 +8918,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8740,7 +8931,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8770,7 +8961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -8809,7 +9000,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8833,6 +9024,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -8842,7 +9048,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -8871,7 +9077,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8902,7 +9108,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8953,7 +9159,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8969,7 +9175,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8988,6 +9194,11 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9017,13 +9228,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9034,7 +9245,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9054,17 +9265,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9077,59 +9288,66 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9139,12 +9357,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9184,23 +9397,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9243,12 +9456,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9278,8 +9491,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9362,12 +9575,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9428,7 +9641,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9448,7 +9661,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9500,7 +9713,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9510,7 +9723,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9525,7 +9738,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9591,12 +9804,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9631,12 +9844,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9647,12 +9860,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9660,7 +9873,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9720,7 +9933,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9743,7 +9956,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9759,12 +9972,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9781,23 +9994,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9813,22 +10026,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9838,12 +10057,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9853,7 +10072,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9928,7 +10147,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9944,27 +10168,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,7 +10191,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10032,7 +10251,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10089,12 +10308,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10117,7 +10336,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10130,14 +10349,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,7 +10366,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10157,7 +10376,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10177,6 +10401,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10188,7 +10420,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10236,7 +10468,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10623,7 +10855,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10639,7 +10871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10658,7 +10890,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10732,7 +10964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10742,7 +10974,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10770,7 +11002,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10780,7 +11012,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10790,7 +11022,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10810,13 +11042,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10828,12 +11084,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10848,12 +11104,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11118,14 +11369,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11135,12 +11386,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11150,7 +11401,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11165,27 +11416,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11201,29 +11452,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11243,18 +11504,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11264,78 +11527,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11346,17 +11609,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11371,24 +11634,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11403,7 +11666,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11413,7 +11681,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11488,7 +11756,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11518,7 +11786,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11533,7 +11801,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11581,7 +11849,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11589,7 +11857,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11632,7 +11900,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11712,7 +11980,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11728,17 +11996,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11843,7 +12106,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11893,21 +12156,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11917,7 +12180,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11932,7 +12195,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11947,12 +12210,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11972,12 +12235,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11987,7 +12250,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11995,7 +12258,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12025,7 +12288,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12039,7 +12308,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12049,7 +12318,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12060,27 +12334,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12100,7 +12374,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12110,12 +12384,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12125,12 +12405,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12140,7 +12415,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12150,10 +12425,15 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12179,7 +12459,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12189,13 +12469,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12205,7 +12485,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12279,7 +12559,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12289,12 +12569,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12317,18 +12597,34 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12346,27 +12642,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12387,7 +12688,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12396,26 +12702,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,7 +12736,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12453,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,7 +12780,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12490,7 +12802,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12501,12 +12813,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12531,11 +12843,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12546,31 +12859,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12585,7 +12902,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12615,7 +12937,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12635,7 +12957,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12680,12 +13002,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12700,7 +13023,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12709,17 +13032,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12755,12 +13078,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12775,32 +13098,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12811,32 +13134,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12906,7 +13229,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12946,7 +13269,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12966,18 +13289,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -12988,7 +13311,17 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13008,7 +13341,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13018,21 +13351,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13047,7 +13380,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13057,30 +13390,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13195,13 +13528,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13221,7 +13554,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13242,7 +13575,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13272,18 +13605,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13323,13 +13656,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13339,12 +13672,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13422,7 +13755,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13432,7 +13765,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13455,7 +13788,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13463,7 +13796,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13491,7 +13824,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13501,37 +13834,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13571,7 +13904,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13623,7 +13956,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13633,12 +13966,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13648,17 +13981,22 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13667,14 +14005,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13689,12 +14037,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13794,7 +14142,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13804,16 +14152,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -13843,17 +14191,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -13884,7 +14232,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13894,7 +14242,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13904,7 +14252,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13913,6 +14261,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -13939,13 +14297,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14020,7 +14378,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14034,7 +14392,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14049,18 +14407,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14095,7 +14463,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14149,7 +14527,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14159,7 +14537,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14194,7 +14572,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14335,7 +14713,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14345,7 +14723,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14359,7 +14737,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14392,18 +14776,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14413,12 +14792,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14451,7 +14830,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14472,7 +14851,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14502,19 +14881,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14524,12 +14903,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14539,7 +14918,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14654,7 +15033,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14664,7 +15043,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -14771,7 +15150,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14786,7 +15165,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14796,12 +15175,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15039,7 +15418,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15059,12 +15438,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15079,7 +15458,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15090,17 +15469,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15108,7 +15489,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15247,7 +15628,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15292,12 +15678,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15343,21 +15724,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15375,7 +15756,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15451,12 +15832,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15482,7 +15863,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15503,7 +15884,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15543,7 +15924,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15601,7 +15982,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15919,17 +16300,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15958,7 +16339,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16017,19 +16398,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16065,12 +16446,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16281,12 +16662,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16339,7 +16735,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16359,8 +16755,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16385,13 +16781,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16419,12 +16815,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16439,12 +16835,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16460,7 +16866,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16470,7 +16886,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16490,12 +16906,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16510,7 +16936,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16521,7 +16947,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16531,7 +16957,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16539,12 +16965,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -16578,7 +17004,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16616,7 +17042,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16632,7 +17068,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16647,12 +17083,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16665,18 +17106,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16687,12 +17128,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16702,7 +17143,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16712,17 +17153,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16732,7 +17173,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16742,7 +17183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16783,7 +17224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16806,7 +17247,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16816,15 +17267,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16834,42 +17285,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16889,7 +17340,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16919,17 +17370,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16944,12 +17395,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16959,27 +17415,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16994,7 +17454,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17068,6 +17528,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17157,16 +17627,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17274,7 +17744,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17290,7 +17760,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17325,12 +17795,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17374,27 +17844,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17404,12 +17874,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17439,13 +17909,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17457,12 +17927,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17477,7 +17957,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17492,20 +17972,25 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PulseMessage</name>
@@ -17515,7 +18000,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -17534,7 +18019,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17544,7 +18029,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17571,7 +18056,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17581,7 +18066,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17601,7 +18086,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17717,7 +18202,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17725,37 +18210,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17787,7 +18277,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17795,8 +18285,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18064,12 +18554,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18100,7 +18590,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18134,7 +18624,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18153,6 +18643,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18232,7 +18742,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18242,7 +18752,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18252,7 +18762,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18268,7 +18778,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18335,7 +18845,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18363,7 +18873,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18544,12 +19054,28 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Status</source>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18792,6 +19318,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -18931,7 +19469,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19098,7 +19636,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19111,7 +19649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19284,17 +19822,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+8"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19302,12 +19845,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19995,7 +20538,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20116,7 +20659,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20136,7 +20679,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20192,7 +20735,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20206,11 +20749,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20224,6 +20762,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20246,12 +20789,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20275,7 +20823,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20296,7 +20846,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20357,7 +20907,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20378,7 +20928,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20408,7 +20958,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20426,7 +20976,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20443,12 +20993,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20509,7 +21059,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20524,7 +21074,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20624,23 +21174,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20650,7 +21200,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20687,7 +21237,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -20698,17 +21248,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20728,7 +21278,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20736,7 +21286,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20752,22 +21302,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20784,7 +21334,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20809,8 +21359,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20818,7 +21368,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20849,7 +21399,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20894,12 +21444,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20919,17 +21469,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20939,7 +21484,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20949,7 +21504,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20959,12 +21514,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21023,12 +21578,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21049,22 +21604,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21077,21 +21632,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21101,23 +21651,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21127,7 +21700,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21152,37 +21725,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21197,71 +21828,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21271,22 +21838,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21298,12 +21850,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21313,7 +21865,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21328,23 +21880,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21355,17 +21907,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21375,12 +21917,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21390,17 +21927,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21440,7 +21967,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21455,12 +21982,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21496,7 +22018,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21551,7 +22098,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21576,7 +22123,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -21588,7 +22135,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21611,7 +22158,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21671,17 +22218,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21697,18 +22255,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21743,12 +22301,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21771,22 +22329,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21821,7 +22379,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21831,12 +22389,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21916,7 +22474,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21926,12 +22484,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -21950,7 +22508,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21970,17 +22528,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21990,7 +22548,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22081,7 +22639,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22089,7 +22647,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22140,11 +22698,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22154,7 +22717,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22169,7 +22732,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22185,7 +22748,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22210,7 +22773,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22353,12 +22916,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22382,7 +22945,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22721,7 +23284,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22958,7 +23521,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22994,12 +23557,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23009,18 +23575,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23030,12 +23591,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23043,7 +23649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23053,7 +23659,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23064,11 +23670,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23096,7 +23703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23107,7 +23714,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23117,22 +23724,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23217,7 +23829,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23226,7 +23838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23251,7 +23868,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23316,12 +23938,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23331,7 +23948,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23359,7 +23986,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23387,19 +24014,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -23606,7 +24233,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23631,7 +24263,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23652,7 +24284,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -23685,7 +24317,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23700,7 +24342,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -23827,23 +24469,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23853,7 +24490,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23863,7 +24500,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23878,7 +24515,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23888,7 +24525,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24302,12 +24939,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24347,17 +24989,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24367,12 +25019,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24509,7 +25161,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24524,7 +25176,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24612,7 +25264,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24647,7 +25299,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24677,14 +25329,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24705,7 +25361,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24788,12 +25444,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24808,7 +25459,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24828,7 +25479,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24858,7 +25509,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24868,7 +25519,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -24931,35 +25582,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25004,11 +25662,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25086,7 +25774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25123,7 +25811,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_es.ts b/retroshare-gui/src/lang/retroshare_es.ts
index 3df49a47e..dc0d23800 100644
--- a/retroshare-gui/src/lang/retroshare_es.ts
+++ b/retroshare-gui/src/lang/retroshare_es.ts
@@ -84,13 +84,6 @@
         <translation>Sólo nodo oculto</translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Añadir un comentario</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: Búsqueda avanzada</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Criterios de búsqueda</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Añadir un criterio de búsqueda adicional.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Reinicializa el criterio de búsqueda.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Cancela la búsqueda.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Buscar</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Crear álbum</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Nombre del álbum:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Categoría:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Animales</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Familia</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Amigos</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Flores</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Festivo</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Paisajes</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Mascotas</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Retratos</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Viajes</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Trabajo</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Aleatorio</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Título:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Dónde:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotógrafo:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descripción:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Opciones de compartición</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Política:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Calidad:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Comentarios:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Identidad:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Público</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Restringido</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Redimensionar imágenes (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Redimensionar imágenes (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Enviar imágenes originales</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">No se permiten comentarios</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Comentarios autenticados</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Permitir cualquier comentario</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Publicar con identidad</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Arrastrar y soltar para insertar imágenes. A continuación pulse en una imagen para editar los detalles.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Atrás</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Añadir fotos</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Publicar álbum</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Álbum sin título</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Diga algo sobre este álbum...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">¿Dónde estaban tomadas?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Cargar miniatura del álbum</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Miniatura del álbum</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Texto de la etiqueta</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Resumen</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Título</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Dónde:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Cuándo</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descripción:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Opciones de compartición</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Comentarios</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Publicar identidad</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Visibilidad</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -483,7 +269,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+10"/>
         <source>Where:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Donde:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Advertencia: Los servicios aquí son experimentales. Por favor, ayúdenos a probarlos.
@@ -783,14 +569,6 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <source>Circles</source>
         <translation>Círculos</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">GxsForos</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">GxsCanales</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation>Fotos</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">Guardar imagen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -842,17 +633,13 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Añadir avatar</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Establecer imagen de avatar</translation>
     </message>
@@ -871,10 +658,6 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Cargar avatar</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation>Reinicializar</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Tasa de recepción</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Tasa de envío</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Siempre encima</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Estilo</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <source>% Opaque</source>
         <translation>% Transparencia</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Guardar</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Cancelar</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Desde:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Ocultar ajustes</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,7 +822,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Comentario</translation>
     </message>
@@ -1093,12 +852,12 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;El autor de este mensaje (con Identificación %1) está excluído.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positivo</translation>
     </message>
@@ -1126,7 +885,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positivo</translation>
     </message>
@@ -1184,7 +943,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">Compartir</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Cambiar el estado de lectura del mensaje</translation>
     </message>
@@ -1224,7 +983,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1232,12 +991,12 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Esto me gusta</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1283,12 +1042,12 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,17 +1216,17 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Canales</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>General</translation>
     </message>
@@ -1477,11 +1236,17 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Cargar mensajes en segundo plano (hilo)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Descargas</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Abrir cada canal en una nueva pestaña</translation>
     </message>
@@ -1489,7 +1254,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Esto me gusta</translation>
     </message>
@@ -1537,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1563,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
@@ -1573,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Comentario</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished">Comentarios</translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Ocultar</translation>
     </message>
@@ -1591,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
@@ -1782,7 +1537,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Mostrar sala de chat</translation>
     </message>
@@ -1794,22 +1549,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>Chats</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Tiene %1 nuevos mensajes</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Tiene %1 nuevo mensaje</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 nuevos mensajes</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 nuevo mensaje</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1831,13 +1570,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Sala desconocida</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Borrar todo</translation>
     </message>
@@ -1845,13 +1585,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Recuento</translation>
     </message>
@@ -1861,33 +1601,7 @@ into the image, so as to
         <translation>Tema</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>Salas de chat privadas suscritas</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>Salas de chat públicas suscritas</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Salas de chat privadas</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Salas de chat públicas</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Salas de chat&lt;/h1&gt;                              	                      &lt;p&gt;Las salas de chat funcionan de forma bastante parecida al IRC.                                      	                      Le permiten hablar de forma anónima con montones de personas sin necesidad de hacer amigos.&lt;/p&gt;                    	                      &lt;p&gt;Una sala de chat puede ser pública (sus amigos la ven) o privada (sus amigos no pueden verla, a menos que les                                     invite con &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Una vez haya sido invitado a una sala privada, podrá verla cuando la estén usando   	                      sus amigos.&lt;/p&gt;                                                                                               	                      &lt;p&gt;La lista de la izquierda muestra                                                                                     	                      salas de chat en las que están participando sus amigos. Puede                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Hacer clic para crear una nueva sala de chat&lt;/li&gt;                                                              		     &lt;li&gt;Hacer doble clic en una sala de chat para entrar, chatear, y mostrarla a sus amigos.&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Aviso: Para que las salas de chat funcionen adecuadamente, su computadora tiene que estar en hora. ¡Compruebe el reloj de su sistema!	                      &lt;/p&gt;                                      	                      </translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Crear sala de chat</translation>
     </message>
@@ -1897,7 +1611,7 @@ into the image, so as to
         <translation>Abandonar esta sala</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Crear una identidad no anónima y entrar en esta sala</translation>
     </message>
@@ -1956,12 +1670,12 @@ Seleccione salas de chat a la izquierda para mostrar detalles.
 Haga doble clic en una sala de chat para entrar y conversar.</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 le invita a una sala de chat llamada %2</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Escoja una identidad no anónima para esta sala de chat:</translation>
     </message>
@@ -1971,31 +1685,31 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Escoja una identidad para esta sala de chat:</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Crear sala de chat</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[No se ha proporcionado tema]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Información sobre la sala</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Privada</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Pública</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>Identificaciones anónimas aceptadas</translation>
     </message>
@@ -2005,42 +1719,25 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Suprimir autosuscripción</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Añadir  autosuscripción</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Buscar salas de chat</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Buscar por nombre</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Suscrito</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation> Columnas</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">No</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2052,47 +1749,47 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Nombre de la sala de chat:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>Identificador de la sala de chat:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Tema: </translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Seguridad:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Vecinos:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Etiqueta de texto</translation>
     </message>
@@ -2107,13 +1804,24 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Sin identificaciones anónimas</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>columna</translation>
@@ -2127,7 +1835,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Eliminar elemento</translation>
     </message>
@@ -2172,46 +1880,22 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Chat distante</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Todos</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Contactos</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Nadie</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Aceptar chat distante cifrado de</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Ajustes del chat</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Habilitar emoticonos en conversación privada</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Habilitar emoticonos en conversación en grupo</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Habilitar fuentes personalizadas</translation>
     </message>
@@ -2220,10 +1904,6 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Enable custom font size</source>
         <translation>Habilitar tamaño de fuente personalizado</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Tamaño mínimo de fuente</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2235,7 +1915,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Habilitar cursiva</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2260,11 +1940,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Cargar imágenes incrustadas</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Sala de chat</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Icono de pestaña intermitente</translation>
     </message>
@@ -2273,10 +1949,6 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Do not send typing notifications</source>
         <translation>No enviar notificaciones de actividad de escritura</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Chat privado</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2298,11 +1970,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Icono de ventana/pestaña intermitente</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Fuente del chat</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Cambiar fuente del chat</translation>
     </message>
@@ -2312,14 +1980,10 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Fuente del chat:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Historial</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Estilo</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2334,17 +1998,13 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Variant:</source>
         <translation>Variante:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Chat en grupo</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Chat privado</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation>Escoja su fuente predeterminada para Chat.</translation>
     </message>
@@ -2408,22 +2068,28 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;En esta pestaña puedes configurar cuantos mensajes guardará en disco RetroShare y cuantas conversaciones previas mostrará para los distintos sistemas de chateo. El periodo máximo de almacenado permite eliminar mensajes viejos y evita que el historial de chateo se llene de conversaciones intrascendentes (salas de chateo y chateo distante)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Salasdechat</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Habilitar:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">Buscar</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2433,7 +2099,17 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Salas de chat</translation>
@@ -2530,11 +2206,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Máximo periodo de almacenamiento, en días (0=mantener todo):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Búsqueda por defecto</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Discriminar minúsculas/mayúsculas</translation>
     </message>
@@ -2573,10 +2245,6 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Threshold for automatic search</source>
         <translation>Umbral para búsqueda automática</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Identidad por defecto para las salas de conversación:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2644,7 +2312,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Mostrar chat</translation>
     </message>
@@ -2680,7 +2348,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
@@ -2715,12 +2383,12 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>Insertar emoticono</translation>
     </message>
@@ -2729,10 +2397,6 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Attach a Picture</source>
         <translation>Adjuntar una imagen</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2804,11 +2468,6 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Insert horizontal rule</source>
         <translation>Insertar regla horizontal</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Guardar imagen</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2846,7 +2505,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>está escribiendo...</translation>
     </message>
@@ -2870,7 +2529,7 @@ after HTML conversion.</source>
         <translation>Escoja su fuente.</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>¿Seguro que quiere borrar el historial?</translation>
     </message>
@@ -2920,7 +2579,7 @@ after HTML conversion.</source>
         <translation>está ocupado e igual no contesta</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Buscar discriminando mayúsculas/minúsculas</translation>
     </message>
@@ -2942,7 +2601,7 @@ after HTML conversion.</source>
         <translation>No detenerse a colorear después de que X elementos se encontrasen (necesita más CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Buscar anterior&lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Mayús+G&lt;/i&gt;</translation>
     </message>
@@ -2957,16 +2616,12 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Buscar &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Estado)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Configurar fuente de texto y color</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Adjuntar un archivo</translation>
     </message>
@@ -2982,12 +2637,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Marcar este texto seleccionado&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation>Identificación persona:</translation>
     </message>
@@ -2999,12 +2654,12 @@ Double click on it to add his name on text writer.</source>
 Haga doble clic sobre este para añadir su nombre en el compositor de texto.</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation>No firmado</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>elementos encontrados.</translation>
     </message>
@@ -3024,7 +2679,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Escriba un mensaje aquí</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>No parar de colorear tras</translation>
     </message>
@@ -3050,7 +2705,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Mostrando detalles:</translation>
     </message>
@@ -3072,7 +2727,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Círculos personales</translation>
     </message>
@@ -3098,7 +2753,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Amigos</translation>
     </message>
@@ -3158,7 +2813,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Amigos de sus amigos</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Círculos externos (Admin)</translation>
     </message>
@@ -3174,7 +2829,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Círculos</translation>
     </message>
@@ -3226,43 +2881,48 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: No se pueden obtener los detalles del vecino.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3274,7 +2934,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Cifrado</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>No conectado</translation>
     </message>
@@ -3356,25 +3016,17 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>ninguno</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Este certificado contiene:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;una &lt;b&gt;identificación de nodo&lt;/b&gt; y &lt;b&gt;nombre&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">una &lt;b&gt;dirección .onion&lt;/b&gt; y &lt;b&gt;puerto&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">una &lt;b&gt;dirección IP&lt;/b&gt; y &lt;b&gt;puerto&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Puede usar este certificado para hacer nuevos amigos. Envíelo por correo electrónico, o proporciónelo en mano.&lt;/p&gt;</translation>
     </message>
@@ -3389,7 +3041,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este es el método de cifrado usado por &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. La conexión a nodos amigos&lt;/p&gt;&lt;p&gt;siempre se cifra fuertemente, y si está presente el DHE (intercambio de claves Diffie-Hellman)&lt;/p&gt;&lt;p&gt;la conexión además usa &amp;quot;secreto perfecto hacia delante&amp;quot; (perfect forward secrecy).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>con</translation>
     </message>
@@ -3406,118 +3058,16 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <source>Connect Friend Wizard</source>
         <translation>Asistente para conectarse con los amigos</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Añadir un amigo nuevo</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Obtener un archivo de certificado de su amigo</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">Hacer a&amp;migos con los amigos de mis amigos seleccionados</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Email 
- (Your friend will receive an email with instructions how to download RetroShare)</source>
-        <translation type="vanished">&amp;Enviar una invitación por correo
- (Su amigo recibirá un correo electrónico con instrucciones sobre cómo descargar RetroShare)</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Incluir firmas</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Copiar su certificado al portapapeles</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Guardar su certificado en un archivo</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Abrir programa de email</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Abrir certificado de su amigo desde fichero</translation>
     </message>
-    <message>
-        <source>Open certificate</source>
-        <translation type="vanished">Abrir certificado</translation>
-    </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">Por favor, pegue el certificado Retroshare de su amigo en el recuadro de debajo</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Archivos de certificados PGP</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Usar certificados PGP guardados en archivos.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Importar certificado PGP de un amigo...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Tiene que crear un archivo con su certificado PGP y enviárselo a un amigo. También puede usar un archivo generado anteriormente.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Exportar mi certificado PGP...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Arrastre y suelte el certificado de sus amigos en esta ventana o especifique la ruta aquí</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Navegar</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Amigos de amigos</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Elija ahora quienes quiere hacer sus amigos.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Mostrarme:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Hacer amistad con estos vecinos</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>ID de RetroShare</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Utilize la ID de RetroShare para añadir a amigos que estén disponibles en su red.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Añadir la ID de RetroShare del amigo...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Pegar el ID de amigos de RetroShare en el siguiente cuadro</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Introduzca el ID de RetroShare de su amigo, p,ej. Peer@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3559,27 +3109,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Correo electrónico</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Invitar a amigos por correo electrónico</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Introduzca las direcciones de email de sus amigos (separadas cada una con un punto y coma)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Direcciones de correo de sus amigos:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Introduzca la dirección de correo de su amigo</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Asunto:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3595,78 +3125,32 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Detalles de la solicitud</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Detalles del vecino</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Email:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Nodo:</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">Por favor, observe que RetroShare requerirá cantidades excesivas de ancho de banda, memoria y CPU si añade demasiados amigos. Puede añadir tantos amigos como quiera, pero más de 40 probablemente requerirá demasiados
-recursos.</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">Este asistente le ayudará a conectar a su(s) amigo(s) a la red RetroShare.&lt;br&gt;Seleccione cómo desea añadir un amigo:</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Introduzca el certificado manualmente</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">Introduzca la identificación de RetroShare manualmente</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">&amp;Enviar una invitación mediante proveedores de correo web</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Intercambie muchas recomendaciones de amigos con sus amigos</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">Certificado de RetroShare</translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">Por favor, pegue debajo el certificado de RetroShare de su amigo</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Pegar certificado</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este recuadro espera el certificado de RetroShare de su amigo. ADVERTENCIA: Este es distinto de la clave del perfil de su amigo. No pegue aquí la clave del perfil de su amigo (ni siquiera una parte de ella). No va a funcionar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Añadir amigo a grupo:</translation>
     </message>
@@ -3676,7 +3160,7 @@ recursos.</translation>
         <translation>Autenticar amigo (firmar la clave PGP)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3701,16 +3185,22 @@ recursos.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Añadir como amigo al conectarse con</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Para aceptar la solicitud de amigo, pulse en el botón Finalizar.</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Lo siento, ha ocurrido un error</translation>
     </message>
@@ -3730,32 +3220,27 @@ recursos.</translation>
         <translation>Detalles acerca de su amigo:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Validez de la clave:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Firmantes</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmar la clave de un amigo es una forma de expresar su confianza en este amigo a sus otros amigos. Las firmas de debajo atestiguan criptográficamente que los titulares de las claves listadas reconocen como auténtica la clave PGP actual.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Este vecino ya está en su lista de amigos. Añadiendolo sólo podrá establecer su dirección ip.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3801,49 +3286,17 @@ recursos.</translation>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Error al cargar el certificado</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">No se pudieron obtener los detalles del vecino con clave PGP %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Vecinos a quienes no he firmado las claves PGP</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Amigos de amigos que me han firmado la clave PGP</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Vecinos bloqueados a quienes he firmado la llave PGP</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Nombre del vecino</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Tambien firmado por</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">ID del vecino</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">El certificado parece ser válido</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>¡No es un certificado RetroShare válido!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Invitación de RetroShare</translation>
     </message>
@@ -3865,12 +3318,12 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>¿Este es su propio certificado? No querría hacerse amigo de si mismo. ¿No es así?</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3878,7 +3331,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation>Esta clave ya está en su lista de confianza</translation>
     </message>
@@ -3918,7 +3371,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>Tiene una solicitud de amistad de</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3943,7 +3396,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3953,47 +3406,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">La carga del certificado PGP ha fallado: archivo %1 no encontrado</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Este vecino %1 no está disponible en su red</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Usar el nuevo formato de certificado (más seguro y robusto)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Usar el viejo formato de certificado (compatible con versiones anteriores)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Quitar las firmas</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">Invitar a RetroShare</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Ayuda para conectar con sus amigos</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Puede copiar este texto y enviarlo a su amigo por email o de alguna otra forma</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Su certificado se ha copiado al portapapeles. Péguelo y envíeselo a un amigo por email u otro medio</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Guardar como...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4032,11 +3445,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>*** Ningúno ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Utilizar como fuente directa, cuando esté disponible</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>Dir-IP:</translation>
     </message>
@@ -4046,7 +3455,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>Dirección-IP</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Mostrar opciones avanzadas</translation>
     </message>
@@ -4055,10 +3464,6 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmar una clave de un amigo es una forma de expresar su confianza en este amigo al resto de sus amigos. Les ayuda a decidir si permitir conexiones desde esa clave en base a la propia confianza de usted. Firmar una clave es absolutamente opcional y no se puede deshacer, así que hágalo juiciosamente. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare comprueba periódicamente sus listas de amigos en busca de ficheros explorables que coincidan con sus transferencias, para establecer una transferencia directa. En tal caso, su amigo sabe que usted está descargando el fichero.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Para evitar este comportamiento sólo para este amigo, desmarque esta casilla. Aún puede efectuar una transferencia directa si la pide explícitamente, por ejemplo, descargando de la lista de ficheros de su amigo. Está ajuste se aplica a todas las ubicaciones del mismo nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4069,45 +3474,13 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Los vecinos que tengan esta opción no pueden conectar si la dirección de su conexión no está en la lista blanca. Esto le protege de ataques de reenvío de tráfico. Cuando lo use, se informará de los vecinos rechazados mediante &amp;quot;elementos de seguridad de la suscripción (feed)&amp;quot; en la sección de Suscripción de Noticias. Desde allí, puede incluir sus IPs en lista blanca/negra. Se aplica a todas las ubicaciones del mismo nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Recomendar varios amigos a los demás</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Recomendaciones de amigo</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">El texto de debajo es su certificado Retroshare. Tiene que proporcionárselo a su amigo.</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Mensage:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Recomendar amigos</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">A</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Por favor, seleccione al menos un amigo por recomendación.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Por favor, seleccione al menos un amigo como destinatario.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Añadir al grupo de claves (&apos;keyring&apos;)</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Esta clave ya está en su grupo de claves (&apos;keyring&apos;)</translation>
     </message>
@@ -4123,7 +3496,7 @@ mensajes distantes a este vecino
 incluso si no hace amigos.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>El certificado tiene un número de versión incorrecto. Recuerde que las redes de v0.6 y v0.5 son incompatibles.</translation>
     </message>
@@ -4158,7 +3531,7 @@ incluso si no hace amigos.</translation>
         <translation>Añadir IP a la lista blanca</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>¡No hay IP en este certificado!</translation>
     </message>
@@ -4168,27 +3541,10 @@ incluso si no hace amigos.</translation>
         <translation>&lt;p&gt;Este certificado no tiene IP. Dependerá del descubrimiento y la DHT (tabla distribuida de hashes) para encontrarlo. A causa de que usted requiere que se limpie la lista blanca, el vecino generará una advertencia de seguridad en la pestaña de Novedades (feed). Desde allí puede añadir su IP a la lista blanca.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Añadido con el certificado de %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Pegar certificado de su amigo desde el Portapapeles</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">La carga del certificado falló: No se pudo leer del archivo %1</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">La carga del certificado falló: Hay algo mal con %1</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4250,7 +3606,7 @@ incluso si no hace amigos.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>Configurar UDP</translation>
     </message>
@@ -4286,7 +3642,7 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;puede cerrarlo.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Asistente de conexión</translation>
     </message>
@@ -4296,17 +3652,20 @@ p, li { white-space: pre-wrap; }
         <translation>ID del vecino inválido</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Estado desconocido</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Desconectado</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Detrás de NAT simétrico</translation>
     </message>
@@ -4316,12 +3675,14 @@ p, li { white-space: pre-wrap; }
         <translation>Detrás de NAT y sin DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Reiniciar red</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>Detrás de NAT</translation>
     </message>
@@ -4331,7 +3692,8 @@ p, li { white-space: pre-wrap; }
         <translation>Sin DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>ESTADO DE LA RED BUENO!</translation>
     </message>
@@ -4356,7 +3718,7 @@ p, li { white-space: pre-wrap; }
         <translation>Encontrando vecinos de RS</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>La búsqueda requiere DHT</translation>
     </message>
@@ -4648,7 +4010,7 @@ p, li { white-space: pre-wrap; }
         <translation>Por favor, intenta volver a importar el certificado completo</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4656,7 +4018,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>REENVÍO NO VERIFICABLE!</translation>
     </message>
@@ -4666,7 +4029,7 @@ p, li { white-space: pre-wrap; }
         <translation>REENVÍO NO VERIFICABLE Y SIN DHT</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Buscando</translation>
     </message>
@@ -4702,12 +4065,12 @@ p, li { white-space: pre-wrap; }
         <translation>Detalles del círculo</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nombre, contacto del autor y lista de miembros invitados del círculo será visible para todos los miembros invitados. Si el círculo no es privado, también será visible a los nodos vecinos de los nodos que alojen a los miembros invitados.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4727,7 +4090,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>IDs</translation>
     </message>
@@ -4747,18 +4110,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtrar</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Miembros invitados</translation>
     </message>
@@ -4773,15 +4136,7 @@ p, li { white-space: pre-wrap; }
         <translation>Personas conocidas</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Tipo</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
@@ -4821,23 +4176,19 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Los círculos se pueden restringir a los miembros de otro círculo. Sólo los miembros de ese segundo círculo tendrán permitido ver el nuevo círculo y su contenido (lista de miembros, etc.).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Sólo visible para los miembros de:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Por favor elija un nombre para su círculo</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Círculo seleccionado sin restricciones</translation>
     </message>
@@ -4847,12 +4198,24 @@ p, li { white-space: pre-wrap; }
         <translation>No hay limitaciones en el círculo seleccionado</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
@@ -4862,7 +4225,7 @@ p, li { white-space: pre-wrap; }
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Buscar</translation>
@@ -4877,10 +4240,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Firmado</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Firmado por nodos conocidos</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4897,10 +4256,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>Identidad PGP</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Identidad anónima</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4923,17 +4278,13 @@ p, li { white-space: pre-wrap; }
         <translation>Crear nuevo círculo</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">Identidad vinculada a PGP</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Añadir miembro</translation>
     </message>
@@ -4952,7 +4303,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crear un grupo</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Nombre del grupo:</translation>
     </message>
@@ -4987,7 +4338,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Nuevo mensaje del canal</translation>
     </message>
@@ -4997,7 +4348,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mensaje del canal</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5058,23 +4409,11 @@ p, li { white-space: pre-wrap; }
  &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Utilice arrastrar y soltar / Botón añadir archivos, para nuevos hash de archivos&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copiar/pegar enlaces de RetroShare desde sus recursos compartidos&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Adjuntar archivo</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Añadir imagen al canal</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Mensaje</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Asunto:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5160,17 +4499,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5189,17 +4528,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Archivo ya añadido y hash generado</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Por favor, añada un asunto</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Cargar imagen en miniatura</translation>
     </message>
@@ -5214,18 +4554,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Generar datos masivos</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>¿De veras quiere generar %1 mensajes?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Está a punto de añadir archivos que actualmente no está compartiendo. ¿Seguro que quiere continuar?</translation>
     </message>
@@ -5259,7 +4593,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Enviar mensaje al foro</translation>
     </message>
@@ -5268,10 +4602,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Foro</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Asunto</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5292,8 +4622,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5312,7 +4642,7 @@ p, li { white-space: pre-wrap; }
         <translation>En esta ventana puede adjuntar archivos mediante arrastrar y soltar</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5342,17 +4672,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Ningún foro</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>En respuesta a</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Título</translation>
     </message>
@@ -5406,7 +4736,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Cargar archivo de imagen</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>Identificación no compatible para este foro</translation>
     </message>
@@ -5416,8 +4746,8 @@ Do you want to discard this message?</source>
         <translation>Ninguna de sus identidades tiene permitido publicar en este foro. Esto se podría deber a que el foro se esté limitando a un círculo que no contiene ninguna de sus identidades, o a que los indicativos del foro requieran una identidad firmada-con-PGP.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Generar datos masivos</translation>
     </message>
@@ -5426,10 +4756,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>¿De veras quiere generar %1 mensajes?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Enviar</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5444,23 +4770,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Crear sala de chat</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Un &quot;Chat lobby&quot; es una sala de chat en grupo descentralizada y anónima. Todos los participantes reciben todos los mensajes. Una vez que se crea la sala puede invitar a otros amigos de la ficha de Amigos.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Nombre de la sala:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Tema de la sala:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5495,7 +4805,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
@@ -5505,11 +4815,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si marca esto, sólo se pueden usar las identificaciones firmadas-con-PGP para unirse y hablar en esta sala. Esta limitación previene el spam anónimo ya que se hace posible para, al menos algunas personas en la sala, localizar el nodo spammer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>requiere identidades firmadas-con-PGP</translation>
     </message>
@@ -5524,11 +4830,7 @@ Do you want to discard this message?</source>
         <translation>Seleccione los amigos para el chat de grupo.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Amigos invitados</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Crear sala de chat</translation>
@@ -5549,7 +4851,7 @@ Do you want to discard this message?</source>
         <translation>Contactos:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Identidad a usar:</translation>
     </message>
@@ -5557,17 +4859,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Información pública</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
@@ -5577,12 +4879,12 @@ Do you want to discard this message?</source>
         <translation>ID del lugar:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Versión del programa:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>En línea desde:</translation>
     </message>
@@ -5602,12 +4904,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5617,7 +4914,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Otra información</translation>
     </message>
@@ -5627,17 +4924,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished">Perfil</translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Certificado</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5647,11 +4939,7 @@ Do you want to discard this message?</source>
         <translation>Incluir firmas</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Guardar mi clave en un archivo</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exportar identidad</translation>
     </message>
@@ -5725,33 +5013,33 @@ y utilizar el botón Importar para cargarla</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Texto de la etiqueta</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>Huella de validación de clave PGP:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Información del nodo</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>Identificación de PGP :</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Nodos amigos:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5790,14 +5078,6 @@ y utilizar el botón Importar para cargarla</translation>
         <source>Node</source>
         <translation>Nodo</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Crear nuevo nodo...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">mostrar ventana de estadísticas</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5814,10 +5094,6 @@ y utilizar el botón Importar para cargarla</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Retroshare usar la DHT (tabla de hashes dinámica) de Bittorrent como un proxy (interpuesto) para conexiones. No &quot;almacena&quot; su IP en la DHT. 				                        En su lugar, la DHT es usada por sus amigos para llegar a usted mientras se procesan peticiones DHT estándar. 												El indicador de estado se volverá verde tan pronto como Retroshare obtenga una respuesta DHT de uno de sus amigos.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5853,7 +5129,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6521,7 +5797,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Abrir archivo</translation>
     </message>
@@ -6529,38 +5805,38 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>a</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>Ignorar Mayús/Minús</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>dd.MM.yyyy</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6568,12 +5844,12 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Widget de expresiones</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Borrar esta expresión</translation>
     </message>
@@ -6735,7 +6011,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Imagen</translation>
     </message>
@@ -6745,7 +6021,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6805,11 +6081,21 @@ y utilizar el botón Importar para cargarla</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Carpetas de amigos</translation>
     </message>
@@ -6931,7 +6217,7 @@ y utilizar el botón Importar para cargarla</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation>Identidad</translation>
     </message>
@@ -6966,10 +6252,6 @@ y utilizar el botón Importar para cargarla</translation>
         <source>Show State</source>
         <translation>Mostrar estado</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">Nodos de confianza</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6977,7 +6259,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Mostrar grupos</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
@@ -7013,7 +6295,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Añadir a grupo</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Buscar</translation>
@@ -7029,7 +6311,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Ordenar por estado</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Detalles del perfil</translation>
     </message>
@@ -7273,7 +6555,7 @@ al menos un vecino no fue añadido al grupo</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Confirmar solicitud de amistad</translation>
     </message>
@@ -7290,10 +6572,6 @@ al menos un vecino no fue añadido al grupo</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Buscar:</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7315,7 +6593,7 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Buscar a amigos</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Marcar todo</translation>
     </message>
@@ -7326,16 +6604,134 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>No marcar nada</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished">Dirección</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Estado</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Hacer amigo</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished">El proxy no está habilitado o está estropeado.
+¿¿Están todos los servicios en marcha y ejecutándose correctamente??
+¡Compruebe también sus puertos!</translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Editar mensaje de estado</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Difusión</translation>
     </message>
@@ -7418,33 +6814,38 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Restablecer la fuente por defecto</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Juego de claves</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Red&lt;/h1&gt;                                       &lt;p&gt;La pestaña de Red muestra sus nodos RetroShare amigos: los nodos RetroShare vecinos que están conectados a usted.     &lt;/p&gt;                                                       &lt;p&gt;Puede agrupar nodos juntos para permitir un nivel de regulación más fino del acceso a la información, por ejemplo para permitir que sólo          algunos nodos vean algunos de sus archivos.&lt;/p&gt;     &lt;p&gt;A la derecha, encontrará 3 pestañas útiles:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Difusión envía mensajes a todos los nodos conectados a la vez&lt;/li&gt;                                   &lt;li&gt;Gráfica de red local muestra la red alrededor de usted, basándose en la información de descubrimiento&lt;/li&gt;                       &lt;li&gt;El juego de claves contiene claves de nodos que ha recopilado, en su mayoría redirigidos hacia usted por sus nodos amigos&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Chat de difusión de RetroShare: Los mensajes se envían a todos los amigos conectados.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Gráfica de la red</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Configure su mensaje de estado aquí.</translation>
     </message>
@@ -7462,7 +6863,17 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Todos los campos requieren como mínimo 3 letras</translation>
     </message>
@@ -7472,17 +6883,12 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Las contraseñas no coinciden</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation>Usar BOB</translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Esta contraseña es para PGP</translation>
@@ -7503,50 +6909,38 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>¡Fallo al generar su nuevo certificado, quizá la contraseña PGP está mal!</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="vanished">Opciones</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation>Tamaño de la clave PGP</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Introduzca aquí una contraseña robusta. ¡Esta contraseña protege la clave privada de su nodo!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Por favor, mueva su ratón al azar para adquirir tanta aleatoriedad como sea posible. Se necesita un mínimo del 20% para crear las claves de su nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Nodo estándar</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">Nodo oculto TOR/I2P</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nombre de su nodo designa la instancia de RetroShare que&lt;/p&gt;&lt;p&gt;se ejecutará en esta máquina.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Use existing profile</source>
-        <translation type="vanished">Usar perfil existente</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Nombre del nodo</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7566,12 +6960,12 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nombre del perfil le identifica en la red.&lt;/p&gt;&lt;p&gt;Es usado por sus amigos para aceptar conexiones de usted.&lt;/p&gt;&lt;p&gt;Puede crear múltiples nodos de RetroShare con el&lt;/p&gt;&lt;p&gt;mismo perfil en distintas máquinas.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Exportar este perfil</translation>
     </message>
@@ -7581,42 +6975,43 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esto debe ser una dirección onion de Tor con la forma: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;o una dirección I2P con la forma: [52 caracteres].b32.i2p &lt;/p&gt;&lt;p&gt;Para obtener una, tiene que configurar Tor o bien I2P para crear un nuevo servicio oculto / túnel de servidor. &lt;/p&gt;&lt;p&gt; También puede dejar esto en blanco ahora, pero su nodo sólo funcionará si establece correctamente la dirección del servicio Tor/I2P en el panel de configuración Opciones-&amp;gt;Red-&amp;gt;Servicio oculto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Las identidades se usan cuando escribe en salas de chat, foros y comentarios de canal.&lt;/p&gt;&lt;p&gt;También reciben/envían correo electrónico sobre la red RetroShare. Puede crear&lt;/p&gt;&lt;p&gt;ahora una identidad firmada, o hacerlo más tarde cuando le sea necesaria.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>¡Vamos!</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation>EtiquetaTexto</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Opciones avanzadas</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>dirección oculta</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Su perfil está asociado con un par de claves PGP. RetroShare actualmente ignora las claves DSA.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este es su puerto de conexión.&lt;/p&gt;&lt;p&gt;Cualquier valor entre 1024 y 65535 &lt;/p&gt;&lt;p&gt;debería estar bien. Puede cambiarlo más tarde.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7664,13 +7059,13 @@ y usar el botón Importar para cargarlo</translation>
         <translation>Su perfil no fue guardado. Ocurrió un error.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Perfil importado</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Crear nuevo perfil y nuevo nodo RetroShare</translation>
     </message>
@@ -7680,7 +7075,7 @@ y usar el botón Importar para cargarlo</translation>
         <translation>Crear nuevo nodo RetroShare</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation>Dirección Tor/I2P</translation>
     </message>
@@ -7715,7 +7110,7 @@ y usar el botón Importar para cargarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7725,12 +7120,7 @@ y usar el botón Importar para cargarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La creación de nodo está deshabilitada hasta que todos los campos estén establecidos correctamente.&lt;/p&gt;</translation>
     </message>
@@ -7740,12 +7130,7 @@ y usar el botón Importar para cargarlo</translation>
         <translation>&lt;p&gt;La creación de nodo está deshabilitada hasta que se recoja suficiente aleatoriedad. Por favor, mueva su ratón hasta que alcance al menos el 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation>Dirección de instancia de I2P con BOB habilitado</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation>Dirección de instancia de I2P</translation>
     </message>
@@ -7971,36 +7356,13 @@ y usar el botón Importar para cargarlo</translation>
         <translation>Primeros pasos</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Invitar a los amigos</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare no es nada sin sus amigos. Pulse en el botón para iniciar el proceso.&lt;/span&gt;&lt;/p&gt;
- &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Envíe por correo electrónico una invitación con su &amp;quot;Certificado ID&amp;quot; a sus amigos.&lt;/span&gt;&lt;/p&gt;
- &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Asegúrese de obtener de vuelta la invitación de su amigo... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Sólo puede conectarse con amigos, si se han añadido unos a otros.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Añadir a sus amigos a RetroShare</translation>
     </message>
@@ -8010,136 +7372,103 @@ p, li { white-space: pre-wrap; }
         <translation>Añadir amigos</translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;¡Permanezca conectado al mismo tiempo que sus amigos, y Retroshare conectará automáticamente con usted!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Su cliente necesita encontrar la red Retroshare antes de poder hacer conexiones.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Esto lleva entre 5-30 minutos la primera vez que inicie Retroshare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;El indicador de la DHT (en la barra de estado) se vuelve verde cuando puede realizar conexiones.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Tras un par de minutos, el indicador de NAT (también en la barra de estado) cambia a amarillo o verde.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Si permanece rojo, entonces tiene un cortafuegos molesto, con el que RetroShare lucha para conectar a través de él.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Vea la sección Ayuda Adicional para más recomendaciones sobre cómo conectar.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Conectar con amigos</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Puede mejorar su rendimiento de Retroshare abriendo un puerto externo. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Esto acelerará las conexiones y permitirá a más personas conectar con usted. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;La forma más fácil de hacer esto es habilitando UPnP en su dispositivo inalámbrico o router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Como cada router es diferente, necesitará averiguar el modelo de su router y buscar las instrucciones en Internet.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Si nada de esto tiene sentido para usted, no se preocupe por ello, Retroshare todavía funcionará.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avanzado: Abrir el puerto del cortafuegos</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;¿Tiene problemas iniciándose con RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Mire al wiki de preguntas frecuentes (FAQ). Este es un poco antiguo, estamos tratando de actualizarlo.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Revise los foros en línea. Formule preguntas y discuta características.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Pruebe en los foros internos de RetroShare &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- Estos entran en línea una vez este conectado a amigos.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) Si aún está estancado, escríbanos un correo.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Disfrute del Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Conectar con amigos</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Cuando sus amigos le envíen invitaciones, pulse para abrir la ventana Añadir Amigos.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Pegue los &amp;quot;Certificados de identificación&amp;quot; de sus amgios en la ventana y añádalos como amigos.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avanzado: Abrir el puerto del cortafuegos</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Más ayuda y soporte técnico</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Abrir sitio web de RS</translation>
     </message>
@@ -8164,7 +7493,7 @@ p, li { white-space: pre-wrap; }
         <translation>Email para enviar comentarios</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>Invitación de RetroShare</translation>
     </message>
@@ -8214,12 +7543,12 @@ p, li { white-space: pre-wrap; }
         <translation>Comentarios de RetroShare</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>Soporte de RetroShare</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Tiene muchas características, incluyendo un chan integrado, mensajería,</translation>
     </message>
@@ -8343,7 +7672,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Mostrar chat de grupo</translation>
     </message>
@@ -8351,7 +7680,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[Desconocido]</translation>
     </message>
@@ -8517,19 +7846,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Puede dejar que sus amigos sepan de su foro al compartirlo con ellos. Seleccione a los amigos con los que quiera compartir su foro.</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">Compartir permisos de administrador del hilo</translation>
-    </message>
-    <message>
-        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
-        <translation type="vanished">Puede permitir que sus amigos editen el hilo. Selecciónelos en la lista de debajo. Nota: No es posible revocar permisos de administrador de Posted.</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Título</translation>
     </message>
@@ -8542,12 +7863,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8572,35 +7893,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">Ordenar en orden descendente</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">Ordenar en orden ascendente</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Ordenar por nombre</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Ordenar por popularidad</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Ordenar por última entrada</translation>
-    </message>
-    <message>
-        <source>Sort by Number of Posts</source>
-        <translation type="vanished">Ordenar por número de mensajes</translation>
-    </message>
-    <message>
-        <source>Sort by Unread</source>
-        <translation type="vanished">Ordenar por no leídos</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Usted es administrador (modifique nombres y descripciones usando el menú Editar)</translation>
     </message>
@@ -8615,14 +7908,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Última publicación</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
@@ -8633,17 +7926,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularidad</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Mostrar</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8656,7 +7945,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>y</translation>
     </message>
@@ -8792,7 +8081,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Canales</translation>
@@ -8803,26 +8092,22 @@ p, li { white-space: pre-wrap; }
         <translation>Crear canal</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Activar descarga automática</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Mis canales</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Canales&lt;/h1&gt;        &lt;p&gt;Los canales le permiten publicar datos (ej. películas, música) que se diseminarán por la red&lt;/p&gt;                &lt;p&gt;Puede ver los canales a los que están suscritos sus amigos, y reenviar automáticamente los canales a los que esté suscrito a sus amigos. Esto promueve buenos canales en la red.&lt;/p&gt;    &lt;p&gt;Sólo el creador del canal puede publicar en ese canal. Otros vecinos en la red sólo pueden leer de él, a no ser que el canal sea privado. Sin embargo, puede compartir los derechos de publicación o lectura con nodos RetroShare amigos.&lt;/p&gt;	 &lt;p&gt;Los canales pueden hacerse anónimos, o ligados a una identidad de RetroShare de forma que los lectores puedan contactar con usted si lo necesitan.	 Habilite &quot;Permitir comentarios&quot; si quiere permitir a los usuarios comentar en sus posts.&lt;/p&gt;    &lt;p&gt;Los posts de canal se conservan durante %1 días, y se sincronizan para los últimos %2 días, a menos que cambie esto.&lt;/p&gt;                </translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Canales suscritos</translation>
     </message>
@@ -8842,12 +8127,12 @@ p, li { white-space: pre-wrap; }
         <translation>Seleccione el directorio de descarga del canal</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Desactivar descarga automática</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>Establecer directorio de descarga</translation>
     </message>
@@ -8882,22 +8167,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Reproducir</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Abrir carpeta</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -8917,17 +8202,17 @@ p, li { white-space: pre-wrap; }
         <translation>Comprobando</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>¿Está seguro de que quiere cancelar y borrar el archivo?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>No se pudo abrir la carpeta</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Reproducir archivo</translation>
     </message>
@@ -8937,37 +8222,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Archivo %1 no está en ese lugar.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulario</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Nombre del archivo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Tamaño</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Título</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Publicado</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Estado</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Crear nuevo canal</translation>
     </message>
@@ -9005,9 +8263,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Suscribirse al canal</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9021,7 +8289,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -9036,7 +8304,7 @@ p, li { white-space: pre-wrap; }
         <translation>Descripción del canal</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Cargando</translation>
     </message>
@@ -9051,8 +8319,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Nuevo canal</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Nunca</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -9063,7 +8332,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Nuevo comentario:</translation>
     </message>
@@ -9084,7 +8353,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
@@ -9140,28 +8409,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Archivos</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">¡Aviso! Tiene menos de %1 horas y %2 minutos antes que este archivo sea eliminado, considere la posibilidad de guardarlo.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Comentario</translation>
     </message>
@@ -9176,21 +8441,17 @@ p, li { white-space: pre-wrap; }
         <translation>Esto no me gusta</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Cargando</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation>Comentarios</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9215,139 +8476,16 @@ p, li { white-space: pre-wrap; }
         <translation>Reproducir medio</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Mensaje al canal</translation>
-    </message>
-    <message>
-        <source>Add new post</source>
-        <translation type="vanished">Añadir nuevo mensaje</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Cargando</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Buscar canales</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Título</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Buscar por título</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Mensaje</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Buscar mensaje</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Nombre del archivo</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Buscar nombre de archivo</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Ningún canal seleccionado</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Nunca</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Público</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle &quot;</source>
-        <translation type="vanished">Restringido a los miembros del círculo &quot;</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle </source>
-        <translation type="vanished">Restringido a los miembros del círculo</translation>
-    </message>
-    <message>
-        <source>Your eyes only</source>
-        <translation type="vanished">Sólo para sus ojos</translation>
-    </message>
-    <message>
-        <source>You and your friend nodes</source>
-        <translation type="vanished">Usted y sus nodos amigos</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Desactivar descarga automática</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Activar descarga automática</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Mostrar novedades (feeds)</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Mostrar archivos</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Administrador:</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Último post:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">desconocido</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Distribución:</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Novedades (feeds)</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Archivos</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Suscriptores</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descripción:</translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">Publicaciones (en nodos vecinos):</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Mensaje al canal</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished">Añadir nuevo mensaje</translation>
     </message>
@@ -9417,7 +8555,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9453,7 +8591,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Comentarios</translation>
     </message>
@@ -9468,13 +8606,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Novedades (feeds)</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9489,7 +8627,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9504,7 +8642,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9564,12 +8702,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9644,12 +8792,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Usted y sus nodos amigos</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Suscrito</translation>
     </message>
@@ -9700,17 +8849,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9730,27 +8879,11 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Eliminar elemento</translation>
     </message>
-    <message>
-        <source>for identity </source>
-        <translation type="vanished">para la identidad</translation>
-    </message>
-    <message>
-        <source>You received a membership request for circle:</source>
-        <translation type="vanished">Ha recibido una solicitud de membresía para el círculo:</translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Conceder solicitud de membresía</translation>
     </message>
-    <message>
-        <source>Revoke membership request</source>
-        <translation type="vanished">Revocar solicitud de membresía</translation>
-    </message>
-    <message>
-        <source>You received an invitation for circle:</source>
-        <translation type="vanished">Ha recibido una invitación para el círculo:</translation>
-    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -9841,7 +8974,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Comentarios aquí</translation>
     </message>
@@ -9854,7 +8987,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9884,7 +9017,7 @@ p, li { white-space: pre-wrap; }
         <translation>Refrescar</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Comentario</translation>
@@ -9923,7 +9056,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Responder al comentario</translation>
     </message>
@@ -9947,6 +9080,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Votar negativo</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9956,7 +9104,7 @@ p, li { white-space: pre-wrap; }
         <translation>Hacer comentario</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9985,22 +9133,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comentario&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Firmado por</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -10028,7 +9164,7 @@ before you can comment</source>
         <translation>Es necesario crear una identidad⏎ antes de poder comentar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10070,14 +9206,6 @@ before you can comment</source>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Añadir administradores al foro</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Seleccionar administradores del foro</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -10087,7 +9215,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Suscribirse al foro</translation>
     </message>
@@ -10103,7 +9231,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -10123,8 +9251,9 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Cargando</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10155,13 +9284,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Tema:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Anular suscripción al foro</translation>
     </message>
@@ -10172,7 +9301,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -10192,21 +9321,17 @@ before you can comment</source>
         <translation>En respuesta a:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Cargando</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Novedad (feed) del canal</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
@@ -10219,63 +9344,66 @@ before you can comment</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Iniciar nuevo tema para el foro seleccionado</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Buscar foros</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Último mensaje</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation>Nuevo hilo</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Vista por discusión</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Vista plana</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Guardar imagen</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Cargando</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10285,12 +9413,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Responder mensaje</translation>
     </message>
@@ -10314,10 +9437,6 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Descargar todos los archivos</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Siguiente no leído</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10334,35 +9453,23 @@ before you can comment</source>
         <translation>Buscar por autor</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Contenido</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Buscar por contenido</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Suscribiendose al foro reunirá 	                                        los posts disponibles de los amigos a los que esté suscrito, y hará el 	                                        foro visible al resto de sus amigos.&lt;/p&gt;&lt;p&gt;Posteriormente puede desuscribirse desde el menú contextual de la lista del foro a la izquierda.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Responder</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10405,20 +9512,12 @@ before you can comment</source>
         <translation>Copiar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Expandir</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Excluido]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[desconocido]</translation>
     </message>
@@ -10448,8 +9547,8 @@ before you can comment</source>
         <translation>Sólo para sus ojos</translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation>Distribución</translation>
     </message>
@@ -10463,26 +9562,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation>Anti-spam</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Mensaje redactado ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anónimo</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">firmado</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">ninguno</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Mensaje perdido ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10552,16 +9631,12 @@ before you can comment</source>
         <translation>Mensaje original</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation>Nuevo hilo</translation>
     </message>
     <message>
-        <source>Read status</source>
-        <translation type="vanished">Estado de lectura</translation>
-    </message>
-    <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
@@ -10622,7 +9697,7 @@ before you can comment</source>
         <translation>Reputación del autor</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10642,7 +9717,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Posts anónimos/desconocidos reenviados si la reputación es positiva</translation>
     </message>
@@ -10694,7 +9769,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10704,7 +9779,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10719,30 +9794,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information for this identity is currently missing.</source>
-        <translation type="vanished">La información para esta identidad actualmente está desaparecida.</translation>
-    </message>
-    <message>
-        <source>You have banned this ID. The message will not be
-displayed nor forwarded to your friends.</source>
-        <translation type="vanished">Ha excluido esta identificación. El mensaje no será
-mostrado ni reenviado a sus amigos.</translation>
-    </message>
-    <message>
-        <source>You have not set an opinion for this person,
- and your friends do not vote positively: Spam regulation 
-prevents the message to be forwarded to your friends.</source>
-        <translation type="vanished">No ha establecido una opinión para esta persona,
-y sus amigos no la han votado positivamente: La
-regulación de spam evita que este mensaje sea
-reenviado a sus amigos.</translation>
-    </message>
-    <message>
-        <source>Message will be forwarded to your friends.</source>
-        <translation type="vanished">El mensaje será reenviado a sus amigos.</translation>
-    </message>
-    <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation>(Más reciente)</translation>
     </message>
@@ -10751,10 +9803,6 @@ reenviado a sus amigos.</translation>
         <source>(Old) </source>
         <translation>(Antiguo)</translation>
     </message>
-    <message>
-        <source>You cant act on the author to a non-existant Message</source>
-        <translation type="vanished">No puede actuar sobre el autor de un mensaje no-existente</translation>
-    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -10812,12 +9860,12 @@ reenviado a sus amigos.</translation>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Foros&lt;/h1&gt;               			&lt;p&gt;Los foros de RetroShare se parecen a los foros de Internet, pero funcionan de forma descentralizada&lt;/p&gt;    			&lt;p&gt;Puede ver los foros a los que están suscritos sus amigos, y reenviar los foros a los que esté suscrito      			a sus amigos. Esto automáticamente promueve foros interesantes en la red.&lt;/p&gt;                        &lt;p&gt;Los mensajes del foro se conservan durante %1 días y sincronizan para los últimos dos días, a menos que lo configure de otro modo.&lt;/p&gt;                </translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Foros</translation>
@@ -10848,35 +9896,16 @@ reenviado a sus amigos.</translation>
         <translation>Otros foros</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Esperando</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Recuperando</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Cargando</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Añadir icono</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Los destinatarios de la clave pueden publicar en grupos de tipo restringido, y pueden ver y publicar en canales de tipo privado</translation>
     </message>
@@ -10885,22 +9914,14 @@ reenviado a sus amigos.</translation>
         <source>Share Publish Key</source>
         <translation>Compartir clave de publicación</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">marque los vecinos con los que desea compartir la clave privada de publicación</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Compartir clave con</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Distribución del mensaje</translation>
     </message>
@@ -10908,7 +9929,7 @@ reenviado a sus amigos.</translation>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Público</translation>
     </message>
@@ -10927,14 +9948,6 @@ reenviado a sus amigos.</translation>
         <source>New Thread</source>
         <translation>Nuevo hilo</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Requerido</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Mensajes cifrados</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10976,7 +9989,7 @@ reenviado a sus amigos.</translation>
         <translation>Protección-del-spam</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Comentarios:</translation>
     </message>
@@ -10999,7 +10012,7 @@ reenviado a sus amigos.</translation>
         <translation>Anti-spam:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11015,12 +10028,12 @@ reenviado a sus amigos.</translation>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation>Restringido al círculo:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation>Limitado a sus amigos</translation>
     </message>
@@ -11037,23 +10050,23 @@ reenviado a sus amigos.</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>Rastreo de mensaje</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>Se requiere firma PGP</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation>Sólo nodos amigos en el grupo</translation>
     </message>
@@ -11069,30 +10082,28 @@ reenviado a sus amigos.</translation>
         <translation>Por favor añadir un nombre</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>Se requiere firma PGP de identificación conocida</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Cargar el logo del grupo</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Enviar cambios del grupo</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Fallo al preparar Metadatos del grupo - por favor revise</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Se usará para enviar comentarios</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Propietario:</translation>
     </message>
@@ -11102,12 +10113,12 @@ reenviado a sus amigos.</translation>
         <translation>Configure una descripción explicativa aquí</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -11117,7 +10128,7 @@ reenviado a sus amigos.</translation>
         <translation>Último mensaje</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Los mensajes se difundirán mucho más allá de los nodos de sus amigos, mientras la gente se suscriba al canal/foro/posted que está creando.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -11192,7 +10203,12 @@ reenviado a sus amigos.</translation>
         <translation>Desfavorecer identificaciones no firmadas e identificaciones desde nodos desconocidos</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Popularidad</translation>
     </message>
@@ -11208,27 +10224,22 @@ reenviado a sus amigos.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Autor</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>GxsEtiquetaIdentificación</translation>
     </message>
@@ -11236,7 +10247,7 @@ reenviado a sus amigos.</translation>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Cargando</translation>
     </message>
@@ -11296,7 +10307,7 @@ reenviado a sus amigos.</translation>
         <translation>Editar detalles</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation>Sincronizar posts de los últimos...</translation>
     </message>
@@ -11353,16 +10364,12 @@ reenviado a sus amigos.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share publish permissions</source>
-        <translation type="vanished">Compartir permisos de publicación</translation>
-    </message>
-    <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Copiar enlace de RetroShare</translation>
     </message>
@@ -11385,7 +10392,7 @@ reenviado a sus amigos.</translation>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Sin Firma</translation>
     </message>
@@ -11398,40 +10405,24 @@ reenviado a sus amigos.</translation>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Cargando</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>No encontrado</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Sin Firma</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Excluido]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Autentificación</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>clave desconocida</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">anónimo</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11441,7 +10432,12 @@ reenviado a sus amigos.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Nombre&amp;nbsp;de&amp;nbsp;identidad</translation>
     </message>
@@ -11455,16 +10451,20 @@ reenviado a sus amigos.</translation>
         <source>Node</source>
         <translation type="unfinished">Nodo</translation>
     </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">Firmado&amp;nbsp;por</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Desconocida]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11476,7 +10476,7 @@ reenviado a sus amigos.</translation>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11524,17 +10524,13 @@ reenviado a sus amigos.</translation>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Cargando</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11651,10 +10647,6 @@ reenviado a sus amigos.</translation>
         <source>Group ID / Author</source>
         <translation>Identificación del grupo / Autor</translation>
     </message>
-    <message>
-        <source>Number of messages / Publish TS</source>
-        <translation type="vanished">Número de mensajes / Publicar estadísticas de transporte</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -11670,10 +10662,6 @@ reenviado a sus amigos.</translation>
         <source>Popularity</source>
         <translation>Popularidad</translation>
     </message>
-    <message>
-        <source>Details</source>
-        <translation type="vanished">Detalles</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -11706,41 +10694,6 @@ reenviado a sus amigos.</translation>
         <translation>No</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">Túneles autentificados:</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">Identificador de túnel: %1</translation>
-    </message>
-    <message>
-        <source>from: %1</source>
-        <translation type="vanished">de: %1</translation>
-    </message>
-    <message>
-        <source>to: %1</source>
-        <translation type="vanished">a: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">estado: %1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">total envd: %1 bytes</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">total recb: %1 bytes</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Vecino desconocido</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11953,48 +10906,12 @@ reenviado a sus amigos.</translation>
         <source>About</source>
         <translation>Acerca de</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare es una plataforma de comunicación descentralizada &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;multi-sistema, descentralizada, privada y segura.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Le permite compartir de forma segura con sus amigos, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;usando un web-of-trust para autentificar vecinos y OpenSSL para cifrar toda la comunicación. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare proporciona compartición de ficheros, chat, mensajes y canales&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;Enlaces externos útiles para mayor información:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Página web de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Wiki de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Foro de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Página del proyecto RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Blog del equipo de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Twitter de desarrollo de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+37"/>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -12010,7 +10927,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Autores</translation>
     </message>
@@ -12029,7 +10946,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -12042,36 +10959,6 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traducciones de RetroShare:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traductores del sitio web de RetroShare:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Sueco: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Alemán: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polaco: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -12133,12 +11020,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+158"/>
+        <location line="+165"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12153,7 +11040,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12162,32 +11049,12 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Did you receive a certificate from a friend?</source>
-        <translation type="vanished">¿Ha recibido un certificado de un amigo?</translation>
-    </message>
-    <message>
-        <source>Add friends certificate</source>
-        <translation type="vanished">Añadir certificado de amigos</translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">Añadir fichero de certificado</translation>
-    </message>
-    <message>
-        <source>Share your RetroShare Key</source>
-        <translation type="vanished">Compartir su clave de RetroShare</translation>
-    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
-        <translation type="vanished">El texto de debajo es su propio certificado de RetroShare. Envíeselo a sus amigos</translation>
-    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -12197,20 +11064,12 @@ private and secure decentralized communication platform.
 de código abierto, multi-sistema, privada y segura.</translation>
     </message>
     <message>
-        <source>Launch startup wizard</source>
-        <translation type="vanished">Iniciar asistente de arranque</translation>
-    </message>
-    <message>
-        <source>Do you need help with RetroShare?</source>
-        <translation type="vanished">¿Necesita ayuda con RetroShare?</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+134"/>
         <source>Open Web Help</source>
         <translation>Ayuda de Open Web</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Copiar su certificado al portapapeles</translation>
     </message>
@@ -12220,7 +11079,7 @@ de código abierto, multi-sistema, privada y segura.</translation>
         <translation>Guardar su certificado en un fichero</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>Enviar vía correo electrónico</translation>
     </message>
@@ -12240,13 +11099,37 @@ de código abierto, multi-sistema, privada y segura.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12258,17 +11141,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+57"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12277,19 +11155,11 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;¡Bienvenido a RetroShare!&lt;/h1&gt;   &lt;p&gt;¡Necesita hacer &lt;b&gt;hacer amigos&lt;/b&gt;! Después de que cree una red de amigos o se una a una red existente,	  podrá intercambiar ficheros, chatear, hablar en foros, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;Para hacerlo así, copie su certificado en esta página y envíelo a los amigos, y añada el certificado de sus amigos.&lt;/p&gt;    &lt;p&gt;Otra opción es buscar en Internet por &quot;servidores de chat de RetroShare&quot; (administrados independientemente). Estos servidores le permite intercambiar 	certificados con un nodo dedicado de RetroShare, a través del cual	 podrá encontrarse anónimamente con otras personas.&lt;/p&gt; </translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Invitación de RetroShare</translation>
     </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Su certificado se copia al Portapapeles, pegue y envíeselo a su amigo por correo electrónico o de algún otro modo</translation>
-    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -12561,14 +11431,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Reputación</translation>
     </message>
@@ -12578,12 +11448,12 @@ p, li { white-space: pre-wrap; }
         <translation>Buscar</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>ID anónima</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Crear nueva identidad</translation>
     </message>
@@ -12593,7 +11463,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crear nuevo círculo</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>Personas</translation>
     </message>
@@ -12608,27 +11478,27 @@ p, li { white-space: pre-wrap; }
         <translation>Persona</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation>Opción de exclusión:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Auto-excluir todas las identidades firmadas por el mismo nodo</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation>Votos de amigos:</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Votos positivos</translation>
     </message>
@@ -12644,29 +11514,39 @@ p, li { white-space: pre-wrap; }
         <translation>Votos negativos</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation>Estadísticas de uso</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Círculos</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Nombre del círculo</translation>
     </message>
@@ -12686,18 +11566,20 @@ p, li { white-space: pre-wrap; }
         <translation>Círculos personales</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Editar identidad</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Borrar indentidad</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Charlar con este vecino</translation>
     </message>
@@ -12707,98 +11589,78 @@ p, li { white-space: pre-wrap; }
         <translation>Abre un chat a distancia con este vecino</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>Identificación del nodo propietario :</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Nombre de la identidad :</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>Identificación de la identidad</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Enviar mensaje</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Información de la identidad</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Identificación de la identidad :</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Nombre del nodo propietario :</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation>Crear nueva...</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Enviar invitación</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La opinión media de los nodos vecinos acerca de esta identidad. Negativo es malo,&lt;/p&gt;&lt;p&gt;positivo es bueno. Cero es neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>Su opinión:</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Su propia opinión acerca de una identidad rige la visibilidad de esa identidad para si mismo y los nodos de sus amigos. Su propia opinión es compartida entre amgios y usada para calcular una puntuación de reputación: Si su opinión acerca de una identidad es neutral, la puntuación de reputación es la diferencia entre las opiniones positivas y negativas del amigo. Si no, su propia opinión proporciona la puntuación.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La puntuación global se usa en salas de chat, foros y canales para decidir sobre las acciones a tomar para cada identidad específica. Cuando la puntuación global es menor que -1, la identidad es excluida, lo que evita que sean reenviados todos los mensajes y foros/canales cuya autoría pertenezca a esta identidad, en ambos sentidos. Algunos foros también tienen indicativos anti-spam especiales que requieren un nivel de reputación no negativo, y eventualmente desaparecen (tras 5 días).&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Puede cambiar los umbrales y el tiempo de inactividad para eliminar identidades en Preferencias -&amp;gt; Personas. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Negativo</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Neutral</translation>
     </message>
@@ -12809,17 +11671,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positivo</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Puntuación de reputación global, contando la suya y las de sus amigos.&lt;/p&gt;&lt;p&gt;Negativo es malo, positivo es bueno, cero es neutral. Si la puntuación es demasiado baja,&lt;/p&gt;&lt;p&gt;la identidad se señalará como mala, y será rechazada en foros, salas de chat,&lt;/p&gt;&lt;p&gt;canales, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Global:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anónimo</translation>
     </message>
@@ -12834,24 +11696,24 @@ p, li { white-space: pre-wrap; }
         <translation>Buscar identificación</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Esta identidad es propiedad de usted</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>Mis propias identidades</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>Mis contactos</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation>Mostrar elementos</translation>
     </message>
@@ -12866,7 +11728,12 @@ p, li { white-space: pre-wrap; }
         <translation>Enlazado a mi nodo</translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>Otros círculos</translation>
     </message>
@@ -12876,7 +11743,7 @@ p, li { white-space: pre-wrap; }
         <translation>Círculos a los que pertenezco</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>Identificación del círculo:</translation>
     </message>
@@ -12951,7 +11818,7 @@ p, li { white-space: pre-wrap; }
         <translation>No es miembro (no tiene acceso a datos limitados a este círculo)</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>Identificación de identidad:</translation>
     </message>
@@ -12981,7 +11848,7 @@ p, li { white-space: pre-wrap; }
         <translation>desconocido</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>Invitado</translation>
     </message>
@@ -12996,7 +11863,7 @@ p, li { white-space: pre-wrap; }
         <translation>Miembro</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>Editar círculo</translation>
     </message>
@@ -13044,7 +11911,7 @@ p, li { white-space: pre-wrap; }
         <translation>Conceder membresía</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -13055,7 +11922,7 @@ Debe deshacerse de ella ahora y usar una nueva.
 Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Nodo desconocido]</translation>
@@ -13098,7 +11965,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Identidad anónima</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13178,7 +12045,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation>información</translation>
     </message>
@@ -13194,29 +12061,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Copiar identidad al portapapeles</translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">¿Enviar invitación?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">¿Está seguro de que quiere enviar una invitación con su certificado?</translation>
-    </message>
-    <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Excluido</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identidades&lt;/h1&gt;    			&lt;p&gt;En esta pestaña puede crear/editar &lt;b&gt;identidades pseudo-anónimas&lt;/b&gt;, y &lt;b&gt;círculos&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;Las &lt;b&gt;identidades&lt;/b&gt; se usan para identificar sus datos de forma segura: firmar mensajes en salas de chat, foros y posts en canales,			recibir comentarios usando el sistema de correo electrónico integrado de RetroShare, comentarios publicados 				tras los posts en los canales, chat usando túneles seguros, etc.&lt;/p&gt; 			&lt;p&gt;Las identidades opcionalmente pueden estar &lt;b&gt;firmadas&lt;/b&gt; por el certificado de su nodo RetroShare.   			Es más fácil confiar en las identidades firmadas pero son más fácilmente vinvulables con la dirección IP de su nodo.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Unknown ID:</source>
-        <translation type="vanished">Identidad desconocida:</translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation>positivo</translation>
     </message>
@@ -13260,19 +12110,11 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>Forums</source>
         <translation>Foros</translation>
     </message>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Posted</translation>
-    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Desconocido</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13293,14 +12135,6 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>Creación de firma del autor en servicio %1</translation>
     </message>
-    <message>
-        <source>Message/vote/comment</source>
-        <translation type="vanished">Mensaje/voto/comentario</translation>
-    </message>
-    <message>
-        <source>%1 in %2 tab</source>
-        <translation type="vanished">%1 en la pestaña %2</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -13321,19 +12155,11 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Firma en sistema de túnel distante.</translation>
     </message>
-    <message>
-        <source>Update of identity data.</source>
-        <translation type="vanished">Actualizar datos de identidad.</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Validación de firma genérica.</translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">Firma genérica.</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -13345,11 +12171,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Descifrado genérico.</translation>
     </message>
     <message>
-        <source>Membership verification in circle %1.</source>
-        <translation type="vanished">Verificación de membresía en el círculo %1.</translation>
-    </message>
-    <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation>Añadir a contactos</translation>
     </message>
@@ -13399,21 +12221,21 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Hola,&lt;br&gt;quiero que seamos amigos en RetroShare.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Personas</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Su avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>Enlazado hacia nodos vecinos</translation>
     </message>
@@ -13423,7 +12245,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Enlazado hacia nodos distantes</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Enlazado hacia un nodo de RetroShare amigo</translation>
     </message>
@@ -13438,7 +12260,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Enlazado hacia un nodo RetroShare desconocido</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Conversar con esta persona</translation>
     </message>
@@ -13453,12 +12275,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Conversación distante rechazada con esta persona.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Usado por última vez:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP conocidos</translation>
     </message>
@@ -13478,12 +12300,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>¿De verdad quiere borrar esta identidad?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Propiedad de</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Nombre del nodo:</translation>
     </message>
@@ -13493,7 +12315,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Identificación del nodo:</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>¿Está seguro de borrar?</translation>
     </message>
@@ -13501,7 +12323,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
@@ -13531,7 +12353,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Seudónimo</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13541,12 +12363,19 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Nueva identidad</translation>
     </message>
@@ -13560,7 +12389,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13570,7 +12399,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Editar identidad</translation>
@@ -13581,27 +12415,27 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished">Actualizar</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13621,7 +12455,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13631,11 +12465,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">¡Error al obtener la clave!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Error, ID de la clave no válida</translation>
     </message>
@@ -13650,7 +12480,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Nombre real desconocido</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Crear nueva identidad</translation>
     </message>
@@ -13660,10 +12490,15 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13689,7 +12524,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
@@ -13699,17 +12534,13 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Su avatar</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Establecer avatar</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>Enlazado a su perfil</translation>
     </message>
@@ -13719,7 +12550,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Puede tener una o más identidades. Se usan cuando escribe un salas de chat, foros y comentarios de canales. Actúan como el destinatario para conversaciones distantes y el sistema de correo distante de RetroShare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>El apodo es demasiado corto. Por favor, introduzca al menos %1 caracteres.</translation>
     </message>
@@ -13778,10 +12609,6 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>PGP name:</source>
         <translation>Nombre de PGP:</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">Identificación de GXS:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13797,7 +12624,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -13807,12 +12634,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Quitar</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Marcar todo</translation>
     </message>
@@ -13831,26 +12658,38 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>Quote</source>
         <translation type="unfinished">Citar</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Enviar</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Guardar imagen</translation>
     </message>
     <message>
         <location line="-7"/>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>No se puede guardar la imagen, nombre de fichero no válido</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>No es una imagen</translation>
     </message>
@@ -13868,27 +12707,32 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Puerto:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Estado:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13909,7 +12753,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13918,26 +12767,31 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Abrir carpeta</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Comprobando...</translation>
     </message>
@@ -13947,7 +12801,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Comprobar archivos</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation>Recomendar en un mensaje a...</translation>
     </message>
@@ -13975,7 +12829,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Añadir a amigo</translation>
     </message>
@@ -13991,7 +12845,8 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
@@ -14012,7 +12867,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Cerrar</translation>
     </message>
@@ -14023,12 +12878,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Asistente para el inicio rápido</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 es una plataforma de comunicación descentralizada y segura</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Incompleto</translation>
     </message>
@@ -14057,11 +12912,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Notificación</translation>
     </message>
@@ -14072,31 +12928,35 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Abrir mensajes</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Gráfico del uso de la red</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Minimizar</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Maximizar</translation>
     </message>
@@ -14111,7 +12971,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 nuevo mensaje</translation>
     </message>
@@ -14141,7 +13006,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>%1 amigos conectados</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>¿Realmente desea salir de RetroShare?</translation>
     </message>
@@ -14161,7 +13026,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Asegúrese de que este enlace no ha sido falsificado para arrastrarle a un sitio web malicioso.</translation>
     </message>
@@ -14206,12 +13071,13 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Matriz de permisos del servicio</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Mostrar interfaz web</translation>
     </message>
@@ -14226,7 +13092,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>directorio está descenciendo (el límite actual es</translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>¿Está seguro de salir?</translation>
     </message>
@@ -14235,17 +13101,17 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Componer</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Párrafo</translation>
     </message>
@@ -14281,12 +13147,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Encabezamiento 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Tamaño de letra</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Aumentar tamaño de letra</translation>
     </message>
@@ -14301,32 +13167,32 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Negrita</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Alineación</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Añadir una imagen</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Cambia el estilo de letra a tipo codigo</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Subrayado</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Asunto:</translation>
     </message>
@@ -14337,32 +13203,32 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>Lista de direcciones:</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation>Recomendar este amigo</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Establecer color del texto</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Establecer color de fondo</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Archivos recomendados</translation>
     </message>
@@ -14432,7 +13298,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Añadir cita</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Enviar a:</translation>
     </message>
@@ -14456,10 +13322,6 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>&amp;Justify</source>
         <translation>&amp;Justificar</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">Todas las direcciones (mezcladas)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14471,7 +13333,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Mis contactos</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hola,&lt;br&gt;Le recomiendo a un buen amigo mío, puede confiar en él tanto como confía en mí. &lt;br&gt;</translation>
     </message>
@@ -14491,18 +13353,18 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>quiere ser su amigo en RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hola %1,&lt;br&gt;&lt;br&gt;%2 quiere ser su amigo en RetroShare.&lt;br&gt;&lt;br&gt;Responder ahora:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Gracias,&lt;br&gt;El equipo de RetroShare</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Guardar mensaje</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>El mensaje no se ha enviado.
@@ -14514,7 +13376,17 @@ Do you want to save message to draft box?</source>
         <translation>Pegar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Añadir a &quot;A&quot;</translation>
     </message>
@@ -14534,7 +13406,7 @@ Do you want to save message to draft box?</source>
         <translation>Añadir como recomendado</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Mensaje original</translation>
     </message>
@@ -14544,21 +13416,21 @@ Do you want to save message to draft box?</source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Enviar</translation>
     </message>
@@ -14573,7 +13445,7 @@ Do you want to save message to draft box?</source>
         <translation>En %1, %2 escribió:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -14583,30 +13455,30 @@ Do you want to save message to draft box?</source>
         <translation>Env:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>¿Quiere enviar este mensaje sin asunto?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Por favor, introduzca por lo menos un destinatario.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -14721,13 +13593,13 @@ Do you want to save message to draft box?</source>
         <translation>Detalles</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Abrir archivo...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Archivos HTML (*.htm *.html);;Todos los archivos(*)</translation>
     </message>
@@ -14747,7 +13619,7 @@ Do you want to save message to draft box?</source>
         <translation>Exportar PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>El mensaje no se ha enviado.
@@ -14769,7 +13641,7 @@ Do you want to save message ?</source>
         <translation>Añadir otro archivo</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Hola,&lt;br&gt;quiero establecer amistad contigo en RetroShare.&lt;br&gt;</translation>
     </message>
@@ -14793,28 +13665,24 @@ Do you want to save message ?</source>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">Tiene una invitación de amistad.</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Responder ahora:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>Nodos amigos</translation>
     </message>
@@ -14859,13 +13727,13 @@ Do you want to save message ?</source>
         <translation>Lista ordenada (números romanos en mayúscula)</translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Gracias, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Identidad distante:</translation>
     </message>
@@ -14875,12 +13743,12 @@ Do you want to save message ?</source>
         <translation>[Desaparecido]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Por favor, cree una identidad para firmar mensajes distantes, o elimine los vecinos distantes de la lista de destinos.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Nombre de nodo e identificación:</translation>
     </message>
@@ -14958,7 +13826,7 @@ Do you want to save message ?</source>
         <translation>Por defecto</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Una pestaña nueva</translation>
     </message>
@@ -14968,7 +13836,7 @@ Do you want to save message ?</source>
         <translation>Una ventana nueva</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Editar etiqueta</translation>
     </message>
@@ -14991,7 +13859,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Asunto:</translation>
     </message>
@@ -14999,7 +13867,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
@@ -15027,7 +13895,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Archivos recomendados</translation>
     </message>
@@ -15037,37 +13905,37 @@ Do you want to save message ?</source>
         <translation>Descargar todos los archivos recomendados</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Asunto:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Etiquetas:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Responder</translation>
     </message>
@@ -15107,7 +13975,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>Enviar invitación</translation>
     </message>
@@ -15159,7 +14027,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Confirmar %1 como amigo</translation>
     </message>
@@ -15169,12 +14037,12 @@ Do you want to save message ?</source>
         <translation>Añadir %1 como amigo</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Sin asunto</translation>
     </message>
@@ -15184,17 +14052,22 @@ Do you want to save message ?</source>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15204,21 +14077,23 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">¿Enviar invitación?</translation>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">¿Está seguro de que quiere enviar una invitación con su certificado?</translation>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Dercargar todo</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Imprimir documento</translation>
     </message>
@@ -15233,12 +14108,12 @@ Do you want to save message ?</source>
         <translation>Archivos HTML (*.htm *.html);;Todos los archivos(*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Cargar siempre imágenes para este mensaje</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Ocultar el panel de adjunto</translation>
     </message>
@@ -15260,42 +14135,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Componer</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Responder al mensaje seleccionado</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Responder</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Responder a todos los mensajes seleccionados</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Responder a todos</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Reenviar mensaje seleccionado</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Adelante</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Borrar mensaje seleccionado</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Borrar</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Imprimir mensaje seleccionado</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15374,7 +14213,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Nuevo mensaje</translation>
     </message>
@@ -15384,60 +14223,16 @@ Do you want to save message ?</source>
         <translation>Componer</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Responder a mensaje seleccionado</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Responder</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Responder a todos los mensajes seleccionados</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Responder a todos</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Reenviar mensaje seleccionado</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Reenviar</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Borrar mensaje seleccionado</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Borrar</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Imprimir mensaje seleccionado</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Imprimir</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Mostrar</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Bandeja de entrada</translation>
@@ -15467,21 +14262,17 @@ Do you want to save message ?</source>
         <translation>Papelera</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Buzón de entrada total:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Carpetas</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Vista rápida</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Imprimir...</translation>
@@ -15491,26 +14282,6 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>Vista previa</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Botones solo con icono</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Botones con texto al lado del icono</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Botones con texto</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Botones con texto debajo del icono</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Poner texto debajo de los iconos</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15532,7 +14303,7 @@ Do you want to save message ?</source>
         <translation>Reenviar mensaje</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
@@ -15542,7 +14313,7 @@ Do you want to save message ?</source>
         <translation>De</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
@@ -15552,39 +14323,7 @@ Do you want to save message ?</source>
         <translation>Contenido</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Pulsar para ordenar por adjuntos</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Pulsar para ordenar por asunto</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Pulsar para ordenar por leido</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Pulsar para ordenar por remitente</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Pulsar para ordenar por fecha</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Pulsar para ordenar por etiqueta</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Pulsar para ordenar por estrella</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Reenviar mensaje seleccionado</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Buscar por el asunto</translation>
     </message>
@@ -15593,6 +14332,11 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Buscar desde</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15619,14 +14363,14 @@ Do you want to save message ?</source>
         <translation>Buscar por adjuntos</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;RetroShare tiene su propio sistema interno de correo electrónico. Puede recibir/enviar correos de/a nodos amigos conectados.&lt;/p&gt;  &lt;p&gt;También es posible enviar mensajes a las identidades de otras personas usando el sistema de enrutamiento global. Estos mensajes siempre se cifran y firman, y son repetidos por nodos intermedios hasta que alcanzan su destino final. &lt;/p&gt;    &lt;p&gt;Los mensajes distantes permanecen en su Bandeja de Salida hasta que llegue un acuse de recibo.&lt;/p&gt; &lt;p&gt;Generalmente, puede usar mensajes para recomendar archivos a sus amigos pegando los enlaces de los archivos, o puede recomendar nodos amigos a otros nodos amigos para fortalecer su red, o enviar comentarios al propietario de un canal.&lt;/p&gt;                    </translation>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Con estrella</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15700,7 +14444,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15714,7 +14458,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15729,38 +14473,33 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Borradores</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">No hay mensajes favoritos disponibles. Las estrellas permiten dar un estatus especial a los mensajes para que sean más fáciles de encontrar. Para marcar como favorito un mensaje, pulse en la estrella gris claro al lado de cualquier mensaje.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">No hay mensajes del sistema disponibles.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">A</translation>
+        <translation>A</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Pulsar para ordenar por destinatario</translation>
-    </message>
-    <message>
-        <source>This message goes to a distant person.</source>
-        <translation type="vanished">Este mensaje va a una persona distante.</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15768,26 +14507,6 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Total:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Mensajes</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Haga clic en ordenar por firma</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Este mensaje fue firmado y la firma comprobada</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Este mensaje esta firmado, pero la firma no se ha comprobado</translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">Este mensaje viene de una persona distante.</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15815,7 +14534,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">Guardar imagen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Pegar como texto sin cifrar</translation>
     </message>
@@ -15869,7 +14598,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Abrir</translation>
     </message>
@@ -15879,7 +14608,7 @@ Do you want to save message ?</source>
         <translation>Quitar objeto</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation>de</translation>
     </message>
@@ -15914,18 +14643,10 @@ Do you want to save message ?</source>
         <translation>Mensajes pendientes</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
-    <message>
-        <source>Send invite?</source>
-        <translation type="vanished">¿Enviar invitación?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">¿Está seguro de que quiere enviar una invitación con su certificado?</translation>
-    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -16063,7 +14784,7 @@ Do you want to save message ?</source>
         <translation>ID del vecino</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Eliminar claves sin uso...</translation>
     </message>
@@ -16073,7 +14794,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Vaciar el juego de claves</translation>
     </message>
@@ -16090,7 +14811,13 @@ Nota: Se hará copia de seguridad de su viejo juego de claves.
 La eliminación puede fallar cuando se ejecutan varias instancias de Retroshare en la misma máquina.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Información del juego de claves</translation>
@@ -16126,18 +14853,13 @@ Para mayor seguridad, previamente se hizo copia de seguridad en fichero de su ju
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Inconsistencia de datos en el juego de claves. Probablemente esto es un error. Póngase en contacto con los desarrolladores.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>Exportar/crear un nuevo nodo</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Sólo claves de confianza</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Buscar nombre</translation>
     </message>
@@ -16147,12 +14869,12 @@ Para mayor seguridad, previamente se hizo copia de seguridad en fichero de su ju
         <translation>Buscar identificación del vecino</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>Detalles del perfil...</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -16161,13 +14883,6 @@ Reported error:</source>
 Se informo del error:</translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Red</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -16194,7 +14909,7 @@ Se informo del error:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16215,7 +14930,7 @@ Se informo del error:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Grupos</translation>
     </message>
@@ -16245,19 +14960,19 @@ Se informo del error:</translation>
         <translation type="unfinished">importar su lista de amigos incluyendo grupos</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Buscar</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16267,12 +14982,12 @@ Se informo del error:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished">Mostrar elementos</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16282,7 +14997,7 @@ Se informo del error:</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Grupo</translation>
     </message>
@@ -16397,7 +15112,7 @@ Se informo del error:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">¿Quiere eliminar este nodo?</translation>
     </message>
@@ -16407,7 +15122,7 @@ Se informo del error:</translation>
         <translation type="unfinished">¿Quiere eliminar este amigo?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">¡Hecho!</translation>
@@ -16521,11 +15236,7 @@ al menos un vecino no fue añadido al grupo</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">Entradas de registro (log)</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16540,11 +15251,7 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Quitar todo</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Esto es una prueba.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>Los más recientes arriba</translation>
     </message>
@@ -16554,20 +15261,12 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Los más antiguos arriba</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Suscripción de noticias&lt;/h1&gt;                                                             &lt;p&gt;La suscripción de registro (log feed) muestra los últimos eventos en su red, ordenados por la hora a la que los recibió.                   Esto le proporciona un compendio de la actividad de sus amigos.                                                          Puede configurar qué eventos mostrar pulsando en &lt;b&gt;Opciones&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;Los distintos eventos mostrados son:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Intentos de conexión (útil para hacer amigos con nuevas personas y controlar quién está tratando de acceder a usted)&lt;/li&gt;    &lt;li&gt;Posts de canal y foro&lt;/li&gt;                                                                               &lt;li&gt;Nuevos canales y foros a los que puede suscribirse&lt;/li&gt;                                                          &lt;li&gt;Mensajes privados de sus amigos&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="vanished">Registro (log)</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16622,10 +15321,6 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Seguridad</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16647,10 +15342,6 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Intento de conectar</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16667,10 +15358,6 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Ip security</source>
         <translation>Seguridad de la IP</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Registro (log)</translation>
-    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -16681,10 +15368,6 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Circles</source>
         <translation>Círculos</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Enlaces</translation>
-    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -16737,26 +15420,6 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Chat rooms</source>
         <translation>Salas de chat</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">Salas de chat</translation>
-    </message>
-    <message>
-        <source>Count occurrences of my current identity</source>
-        <translation type="vanished">Contar apariciones de mi identidad actual</translation>
-    </message>
-    <message>
-        <source>Count occurrences of any of the following texts (separate by newlines):</source>
-        <translation type="vanished">Contar apariciones de cualquiera de los siguientes textos (separar en líneas):</translation>
-    </message>
-    <message>
-        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
-        <translation type="vanished">Márquelo, si las apariciones de la identidad y el texto anterior deben coincidir en mayúsculas y minúsculas para incrementar el recuento.</translation>
-    </message>
-    <message>
-        <source>Case sensitive</source>
-        <translation type="vanished">Distingue mayúsculas y minúsculas</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16832,24 +15495,16 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Deshabilitar todas las notificaciones temporalmente</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Novedades (feed)</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Bandeja del sistema</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">Contar todos los mensajes no leídos</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation>Se requiere frase-contraseña</translation>
     </message>
@@ -16869,12 +15524,12 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>¡Contraseña errónea!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Por favor, introduzca su frase-contraseña de RetroShare</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Plugin no registrado/ejecutable</translation>
     </message>
@@ -16889,19 +15544,7 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Por favor, compruebe su reloj del sistema.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Examinando archivos compartidos...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Calculando hash del archivo</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Guardando indice del archivo...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Prueba</translation>
     </message>
@@ -16912,17 +15555,19 @@ al menos un vecino no fue añadido al grupo</translation>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Título desconocido</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Mesaje criptado</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Para que las salas de chat funcionen adecuadamente, la hora de su computadora tiene que se correcta. Por favor, compruebe si este es el caso (una posible desincronización de varios minutos fue detectada con sus amigos).</translation>
     </message>
@@ -16930,7 +15575,7 @@ al menos un vecino no fue añadido al grupo</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Amigo conectado</translation>
     </message>
@@ -16982,10 +15627,6 @@ Sin Anonimato D/S: desactiva el reenvío de archivos
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Diálogo</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -17051,10 +15692,6 @@ Sin Anonimato D/S: desactiva el reenvío de archivos
         <source>This profile has signed your own profile key</source>
         <translation>Este perfil ha firmado su propia clave del perfil</translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Firmas de clave :</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17084,23 +15721,20 @@ p, li { white-space: pre-wrap; }
         <translation>Clave PGP</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation>Estas opciones se aplican a todos los nodos del perfil:</translation>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmar la clave de un amigo es una forma de expresar su confianza en este amigo al resto de sus amigos. Les ayuda a decidir si permitir conexiones desde esa clave en base a su propia confianza. Firmar una clave es absolutamente opcional y no puede deshacerse, así que hágalo con sabiduría.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation>Estas opciones se aplican a todos los nodos del perfil:</translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Firmar clave PGP</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17137,12 +15771,7 @@ p, li { white-space: pre-wrap; }
         <translation>Incluir firmas</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Opciones</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare comprueba periódicamente las listas de su amigo en busca de ficheros navegables que coincidan con sus transferencias, para establecer una transferencia directa. En este caso, su amigo sabe que usted está descargando el fichero.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Para evitar este comportamiento, sólo para este amigo, desmarque esta casilla. Aún podrá realizar una transferencia directa si la pide explícitamente, por ejemplo, descargándolo de la lista de ficheros de su amigo. Esta configuración se aplica a todas las ubicaciones del mismo nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -17156,10 +15785,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esta opción le permite descargar automáticamente un fichero que esté recomendado en un mensaje proveniente de este nodo. Esto se puede usar, por ejemplo, para enviar ficheros entre sus propios nodos. Se aplica a todas las ubicaciones del mismo nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -17192,21 +15817,21 @@ p, li { white-space: pre-wrap; }
         <translation>KB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: No se pueden obtener los detalles del vecino.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>El algoritmo de la clave proporcionada no está soportado por RetroShare
@@ -17227,7 +15852,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Advertencia: En su opción de Transferencia-de-fichero, establezca permitir descarga directa a No.</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>El nivel de confianza es una forma de expresar su propia confianza en esta clave. No es utilizado por la aplicación ni se comparte, pero puede serle útil para recordar buenas/malas claves.</translation>
     </message>
@@ -17296,10 +15921,6 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Probablemente la contraseña es errónea</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -17307,12 +15928,12 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>Perfil de RetroShare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Esta es su propia clave PGP, y está firmada por:</translation>
     </message>
@@ -17338,7 +15959,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
@@ -17359,7 +15980,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>Quitar objeto</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
@@ -17399,7 +16020,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>Desfase temporal:</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Escribir mensaje</translation>
     </message>
@@ -17413,10 +16034,6 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>Friend Connected</source>
         <translation>Amigo conectado</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Intentando conectar</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17455,17 +16072,13 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Vecino desconocido</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Enviar mensaje</translation>
     </message>
@@ -17517,10 +16130,6 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>Chat with this person as...</source>
         <translation>Chatear con esta persona como...</translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">Enviar un mensaje a esta persona</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17579,10 +16188,6 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cualquiera en su lista de contactos automáticamente tendrá una opinión positiva si no está establecida. Esto permite erigir automáticamente las reputaciones de los nodos usados. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
-        <translation type="vanished">dar automáticamente una opinión &quot;Positiva&quot; a mis contactos</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -17640,13 +16245,6 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Para evitar que las identificaciones borradas reaparezcan porque sean usadas, por ejemplo, en foros o canales, se conservan en una lista durante algún tiempo. Tras aquello, se &amp;quot;eliminan&amp;quot; de la lista de exclusión, y se descargarán de nuevo como no excluidas si se usan en foros, salas de chat, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulario</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17654,23 +16252,11 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>PhotoShare</source>
         <translation>Compartir fotos</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Fotografía</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Texto de la etiqueta</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Comentario</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Resumen</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17731,14 +16317,6 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Añadir comentario</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Escribir un comentario...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17809,10 +16387,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Crear álbum</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Ver álbum</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17834,17 +16408,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diapositivas</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Mi álbum</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Álbum suscritos</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Álbumes compartidos</translation>
     </message>
@@ -17874,7 +16448,7 @@ solicitar editarlo!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Nombre del album</translation>
     </message>
@@ -17933,19 +16507,19 @@ solicitar editarlo!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17981,12 +16555,12 @@ solicitar editarlo!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Texto de la etiqueta</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Mostrar más detalles sobre este plugin</translation>
     </message>
@@ -18132,60 +16706,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Directorios de búsqueda de plugin</translation>
     </message>
-    <message>
-        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="vanished">Complemento deshabilitado. Haga clic en el botón habilitar y reinicie Retroshare</translation>
-    </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[deshabilitado]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">No se ha suministrado el número del API. Por favor lea el manual de desarrollo del plugin.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[problema al cargar]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">No se ha suministrado el número del SVN. Por favor lea el manual de desarrollo del plugin.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Error cargando.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Símbolo faltante. ¿Versión incorrecta?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Ningún objeto plugin</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Los plugins están cargados.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Estado desconocido.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Marque esto para el desarrollo de plugins. Esto hará
-que no se compruebe el hash. Sin embargo, en
-condiciones normales, el control de hash le protege
-de un posible comportamiento malicioso de los plugins.</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Complementos&lt;/h1&gt;                   &lt;p&gt;Los complementos (plugins) se cargan desde los directorios que aparecen en la lista del fondo.&lt;/p&gt;                       &lt;p&gt;Por razones de seguridad, los complementos aceptados se cargan automáticamente hasta que                              el ejecutable principal de RetroShare o la librería del complemento cambian. En                                tal caso, el usuario necesita confirmarlos de nuevo.                                              Después de que se inicie el programa, puede habilitar un complemento manualmente haciendo clic en el botón               &quot;Habilitar&quot;, y luego reiniciar RetroShare.&lt;/p&gt;                                              &lt;p&gt;Si quiere desarrollar sus propios complementos, contacte con el equipo de desarrolladores                        ¡ellos estarán contentos de auxiliarle!&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -18255,12 +16775,27 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation>Ventana de ajustes en la parte superior</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">Excluir a esta persona (establece una opinión negativa)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished">Dar una opinión neutral</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished">Dar una opinión positiva</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -18294,22 +16829,6 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The person you are talking to has deleted the secured chat tunnel.</source>
-        <translation type="vanished">La persona con la está hablando ha eliminado el túnel de chat seguro.</translation>
-    </message>
-    <message>
-        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
-        <translation type="vanished">El interlocutor del chat eliminó el túnel seguro, los mensajes se entregarán tan pronto como sea posible.</translation>
-    </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Cerrando esta ventana finalizará la conversación, notifíqueselo al vecino y retire el túnel cifrado.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">¿Matar el túnel?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -18329,7 +16848,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positivo</translation>
     </message>
@@ -18349,8 +16868,8 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Comentarios</translation>
     </message>
@@ -18375,13 +16894,13 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Comentario</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished">Comentarios</translation>
     </message>
@@ -18409,20 +16928,12 @@ de un posible comportamiento malicioso de los plugins.</translation>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Firmado por:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Notas</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -18437,12 +16948,22 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Cargar archivo de imagen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18458,7 +16979,17 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18468,23 +16999,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Enviar mensaje</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">Está publicando un enlace. La clave de un envío exitoso es un contenido interesante y un título descriptivo</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Enviar</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Publicar un nuevo envío</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Por favor añada un título</translation>
     </message>
@@ -18504,12 +17019,22 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18524,7 +17049,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Publicar como</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18535,7 +17060,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Imágen</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18545,7 +17070,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation>Título</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Enlace</translation>
     </message>
@@ -18553,44 +17078,12 @@ de un posible comportamiento malicioso de los plugins.</translation>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Enlaces de Posted</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;El servicio posted le permite compartir enlaces de Internet, que se difunden entre nodos RetroShare como foros y 	 canales&lt;/p&gt; 	 &lt;p&gt;Los enlaces pueden ser comentados por usuarios suscritos. Es un sistema de promoción que también da la oportunidad de  	 ilustrar enlaces importantes.&lt;/p&gt;      &lt;p&gt;No hay restricciones en cuanto a qué enlaces se comparten. Tenga cuidado cuando pulse sobre ellos.&lt;/p&gt;    &lt;p&gt;Los enlaces de posted se conservan durante %1 días, y se sincronizan más allá de los últimos %2 días, a menos que usted cambie esto.&lt;/p&gt;                </translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Crear tema</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Mis temas</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Temas suscritos</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Temas populares</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Otros temas</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Enlaces</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18624,31 +17117,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Tema de Posted</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Añadir tema de administradores</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Seleccionar tema de administradores</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Crear nuevo tema</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Editar tema</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Actualizar temática</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18686,7 +17155,17 @@ de un posible comportamiento malicioso de los plugins.</translation>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>Suscribirse a Posted</translation>
     </message>
@@ -18702,7 +17181,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -18717,24 +17196,17 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">Descripción de Posted</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Cargando</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">Nuevo Posted</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">Nunca</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18747,22 +17219,18 @@ de un posible comportamiento malicioso de los plugins.</translation>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Lugar</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Comentarios</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
@@ -18773,12 +17241,12 @@ de un posible comportamiento malicioso de los plugins.</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Comentario</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished">Comentarios</translation>
     </message>
@@ -18788,7 +17256,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;El autor de este mensaje (con Identificación %1) está excluído.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18798,21 +17266,17 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Votar positivo</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Votar negativo</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Ajustar como leer y eliminar elemento</translation>
     </message>
@@ -18822,7 +17286,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Nuevo comentario:</translation>
     </message>
@@ -18832,7 +17296,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation>Valor del comentario</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
@@ -18873,77 +17337,10 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Cargando</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Por</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulario</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Acalorado</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nuevo</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Más alto</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Hoy</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Ayer</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Esta semana</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Este mes</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Este año</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Publicar un nuevo envío</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Siguiente</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Por favor, cree o seleccione una Id de firma antes de votar</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Anterior</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18963,7 +17360,17 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18973,15 +17380,15 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Administrador:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">desconocido</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">Distribución:</translation>
     </message>
@@ -18991,42 +17398,42 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">Posts</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19046,7 +17453,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Acalorado</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">Buscar</translation>
     </message>
@@ -19076,17 +17483,17 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19101,12 +17508,17 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Vacío</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19116,27 +17528,31 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished">información</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19151,7 +17567,7 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation type="unfinished">Suscribirse</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Nunca</translation>
     </message>
@@ -19225,6 +17641,16 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <source>No Channel Selected</source>
         <translation type="unfinished">Ningún canal seleccionado</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -19233,14 +17659,6 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Abrir cada asunto en una nueva pestaña</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Enlaces</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -19254,10 +17672,6 @@ de un posible comportamiento malicioso de los plugins.</translation>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Posted</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -19326,25 +17740,17 @@ de un posible comportamiento malicioso de los plugins.</translation>
         <translation>Administrador de perfiles</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Ubuntu&apos;; font-size:11pt; 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;Seleccione una clave de nodo RetroShare de la lista de debajo para ser usada en otra computadora, y pulse &amp;quot;Exportar clave seleccionada.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Para crear una nueva ubicación en un equipo distinto, seleccione el administrador de identidades en la ventana de inicio de sesión. Desde allí puede importar el fichero de clave y crear una nueva ubicación para esa clave. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Crear un nuevo nodo con la misma clave permite que sus nodos amigos le acepten automáticamente.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -19455,7 +17861,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Editar mensaje de estado</translation>
@@ -19471,7 +17877,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Administrador de perfiles</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Información pública</translation>
     </message>
@@ -19506,12 +17912,12 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>En línea desde:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Otra información</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Mi dirección</translation>
     </message>
@@ -19555,51 +17961,27 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Entrada de:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Cuenta 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Cuenta 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Cuenta 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Añadir a Pulse</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">filtro</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">URL añadida</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Mostrar como</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19609,12 +17991,12 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished">De:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19644,13 +18026,13 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished">Negativo</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19662,12 +18044,22 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19676,17 +18068,13 @@ y utilizar el botón Importar para cargarla</translation>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Mensaje de Pulso para Wire</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19701,34 +18089,24 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">De</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Fecha</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Cargar archivo de imagen</translation>
     </message>
 </context>
 <context>
@@ -19739,7 +18117,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished">Formulario</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19758,7 +18136,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19768,7 +18146,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19795,7 +18173,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19805,7 +18183,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19825,7 +18203,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19941,7 +18319,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19949,37 +18327,42 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -20011,7 +18394,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20019,8 +18402,8 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Confirmación</translation>
     </message>
@@ -20290,12 +18673,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Detalles del vecino</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Solicitud del archivo cancelada</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Esta versión de RetroShare está usando OpenPGP SDK. Como efecto secundario, no está utilizando el juego de claves PGP compartido por el sistema, pero tiene su propio juego de claves compartido por todas las instancias de RetroShare. &lt;br&gt;&lt;br&gt;No parece que tenga tal juego de claves, aunque las claves PGP son mencionadas por cuentas existentes de RetroShare, probablemente debido a que acaba de cambiar a esta nueva versión del programa.</translation>
     </message>
@@ -20326,7 +18709,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Ocurrió un error inesperado. Error: &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation>¡No se puede iniciar el Administrador de Tor!</translation>
     </message>
@@ -20364,7 +18747,7 @@ El error obtenido es:&quot;</translation>
         <translation>No fue posible iniciar un servicio oculto.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Instancias múltiples</translation>
@@ -20387,6 +18770,26 @@ archivo bloqueado:
  Archivo bloqueado:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20407,14 +18810,6 @@ archivo bloqueado:
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
-        <translation type="vanished">El túnel está pendiente... Los mensajes se entregarán tan pronto como sea posible</translation>
-    </message>
-    <message>
-        <source>Secured tunnel is working. Messages are delivered immediately!</source>
-        <translation type="vanished">El túnel asegurado está funcionando. ¡Los mensajes se entregarán inmediatamente!</translation>
-    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -20477,7 +18872,7 @@ El error reportado es:
         <translation>Datos reenviados</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Parece que tiene nodos asociados a claves DSA:</translation>
     </message>
@@ -20487,7 +18882,7 @@ El error reportado es:
         <translation>Las claves DSA aún no están soportadas por esta versión de RetroShare. Todos estos nodos serán inutilizables. Lo sentimos por esto.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>habilitado</translation>
     </message>
@@ -20497,7 +18892,7 @@ El error reportado es:
         <translation>deshabilitado</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Mover IP %1 a la lista blanca</translation>
     </message>
@@ -20513,7 +18908,7 @@ El error reportado es:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>hace %1 segundos</translation>
     </message>
@@ -20581,7 +18976,7 @@ Security: no anonymous IDs</source>
 Seguridad: No hay identificaciones anónimas</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation>Unirse a la sala de chat</translation>
     </message>
@@ -20609,7 +19004,7 @@ Seguridad: No hay identificaciones anónimas</translation>
         <translation>¡no se pudo interpretar el fichero XML!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation>Indefinidamente</translation>
     </message>
@@ -20789,13 +19184,29 @@ Seguridad: No hay identificaciones anónimas</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Nombre</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Nodo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished">Dirección</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Estado</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20988,10 +19399,6 @@ Seguridad: No hay identificaciones anónimas</translation>
         <source>Click to resume the hashing process</source>
         <translation>Haz clic para continuar con el proceso de hashing</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Este certificado contiene:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -21042,6 +19449,18 @@ Seguridad: No hay identificaciones anónimas</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -21199,7 +19618,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>En toda la red</translation>
     </message>
@@ -21382,7 +19801,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>La carga de las imágenes incrustadas esta bloqueada.</translation>
     </message>
@@ -21395,7 +19814,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Permitido por defecto</translation>
     </message>
@@ -21568,12 +19987,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Guardar imagen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21581,12 +20010,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation>Opciones de vista de árbol</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21616,14 +20045,6 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">Mostrar columna...</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[sin título]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -22284,7 +20705,7 @@ Si crees que es correcto, elimina la correspondiente línea del archivo y reábr
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nombre</translation>
@@ -22405,7 +20826,7 @@ Si crees que es correcto, elimina la correspondiente línea del archivo y reábr
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
@@ -22425,7 +20846,7 @@ Si crees que es correcto, elimina la correspondiente línea del archivo y reábr
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22485,7 +20906,7 @@ reenviado a sus amigos.</translation>
         <translation type="unfinished">El mensaje será reenviado a sus amigos.</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Mensaje redactado ... ]</translation>
     </message>
@@ -22499,11 +20920,6 @@ reenviado a sus amigos.</translation>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Mensaje perdido ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22517,6 +20933,11 @@ reenviado a sus amigos.</translation>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">A</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22539,13 +20960,18 @@ reenviado a sus amigos.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Pulsar para ordenar por leido</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Pulsar para ordenar por remitente</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22568,7 +20994,9 @@ reenviado a sus amigos.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22589,7 +21017,7 @@ reenviado a sus amigos.</translation>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Reiniciar todos los ajustes de RetroShare.</translation>
     </message>
@@ -22650,7 +21078,7 @@ reenviado a sus amigos.</translation>
         <translation>Determinar el idioma de retroShare. </translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>No se puede abrir el archivo de registro &apos;%1&apos;: %2</translation>
     </message>
@@ -22671,11 +21099,7 @@ reenviado a sus amigos.</translation>
         <translation>No se pudo crear el directorio de datos: %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Revisión</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation>modoop</translation>
     </message>
@@ -22705,7 +21129,7 @@ reenviado a sus amigos.</translation>
         <translation>Información sobre el uso de la GUI</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>Código de idioma especificado no válido:</translation>
     </message>
@@ -22723,7 +21147,7 @@ reenviado a sus amigos.</translation>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Error de acceso al registro. Puede que necesite privilegios de Administrador.</translation>
@@ -22740,12 +21164,12 @@ reenviado a sus amigos.</translation>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Introduzca una palabra clave aquí (como mínimo 3 letras)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Comenzar búsqueda</translation>
     </message>
@@ -22807,7 +21231,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Limpiar</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Palabras clave</translation>
     </message>
@@ -22822,7 +21246,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>ID de la búsqueda</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Nombre de archivo</translation>
     </message>
@@ -22922,23 +21346,23 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Descargar seleccionados</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Nombre de archivo</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Copiar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Enviar enlace de RetroShare</translation>
     </message>
@@ -22948,7 +21372,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Notificación de descarga</translation>
     </message>
@@ -22985,7 +21409,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Borrar todo</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Carpeta</translation>
@@ -22996,17 +21420,17 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nuevo(s) enlace(s) de RetroShare</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Abrir carpeta</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Crear colección...</translation>
     </message>
@@ -23026,7 +21450,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Descargar desde archivo de colección...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Colección</translation>
     </message>
@@ -23034,7 +21458,7 @@ en la red (siempre informar de archivos disponibles)</translation>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Detalles del vecino</translation>
     </message>
@@ -23050,22 +21474,22 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Eliminar objeto</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>Dirección IP:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Identificación del vecino:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Nombre del vecino:</translation>
     </message>
@@ -23082,7 +21506,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation>pero se informó de:</translation>
     </message>
@@ -23107,8 +21531,8 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>&lt;p&gt;Esta es la IP a la que su amigo afirma estar conectado. Si acaba de cambiar las IPs, esta es una advertencia en falso. Si no, eso significa que su conexión con este amigo está siendo repetida por un vecino intermedio, que sería sospechoso.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esta advertencia está aquí para protegerle contra ataques de interposición y reenvío de tráfico. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Sin embargo, si sencillamente su IP cambia por alguna razón (algunos ISPs fuerzan cambios de IPs regularmente) esta advertencia sólo le dice que un amigo conectó a la nueva IP antes de que RetroShare notara el cambio de IP. No hay nada incorrecto en este caso.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Puede suprimir fácilmente falsas advertencias añadiendo sus propias IPs a la lista-blanca (ej. el rango de su ISP), o deshabilitando completamente estas advertencias en Opciones-&amp;gt;Notificar-&amp;gt;Novedades (feed).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23116,7 +21540,7 @@ en la red (siempre informar de archivos disponibles)</translation>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>quiere ser su amigo en RetroShare</translation>
     </message>
@@ -23147,7 +21571,7 @@ en la red (siempre informar de archivos disponibles)</translation>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -23192,12 +21616,12 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Estado:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Escribir mensaje</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Intentando conectar</translation>
     </message>
@@ -23217,17 +21641,22 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Desconocido (saliente) intento de conexión</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Problema de seguridad desconocido</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23237,11 +21666,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Vecino desconocido</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
@@ -23251,7 +21676,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>¿Quiere eliminar este amigo?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>¡¡El certificado tiene una firma errónea!! El vecino no es quien dice ser.</translation>
     </message>
@@ -23261,12 +21686,12 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Certificado perdido/dañado. No es un usuario RetroShare real.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>El certificado provocó un error interno.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>El vecino/nodo no está en la lista de amigos (identificación PGP=</translation>
     </message>
@@ -23325,12 +21750,12 @@ en la red (siempre informar de archivos disponibles)</translation>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Dirección local</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -23351,22 +21776,22 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Puerto:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Red local</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Buscador de direcciónes IP externas</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>IPs conocidas / anteriores:</translation>
     </message>
@@ -23382,21 +21807,16 @@ behind a firewall or a VPN.</source>
  tras de un cortafuegos o una VPN.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Permitir a RetroShare preguntarle mi ip a estos sitios web:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Rango de puertos aceptable desde 10 a 65535. Normalmente los puertos por debajo del 1024 están reservados por su sistema.</translation>
     </message>
@@ -23406,23 +21826,46 @@ behind a firewall or a VPN.</source>
         <translation>Rango de puertos aceptable desde 10 a 65535. Normalmente los puertos por debajo del 1024 están reservados para su sistema.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Dirección onion</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Descubrimiento activado (recomendado)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>Tor ha sido configurado automáticamente por Retroshare. No deberías necesitar cambiar nada aquí.</translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Descubrimiento inactivo</translation>
     </message>
@@ -23432,7 +21875,7 @@ behind a firewall or a VPN.</source>
         <translation>Oculto - Ver configuración</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>Dirección I2P</translation>
     </message>
@@ -23457,41 +21900,95 @@ behind a firewall or a VPN.</source>
         <translation>entrada correcta</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>El proxy parece funcionar.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>El proxy I2P no está habilitado</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
-        <translation>BOB está funcionando y accesible</translation>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
-        <translation>BOB no es accesible! Está funcionando?</translation>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
-        <translation>Retroshare utiliza BOB para crear un %1 túnel en %2:%3 (llamado %4)
-
-Al cambiar opciones (p.e. el puerto) utiliza los botones de abajo para reiniciar BOB.
-
-</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation>cliente</translation>
     </message>
@@ -23506,73 +22003,7 @@ Al cambiar opciones (p.e. el puerto) utiliza los botones de abajo para reiniciar
         <translation>desconocido</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation>BOB está procesando una petición</translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation>comprobación de conectividad</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation>creando clave</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation>iniciando</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation>apagando</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation>BOB está procesando una petición: %1</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation>BOB está roto
-</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation>BOB ha encontrado un error:
-</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation>El túnel de BOB está funcionando</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation>BOB está funcionando bien: túnel establecido</translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation>El túnel de BOB no está funcionando</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation>BOB está inactivo: túnel cerrado</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation>solicita una nueva clave de servidor</translation>
     </message>
@@ -23582,22 +22013,7 @@ Al cambiar opciones (p.e. el puerto) utiliza los botones de abajo para reiniciar
         <translation>carga la clave de servidor desde base64</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation>para generar una nueva clave, primero detén el túnel BOB</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation>para cargar una clave, primero detén el túnel BOB</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation>detén el túnel BOB para desactivar BOB</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Usted no es alcanzable mediante el servicio oculto.</translation>
     </message>
@@ -23611,12 +22027,12 @@ Also check your ports!</source>
 ¡Compruebe también sus puertos!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Modo oculto]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esto limpia la lista de direcciones conocidas. Esta acción es útil si por algún motivo su lista de direcciones contiene una dirección no-válida/irrelevante/caducada que quiera evitar pasar a sus amigos como dirección de contacto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23626,7 +22042,7 @@ Also check your ports!</source>
         <translation>Limpiar</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>Límite de descarga (KB/s)</translation>
     </message>
@@ -23641,24 +22057,24 @@ Also check your ports!</source>
         <translation>Límite de subida (KB/s)</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El límite de subida cubre el total de la aplicación. Un límite de subida demasiado pequeño eventualmente podría bloquear servicios de prioridad baja (canales de foros). Un valor mínimo recomendado es 50 KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation>ATENCIÓN:
 Estos valores no tienen en cuenta los Relays.</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23675,17 +22091,7 @@ Ahora, añade la dirección (p.e. 127.0.0.1) y el puerto que has elegido para el
 Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar. ¿Por qué no utilizar Tor y/o I2P?</translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation>I2P/BOB automático</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation>Activar I2P BOB - este cambio requiere reiniciar para que tenga el efecto esperado</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation>activa la configuración avanzada</translation>
     </message>
@@ -23695,12 +22101,7 @@ Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar
         <translation>modo avanzado</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation>I2P Basic Open Bridge</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation>Dirección de instancia de I2P</translation>
     </message>
@@ -23710,17 +22111,7 @@ Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation>Puerto del proxy I2P</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation>BOB accesible</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
@@ -23760,7 +22151,7 @@ Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar
         <translation>cargar clave</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
@@ -23775,12 +22166,7 @@ Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar
         <translation>Detener</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation>Estado de BOB</translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation>Entrante</translation>
     </message>
@@ -23827,7 +22213,32 @@ Para terminar, asegúrate de que los puertos coinciden con la configuración.
 Si tienes problemas conectando a través de Tor, comprueba sus logs.</translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation>Repetidor</translation>
     </message>
@@ -23882,7 +22293,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Total:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation>Atención: este ancho de banda supera el máximo ancho de banda.</translation>
     </message>
@@ -23907,7 +22318,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Quitar servidor</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23921,7 +22332,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>Filtros de IP</translation>
     </message>
@@ -23944,7 +22355,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
@@ -24004,17 +22415,28 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Añadir a la lista blanca</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Configuración de servicio oculto</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este es el puerto proxy Socks de Tor. Su nodo RetroShare puede usar este puerto para conectar a&lt;/p&gt;&lt;p&gt;nodos ocultos. El led de la derecha se vuelve verde cuando este puerto esté activo en su computadora. &lt;/p&gt;&lt;p&gt;Sin embargo esto no significa que su tráfico de RetroShare transite a través de Tor. Sólo lo hace si &lt;/p&gt;&lt;p&gt;conecta a nodos ocultos, o si usted mismo está ejecutando un nodo oculto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este led a la izquierda será verde cuando el puerto de escucha esté activo en su computadora. No&lt;/p&gt;&lt;p&gt;significa que su tráfico de RetroShare transite a través de Tor. Sólo lo hará si&lt;/p&gt;&lt;p&gt;conecta a nodos ocultos, o si usted mismo está ejecutando un nodo oculto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24030,18 +22452,18 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este led a la izquierda será verde cuando el puerto de escucha esté activo en su computadora. No&lt;/p&gt;&lt;p&gt;significa que su tráfico de RetroShare transite a través de I2P. Sólo lo hará si&lt;/p&gt;&lt;p&gt;conecta a nodos ocultos, o si usted mismo está ejecutando un nodo oculto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>Salida de I2P correcta</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Dirección del servicio</translation>
     </message>
@@ -24076,12 +22498,12 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Por favor, introduzca una dirección de servicio</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>Rango de IPs</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Fue señalado por la DHT (tabla distribuida de hashes) para enmascaramiento de IP (IP masquerading)</translation>
     </message>
@@ -24104,22 +22526,22 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Añadido por usted</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Las IPs en lista blanca son reunidas desde las siguientes fuentes: IPs provenientes del interior de certificados intercambiados manualmente, rangos de IPs introducidos por usted en esta ventana, o en los elementos de seguridad de las novedades (feed).&lt;/p&gt;&lt;p&gt;El comportamiento predeterminado para RetroShare es (1) permitir siempre la conexión a los vecinos con IP en la lista blanca; (2) requerir opcionalmente que las IPs estén en la lista blanca. Puede cambiar este comportamiento en la ventana &amp;quot;Detalles&amp;quot; de cada nodo RetroShare. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La DHT (tabla dinámica de hashes) le permite responder a las peticiones de conexión de sus amigos usando la DHT de BitTorrent. Esto mejora enormemente la conectividad. No se almacena en realidad información en la DHT, sólo se usa como un proxy (interpuesto) del sistema para ponerse en contacto con otros nodos RetroShare.&lt;/p&gt;&lt;p&gt;El servicio de Descubrimiento envía el nombre del nodo y las identificaciones de sus contactos de confianza a vecinos conectados, para ayudarles a elegir nuevos amigos. Sin embargo, el establecimiento de amistad nunca es automático, y ambos vecinos todavía necesitan confiar el uno en el otro para permitir la conexión. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El indicador se vuelve verde tan pronto como RetroShare logra obtener su propia IP de los sitios web listados debajo, si habilita esa acción. RetroShare también usará otros medios para averiguar su propia IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esta lista se rellena automáticamente con información reunida en múltiples fuentes: vecinos con enmascaramiento de los que informó la DHT, rangos de IPs introducidos por usted, y rangos de IPs de los que informaron sus amigos. La configuración predeterminada debe protegerle contra la repetición de tráfico a gran escala.&lt;/p&gt;&lt;p&gt;Conjeturar automáticamente si las IPs son de enmascaramiento puede incluir las IPs de sus amigos en la lista negra. En ese caso, use el menú contextual para incluirlas en la lista blanca.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24154,26 +22576,22 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Excluir automáticamente rangos de IPs de enmascaramiento de la DHT comenzando en</translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation>Tor/I2P saliente manual</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configura tus SOCKS proxy Tor e I2P aquí. &lt;br/&gt;Si prefieres utilizar BOB para gestionar automáticamente I2P, visita la otra pestaña.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Proxy Socks de Tor</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Salida de Tor correcta</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>El proxy de Tor no está habilitado</translation>
     </message>
@@ -24253,7 +22671,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>seleccione los vecinos con los que desea compartir su clave privada de publicación</translation>
     </message>
@@ -24263,12 +22681,12 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Compartir con amigo</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Compartir</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Puede permitir a sus amigos saber de su canal al compartirlo con ellos. 
@@ -24288,7 +22706,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Administrador de carpetas compartidas</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation>Directorio compartido</translation>
     </message>
@@ -24308,17 +22726,17 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Visibilidad</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation>Añadir nuevo</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Compartir una carpeta</translation>
     </message>
@@ -24328,7 +22746,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Quitar</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Aplicar y cerrar</translation>
     </message>
@@ -24419,7 +22837,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Carpeta no encontrada o nombre de carpeta no aceptado.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Esta es una lista de carpetas compartidas. Puedes añadir o quitar carpetas utilizando los botones inferiores. Cuando añades una carpeta inicialmente se comparte todo su contenido. Puedes cambiar los permisos individualmente para cada carpeta.</translation>
     </message>
@@ -24427,7 +22845,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Archivos</translation>
     </message>
@@ -24478,11 +22896,16 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>Comprobar archivos</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Descargar seleccionados</translation>
     </message>
@@ -24492,7 +22915,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Copiar enlace de RetroShare al portapapeles</translation>
     </message>
@@ -24507,7 +22930,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Enviar enlaces de RetroShare</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation>Algunos ficheros se han omitido</translation>
     </message>
@@ -24523,7 +22946,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Recomendaciones</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Crear colección...</translation>
     </message>
@@ -24548,7 +22971,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Descargar desde archivo de colección...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Algunos ficheros se han omitido porque aún no han sido indexados.</translation>
     </message>
@@ -24691,12 +23114,12 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Cargar configuración</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Crear interfaz</translation>
     </message>
@@ -24720,7 +23143,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Recordar contraseña</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Iniciar sesión</translation>
     </message>
@@ -25077,7 +23500,7 @@ Esta elección puede revertirse en la configuración.</translation>
         <translation>Mensaje de estado</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Mensage:</translation>
     </message>
@@ -25322,7 +23745,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Quitar todas las etiquetas</translation>
     </message>
@@ -25358,12 +23781,15 @@ p, li { white-space: pre-wrap; }
         <translation>Configurando Tor...</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation>Estado Tor:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -25373,18 +23799,13 @@ p, li { white-space: pre-wrap; }
         <translation>No iniciado</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
-        <translation>Dirección del servicio oculto:</translation>
+        <location line="+13"/>
+        <source>Hidden address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation>Estado de la secuencia Tor:</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation>No establecido</translation>
     </message>
@@ -25394,12 +23815,57 @@ p, li { white-space: pre-wrap; }
         <translation>Dirección onion:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">No conectado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation>Comprueba que Tor es accesible en tu ruta de ejecución</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation>[Esperando a Tor...]</translation>
     </message>
@@ -25407,21 +23873,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Esta versión de RetroShare utiliza Tor para conectar con tus amigos.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation>Tor está actualmente fuera de línea</translation>
     </message>
@@ -25432,11 +23894,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Sin configuración de Tor</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25464,7 +23927,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Opciones de transferencias</translation>
@@ -25475,7 +23938,7 @@ p, li { white-space: pre-wrap; }
         <translation>Máximas descargas simultáneas:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation>Directorios compartidos</translation>
     </message>
@@ -25485,22 +23948,27 @@ p, li { white-space: pre-wrap; }
         <translation>Compartir automáticamente el directorio de entrada (recomendado)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation>Editar compartidos</translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished">Configurar directorios compartidos</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation>Comprobar automáticamente los directorios compartidos cada</translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation>minuto(s)</translation>
     </message>
@@ -25585,7 +24053,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25594,7 +24062,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Máximo de subidas por amigo (0 = sin límite) </translation>
     </message>
@@ -25619,7 +24092,12 @@ p, li { white-space: pre-wrap; }
         <translation>Permitir descarga directa:</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -25678,38 +24156,13 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; es capaz de transferir datos y peticiones de búsqueda entre vecinos que no necesariamente son amigos. Sin embargo, este tráfico sólo transita a través de una lista de amigos conectados, y es anónimo.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;Puede establecer indicativos para cada directorio compartido por separado en el cuadro de diálogo de ficheros compartidos para que sean:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Explorables por amigos&lt;/span&gt;: Los ficheros son vistos por sus amigos.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Compartidos anónimamente&lt;/span&gt;: Los ficheros son alcanzables anónimamente a través de túneles anónimos F2F (entre amigos).&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Máximo de peticiones de túnel repetidas por segundo:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;provoca que la transferencia requiera 1 MB de pedazos del archivo en orden desde el principio, para facilitar la previsualización durante la descarga. &lt;span style=&quot; font-weight:600;&quot;&gt;Aleatoria&lt;/span&gt; es puramente aleatoria y favorece un comportamiento de enjambre (subir y bajar el archivo simultáneamente). &lt;span style=&quot; font-weight:600;&quot;&gt;Progresiva&lt;/span&gt; es un equilibrio, selecciona el siguiente pedazo aleatoriamente dentro de los 50 MB posteriores al final de un archivo parcial. Eso permite cierta aleatorización a la vez que previene grandes tiempos de inicialización de archivos vacíos.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RetroShare suspenderá todas las transferencias y configurará el guardado de archivos si el espacio de disco baja de este límite. Esto previene la pérdida de información en algunos sistemas. Una ventana emergente le alertará cuando eso suceda.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -25719,7 +24172,17 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este valor controla cuantas peticiones de túneles puede repetir por segundo su vecino. &lt;/p&gt;&lt;p&gt;Si tiene un gran ancho de banda para Internet, puede elevar esto hasta 30-40, para estadísticamente permitir pasar a túneles más largos. No obstante tenga mucho cuidado, ya que esto genera muchos paquetes pequeños que pueden ralentizar significativamente su propia transferencia de archivos. &lt;/p&gt;&lt;p&gt;El valor por defecto es 20. Si no está seguro, déjelo así.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Aviso</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation>Establecer directorio de entrada</translation>
     </message>
@@ -25747,7 +24210,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Descarga completa</translation>
     </message>
@@ -25771,39 +24234,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Tiene %1 descargas completas</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Tiene %1 descarga completa</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 descargas completas</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 descarga completa</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Descargas</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Enviando</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nombre</translation>
@@ -26010,11 +24457,7 @@ p, li { white-space: pre-wrap; }
         <translation>Especificar...</translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Transferencia de archivos&lt;/h1&gt;                                                             &lt;p&gt;RetroShare tiene dos formas de transferir archivos: transferencias directas desde sus amigos, y                                         transferencias distantes anónimas por túnel. Además, la transferencia de archivos es desde múltiples-fuentes y permite comportamiento de enjambre                                          (puede ser fuente a la vez que descarga)&lt;/p&gt;                                         &lt;p&gt;Puede compartir archivos usando el &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icono del lado izquierdo de la barra lateral.     Estos archivos se listarán en la pestaña Mis Archivos. Puede decidir para cada grupo de amigos si pueden o no ver estos archivos en su pestaña de Archivos de Amigos&lt;/p&gt;    &lt;p&gt;La pestaña de búsqueda informa de archivos de las listas de archivos de sus amigos, y de archivos distantes que se pueden alcanzar     de forma anónima usando la sistema de tunelización de múltiples-saltos.&lt;/p&gt;     </translation>
-    </message>
-    <message>
-        <location line="+253"/>
+        <location line="+262"/>
         <source>Move in Queue...</source>
         <translation>Mover en la lista de espera...</translation>
     </message>
@@ -26039,7 +24482,7 @@ p, li { white-space: pre-wrap; }
         <translation>Elegir directorio</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Túnel anónimo cifrado extremo-a-extremo 0x</translation>
     </message>
@@ -26060,7 +24503,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -26093,7 +24536,17 @@ p, li { white-space: pre-wrap; }
         <translation>El archivo %1 no está completo todavía. Si es un archivo multimedia, trate de obtener una vista previa.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Aviso</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Cambiar nombre de archivo</translation>
     </message>
@@ -26108,7 +24561,7 @@ p, li { white-space: pre-wrap; }
         <translation>Por favor, introduzca un nuevo - y válido - nombre de archivo</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Expandir todo</translation>
@@ -26235,23 +24688,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation> Columnas</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Transferencia de archivos</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
@@ -26261,7 +24709,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mostrar columna de ruta</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>No se pudo borrar el archivo de vista previa</translation>
     </message>
@@ -26271,7 +24719,7 @@ p, li { white-space: pre-wrap; }
         <translation>¿Intentarlo de nuevo?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Crear colección...</translation>
     </message>
@@ -26286,7 +24734,12 @@ p, li { white-space: pre-wrap; }
         <translation>Ver colección...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+74"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
         <source>Collection</source>
         <translation>Colección</translation>
     </message>
@@ -26296,7 +24749,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 túneles</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Túnel anónimo 0x</translation>
     </message>
@@ -26517,10 +24970,6 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">Túneles anónimos</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26714,12 +25163,17 @@ p, li { white-space: pre-wrap; }
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Habilitar interfaz WEB de RetroShare</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Estado:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Parámetros web</translation>
     </message>
@@ -26753,35 +25207,33 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Port:</source>
-        <translation type="vanished">Puerto:</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation>Permitir el acceso desde todas las direcciones IP (Predeterminado: sólo localhost (nodo local))</translation>
     </message>
     <message>
-        <source>Apply setting and start browser</source>
-        <translation type="vanished">Aplicar configuración e iniciar navegador</translation>
-    </message>
-    <message>
-        <source>Note: these settings do not affect retroshare-nogui. Retroshare-nogui has a command line switch to activate the web interface.</source>
-        <translation type="vanished">Nota: estas configuraciones no afectan a retroshare-nogui (aplicación en línea de comandos sin interfaz gráfica). retroshare-nogui tiene un parámetro de línea comandos para activar la interfaz web. </translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Interfaz web&lt;/h1&gt;       &lt;p&gt;La interfaz web le permite controlar Retroshare desde el navegador. Múltiples dispositivos pueden compatir el control sobre una instancia Retroshare. Así que podría iniciar una conversación en una tableta y posteriormente usar una computadora de escritorio para continuarla.&lt;/p&gt;     &lt;p&gt;Advertencia: No exponga la interfaz web hacia Internet, porque no hay control de acceso ni cifrado. Si quiere usar la interfaz web sobre Internet, use un túnel SSH o un proxy para asegurar la conexión.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>Interfaz web no habilitada</translation>
     </message>
@@ -26791,12 +25243,12 @@ p, li { white-space: pre-wrap; }
         <translation>La interfaz web no está habilitada. Habilítela en Configuración -&gt; Interfaz web</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>fallo al iniciar la interfaz web</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Interfaz web</translation>
     </message>
@@ -26933,11 +25385,7 @@ p, li { white-space: pre-wrap; }
         <translation>Páginas Wiki</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Nuevo grupo</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Nombre página</translation>
     </message>
@@ -26952,7 +25400,7 @@ p, li { white-space: pre-wrap; }
         <translation>ID original</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -27040,7 +25488,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Historial de edición de páginas</translation>
     </message>
@@ -27075,7 +25523,7 @@ p, li { white-space: pre-wrap; }
         <translation>ID de página</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -27105,14 +25553,18 @@ p, li { white-space: pre-wrap; }
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Historial</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Mostrar historial de ediciones</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
@@ -27133,7 +25585,7 @@ p, li { white-space: pre-wrap; }
         <translation>Revertir</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Enviar</translation>
     </message>
@@ -27205,10 +25657,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">Intervalo de tiempo</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -27220,16 +25668,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Refrescar</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27244,7 +25683,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Otros</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27264,7 +25703,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27294,85 +25733,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Mes pasado</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Semana pasada</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Hoy</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nuevo</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">de</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">hasta</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Buscar/Filtrar</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">En toda la red</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Administrar cuentas</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Mostrando:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Yo mismo</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Amigos</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Personalizar</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Cuenta 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Cuenta 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Cuenta 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">Casilla de verificación</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Mensaje de Pulso para Wire</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -27435,35 +25806,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulario</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Lugar:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -27508,11 +25886,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Siguiente</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Desconocido</translation>
@@ -27590,7 +25998,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1a. %2d</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -27623,15 +26031,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Imágenes (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation>¿Acepta las conexiones firmadas por este perfil?</translation>
     </message>
@@ -27640,10 +26044,6 @@ p, li { white-space: pre-wrap; }
         <source>Name of the profile</source>
         <translation>Nombre del perfil</translation>
     </message>
-    <message>
-        <source>This column indicates trust level and whether you signed the profile PGP key</source>
-        <translation type="vanished">Esta columna indica el nivel de confianza y si ha firmado la clave PGP del perfil</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
@@ -27754,10 +26154,6 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> - </source>
-        <translation type="vanished">-</translation>
-    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_fi.ts b/retroshare-gui/src/lang/retroshare_fi.ts
index 4356c9860..035f64f23 100644
--- a/retroshare-gui/src/lang/retroshare_fi.ts
+++ b/retroshare-gui/src/lang/retroshare_fi.ts
@@ -84,13 +84,6 @@
         <translation>Ainoastaan piilotettu solmu</translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Lisää kommentti</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -128,12 +121,12 @@
         <translation>Retroshare: tarkennettu haku</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Hakuehdot</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Lisää hakuehto.</translation>
     </message>
@@ -143,7 +136,7 @@
         <translation>Tyhjennä hakuehdot.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Peruu haun.</translation>
     </message>
@@ -163,177 +156,6 @@
         <translation>Haku</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Luo albumi</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Albumin nimi:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Luokka:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Eläimet</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Sukulaiset</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Ystävät</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Kukat</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Loma</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Maisemat</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Lemmikit</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Muotokuvat</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Matkustaminen</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Työ</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Satunnainen</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Kuvateksti:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Missä:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Valokuvaaja:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Kuvaus:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Jakoasetukset</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Käytänne:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Laatu:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Kommentit:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Henkilöllisyys:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Julkinen</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Rajoitettu</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Muuta kuvien kokoa (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Muuta kuvien kokoa (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Lähetä alkuperäiset kuvat</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Kommentteja ei sallittu</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Varmennetut kommentit</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Kaikki kommentit sallittu</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Julkaise henkilöllisyyden kera</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Vedä ja pudota lisätäksesi kuvia. Paina kuvaa muokataksesi tietoja alhaalla.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Takaisin</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Lisää kuvia</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Julkaise albumi</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Nimetön albumi</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Kirjoita tietoja albumista</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Missä nämä on otettu?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Lataa albumin näytekuva</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -342,19 +164,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Albumi</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Albumin näytekuva</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Yhteenveto</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -370,34 +184,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Kuvateksti</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Missä:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Milloin</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Kuvaus:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Jakoasetukset</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Kommentit</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Julkaise henkilöllisyys</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Näkyvyys</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -766,7 +552,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation> Varoitus: nämä palvelut ovat kokeellisia. Auta meitä niiden testaamisessa. 
@@ -782,14 +568,6 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>Piirit</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">Gxs-foorumit</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">GxsKanavat</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -801,10 +579,23 @@ p, li { white-space: pre-wrap; }
         <translation>Valokuvat</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">Tallenna kuva</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -841,17 +632,13 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Lisää avatar</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Aseta avatarkuvasi</translation>
     </message>
@@ -870,10 +657,6 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Lataa avatar</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -942,22 +725,10 @@ p, li { white-space: pre-wrap; }
         <translation>Palauta asetukset</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Vastaanottonopeus</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Lähetysnopeus</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Aina päällimmäisenä</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Tyyli</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -973,23 +744,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% näkyvä</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Tallenna</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Peru</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Alkaen:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Piilota asetukset</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1062,7 +821,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentti</translation>
     </message>
@@ -1092,12 +851,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Tämän viestin kirjoittaja (tunnisteella %1) on pannassa.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1105,7 +864,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Äänestä ylös</translation>
     </message>
@@ -1125,7 +884,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,7 +922,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Äänestä ylös</translation>
     </message>
@@ -1183,7 +942,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1213,7 +972,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Jaa</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Vaihda viestin tila luetuksi tai päinvastoin</translation>
     </message>
@@ -1223,7 +982,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Uusi</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1231,12 +990,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Pidän tästä</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1256,18 +1015,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Laajenna</translation>
     </message>
@@ -1282,12 +1041,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Poista kohde</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1456,17 +1215,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Kanavat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Välilehdet</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Yleiset</translation>
     </message>
@@ -1476,11 +1235,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Lataa viestit taustalla (aihe)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Lataukset</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Avaa jokainen kanava uuteen välilehteen</translation>
     </message>
@@ -1488,7 +1253,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1511,7 +1276,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Pidän tästä</translation>
     </message>
@@ -1536,18 +1301,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Laajenna</translation>
     </message>
@@ -1562,7 +1327,7 @@ into the image, so as to
         <translation type="unfinished">Poista kohde</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
     </message>
@@ -1572,17 +1337,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Kommentti</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished">Kommentit</translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Piilota</translation>
     </message>
@@ -1590,7 +1345,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
@@ -1781,7 +1536,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Näytä keskusteluhuone</translation>
     </message>
@@ -1793,22 +1548,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>Keskustelut</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Sinulle on uusia viestejä %1 kpl</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Sinulle on %1 uusi viesti</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 kpl uusia viestejä</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 uusi viesti</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1830,13 +1569,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Tuntematon huone</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Poista kaikki</translation>
     </message>
@@ -1844,13 +1584,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Lkm</translation>
     </message>
@@ -1860,33 +1600,7 @@ into the image, so as to
         <translation>Aihe</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>Yksityiset tilatut keskusteluhuoneet</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>Julkiset tilatut keskusteluhuoneet</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Yksityiset keskusteluhuoneet</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Julkiset keskusteluhuoneet</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Keskusteluhuoneet&lt;/h1&gt;&lt;p&gt;Keskusteluhuoneissa voit käydä nimettömiä keskusteluja lukuisien ihmisten kanssa ilman tarvetta ystävystyä.&lt;/p&gt;&lt;p&gt;Keskusteluhuone voi olla julkinen (ystäviesi nähtävissä) tai yksityinen (ystäväsi eivät näe sitä, ellet kutsu heitä painamalla &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). Kun sinut on kutsuttu yksityiseen huoneeseen, näet sen ystäviesi käyttäessä sitä&lt;/p&gt;&lt;p&gt;Vasemmalla oleva luettelo näyttää keskusteluhuoneet, joissa on ystäviäsi. Voit&lt;ul&gt; &lt;li&gt;Käyttää hiiren oikeata painiketta luodaksesi uuden huoneen&lt;/li&gt;&lt;li&gt;Kaksoisnapauttaa huonetta liittyäksesi keskusteluun&lt;/li&gt;&lt;/ul&gt;Huomaa, että tietokoneesi on oltava oikeassa ajassa, jotta keskusteluhuoneet toimivat kunnolla. Tarkista siis järjestelmäsi kello!&lt;/p&gt;                                      	                      </translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Luo keskusteluhuone</translation>
     </message>
@@ -1896,7 +1610,7 @@ into the image, so as to
         <translation>Poistu huoneesta</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Luo nimellä varustettu henkilöllisyys ja astu huoneeseen</translation>
     </message>
@@ -1955,12 +1669,12 @@ Valitse huoneita vasemmalta nähdäksesi tietoja.
 Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 kutsuu sinut keskusteluhuoneeseen nimeltä %2</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Valitse nimellä varustettu henkilöllisyys tätä keskusteluhuonetta varten:</translation>
     </message>
@@ -1970,31 +1684,31 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Valitse henkilöllisyys tätä keskusteluhuonetta varten:</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Luo keskusteluhuone</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Ei aihetta]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Tietoja valitusta huoneesta</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Yksityinen</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Julkinen</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>Nimettömät tunnisteet hyväksytty</translation>
     </message>
@@ -2004,42 +1718,25 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Poista automaattinen tilaus</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Lisää automaattinen tilaus</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Hae keskusteluauloista</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Hae nimeä</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Tilattu</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Sarakkeet</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Kyllä</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Ei</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2051,47 +1748,47 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Keskusteluhuoneen nimi:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>Keskusteluhuoneen tunniste:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Aihe:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Tyyppi:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Tietoturva:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Vertaiset:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
@@ -2106,13 +1803,24 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Ei nimettömiä tunnisteita</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation> sarake</translation>
@@ -2126,7 +1834,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Poista kohde</translation>
     </message>
@@ -2171,46 +1879,22 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Yleiset</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Etäinen keskustelu</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Jokainen</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Kontaktit</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Ei kukaan</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Hyväksy salattu etäinen keskustelu:</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Keskusteluasetukset</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Ota hymiöt käyttöön yksityiskeskustelussa</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Ota hymiöt käyttöön ryhmäkeskustelussa</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Käytä omia kirjasimia</translation>
     </message>
@@ -2219,10 +1903,6 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Enable custom font size</source>
         <translation>Käytä mukautettuja kirjasinkokoja</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Kirjasin vähimmäiskoko</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2234,7 +1914,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Käytä kursiivia</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2259,11 +1939,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Lataa upotetut kuvat</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Keskusteluhuone</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Vilkuta välilehtikuvaketta</translation>
     </message>
@@ -2272,10 +1948,6 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Do not send typing notifications</source>
         <translation>Älä lähetä kirjoittamista koskevia ilmoituksia</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Yksityinen keskustelu</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2297,11 +1969,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Vilkuta ikkuna- tai välilehtikuvaketta</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Keskustelun kirjasin</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Vaihda keskustelun kirjasin</translation>
     </message>
@@ -2311,14 +1979,10 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Keskustelun kirjasin:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Historia</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Tyyli</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2333,17 +1997,13 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Variant:</source>
         <translation>Muunnelma:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Ryhmäkeskustelu</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Yksityinen keskustelu</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation>Valitse oletuskirjasin keskustelulle.</translation>
     </message>
@@ -2407,22 +2067,28 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Tässä välilehdessä voit määrittää, kuinka monta chat-viestiä Retroshare pitää tallennettuna kiintolevylle ja kuinka paljon edellisestä keskustelusta näytetään eri keskustelutoiminnoissa. Säilytyksen enimmäisaika mahdollistaa vanhojen viestien hävittämisen ja estää keskusteluhistorian täyttymisen (esim. keskusteluaulat ja etäiset keskustelut).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Keskusteluaulat</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Käytössä:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">Haku</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2432,7 +2098,17 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Keskusteluhuoneet</translation>
@@ -2529,11 +2205,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Varastoinnin enimmäisaika, päivinä (0=pidä kaikki):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Haku oletuksena</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Huomioi kirjainkoko</translation>
     </message>
@@ -2572,10 +2244,6 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Threshold for automatic search</source>
         <translation>Automaattisen haun raja-arvo</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Oletushenkilöllisyys keskusteluauloihin:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2643,7 +2311,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Näytä keskustelu</translation>
     </message>
@@ -2679,7 +2347,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
@@ -2714,12 +2382,12 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Kursivointi</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>Syötä hymiö</translation>
     </message>
@@ -2799,11 +2467,6 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Insert horizontal rule</source>
         <translation>Syötä vaakaviiva</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Tallenna kuva</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2841,7 +2504,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>kirjoittaa...</translation>
     </message>
@@ -2865,7 +2528,7 @@ iso HTML-muuntamisen jälkeen.</translation>
         <translation>Valitse kirjasin.</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Haluatko todella tuhota historian pysyvästi?</translation>
     </message>
@@ -2915,7 +2578,7 @@ iso HTML-muuntamisen jälkeen.</translation>
         <translation>on kiireinen, eikä välttämättä vastaa</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Huomioi kirjainkoko</translation>
     </message>
@@ -2937,7 +2600,7 @@ iso HTML-muuntamisen jälkeen.</translation>
         <translation>Älä lopeta värittämistä, kun X kohdetta löydetty (vaatii konetehoa)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Hae edellinen &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2952,16 +2615,12 @@ iso HTML-muuntamisen jälkeen.</translation>
         <translation>&lt;b&gt;Hae &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Tila)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Aseta tekstin kirjasinlaji &amp; väri</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Liitä tiedosto</translation>
     </message>
@@ -2977,12 +2636,12 @@ iso HTML-muuntamisen jälkeen.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Merkitse tämä valittu teksti&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation>Henkilön tunniste:</translation>
     </message>
@@ -2994,12 +2653,12 @@ Double click on it to add his name on text writer.</source>
 Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation>Allekirjoittamaton</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>Kohteita löytyi.</translation>
     </message>
@@ -3019,7 +2678,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Kirjoita viesti tähän</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Älä lopeta värittämistä jälkeen</translation>
     </message>
@@ -3045,7 +2704,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Näytetään tietoja:</translation>
     </message>
@@ -3067,7 +2726,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Henkilökohtaiset piirit</translation>
     </message>
@@ -3093,7 +2752,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Ystävät</translation>
     </message>
@@ -3153,7 +2812,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Ystävien ystävät</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Ulkoiset piirit (Ylläpito)</translation>
     </message>
@@ -3169,7 +2828,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Piirit</translation>
     </message>
@@ -3221,43 +2880,48 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Virhe: vertaisen yksityiskohtia ei saatu.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3269,7 +2933,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Salaus</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>Ei yhteyttä</translation>
     </message>
@@ -3351,25 +3015,17 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>ei mitään</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Tämä varmenne sisältää:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt; &lt;b&gt;solmun tunniste&lt;/b&gt; ja &lt;b&gt;nimi&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">&lt;b&gt;onion-osoite&lt;/b&gt; ja &lt;b&gt;portti&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished"> &lt;b&gt;IP-osoite&lt;/b&gt; ja &lt;b&gt;ja&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Voit käyttää tätä varmennetta luodaksesi uusia ystäviä. Lähetä se sähköpostitse tai anna se tavatessanne.&lt;/p&gt;</translation>
     </message>
@@ -3384,7 +3040,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tätä salaus-metodia käyttää &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. Yhteys ystäväsolmuihin&lt;/p&gt;&lt;p&gt;on aina vahvasti salattu ja jos DHE on läsnä yhteys edelleen käyttää&lt;/p&gt;&lt;p&gt;&amp;quot;täydellistä forward secrecy-ominaisuutta&amp;quot; (salausavaimen murtaminen ei johda aiemmin salattujen viestien tietoturvan vaarantumiseen).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>kanssa</translation>
     </message>
@@ -3401,118 +3057,16 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <source>Connect Friend Wizard</source>
         <translation>Ohjattu toiminto ystävän yhdistämiseksi</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Lisää uusi ystävä</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Saat varmenteen ystävältäsi</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;Ystävysty valitsemieni ystävien ystävien kanssa</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Email 
- (Your friend will receive an email with instructions how to download RetroShare)</source>
-        <translation type="vanished">&amp;Lähetä kutsu sähköpostilla 
- (Ystäväsi saa sähköpostin, jossa on ohjeet Retrosharen lataamiseksi)</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Sisällytä allekirjoitukset</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Kopioi varmenteesi leikepöydälle</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Tallenna varmenteesi tiedostoon</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Käynnistä sähköpostiohjelma</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Avaa ystäväsi varmenne tiedostosta</translation>
     </message>
-    <message>
-        <source>Open certificate</source>
-        <translation type="vanished">Avaa varmenne</translation>
-    </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">Ole hyvä ja liitä ystäväsi Retroshare-varmenne allaolevaan laatikkoon</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Varmennetiedostot</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Käytä tiedostoihin tallennettuja PGP-varmenteita.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Tuo ystävän varmenne...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Sinun tulee luoda tiedosto, joka sisältää varmenteesi ja antaa se ystävällesi. Voit myös käyttää aiemmin luotua tiedostoa.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Vie varmenteeni...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Vedä ja pudota ystäväsi varmenne tähän ikkunaan tai määritä polku allaolevaan laatikkoon</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Selaa</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Ystävien ystäviä</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Valitse nyt, kenen kanssa haluat ystävystyä.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Näytä:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Ystävysty näiden vertaisten kanssa</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>Retrosharen tunniste</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Käytä Retroshare-tunnistetta verkossasi olevan ystävän lisäämiseen.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Lisää ystävän Retroshare-tunniste...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Liitä ystävän Retroshare-tunniste allaolevaan laatikkoon</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Anna ystäväsi Retroshare-tunniste, tyyliin Vertainen@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3554,27 +3108,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Sähköposti</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Kutsu ystäviä sähköpostilla</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Kirjoita ystäviesi sähköpostiosoitteet (erottele ne puolipisteellä)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Ystäviesi sähköpostiosoitteet:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Kirjoita ystäviesi sähköpostiosoitteet</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Aihe:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3590,78 +3124,32 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Tietoja pyynnöstä</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Vertaisen tiedot</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Sähköposti:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Solmu:</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">Huomioithan, että Retroshare edellyttää kohtuuttomia määriä tietoliikennekaistaa, muistia ja suoritintehoa, jos lisäät paljon ystäviä. Voit lisätä niin monta ystävää kuin haluat, mutta yli 40 luultavasti vaatii liikaa 
-resursseja.</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Sijainti:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">Tämä aputoiminta auttaa sinua ottamaan yhteyden ystäviisi Retroshare-verkossa.&lt;br&gt;Valitse miten haluaisit lisätä ystävän:</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Anna varmenne manuaalisesti</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">Anna Retroshare tunniste manuaalisesti</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">&amp;Lähetä kutsu webmailpalvelun kautta</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Suosittele useita ystäviä toisilleen</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">Retroshare varmenne</translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">Ole hyvä ja liitä alle ystäväsi Retroshare-varmenne</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Liitä varmenne</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä laatikko vaatii sinun ystäväsi Retroshare-varmenteen. VAROITUS: se on erilainen, kuin ystäväsi profiiliavain. Älä liitä ystäväsi profiiliavainta tähän (edes osaa siitä). Se ei tule toimimaan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Lisää ystävä ryhmään:</translation>
     </message>
@@ -3671,7 +3159,7 @@ resursseja.</translation>
         <translation>Varmenna ystävä (allekirjoita PGP-avain)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3696,16 +3184,22 @@ resursseja.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Lisää ystäväksi, johon otat yhteyden</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Paina Valmis-painiketta hyväksyäksesi ystäväpyynnön</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Valitettavasti on tapahtunut jokin virhe</translation>
     </message>
@@ -3725,32 +3219,27 @@ resursseja.</translation>
         <translation>Tietoja ystävästäsi:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Avaimen kelpoisuus:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Allekirjoittajat</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Ystäväsi avaimen allekirjoittamisella ilmaiset luottamuksesi tähän ystävään muille ystävillesi. Allekirjoitukset alla kryptograafisesti todistavat, että luettelon avaimien omistajat tunnistavat nykyisen PGP-avaimen aidoksi.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Tämä vertainen on jo ystäväluettelossasi. Hänen lisäämisensä saattaa ainoastaan määrittää uuden IP-osoitteen.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3796,49 +3285,17 @@ resursseja.</translation>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Varmenteen lataus epäonnistui</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Vertaistietoja ei kyetty hakemaan PGP-avaimelle %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Kaikki vertaiset, joita en ole allekirjoittanut</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Ystävieni ystävät, jotka jo luottavat minuun</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Allekirjoitetut vertaiset, jotka näkyvät torjuttuina</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Vertaisen nimi</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Muita allekirjoittaneita</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Vertaisen tunniste</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">Varmenne näyttää olevan kelvollinen</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Ei kelvollinen Retroshare-varmenne!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Retroshare-kutsu</translation>
     </message>
@@ -3860,12 +3317,12 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Tämä on oma varmenteesi! Et haluaisi olla oma ystäväsi. Ethän?</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3873,7 +3330,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation>Tämä avain on jo luotettujen luettelossa</translation>
     </message>
@@ -3913,7 +3370,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation>Sinulle on ystäväpyyntö, lähettäjä</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3938,7 +3395,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3948,47 +3405,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Varmenteen avaaminen epäonnistui: tiedostoa %1 ei löydy</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Vertainen %1 ei ole verkossasi</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Käytä uutta varmenneformaattia (turvallisempi ja vakaampi)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Käytä vanhaa (takaisinpäin yhteensopivaa) varmenneformaattia</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Poista allekirjoitukset</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">Retroshare-kutsu</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Ohje ystävän yhdistämisestä</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Voit kopioida tämän tekstin ja lähettää sen ystävällesi sähköpostilla tai muulla tavoin</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Varmenteesi on kopioitu leikepöydälle, liitä ja lähetä se ystävällesi sähköpostilla tai muulla tavoin</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Tallenna nimellä...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4027,11 +3444,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation>*** Ei mitään ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Käytä suorana lähteenä, kun saatavilla</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>IP-osoite:</translation>
     </message>
@@ -4041,7 +3454,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation>IP-osoite:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Näytä lisäasetukset</translation>
     </message>
@@ -4050,10 +3463,6 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Ystäväsi avaimen allekirjoittamisella ilmaiset luottamuksesi tähän ystävään muille ystävillesi. Se auttaa heitä päättämään salliako yhteydet siitä avaimesta perustuen sinun omaan luottamukseen. Avaimen allekirjoittaminen on täysin vapaaehtoista, eikä sitä voi perua, joten tee niin harkiten.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare käy ajoittain läpi ystäväluettelosi siirtojasi vastaavien selattavien tiedostojen varalta, jotta voitaisiin muodostaa suora siirtoyhteys. Tällaisessa tapauksessa ystäväsi tietää, että lataat tiedostoa.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Estääksesi toiminnan tämän ystävän tapauksessa, poista rasti tästä ruudusta. Voit silti muodostaa suoran siirtoyhteyden halutessasi, esim. lataamalla suoraan ystäväsi tiedostoluettelosta. Tätä asetusta sovelletaan kaikkiin saman solmun sijainteihin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4064,45 +3473,13 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tällä asetuksella varustetut vertaiset eivät voi muodostaa yhteyttä, jos heidän osoitteensa ei ole sallittujen luettelossa. Tämä suojelee sinua liikenteen välittämiseen perustuvilta hyökkäyksiltä. Asetuksen myötä hylätyt vertaiset raportoidaan &amp;quot;tietoturvasyötteen nimikkeisiin&amp;quot; Uutissyöte-alueella. Voit sieltä lisätä heidän IP:nsä sallittujen/estettyjen luetteloon. Tämä pätee saman solmun kaikkiin sijainteihin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Suosittele useita ystäviä toisilleen</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Ystäväsuositukset</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">Teksti alapuolella on Retroshare-varmenteesi. Sinun täytyy toimittaa se ystävällesi</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Viesti:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Suosittele ystäviä</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Vastaanottaja</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Ole hyvä ja valitse ainakin yksi ystävä suositeltavaksi.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Ole hyvä ja valitse ainakin yksi ystävä vastaanottajaksi.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Lisää avain avainnippuun</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Tämä avain on jo avainnipussasi</translation>
     </message>
@@ -4118,7 +3495,7 @@ lähettämiseen tälle vertaiselle,
 vaikkette ystävystyisikään.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Varmenteella on väärä versionumero. Muista, että versioiden 0.6 ja 0.5 verkot eivät ole keskenään yhteensopivia.</translation>
     </message>
@@ -4153,7 +3530,7 @@ vaikkette ystävystyisikään.</translation>
         <translation>Lisää IP sallittujen luetteloon</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>Ei IP-osoitetta tässä varmenteessa!</translation>
     </message>
@@ -4163,27 +3540,10 @@ vaikkette ystävystyisikään.</translation>
         <translation>&lt;p&gt;Varmenteessa ei ole IP-osoitetta. Etsintä ja DHT hakevat osoitteen. Vertainen aiheuttaa tietoturvavaroituksen Uutissyöte-välilehdessä, koska olet määrittänyt sallittujen luettelossa olemisen pakolliseksi. Voit sallia vertaisen IP-osoitteen Uutissyöte-välilehdeltä.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished">[Tuntematon]</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Varmenne lisätty %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Liitä ystäväsi varmenne leikepöydältä</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Varmenteen avaaminen epäonnistui:ei voitu lukea tiedostosta %1</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Varmenteen lataus epäonnistui: jotain on vialla %1</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4245,7 +3605,7 @@ vaikkette ystävystyisikään.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>UDP:n asetukset</translation>
     </message>
@@ -4281,7 +3641,7 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;voit sulkea sen.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Yhteysavustaja</translation>
     </message>
@@ -4291,17 +3651,20 @@ p, li { white-space: pre-wrap; }
         <translation>Väärä vertaistunniste</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Tuntematon tila</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Ei yhteyttä</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Symmetrisen NAT:in takana</translation>
     </message>
@@ -4311,12 +3674,14 @@ p, li { white-space: pre-wrap; }
         <translation>NAT:in takana &amp; ilman DHT:tä</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Verkon uudelleenkäynnistys</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>NAT:in takana</translation>
     </message>
@@ -4326,7 +3691,8 @@ p, li { white-space: pre-wrap; }
         <translation>Ei DHT:tä</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>VERKON TILA HYVÄ!</translation>
     </message>
@@ -4351,7 +3717,7 @@ p, li { white-space: pre-wrap; }
         <translation>Haetaan Retroshare-vertaisia</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Haku vaatii DHT:tä</translation>
     </message>
@@ -4643,7 +4009,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yritä tuoda täydellinen varmenne uudelleen</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4651,7 +4017,8 @@ p, li { white-space: pre-wrap; }
         <translation>Ei sovellu</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>VARMISTAMATON VÄLITYS!</translation>
     </message>
@@ -4661,7 +4028,7 @@ p, li { white-space: pre-wrap; }
         <translation>VARMISTAMATON VÄLITYS EIKÄ DHT:TÄ!</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Haetaan</translation>
     </message>
@@ -4697,12 +4064,12 @@ p, li { white-space: pre-wrap; }
         <translation>Piirin tiedot</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Piirin nimi, kirjoittajan yhteystiedot ja kutsuttujen jäsenten-luettelo ovat näkyviä kaikille kutsutuille jäsenille. Jos piiri ei ole yksityinen, se tulee olemaan näkyvä myös naapuripiireille, jotka isännöivät kutsuttuja jäseniä.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4722,7 +4089,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>Tunnisteet</translation>
     </message>
@@ -4742,18 +4109,18 @@ p, li { white-space: pre-wrap; }
         <translation>Suodata</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Nimimerkki</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Kutsutut jäsenet</translation>
     </message>
@@ -4768,15 +4135,7 @@ p, li { white-space: pre-wrap; }
         <translation>Tuntemasi ihmiset</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">Tunniste</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Tyyppi</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
@@ -4816,23 +4175,19 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Piirit voidaan rajoittaa vain toisen piirin jäsenille. Vain jäsenet toisesta piiristä saavat nähdä uuden piirin ja sen sisällön (jäsenluettelo, jne).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Näkyy ainoastaan jäsenille:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Anna piirillesi nimi</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Rajoituspiiriä ei valittuna</translation>
     </message>
@@ -4842,12 +4197,24 @@ p, li { white-space: pre-wrap; }
         <translation>Piirien rajoituksia ei valittuna</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Tuntematon]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Lisää</translation>
     </message>
@@ -4857,7 +4224,7 @@ p, li { white-space: pre-wrap; }
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Haku</translation>
@@ -4872,10 +4239,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Allekirjoitettu</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Tunnettujen solmujen allekirjoittama</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4892,10 +4255,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP-henkilöllisyys</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Nimetön tunniste</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4918,17 +4277,13 @@ p, li { white-space: pre-wrap; }
         <translation>Luo uusi piiri</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Luo</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP:n linkitetty tunniste</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Lisää jäsen</translation>
     </message>
@@ -4947,7 +4302,7 @@ p, li { white-space: pre-wrap; }
         <translation>Luo ryhmä</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Ryhmä nimi:</translation>
     </message>
@@ -4982,7 +4337,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Uusi kirjoitus kanavalle</translation>
     </message>
@@ -4992,7 +4347,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanavakirjoitus</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5053,23 +4408,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Vedä ja pudota ja paina Lisää tiedostoja -painiketta uusien tiedostojen hash-arvojen laskemiseksi.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Kopioi ja liitä Retroshare-linkkejä jaetuista tiedostoistasi.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Lisää liitettävä tiedosto</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Lisää kanavan näytekuva</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Viesti</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Aihe:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5155,17 +4498,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5184,17 +4527,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Tiedosto on jo lisätty ja tiivistetty (hash)</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Ole hyvä ja lisää aihe</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Lataa näytekuva</translation>
     </message>
@@ -5209,18 +4553,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Luo massatietoja</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Haluatko todella luoda %1 viestiä?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Olet aikeissa lisätä tiedostoja, joita et todellisuudessa jaa. Haluatko silti tehdä tämän?</translation>
     </message>
@@ -5254,7 +4592,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Lähetä viesti foorumiin</translation>
     </message>
@@ -5263,10 +4601,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Foorumi</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Aihe</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5287,8 +4621,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5307,7 +4641,7 @@ p, li { white-space: pre-wrap; }
         <translation>Voit liittää tiedostoja vetämällä ja pudottamalla niitä tähän ikkunaan</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5337,17 +4671,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Ei foorumia</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>Vastauksena</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Otsikko</translation>
     </message>
@@ -5401,7 +4735,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished">Lataa kuvatiedosto</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>Ei yhteensopiva tunniste tälle foorumille</translation>
     </message>
@@ -5411,8 +4745,8 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Mikään sinun henkilöllisyyksistä ei saa kirjoittaa tälle foorumille. Tämä voi johtua siitä, että foorumi on rajattu piirille, johon sinun henkilöllisyydet eivät kuulu tai foorumi-ilmaisimet vaativat PGP-allekirjoitetun henkilöllisyyden.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Luo massatietoja</translation>
     </message>
@@ -5421,10 +4755,6 @@ Haluatko hävittää tämän viestin?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Haluatko todella luoda %1 viestiä?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Lähetä</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5439,23 +4769,7 @@ Haluatko hävittää tämän viestin?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Luo keskusteluhuone</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Keskusteluhuone on hajautettu ja nimetön keskusteluryhmä. Kaikki osallistujat näkevät kaikki viestit. Kun huone on luotu, voit kutsua muita ystäviäsi Ystävät-välilehdeltä</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Huoneen nimi:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Huoneen aihe:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5490,7 +4804,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Luo</translation>
     </message>
@@ -5500,11 +4814,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Jos rastitat tämän, vain PGP-allekirjoitettuja tunnisteita voi käyttää huoneeseen liittymiseen ja siellä keskustelemiseen. Tämä rajoitus estää nimettömän roskaviestittämisen, koska osa huoneessa olevista ihmisistä pystyy paikantamaan roskaviestittäjän solmun.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>vaatii PGP-allekirjoitetut henkilöllisyydet</translation>
     </message>
@@ -5519,11 +4829,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Valitse ystävät ryhmäkeskusteluun.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Kutsutut ystävät</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Luo keskusteluhuone</translation>
@@ -5544,7 +4850,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Kontaktit:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Käytä henkilöllisyyttä:</translation>
     </message>
@@ -5552,17 +4858,17 @@ Haluatko hävittää tämän viestin?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Julkiset tiedot</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Sijainti:</translation>
     </message>
@@ -5572,12 +4878,12 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Sijaintitunniste:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Ohjelmiston versio:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Linjoilla alkaen:</translation>
     </message>
@@ -5597,12 +4903,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5612,7 +4913,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Muita tietoja</translation>
     </message>
@@ -5622,17 +4923,12 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished">Profiili</translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Varmenne</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5642,11 +4938,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Sisällytä allekirjoitukset</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Tallenna avain tiedostoon</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Vie henkilöllisyys</translation>
     </message>
@@ -5720,33 +5012,33 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP-sormenjälki:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Solmun tiedot</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP tunniste:</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Ystäväsolmut:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5785,14 +5077,6 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>Node</source>
         <translation>Solmu</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Luo uusi solmu...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">näytä tilastoikkuna</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5809,10 +5093,6 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Retroshare käyttää Bittorrentin DHT:tä välityspalvelimena yhteyksille. Se ei &quot;tallenna&quot; sinun IP:täsi DHT:n.				                        Sen sijaan DHT:tä käyttävät sinun ystäväsi saadakseen sinuun yhteyden samalla, kun se käsittelee normaaleja DHT-pyyntöjä. 												Tilailmaisin muuttuu vihreäksi heti, kun Retroshare DHT-vastauksen yhdeltäkin ystävältä.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5848,7 +5128,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6516,7 +5796,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Käynnistä tiedosto</translation>
     </message>
@@ -6524,38 +5804,38 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>vastaanottajalle</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>sivuuta kirjainkoko</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>pp.KK.vvvv</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>kB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6563,12 +5843,12 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Lausekevimpain</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Poista tämä lauseke</translation>
     </message>
@@ -6730,7 +6010,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Kuva</translation>
     </message>
@@ -6740,7 +6020,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Ääni</translation>
     </message>
@@ -6800,11 +6080,21 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Ystävien hakemistot</translation>
     </message>
@@ -6926,7 +6216,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation>Tunniste</translation>
     </message>
@@ -6961,10 +6251,6 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>Show State</source>
         <translation>Näytä tila</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">Luetetut solmut</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6972,7 +6258,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Näytä ryhmät</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Ryhmä</translation>
     </message>
@@ -7008,7 +6294,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Lisää ryhmään</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Haku</translation>
@@ -7024,7 +6310,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Lajittele tilan perusteella</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Profiilin tiedot</translation>
     </message>
@@ -7268,7 +6554,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Vahvista ystäväpyyntö</translation>
     </message>
@@ -7285,10 +6571,6 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Haku :</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7310,7 +6592,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Hae ystäviä</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Merkitse kaikki</translation>
     </message>
@@ -7321,16 +6603,134 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Merkitse mitään</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Nimi</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished">Osoite</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Tila</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Ystävysty</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished">Välityspalvelin ei ole käytössä tai on rikki.
+Ovatko kaikki palvelut päällä ja käynnissä??
+Tarkista myös porttisi!</translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Muokkaa tilaviestiä</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Kuulutus</translation>
     </message>
@@ -7413,33 +6813,38 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Palauta oletuskirjasin</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Avainnippu</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Verkko&lt;/h1&gt;                                       &lt;p&gt;Verkko-näkymä näyttää ystäväsolmusi: Retroshare-ystäväsolmut, jotka ovat yhdistettynä sinuun.     &lt;/p&gt;                                                       &lt;p&gt;Voit ryhmitellä solmusi ja näin hienosäätää pääsyä tietoihisi, sallia vain tiettyjen solmujen nähdä vain tietyt tiedostosi.&lt;/p&gt;     &lt;p&gt;Oikealla näet kolme hyödyllistä välilehteä:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Kuulutus lähettää viestejä kaikille linjoilla oleville ystävillesi samanaikaisesti&lt;/li&gt;                                   &lt;li&gt;Paikallinen verkko näyttää sinua ympäröivän verkoston, perustuen etsintätietoihin&lt;/li&gt;                       &lt;li&gt;Avainnippu sisältää keräämäsi solmuavaimet, joista useimmat ovat ystäväsolmujesi välittämiä&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retrosharen kuulutus: viestit lähetetään kaikille linjoilla oleville ystäville.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Verkkokaavio</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Aseta tilaviestisi tähän.</translation>
     </message>
@@ -7457,7 +6862,17 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Kaikki kentät ovat pakollisia ja vähintään 3 merkkiä</translation>
     </message>
@@ -7467,17 +6882,12 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Salasanat eivät täsmää</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Portti</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation>Ota BOB käyttöön</translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Tämä salasana on PGP:tä varten</translation>
@@ -7498,50 +6908,38 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Uuden varmenteesi luonti epäonnistui, ehkä PGP-salasanasi oli väärin!</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="vanished">Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation>PGP-avaimen pituus</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Laita vahva salasana tähän. Tämä salasana suojelee sinun yksityistä solmuavainta!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ole hyvä ja liikuta hiirtäsi ympäriinsä, jolloin autat keräämään satunnaisuutta mahdollisimman paljon. Vähintään 20% tarvitaan solmuavaimiesi luontiin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Normaali solmu</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">TOR/I2P piilotettu solmu</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sinun solmunimesi määrittää Retroshare-instanssin, joka&lt;/p&gt;&lt;p&gt;tulee toimimaan tässä tietokoneessa&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Use existing profile</source>
-        <translation type="vanished">Käytä olemassaolevaa profiilia</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Solmun nimi</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7561,12 +6959,12 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Profiilin nimi yksilöi sinut läpi verkoston.&lt;/p&gt;&lt;p&gt;Ystäväsi käyttävät sitä hyväksyäkseen yhteydet sinulta.&lt;/p&gt;&lt;p&gt;Voit luoda monia Retroshare-solmuja&lt;/p&gt;&lt;p&gt;samalla profiililla eri tietokoneille.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Vie tämä profiili</translation>
     </message>
@@ -7576,42 +6974,43 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämän pitäisi olla Tor Onion-osoite muotoa: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;tai I2P-osoite muodossa: [52 merkkiä].b32.i2p &lt;/p&gt;&lt;p&gt;Saadaksesi sellaisen määritä joko Tor tai I2P luomaan uuden piilotetun palvelu / palvelin-tunnelin. &lt;/p&gt;&lt;p&gt;Voit myös jättää tämän tyhjäksi nyt, mutta solmusi toimii ainoastaan, jos olet oikein määrittänyt Tor/I2P-palvelu osoitteen Asetukset-&amp;gt;Verkko-&amp;gt;Piilotetun palvelun asetusnäkymässä.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Henkilöllisyyksiä käytetään, kun kirjoitat keskusteluhuoneisiin, foorumeille ja kanavakommentteihin. &lt;/p&gt;&lt;p&gt;Ne myös vastaanottavat/lähettävät sähköpostia Retroshare-verkossa. Voit luoda&lt;/p&gt;&lt;p&gt;allekirjoitetun henkilöllisyyden nyt, tai tehdä sen myöhemmin, kun tarvitset sitä.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>Mene!</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation>Tekstiselite</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Lisäasetukset</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>piilotettu osoite</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Profiilisi on kytketty PGP-avainpariin. Retroshare sivuuttaa DSA-avaimet.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä on sinun yhteysportti.&lt;/p&gt;&lt;p&gt;Minkä tahansa arvon 1024 ja 65535 &lt;/p&gt;&lt;p&gt;väliltä pitäisi olla ok. Voit muuttaa sen myöhemmin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7659,13 +7058,13 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>Profiiliasi ei tallennettu. Virhe tapahtui.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Tuo profiili</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Luo uusi profiili ja uusi Retroshare-solmu</translation>
     </message>
@@ -7675,7 +7074,7 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>Luo uusi Retroshare-solmu</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation>Tor/I2P-osoite</translation>
     </message>
@@ -7710,7 +7109,7 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7720,12 +7119,7 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Solmun luonti on kytketty pois päältä kunnes kaikki kentät ovat asetettu oikein.&lt;/p&gt;</translation>
     </message>
@@ -7735,12 +7129,7 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>&lt;p&gt;Solmua ei luoda ennen kuin tarpeeksi satunnaisuutta on kerätty. Ole hyvä ja liikuta hiirtäsi ympäriinsä kunnes saavutat vähintään 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation>I2P-instanssiosoite, jossa BOB on kytketty päälle</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation>I2P-instanssiosoite</translation>
     </message>
@@ -7966,36 +7355,13 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>Aloittaminen</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Kutsu ystäviä</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Retroshare ei ole mitään ilman ystäviä. Paina nappia aloittaaksesi prosessin.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Lähetä ystävillesi kutsu ja &amp;quot;varmennetunnisteesi&amp;quot; sähköpostilla.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Pyydä myös heiltä vastaava kutsu... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Saat yhteyden ystävääsi vain, jos lisäätte toisenne varmenteet.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Lisää ystäviäsi Retroshareen</translation>
     </message>
@@ -8005,136 +7371,103 @@ p, li { white-space: pre-wrap; }
         <translation>Lisää ystäviä</translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Kun olette linjoilla ystävienne kanssa samanaikaisesti, Retroshare yhdistää teidät automaattisesti!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Ohjelman on löydettävä Retroshare-verkko, jotta yhteyksien luominen on mahdollista.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Tämä vie 5-30 minuuttia, kun käynnistät Retrosharen ensimmäistä kertaa&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;DHT-merkki tilarivillä muuttuu vihreäksi, kun yhteyksien luominen on mahdollista.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Muutaman minuutin jälkeen NAT-merkki (myös tilarivillä) vaihtuu keltaisesta vihreään.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Jos se pysyy punaisena, sinulla on palomuuri, jonka läpi Retroshare ei pääse.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Katso Lisäapua-osiosta neuvoja yhteyden luomiseksi.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Ota yhteys ystäviin</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Voit parantaa Retrosharen suorituskykyä avaamalla ulkoisen portin.  &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Tämä nopeuttaa yhteyksiä ja sallii useampien käyttäjien olla yhteydessä sinuun. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Helpoin tapa on ottaa UPnP käyttöön langattoman tukiasemasi tai reitittimesi asetuksissa.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Jokainen reititin on erilainen, joten etsi ohjeet reitittimellesi internetin hakukoneilla.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Jos et ymmärrä edellisestä mitään, älä huoli, koska Retroshare toimii joka tapauksessa.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Vaativa: Avaa palomuurin portti</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Onko sinulla ongelmia päästä Retrosharen kanssa alkuun?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) katso usein kysytyt kysymykset (FAQ Wiki). Se on hieman vanhentunut, yritämme ajantasaistaa sitä.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) tutustu keskustelupalstaamme. Kysele tai keskustele ominaisuuksista.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) kokeile Retrosharen sisäisiä keskustelupalstoja &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- Nämä ilmestyvät näkyviin, kun olet saanut yhteyden ystäviisi.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) jos olet edelleen jumissa, lähetä meille sähköpostia.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Nauti Retrosharetuksesta&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Ota yhteys ystäviin</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Kun ystäväsi lähettävät sinulle kutsunsa, klikkaa avataksesi Lisää ystäviä -ikkuna.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Kopioi ja liitä ystäviesi &amp;quot;varmennetunnisteet&amp;quot; ikkunaan ja lisää heidät ystäviksesi.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Vaativa: Avaa palomuurin portti</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Lisää ohjeita ja tukea</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Avaa RS-verkkosivu</translation>
     </message>
@@ -8159,7 +7492,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sähköpostipalaute</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>Retroshare-kutsu</translation>
     </message>
@@ -8209,12 +7542,12 @@ p, li { white-space: pre-wrap; }
         <translation>Palaute Retrosharelle</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>Retrosharen tuki</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Sillä on monia ominaisuuksia, mukaan lukien keskustelu, viestit,</translation>
     </message>
@@ -8338,7 +7671,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Näytä ryhmäkeskustelu</translation>
     </message>
@@ -8346,7 +7679,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[Tuntematon]</translation>
     </message>
@@ -8512,19 +7845,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Voit antaa ystäviesi tietää foorumistasi jakamalla sen heidän kanssaan. Valitse ystävät, joiden kanssa haluat jakaa foorumin.</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">Jaa keskustelunaihe ylläpitooikeuksia</translation>
-    </message>
-    <message>
-        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
-        <translation type="vanished">Voit sallia ystäviesi muokata aihetta. Valitse heidät alla olevasta luettelosta. Huomautus: Lähetettyjen ylläpito-oikeuksia ei voi kumota.</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Otsikko</translation>
     </message>
@@ -8537,12 +7862,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8567,35 +7892,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">Laskeva järjestys</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">Nouseva järjestys</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Järjestä nimen mukaan</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Järjestä suosion mukaan</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Järjestä viimeisimmän viestin mukaan</translation>
-    </message>
-    <message>
-        <source>Sort by Number of Posts</source>
-        <translation type="vanished">Järjestä viestien määrän mukaan</translation>
-    </message>
-    <message>
-        <source>Sort by Unread</source>
-        <translation type="vanished">Järjestä lukemattomien mukaan</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Olet ylläpitäjä (muokkaa nimiä ja kuvaksia käyttäen Muokkaa-valikkoa)</translation>
     </message>
@@ -8610,14 +7907,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Tunniste</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Viimeisin viesti</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
@@ -8628,17 +7925,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Suosio</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Ei koskaan</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Näytä</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8651,7 +7944,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>ja</translation>
     </message>
@@ -8787,7 +8080,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanavat</translation>
@@ -8798,26 +8091,22 @@ p, li { white-space: pre-wrap; }
         <translation>Luo kanava</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Ota käyttöön automaattinen lataus</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Kanavani</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Kanavat&lt;/h1&gt;        &lt;p&gt;Kanavat sallivat sinun lähettää dataa (esim. elokuvia, musiikkia) , jotka leviävät verkostossa.&lt;/p&gt;                &lt;p&gt;Voit nähdä mitä kanavia ystäväsi tilaavat, ja automaattisesti edelleenlähettää tilatut kanavat ystävillesi. Tämä edistää verkoston hyviä kanavia.&lt;/p&gt;    &lt;p&gt;Ainoastaan kanavan luoja pystyy lähettämään kyseiselle kanavalle. Muut vertaiset verkostossa pystyvät vain lukemaan sitä, ellei kanava ole yksityinen. Kaikesta huolimatta voit jakaa 	 lähetys- tai luku-oikeuksia ystäviesi Retroshare-solmuille.&lt;/p&gt;	 &lt;p&gt;Kanavista voidaan tehdä nimettömiä, tai niihin voidaan liittää Retroshare-henkilöllisyys, että lukijat voivat yhteyden sinuun tarvittaessa.	 Salli &quot;Salli kommentit&quot;, jos haluat käyttäjien kommentoivan viestejäsi.&lt;/p&gt;    &lt;p&gt;Kanavan viestit säilyvät %1 päivää, and pidetään ajan tasalla %2 päivän ajan, ellet sinä muuta tätä.&lt;/p&gt;                </translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Tilatut kanavat</translation>
     </message>
@@ -8837,12 +8126,12 @@ p, li { white-space: pre-wrap; }
         <translation>Valitse kanavan lataushakemisto</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Ota automaattinen lataus pois käytöstä</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>Aseta lataushakemisto</translation>
     </message>
@@ -8877,22 +8166,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Toista</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Avaa kansio</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
@@ -8912,17 +8201,17 @@ p, li { white-space: pre-wrap; }
         <translation>Tarkistetaan</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Oletko varma, että haluat peruuttaa ja poistaa tiedoston?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Kansiota ei voida avata</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Toista tiedosto</translation>
     </message>
@@ -8932,37 +8221,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Tiedostoa %1 ei löydy sijainnista.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Lomake</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Tiedostonimi</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Koko</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Otsikko</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Julkaistu</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Tila</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Luo uusi kanava</translation>
     </message>
@@ -9000,9 +8262,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Tilaa kanava</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9016,7 +8288,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -9031,7 +8303,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanavan kuvaus</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Ladataan</translation>
     </message>
@@ -9046,8 +8318,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Uusi kanava</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Ei koskaan</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -9058,7 +8331,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Uusi kommentti:</translation>
     </message>
@@ -9079,7 +8352,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Toista</translation>
     </message>
@@ -9135,28 +8408,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Tiedostot</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Varoitus! Sinulla on alle %1 tuntia ja %2 minuuttia aikaa, ennen kuin tämä tiedosto poistetaan. Harkitse sen tallentamista.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Kommentti</translation>
     </message>
@@ -9171,21 +8440,17 @@ p, li { white-space: pre-wrap; }
         <translation>En pidä tästä</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Ladataan</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation>Kommentit</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9210,139 +8475,16 @@ p, li { white-space: pre-wrap; }
         <translation>Toista media</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Lähetä viesti kanavalle</translation>
-    </message>
-    <message>
-        <source>Add new post</source>
-        <translation type="vanished">Lisää uusi kirjoitus</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Ladataan</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Hae kanavia</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Otsikko</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Hae otsikolla</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Viesti</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Hae viestejä</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Tiedostonimi</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Hae tiedostonimiä</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Ei kanavaa valittuna</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Ei koskaan</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Julkinen</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle &quot;</source>
-        <translation type="vanished">Rajoitettu piirin jäseniin &quot;</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle </source>
-        <translation type="vanished">Rajoitettu piirin jäseniin</translation>
-    </message>
-    <message>
-        <source>Your eyes only</source>
-        <translation type="vanished">Vain silmillesi</translation>
-    </message>
-    <message>
-        <source>You and your friend nodes</source>
-        <translation type="vanished">Sinä ja ystäväsolmusi</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Ota automaattinen lataus pois käytöstä</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Ota käyttöön automaattinen lataus</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Näytä syötteet</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Näytä tiedostot</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Ylläpitäjä:</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Viimeisin viesti:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">tuntematon</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Jakelu:</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Syötteet</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Tiedostot</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Tilaajat</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Kuvaus:</translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">Viestit (naapurisolmuissa):</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Lähetä viesti kanavalle</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished">Lisää uusi kirjoitus</translation>
     </message>
@@ -9412,7 +8554,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9448,7 +8590,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentit</translation>
     </message>
@@ -9463,13 +8605,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Syötteet</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9484,7 +8626,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9499,7 +8641,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9559,12 +8701,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9639,12 +8791,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Sinä ja ystäväsolmusi</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Tilattu</translation>
     </message>
@@ -9695,17 +8848,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9725,27 +8878,11 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Poista kohde</translation>
     </message>
-    <message>
-        <source>for identity </source>
-        <translation type="vanished">henkilöllisyydelle</translation>
-    </message>
-    <message>
-        <source>You received a membership request for circle:</source>
-        <translation type="vanished">Olet vastaanottanut jäsenyyspyydön piiriin:</translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Myönnä jäsenyyspyyntö</translation>
     </message>
-    <message>
-        <source>Revoke membership request</source>
-        <translation type="vanished">Kumoa jäsenyyspyyntö</translation>
-    </message>
-    <message>
-        <source>You received an invitation for circle:</source>
-        <translation type="vanished">Olet vastaanottanut kutsun piiriin:</translation>
-    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -9836,7 +8973,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Kommenttisäiliö</translation>
     </message>
@@ -9849,7 +8986,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9879,7 +9016,7 @@ p, li { white-space: pre-wrap; }
         <translation>Päivitä</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Kommentti</translation>
@@ -9918,7 +9055,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Vastaa kommenttiin</translation>
     </message>
@@ -9942,6 +9079,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Äänestä alas</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9951,7 +9103,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lisää kommentti</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9980,26 +9132,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Kommentti&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Allekirjoittaja</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -10028,7 +9164,7 @@ before you can comment</source>
 kuin voit kommentoida</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10070,14 +9206,6 @@ kuin voit kommentoida</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Lisää ylläpitäjiä foorumiin</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Valitse foorumin ylläpitäjiä</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -10087,7 +9215,7 @@ kuin voit kommentoida</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Tilaa foorumi</translation>
     </message>
@@ -10103,7 +9231,7 @@ kuin voit kommentoida</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -10123,8 +9251,9 @@ kuin voit kommentoida</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Ladataan</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10155,13 +9284,13 @@ kuin voit kommentoida</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Aihe:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Lopeta foorumin tilaus</translation>
     </message>
@@ -10172,7 +9301,7 @@ kuin voit kommentoida</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -10192,21 +9321,17 @@ kuin voit kommentoida</translation>
         <translation>Vastauksena:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Ladataan</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Foorumisyöte</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
@@ -10219,63 +9344,66 @@ kuin voit kommentoida</translation>
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Aloita uusi viestiketju valitussa foorumissa</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Hae foorumeista</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Viimeisin viesti</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation>Uusi viestiketju</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Ketjunäkymä</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Tasanäkymä</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Otsikko</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Päiväys</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Kirjoittaja</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Tallenna kuva</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Ladataan</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10285,12 +9413,7 @@ kuin voit kommentoida</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Vastaa viestiin</translation>
     </message>
@@ -10314,10 +9437,6 @@ kuin voit kommentoida</translation>
         <source>Download all files</source>
         <translation>Lataa kaikki tiedostot</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Seuraava lukematon</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10334,35 +9453,23 @@ kuin voit kommentoida</translation>
         <translation>Hae kirjoittajaa</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Sisältö</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Hae sisältöä</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Foorumin tilaaminen kerää 	                                        kaikki saatavilla olevat viestit tilaajaystäviltäsi, ja tekee 	                                        foorumista näkyvän kaikille muille ystävillesi.&lt;/p&gt;&lt;p&gt;Myöhemmin voit peruuttaa tilauksen foorumin kontekstivalikosta vasemmalla.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Ei nimeä</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Vastaa</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10405,20 +9512,12 @@ kuin voit kommentoida</translation>
         <translation>Kopioi Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Laajenna</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Pannassa]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[tuntematon]</translation>
     </message>
@@ -10448,8 +9547,8 @@ kuin voit kommentoida</translation>
         <translation>Vain silmillesi</translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10463,26 +9562,6 @@ kuin voit kommentoida</translation>
         <source>Anti-spam</source>
         <translation>Roskapostin esto</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Muokattu viesti ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Nimetön</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">allekirjoitettu</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">ei mitään</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Puuttuva viesti ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10552,16 +9631,12 @@ kuin voit kommentoida</translation>
         <translation>Alkuperäinen viesti</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation>Uusi viestiketju</translation>
     </message>
     <message>
-        <source>Read status</source>
-        <translation type="vanished">Lue tilaviesti</translation>
-    </message>
-    <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation>Muokkaa</translation>
     </message>
@@ -10622,7 +9697,7 @@ kuin voit kommentoida</translation>
         <translation>Kirjoittajan maine</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10642,7 +9717,7 @@ kuin voit kommentoida</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Nimettömät/tuntemattomat viestit lähetetään edelleen, jos maine on myönteinen</translation>
     </message>
@@ -10694,7 +9769,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10704,7 +9779,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10719,29 +9794,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information for this identity is currently missing.</source>
-        <translation type="vanished">Tämän henkilöllisyyden tiedot ovat tällä hetkellä kateissa.</translation>
-    </message>
-    <message>
-        <source>You have banned this ID. The message will not be
-displayed nor forwarded to your friends.</source>
-        <translation type="vanished">Olet laittanut tämän tunnisteen pannaan. Viestiä ei
-näytetä eikä lähetä eteenpäin ystävillesi.</translation>
-    </message>
-    <message>
-        <source>You have not set an opinion for this person,
- and your friends do not vote positively: Spam regulation 
-prevents the message to be forwarded to your friends.</source>
-        <translation type="vanished">Et ole asettanut mielipidettä tästä henkilöstä,
- ja ystäväsi eivät äänestä myönteisesti: Roskapostin säätely 
-estää viestin lähettämisen eteenpäin ystävillesi.</translation>
-    </message>
-    <message>
-        <source>Message will be forwarded to your friends.</source>
-        <translation type="vanished">Viesti tullaan välittämään ystävillesi.</translation>
-    </message>
-    <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation>(Viimeisin) </translation>
     </message>
@@ -10750,10 +9803,6 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>(Old) </source>
         <translation>(Vanha)</translation>
     </message>
-    <message>
-        <source>You cant act on the author to a non-existant Message</source>
-        <translation type="vanished">Et voi ottaa toimia olemattoman viestin kirjoittajan suhteen</translation>
-    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -10811,12 +9860,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Foorumit&lt;/h1&gt;               			&lt;p&gt;Retrosharen foorumit toimivat hajautetusti&lt;/p&gt;    			&lt;p&gt;Näet foorumit, jotka ystäväsi ovat tilanneet ja vastaavasti välität tilaamasi foorumit      			 ystävillesi. Tällä tavoin kiinnostavien foorumeiden näkyvyys lisääntyy automaattisesti.&lt;/p&gt;                        &lt;p&gt;Foorumiviestit pidetään %1 päivän ajan ja ajantasaistetaan viimeisiltä %2 päivältä ellet määritä sitä toisin.&lt;/p&gt;                </translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Foorumi</translation>
@@ -10847,35 +9896,16 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Muut foorumit</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Odotetaan</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Noudetaan</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Ladataan</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Lisää kuvake</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Avaimen vastaanottajat voivat julkaista rajoitetuille ryhmille ja voivat nähdä sekä julkaista yksityisille kanaville</translation>
     </message>
@@ -10884,22 +9914,14 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>Share Publish Key</source>
         <translation>Jaa julkaisuavain</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">rastita vertaiset, joiden kanssa haluat jakaa yksityisen julkaisuavaimesi</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Jaa avain</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Viestin leviäminen</translation>
     </message>
@@ -10907,7 +9929,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Julkinen</translation>
     </message>
@@ -10926,14 +9948,6 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>New Thread</source>
         <translation>Uusi viestiketju</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Vaaditaan</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Salatut viestit</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10975,7 +9989,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Roskaposti-suojaus</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Kommentit:</translation>
     </message>
@@ -10998,7 +10012,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Roskapostin esto:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11014,12 +10028,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation>Rajoitettu piiriin:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation>Rajattu ystäviisi</translation>
     </message>
@@ -11036,23 +10050,23 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>Viestiseuranta</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>PGP-allekirjoitus vaaditaan</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Ei koskaan</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation>Vain ryhmässä olevat ystäväsolmut</translation>
     </message>
@@ -11068,30 +10082,28 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Ole hyvä ja lisää nimi</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>PGP-allekirjoitus tunnetulta tunnisteelta vaaditaan </translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Lataa ryhmän logo</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Vahvista ryhmän muutokset</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Ryhmän metatietojen luonti epäonnistui - tarkista tiedot</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Käytetään palautteen lähettämiseen</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Omistaja:</translation>
     </message>
@@ -11101,12 +10113,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Aseta kuvaava kuvaus tähän</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Tietoja</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>Tunniste</translation>
     </message>
@@ -11116,7 +10128,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Viimeisin viesti</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Viestit leviävät ystäväsolmujen ulkopuolelle, niin kauan kun ihmiset tilaavat kanavan/foorumin/lähetetyn, jolle luot sisältöä.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -11191,7 +10203,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Haittaa allekirjoittamattomia tunnisteita ja tunnisteita tuntemattomista solmuista</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Suosio</translation>
     </message>
@@ -11207,27 +10224,22 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Luo</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Kirjoittaja</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>GxsTunnisteselite</translation>
     </message>
@@ -11235,7 +10247,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Ladataan</translation>
     </message>
@@ -11295,7 +10307,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Muokkaa tietoja</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation>Ajantasaista viestit ajalta...</translation>
     </message>
@@ -11352,16 +10364,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share publish permissions</source>
-        <translation type="vanished">Jaa julkaisuoikeudet</translation>
-    </message>
-    <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopioi Retroshare-linkki</translation>
     </message>
@@ -11384,7 +10392,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Ei allekirjoitusta</translation>
     </message>
@@ -11397,40 +10405,24 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Ladataan</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Ei löydy</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Ei allekirjoitusta</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Pannassa]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Varmennus</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>tuntematon avain</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">nimetön</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11440,7 +10432,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Henkilöllisyyden&amp;nbsp;nimi</translation>
     </message>
@@ -11454,16 +10451,20 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>Node</source>
         <translation type="unfinished">Solmu</translation>
     </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">Allekirjoittama</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Tuntematon]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11475,7 +10476,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11523,17 +10524,13 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Tuntematon]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Ladataan</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11650,10 +10647,6 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>Group ID / Author</source>
         <translation>Ryhmätunniste / Kirjoittaja</translation>
     </message>
-    <message>
-        <source>Number of messages / Publish TS</source>
-        <translation type="vanished">Viestien määrä / Julkaise liikennetilastot</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -11669,10 +10662,6 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>Popularity</source>
         <translation>Suosio</translation>
     </message>
-    <message>
-        <source>Details</source>
-        <translation type="vanished">Tiedot</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -11705,33 +10694,6 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Ei</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">Varmennetut tunnelit:</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">Tunnelitunniste: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">tila: %1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">lähetetty yhteensä: %1 tavua</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">vastaanotettu yhteensä: %1 tavua</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Tuntematon vertainen</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11944,48 +10906,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>About</source>
         <translation>Tietoja</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Retroshare on avoimen lähdekoodin alustariippumaton, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;yksityinen ja turvallinen hajautettu viestintäalusta.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Se antaa sinun jakaa turvallisesti ystäväsi, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;käyttäen luottamuksen verkkoa todentaakseen vertaiset ja OpenSSL kaiken viestinnän salaukseen. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Retroshare tarjoaa tiedostojen jakamisen, keskustelun, viestit ja kanavat&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Hyödyllisiä ulkoisia linkkejä lisätietoja varten:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare verkkosivu&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retrosharen foorumi&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare projekti-sivu&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare työryhmän blogi&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare kehittäjien Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+37"/>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -12001,7 +10927,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Tekijät</translation>
     </message>
@@ -12020,7 +10946,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -12033,36 +10959,6 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Retroshare käännökset:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Retroshare verkkosivuston kääntäjät:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Ruotsi: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Saksa: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Puola: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -12128,12 +11024,12 @@ p, li { white-space: pre-wrap; }
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+158"/>
+        <location line="+165"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12148,7 +11044,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12157,32 +11053,12 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Did you receive a certificate from a friend?</source>
-        <translation type="vanished">Saitko varmenteen ystävältäsi?</translation>
-    </message>
-    <message>
-        <source>Add friends certificate</source>
-        <translation type="vanished">Lisää ystäväsi varmenne</translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">Lisää varmenne-tiedosto</translation>
-    </message>
-    <message>
-        <source>Share your RetroShare Key</source>
-        <translation type="vanished">Jaa Retroshare-avaimesi</translation>
-    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
-        <translation type="vanished">Teksti alapuolella on Retroshare-varmenteesi. Lähetä se ystävillesi</translation>
-    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -12193,20 +11069,12 @@ yksityinen ja turvallinen hajautettu viestintäalusta.
 </translation>
     </message>
     <message>
-        <source>Launch startup wizard</source>
-        <translation type="vanished">Käynnistä ohjattu aloitus</translation>
-    </message>
-    <message>
-        <source>Do you need help with RetroShare?</source>
-        <translation type="vanished">Tarvitsetko apua Retrosharen kanssa?</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+134"/>
         <source>Open Web Help</source>
         <translation>Avaa verkkotuki (englanniksi)</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Kopioi varmenteesi leikepöydälle</translation>
     </message>
@@ -12216,7 +11084,7 @@ yksityinen ja turvallinen hajautettu viestintäalusta.
         <translation>Tallenna varmenteesi tiedostoon</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>Lähetä sähköpostitse</translation>
     </message>
@@ -12236,13 +11104,37 @@ yksityinen ja turvallinen hajautettu viestintäalusta.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12254,17 +11146,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+57"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12273,19 +11160,11 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Tervetuloa Retroshareen!&lt;/h1&gt;   &lt;p&gt;Sinun pitää &lt;b&gt;tehdä ystäviä&lt;/b&gt;! Kun olet luonut ystäväverkoston tai liittynyt olemassa olevaan verkostoon	  voit vaihtaa tiedostoja, keskustella, jutustella foorumeilla, jne. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;Näin tehdäksesi, kopioi varmenteesi tällä sivulla ja lähetä se ystävillesi, ja lisää ystäviesi varmenteet.&lt;/p&gt;    &lt;p&gt;Toinen vaihtoehto on etsiä internetistä &quot;Retroshare chat servers&quot; (itsenäisesti hallinnoituja). Nämä palvelimet antavat sinun vaihtaa 	varmenteita palvelin Retroshare-solmun kanssa, jonka kautta	  voit nimettömästi tavata muita ihmisiä.&lt;/p&gt; </translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Retroshare-kutsu</translation>
     </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Varmenteesi on kopioitu leikepöydälle, liitä ja lähetä se ystävällesi sähköpostilla tai muulla tavoin</translation>
-    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -12557,14 +11436,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Kaikki</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Maine</translation>
     </message>
@@ -12574,12 +11453,12 @@ p, li { white-space: pre-wrap; }
         <translation>Haku</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>Nimetön tunniste</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Luo uusi henkilöllisyys</translation>
     </message>
@@ -12589,7 +11468,7 @@ p, li { white-space: pre-wrap; }
         <translation>Luo uusi piiri</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>Henkilöt</translation>
     </message>
@@ -12604,27 +11483,27 @@ p, li { white-space: pre-wrap; }
         <translation>Henkilö</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation>Pannaus-vaihtoehto:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Automaattisesti pannaa kaikki henkilöllisyydet, jotka ovat saman solmun allekirjoittamia</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation>Ystävän äänet:</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Myönteisiä ääniä</translation>
     </message>
@@ -12640,29 +11519,39 @@ p, li { white-space: pre-wrap; }
         <translation>Kielteisiä ääniä</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation>Käyttötilastot</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Piirit</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Piirin nimi</translation>
     </message>
@@ -12682,18 +11571,20 @@ p, li { white-space: pre-wrap; }
         <translation>Henkilökohtaiset piirit</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Muokkaa henkilöllisyyttä</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Poista henkilöllisyys</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Keskustele vertaisen kanssa</translation>
     </message>
@@ -12703,98 +11594,78 @@ p, li { white-space: pre-wrap; }
         <translation>Käynnistää etäisen keskustelun vertaisen kanssa</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>Omistajasolmun tunniste:</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Henkilöllisyyden nimi:</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>Henkilöllisyystunniste</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Lähetä viesti</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Henkilöllisyyden tiedot</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Henkilöllisyystunniste:</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Omistajasolmun nimi:</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation>Luo uusi...</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Tyyppi:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Lähetä kutsu</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Naapurisolmujen mielipiteiden keskiarvo tästä henkilöllisyydestä. Kielteinen on huono,&lt;/p&gt;&lt;p&gt;myönteinen on hyvä. Nolla on neutraali.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>Sinun mielipiteesi:</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Sinun oma mielipiteesi henkilöllisyydestä määrittää kyseisen henkilöllisyyden näkyvyyden itsellesi ja ystäväsolmuille. Sinun oma mielipiteesi jaetaan ystäviesi kesken ja käytetään maineen pisteytyksen laskemiseen: Jos mielipiteesi henkilöllisyydestä on neutraali, maineen pisteytys lasketaan ystäviesi myönteisten ja kielteisten mielipiteiden erotuksesta. Jos ei, sinun oma mielipiteesi antaa pisteytyksen.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Kokonaispisteytystä käytetään keskusteluauloissa, foorumeilla ja kanavilla toimien määrittämiseen kullekin tietylle henkilöllisyydelle. Kun kokonaispisteytys on alle -1, henkilöllisyys asetetaan pannaan, joka estää tämän henkilöllisyyden kirjoittamien kaikkien viestien ja foorumien/kanavien eteenpäin välityksen, kumpaankin suuntaan. Jotkin foorumit omaavat myös erikois roskapostinestoilmaisimia, jotka vaativat ei-kielteisen maineen tason, tehden niistä herkempiä huonoille mielipiteille. Pannassa olevat henkilöllisyydet vähitellen menettävät toimeliaisuuden ja lopulta katoavat (5 päivän jälkeen).&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Sinä voit muuttaa kynnyksiä ja toimettomuuden aikaa henkilöllisyyksien poistamiseen asetuksista -&amp;gt; Ihmiset. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Kielteinen</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Neutraali</translation>
     </message>
@@ -12805,17 +11676,17 @@ p, li { white-space: pre-wrap; }
         <translation>Myönteinen</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kokonaismainepisteytys, mukaan laskien sinun sekä ystäviesi.&lt;/p&gt;&lt;p&gt;Kielteinen on huono, myönteinen on hyvä. Nolla on neutraali. Jos pisteytys on liian alhainen,&lt;/p&gt;&lt;p&gt;henkilöllisyys merkitään huonoksi, ja tullaan suodattamaan pois foorumeilta, keskusteluauloista,&lt;/p&gt;&lt;p&gt;kanavilta, jne.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Yhteensä:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Nimetön</translation>
     </message>
@@ -12830,24 +11701,24 @@ p, li { white-space: pre-wrap; }
         <translation>Hae tunnistetta</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Tämä henkilöllisyys on sinun omistamasi</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>Minun henkilöllisyyteni</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation>Näytä kohteet</translation>
     </message>
@@ -12862,7 +11733,12 @@ p, li { white-space: pre-wrap; }
         <translation>Linkitetty solmuuni</translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>Muut piirit</translation>
     </message>
@@ -12872,7 +11748,7 @@ p, li { white-space: pre-wrap; }
         <translation>Piirit joihin kuulun</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>Piiri tunniste:</translation>
     </message>
@@ -12947,7 +11823,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ei jäsen (ei ole pääsyä tälle piirille rajoitettuun dataan)</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>Henkilöllisyystunniste:</translation>
     </message>
@@ -12977,7 +11853,7 @@ p, li { white-space: pre-wrap; }
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>Kutsuttu</translation>
     </message>
@@ -12992,7 +11868,7 @@ p, li { white-space: pre-wrap; }
         <translation>Jäsen</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>Muokkaa piiriä</translation>
     </message>
@@ -13040,7 +11916,7 @@ p, li { white-space: pre-wrap; }
         <translation>Myönnä jäsenyys</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -13051,7 +11927,7 @@ Sinun pitäisi hankkiutua siitä eroon ja käyttää uutta.
 Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Tuntematon solmu]</translation>
@@ -13094,7 +11970,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Nimetön henkilöllisyys</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13174,7 +12050,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation>tietoa</translation>
     </message>
@@ -13190,29 +12066,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Kopioi henkilöllisyys leikepöydälle</translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Lähetä kutsu?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Haluatko todella lähettää kutsun varmenteellasi?</translation>
-    </message>
-    <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Pannassa</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown ID:</source>
-        <translation type="vanished">Tuntematon tunniste:</translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation>positiviinen</translation>
     </message>
@@ -13256,19 +12115,11 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>Forums</source>
         <translation>Foorumit</translation>
     </message>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Lähetetty</translation>
-    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Keskustelu</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Tuntematon</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13289,14 +12140,6 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>Kirjoittajan allekirjoituksen luonti palvelussa %1</translation>
     </message>
-    <message>
-        <source>Message/vote/comment</source>
-        <translation type="vanished">Viesti/ääni/kommentti</translation>
-    </message>
-    <message>
-        <source>%1 in %2 tab</source>
-        <translation type="vanished">%1 %2 välilehdessä</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -13317,19 +12160,11 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Allekirjoitus etäisessä tunnelijärjestelmässä.</translation>
     </message>
-    <message>
-        <source>Update of identity data.</source>
-        <translation type="vanished">Henkilöllisyys-datan päivitys.</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Yleinen allekirjoituksen vahvistaminen.</translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">Yleinen allekirjoitus.</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -13341,11 +12176,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Yleinen salauksen purku.</translation>
     </message>
     <message>
-        <source>Membership verification in circle %1.</source>
-        <translation type="vanished">Jäsenyyden varmistus piirissä %1.</translation>
-    </message>
-    <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13395,21 +12226,21 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Hei,&lt;br&gt;haluan olla ystäväsi Retrosharessa.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Ihmiset</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Sinun avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>Linkitetty naapurisolmuihin</translation>
     </message>
@@ -13419,7 +12250,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Linkitetty etäisiin solmuihin</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Linkitetty ystävä Retroshare-solmuun</translation>
     </message>
@@ -13434,7 +12265,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Linkitetty tuntemattomaan Retroshare-solmuun</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Keskustele henkilön kanssa</translation>
     </message>
@@ -13449,12 +12280,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Tämä henkilö torjui etäisen keskustelun</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Viimeksi käytetty:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 tiedettyä PGP:tä</translation>
     </message>
@@ -13474,12 +12305,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Haluatko todella poistaa tämän henkilöllisyyden?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Omistama</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Solmun nimi:</translation>
     </message>
@@ -13489,7 +12320,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Solmun tunniste :</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>Tuhotaanko?</translation>
     </message>
@@ -13497,7 +12328,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Nimimerkki</translation>
     </message>
@@ -13527,7 +12358,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Nimimerkki</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13537,12 +12368,19 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Uusi henkilöllisyys</translation>
     </message>
@@ -13556,7 +12394,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13566,7 +12404,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Ei sovellu</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Muokkaa henkilöllisyyttä</translation>
@@ -13577,27 +12420,27 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished">Päivitä</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13617,7 +12460,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13627,11 +12470,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Virhe haettaessa avainta!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Virhe: viallinen avaimen tunniste</translation>
     </message>
@@ -13646,7 +12485,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Tuntematon oikea nimi</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Luo uusi henkilöllisyys</translation>
     </message>
@@ -13656,10 +12495,15 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Poista</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13685,7 +12529,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Lisää</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Luo</translation>
     </message>
@@ -13695,17 +12539,13 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Sinun avatar</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Aseta Avatar</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>Linkitetty profiiliisi</translation>
     </message>
@@ -13715,7 +12555,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Sinulla voi olla yksi tai useampi henkilöllisyys. Niitä käytetään usein kirjoitettaessa keskusteluhuoneisiin, foorumeille ja kanavakommentteihin. Ne toimivat kohteena etäiselle keskustelulle ja Retrosharen etäiselle postijärjestelmälle.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Nimimerkki on liian lyhyt. Syötä vähintään %1 merkkiä.</translation>
     </message>
@@ -13774,10 +12614,6 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>PGP name:</source>
         <translation>PGP-nimi:</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">GXS tunniste:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13793,7 +12629,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Kopioi</translation>
     </message>
@@ -13803,12 +12639,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Merkitse kaikki</translation>
     </message>
@@ -13827,26 +12663,38 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>Quote</source>
         <translation type="unfinished">Lainaa</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Lähetä</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Tallenna kuva</translation>
     </message>
     <message>
         <location line="-7"/>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Ei voi tallentaa kuvaa, virheellinen tiedostonnimi</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>Ei ole kuva</translation>
     </message>
@@ -13864,27 +12712,32 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Portti:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Tila:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13905,7 +12758,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13914,26 +12772,31 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Avaa kansio</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Tarkistaa...</translation>
     </message>
@@ -13943,7 +12806,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Tarkista tiedostot</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation>Suosittele viestissä vastaanottajalle...</translation>
     </message>
@@ -13971,7 +12834,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Lisää ystävä</translation>
     </message>
@@ -13987,7 +12850,8 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Asetukset</translation>
     </message>
@@ -14008,7 +12872,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Lopeta</translation>
     </message>
@@ -14019,12 +12883,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Ohjattu nopea käynnistys</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>Retroshare %1 turvallinen hajautettu viestintäalusta</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Kesken</translation>
     </message>
@@ -14053,11 +12917,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Huomauta</translation>
     </message>
@@ -14068,31 +12933,35 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Avaa viestit</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Siirtonopeuskuvaaja</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Ohjelmat</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Ohje</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Pienennä</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Suurenna</translation>
     </message>
@@ -14107,7 +12976,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 uusi viesti</translation>
     </message>
@@ -14137,7 +13011,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>%1 ystävää yhdistettynä</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Haluatko todella poistua Retrosharesta?</translation>
     </message>
@@ -14157,7 +13031,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Varmista, että tämä linkki ei ole huijaus, joka johtaa haitalliselle sivustolle.</translation>
     </message>
@@ -14202,12 +13076,13 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Palveluiden käyttöoikeudet</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Näytä verkkokäyttöliittymä</translation>
     </message>
@@ -14222,7 +13097,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>on käymässä vähiin (tämänhetkinen raja on </translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>Lopeta?</translation>
     </message>
@@ -14231,17 +13106,17 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Kirjoita viesti</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Yhteystiedot</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Kappale</translation>
     </message>
@@ -14277,12 +13152,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Otsikko 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Kirjasinkoko</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Suurenna kirjasinkokoa</translation>
     </message>
@@ -14297,32 +13172,32 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Lihavointi</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Kursivointi</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Asettelu</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Lisää kuva</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Asettaa tekstin kirjasinlajin koodityyliseksi</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Alleviivaus</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Aihe:</translation>
     </message>
@@ -14333,32 +13208,32 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Merkkaukset</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>Osoiteluettelo:</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation>Suosittele tätä ystävää</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Aseta tekstin väri</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Aseta tekstin taustaväri</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Suositellut tiedostot</translation>
     </message>
@@ -14428,7 +13303,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Lisää lainauslohko (blockquote)</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Lähetä:</translation>
     </message>
@@ -14452,10 +13327,6 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>&amp;Justify</source>
         <translation>Tasaa &amp;molemmat reunat</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">Kaikki osoitteet (sekaisin)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14467,7 +13338,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hei,&lt;br&gt;suosittelen ystävääni; voit luottaa häneen, kuten luotat minuun.&lt;br&gt;</translation>
     </message>
@@ -14487,18 +13358,18 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>haluaa olla ystäväsi Retrosharessa</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hei %1,&lt;br&gt;&lt;br&gt;%2 haluaa olla ystäväsi Retrosharessa.&lt;br&gt;&lt;br&gt;Vastaa nyt:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Kiittäen,&lt;br&gt;Retroshare-tiimi.</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Tallenna viesti</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Viestiä ei ole lähetetty.
@@ -14510,7 +13381,17 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Liitä Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Lisää vastaanottajiin</translation>
     </message>
@@ -14530,7 +13411,7 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Lisää suosituksena</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Alkuperäinen viesti</translation>
     </message>
@@ -14540,21 +13421,21 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Lähettäjä</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Vastaanottaja</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Kopio</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Lähetetyt</translation>
     </message>
@@ -14569,7 +13450,7 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>%1, %2 kirjoitti:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Vs:</translation>
     </message>
@@ -14579,30 +13460,30 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Vl:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Haluatko lähettää viestin ilman otsikkoa?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Ole hyvä ja lisää ainakin yksi vastaanottaja.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Piilokopio</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Tuntematon</translation>
     </message>
@@ -14717,13 +13598,13 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Avaa tiedosto...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-tiedostot (*.htm *.html);;Kaikki tiedostot (*)</translation>
     </message>
@@ -14743,7 +13624,7 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Vie PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Viestiä ei ole lähetetty.
@@ -14765,7 +13646,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lisää ylimääräinen tiedosto</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Hei,&lt;br&gt;haluan olla ystäväsi Retrosharessa.&lt;br&gt;</translation>
     </message>
@@ -14789,28 +13670,24 @@ Haluatko tallentaa viestin?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">Sinulle on ystäväkutsu</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Vastaa nyt:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Lähettäjä:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>Ystäväsolmut</translation>
     </message>
@@ -14855,13 +13732,13 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Kiitos, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Etäinen henkilöllisyys:</translation>
     </message>
@@ -14871,12 +13748,12 @@ Haluatko tallentaa viestin?</translation>
         <translation>[Puuttuva]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Ole hyvä ja luo henkilöllisyys allekirjoittaaksesi etäiset viestit, tai poista etäiset vertaiset kohdeluttelosta.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Solmun nimi &amp; tunniste:</translation>
     </message>
@@ -14954,7 +13831,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Oletus</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Uudessa välilehdessä</translation>
     </message>
@@ -14964,7 +13841,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Uudessa ikkunassa</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Muokkaa merkkausta</translation>
     </message>
@@ -14987,7 +13864,7 @@ Haluatko tallentaa viestin?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Aih:</translation>
     </message>
@@ -14995,7 +13872,7 @@ Haluatko tallentaa viestin?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Viesti</translation>
     </message>
@@ -15023,7 +13900,7 @@ Haluatko tallentaa viestin?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Suositellut tiedostot</translation>
     </message>
@@ -15033,37 +13910,37 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lataa kaikki suositellut tiedostot</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Aihe:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Lähettäjä:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Vastaanottaja:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Kopio:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Piilokopio:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Merkkaukset:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Vastaa</translation>
     </message>
@@ -15103,7 +13980,7 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>Lähetä kutsu</translation>
     </message>
@@ -15147,7 +14024,7 @@ Haluatko tallentaa viestin?</translation>
         <location line="+5"/>
         <location line="+3"/>
         <source>Buttons Text Beside Icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Painikkeet tekstillä kuvakkeen vieressä</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -15155,7 +14032,7 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Hyväksy %1 ystäväksesi</translation>
     </message>
@@ -15165,12 +14042,12 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lisää %1 ystäväksi</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Ei aihetta</translation>
     </message>
@@ -15180,17 +14057,22 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lataa</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15200,21 +14082,23 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Lähetä kutsu?</translation>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Haluatko todella lähettää kutsun varmenteellasi?</translation>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Lataa kaikki</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Tulosta asiakirja</translation>
     </message>
@@ -15229,12 +14113,12 @@ Haluatko tallentaa viestin?</translation>
         <translation>HTML-tiedostot (*.htm *.html);;Kaikki tiedostot (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Lataa kuvat aina tämän viestin osalta</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Piilota liitteet-näkymä</translation>
     </message>
@@ -15256,42 +14140,6 @@ Haluatko tallentaa viestin?</translation>
         <source>Compose</source>
         <translation>Kirjoita</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Vastaa valittuun viestiin</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Vastaa</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Vastaa kaikkiin valittuihin viesteihin</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Vastaa kaikille</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Välitä valittu viesti</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Eteenpäin</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Poista valittu viesti</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Tuhoa</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Tulosta valittu viesti</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15370,7 +14218,7 @@ Haluatko tallentaa viestin?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Uusi viesti</translation>
     </message>
@@ -15380,60 +14228,16 @@ Haluatko tallentaa viestin?</translation>
         <translation>Kirjoita viesti</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Vastaa valittuun viestiin</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Vastaa</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Vastaa kaikkiin valittuihin viesteihin</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Vastaa kaikille</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Välitä valittu viesti</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Välitä</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Poista valittu viesti</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Tuhoa</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Tulosta valittu viesti</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Tulosta</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Näytä</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Merkkaukset</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Saapuneet</translation>
@@ -15463,21 +14267,17 @@ Haluatko tallentaa viestin?</translation>
         <translation>Roskat</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Saapuneet yhteensä:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Kansiot</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Pikanäkymä</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Tulosta...</translation>
@@ -15487,26 +14287,6 @@ Haluatko tallentaa viestin?</translation>
         <source>Print Preview</source>
         <translation>Tulostuksen esikatselu</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Painikkeet vain kuvakkeilla</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Painikkeet tekstillä kuvakkeiden vieressä</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Painikkeet tekstillä</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Painikkeet tekstillä kuvakkeiden alla</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Aseta teksti kuvakkeen alle</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15528,7 +14308,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Välitä viesti</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Aihe</translation>
     </message>
@@ -15538,7 +14318,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lähettäjä</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Päiväys</translation>
     </message>
@@ -15548,39 +14328,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Sisältö</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Järjestä liitetiedostojen mukaan</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Järjestä otsikon mukaan</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Järjestä luettujen mukaan</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Järjestä lähettäjän mukaan</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Järjestä ajan mukaan</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Järjestä merkkausten mukaan</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Järjestä tähtien mukaan</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Välitä valittu viesti</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Hae aihetta</translation>
     </message>
@@ -15589,6 +14337,11 @@ Haluatko tallentaa viestin?</translation>
         <source>Search From</source>
         <translation>Hae lähettäjää</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15615,14 +14368,14 @@ Haluatko tallentaa viestin?</translation>
         <translation>Hae liitetiedostoja</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Viestit&lt;/h1&gt;                          &lt;p&gt;Retrosharella on sen oma sisäinen sähköpostijärjestelmä. Voit lähettää/vastaanottaa sähköposteja yhdistetyiltä ystäväsolmuilta.&lt;/p&gt;  &lt;p&gt;On myös mahdollista lähettää viestejä muiden ihmisten henkilöllisyyksiin käyttäen yleisreititinjärjestelmää. Nämä viestit     ovat aina salattuja ja allekirjoitettuja, ja ne välitetään välissä olevien solmujen kautta, kunnes ne saavuttavat lopullisen kohteensa. &lt;/p&gt;    &lt;p&gt;Etäiset viestit säilyvät sinun Lähtevissä kunnes vastaanottotodistus on saatu.&lt;/p&gt; &lt;p&gt;Yleisesti, sinä voit käyttää viestejä suositellaksesi tiedostoja ystävillesi liittäen tiedostolinkkejä,  tai suosittelemalla ystäväsolmuja muille ystäväsolmuille, täten vahvistaaksesi omaa verkkoasi, tai antaaksesi palautetta kanavan omistajalle.&lt;/p&gt;                    </translation>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Tähdelliset</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15696,7 +14449,7 @@ Haluatko tallentaa viestin?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15710,7 +14463,7 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15725,38 +14478,33 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Luonnokset</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Ei tähdellä merkittyjä viestejä. Tähtien avulla voit antaa viesteille erikoisaseman ja helpottaa löytämistä. Antaaksesi viestille tähden, paina vaaleanharmaata tähteä viestin vieressä.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Ei järjestelmäviestejä.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Vastaanottaja</translation>
+        <translation>Vastaanottaja</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Järjestä vastaanottajan mukaan</translation>
-    </message>
-    <message>
-        <source>This message goes to a distant person.</source>
-        <translation type="vanished">Tämä viesti menee etäisellä henkilölle.</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15764,26 +14512,6 @@ Haluatko tallentaa viestin?</translation>
         <source>Total:</source>
         <translation>Yhteensä:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Viestit</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Järjestä allekirjoituksen mukaan</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Tämä viesti on allekirjoitettu ja allekirjoitus täsmää</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Tämä viesti on allekirjoitettu, mutta allekirjoitus ei täsmää</translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">Tämä viesti tulee etäiseltä henkilöltä.</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15811,7 +14539,17 @@ Haluatko tallentaa viestin?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">Tallenna kuva</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Liitä muokkaamattomana tekstinä</translation>
     </message>
@@ -15865,7 +14603,7 @@ Haluatko tallentaa viestin?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -15875,7 +14613,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Poista kohde</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished">alkaen</translation>
     </message>
@@ -15910,18 +14648,10 @@ Haluatko tallentaa viestin?</translation>
         <translation>Odottava viesti</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
-    <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Lähetä kutsu?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Haluatko todella lähettää kutsun varmenteellasi?</translation>
-    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -16059,7 +14789,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Vertaisen tunniste</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Poista käyttämättömät avaimet...</translation>
     </message>
@@ -16069,7 +14799,7 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Tyhjennä avainnippu</translation>
     </message>
@@ -16087,7 +14817,13 @@ Huom.: vanha avainnippusi varmuuskopioidaan.
 Poisto voi epäonnistua, jos koneessasi on käynnissä useita Retroshareja samanaikaisesti.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Avainnipun tiedot</translation>
@@ -16122,18 +14858,13 @@ Avainippusi varmuuskopioitiin tiedostoon ennen poistoa.
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Tietojen epäjohdonmukaisuus avainnipussa. Tämä on todennäköisesti ohjelmointivirhe. Ota yhteyttä kehittäjiin.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>Vie/luo uusi solmu</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Luotetut avaimet ainoastaan</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Hae nimeä</translation>
     </message>
@@ -16143,12 +14874,12 @@ Avainippusi varmuuskopioitiin tiedostoon ennen poistoa.
         <translation>Hae vertaisen tunnistetta</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>Profiilin tiedot...</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -16157,13 +14888,6 @@ Reported error:</source>
 Raportoitu virhe:</translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Verkko</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -16190,7 +14914,7 @@ Raportoitu virhe:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16211,7 +14935,7 @@ Raportoitu virhe:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Ryhmät</translation>
     </message>
@@ -16241,19 +14965,19 @@ Raportoitu virhe:</translation>
         <translation type="unfinished">tuo ystäväluettelo mukaan lukien ryhmät</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Haku</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">Tunniste</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16263,12 +14987,12 @@ Raportoitu virhe:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished">Näytä kohteet</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16278,7 +15002,7 @@ Raportoitu virhe:</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Ryhmä</translation>
     </message>
@@ -16393,7 +15117,7 @@ Raportoitu virhe:</translation>
         <translation type="unfinished">Kutista kaikki</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Haluatko poistaa tämän solmun?</translation>
     </message>
@@ -16403,7 +15127,7 @@ Raportoitu virhe:</translation>
         <translation type="unfinished">Haluatko poistaa tämän ystävän?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Valmis!</translation>
@@ -16517,11 +15241,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">Lokimerkinnät</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16536,11 +15256,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Poista kaikki</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">This is a test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>Uusin ylimmäisenä</translation>
     </message>
@@ -16550,20 +15266,12 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Vanhin ylimmäisenä</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Uutissyöte&lt;/h1&gt;                                                             &lt;p&gt;Lokisyöte näyttää uusimmat tapahtumat verkostossasi vastaanottohetken mukaan järjestettynä.                    Näin saat yhteenvedon ystäviesi toiminnasta.                                                          Voit määrittää näytettävät tapahtumat &lt;b&gt;Asetuksista&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;Näytettäviä tapahtumia:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Yhteydenottoyritykset (hyödyllisiä ystävien hankkimiseen ja yhteydenottojen hallintaan)&lt;/li&gt;    &lt;li&gt;Viestit kanaville ja foorumeille&lt;/li&gt;                                                                               &lt;li&gt;Uudet kanavat ja foorumit, jotka ovat tilattavissasi&lt;/li&gt;                                                          &lt;li&gt;Yksityisviestit ystäviltäsi&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="vanished">Loki</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16618,10 +15326,6 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Blogs</source>
         <translation>Blogit</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Turvallisuus</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16643,10 +15347,6 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Message</source>
         <translation>Viesti</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Yhteydenottoyritys</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16663,10 +15363,6 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Ip security</source>
         <translation>IP-tietoturva</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Loki</translation>
-    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -16677,10 +15373,6 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Circles</source>
         <translation>Piirit</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Linkit</translation>
-    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -16733,14 +15425,6 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Chat rooms</source>
         <translation>Keskusteluhuoneet</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">Keskusteluhuoneet</translation>
-    </message>
-    <message>
-        <source>Case sensitive</source>
-        <translation type="vanished">Huomioi kirjainkoko</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16816,24 +15500,16 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Estä väliaikaisesti kaikki ponnahdusviestit</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Syöte</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Ilmaisinalue</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">Laske lukemattomat viestit</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation>Salasana vaadittu</translation>
     </message>
@@ -16853,12 +15529,12 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Väärä salasana!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Anna Retroshare salasanasi:</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Rekisteröimätön lisäosa/suoritettava tiedosto</translation>
     </message>
@@ -16873,19 +15549,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Tarkista järjestelmän kello.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Tarkastellaan jaettuja tiedostoja...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Luodaan tiivistettä (hash) tiedostolle</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Tallennetaan tiedostoluetteloa...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -16896,17 +15560,19 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Tuntematon otsikko</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Salattu viesti</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Keskusteluaulojen toiminnan varmistamiseksi tietokoneesi ajan on oltava oikeassa. Tarkista, että näin on (mahdollinen useiden minuuttien aikasiirtymä havaittiin ystävilläsi). </translation>
     </message>
@@ -16914,7 +15580,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Ystävä linjoilla</translation>
     </message>
@@ -16966,10 +15632,6 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Ikkuna</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -17035,10 +15697,6 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>This profile has signed your own profile key</source>
         <translation>Tämä profiili on allekirjoitettu sinun profiiliavaimellasi</translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Avain allekirjoitukset:</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17068,23 +15726,20 @@ p, li { white-space: pre-wrap; }
         <translation>PGP-avain</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation>Nämä vaihtoehdot koskevat kaikkia solmuja profiilissa:</translation>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Ystäväsi avaimen allekirjoittamisella ilmaiset luottamuksesi tähän ystävään muille ystävillesi. Se auttaa heitä päättämään salliako yhteydet siitä avaimesta perustuen sinun omaan luottamukseen. Avaimen allekirjoittaminen on täysin vapaaehtoista, eikä sitä voi perua, joten tee niin harkiten.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation>Nämä vaihtoehdot koskevat kaikkia solmuja profiilissa:</translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Allekirjoita PGP-avain</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17121,12 +15776,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sisällytä allekirjoitukset</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare käy ajoittain läpi ystäväluettelosi siirtojasi vastaavien selattavien tiedostojen varalta, jotta voitaisiin muodostaa suora siirtoyhteys. Tällaisessa tapauksessa ystäväsi tietää, että lataat tiedostoa.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Estääksesi toiminnan tämän ystävän tapauksessa, poista rasti tästä ruudusta. Voit silti muodostaa suoran siirtoyhteyden halutessasi, esim. lataamalla suoraan ystäväsi tiedostoluettelosta. Tätä asetusta sovelletaan kaikkiin saman solmun sijainteihin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -17140,10 +15790,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä asetus sallii automaattisen suositellun tiedoston latauksen viestistä, joka saapuu tästä solmusta. Tätä voidaan esimerkiksi käyttää tiedostojen lähettämiseen omien solmujesi kesken. Sovelletaan kaikkiin sijainteihin samasta solmusta.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -17176,21 +15822,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Virhe haettaessa vertaisen tietoja.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Retroshare ei tue antamaasi avainalgoritmia
@@ -17211,7 +15857,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla Ei.</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Luottamustaso ilmaisee omaa luottamustasi tähän avaimeen. Ohjelma ei käytä sitä eikä sitä jaeta, mutta se voi olla hyödyllinen hyvien sekä huonojen avainten muistamiseen.</translation>
     </message>
@@ -17280,10 +15926,6 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Salasana saattaa olla väärin</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -17291,12 +15933,12 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>Retroshare-profiili</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Tämä on sinun oma PGP-avain ja sen on allekirjoittanut:</translation>
     </message>
@@ -17322,7 +15964,7 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Keskustelu</translation>
     </message>
@@ -17343,7 +15985,7 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <translation>Poista kohde</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
@@ -17383,7 +16025,7 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <translation>Aikaero:</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Kirjoita viesti</translation>
     </message>
@@ -17397,10 +16039,6 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>Friend Connected</source>
         <translation>Ystävä yhdistyneenä</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Yhteydenottoyritys</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17439,17 +16077,13 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>Unknown</source>
         <translation type="unfinished">Tuntematon</translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Tuntematon vertainen</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Lähetä viesti</translation>
     </message>
@@ -17501,10 +16135,6 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>Chat with this person as...</source>
         <translation>Keskustelu henkilön kanssa...</translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">Lähetä viesti tälle henkilölle</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17563,10 +16193,6 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
-        <translation type="vanished">anna automaattisesti &quot;Myönteinen&quot; mielipide yhteyshenkilöilleni</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -17624,13 +16250,6 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Poistettujen pannattujen tunnisteiden paluun estämiseksi, koska niitä käytetään esim. foorumeilla tai kanavilla, pannatut henkilöllisyydet pidetään luettelossa jonkin aikaa. Sen jälkeen ne &amp;quot;tyhjennetään&amp;quot; pannattujen luettelosta ja ladataan uudestaan pannattomiksi, jos niitä käytetään foorumeille, keskusteluhuoneissa jne.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Lomake</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17638,23 +16257,11 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Valokuva</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Kommentti</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Yhteenveto</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17715,14 +16322,6 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Lisää kommentti</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Kirjoita kommentti...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17793,10 +16392,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Luo albumi</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Näytä albumi</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17818,17 +16413,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diaesitys</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Albumini</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Tilatut albumit</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Jaetut albumit</translation>
     </message>
@@ -17858,7 +16453,7 @@ yrität muokata sitä!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Albumin nimi</translation>
     </message>
@@ -17917,19 +16512,19 @@ yrität muokata sitä!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17965,12 +16560,12 @@ yrität muokata sitä!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Näytä lisätietoja lisäosasta</translation>
     </message>
@@ -18116,56 +16711,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Lisäosien hakemistot</translation>
     </message>
-    <message>
-        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="vanished">Lisäosa on estetty. Napsauta salli-painiketta ja käynnistä Retroshare uudestaan.</translation>
-    </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[estetty]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">API-numeroa ei annettu. Ole hyvä ja lue ohje lisäosien kehittämisestä.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[latausongelma]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">SVN-numeroa ei annettu. Ole hyvä ja lue ohje lisäosien kehittämisestä.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Virhe ladattaessa.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Puuttuva merkki. Väärä versio?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Ei lisäosaobjektia</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Lisäosat ladattu.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Tila tuntematon.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Rastita tämä lisäosien kehittämisen yhteydessä. Tiivistettä (hash)
-ei tällöin tarkasteta. Tavanomaisessa käytössä
-tiivisteen tarkistaminen suojelee sinua
-vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -18235,12 +16780,27 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation>Aseta ikkuna päällimmäiseksi</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">Estä tämä henkilö (antaa kielteisen mielipiteen)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished">Anna neutraali mielipide</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished">Anna myönteinen mielipide</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -18274,22 +16834,6 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The person you are talking to has deleted the secured chat tunnel.</source>
-        <translation type="vanished">Henkilö, jonka kanssa puhut on poistanut suojatun keskustelutunnelin.</translation>
-    </message>
-    <message>
-        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
-        <translation type="vanished">Keskustelukumppani on poistanut suojatun tunnelin, viestit toimitetaan mahdollisimman pian.</translation>
-    </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Tämän ikkunan sulkeminen lopettaa keskustelun, ilmoittaa vertaiselle ja poistaa salatun tunnelin.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Suljetaanko tunneli?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -18309,7 +16853,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Uusi</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Äänestä ylös</translation>
     </message>
@@ -18329,8 +16873,8 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentit</translation>
     </message>
@@ -18355,13 +16899,13 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentti</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished">Kommentit</translation>
     </message>
@@ -18389,20 +16933,12 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Allekirjoitettu:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Huomiot</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
@@ -18417,12 +16953,22 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Lataa kuvatiedosto</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18438,7 +16984,17 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18448,23 +17004,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Lähetä viesti</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">Olet lähettämässä linkkiä. Lähettämässäsi linkissä tulisi mielellään olla mielenkiintoista sisältöä ja kuvaava otsikko.</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Lähetä</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Lähetä uusi viesti</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Ole hyvä ja lisää otsikko</translation>
     </message>
@@ -18484,12 +17024,22 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18504,7 +17054,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Lähetä</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18515,7 +17065,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Kuva</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18525,7 +17075,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation>Otsikko</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Linkki</translation>
     </message>
@@ -18533,44 +17083,12 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Lähetetyt linkit</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Lähetetyt&lt;/h1&gt;        &lt;p&gt;Lähetetyt-palvelu sallii sinun jakaa internet-linkkejä, jotka leviävät Retroshare-solmuihin kuten foorumeille ja 	 kanaville&lt;/p&gt; 	 &lt;p&gt;Tilaavat käyttäjät voivat kommentoida linkkejä. Edistämisjärjestelmä mahdollistaa  	 tärkeiden linkkien korostamisen.&lt;/p&gt;      &lt;p&gt;Linkkien jakamisessa ei ole mitään rajoituksia, joten ole siis varovainen niitä avatessasi.&lt;/p&gt;    &lt;p&gt;Lähetetyt linkit pidetään %1 päivän ajan, ja ajantasaistetaan viimeisten %2 päivän ajan, ellet muuta tätä.&lt;/p&gt;                </translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Luo aihe</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Aiheeni</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Tilatut viestiketjut</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Suositut viestiketjut</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Muut viestiketjut</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Linkit</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18604,31 +17122,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Lähetetyn Aihe</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Lisää viestiketjujen ylläpitäjiä</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Valitse viestiketjujen ylläpitäjiä</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Luo uusi aihe</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Muokkaa aihetta</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Päivitä aihe</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18666,7 +17160,17 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>Tilaa Lähetetyt</translation>
     </message>
@@ -18682,7 +17186,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -18697,24 +17201,17 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">Lähetetyn kuvaus</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Ladataan</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">Uudet Lähetetyt</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">Ei koskaan</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18727,22 +17224,18 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Sivusto</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Kommentit</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
@@ -18753,12 +17246,12 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Kommentti</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished">Kommentit</translation>
     </message>
@@ -18768,7 +17261,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Tämän viestin kirjoittaja (tunnisteella %1) on pannassa.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18778,21 +17271,17 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Äänestä ylös</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Äänestä alas</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Merkitse luetuksi ja poista kohde</translation>
     </message>
@@ -18802,7 +17291,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Uusi kommentti:</translation>
     </message>
@@ -18812,7 +17301,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation>Kommentin arvo</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
     </message>
@@ -18853,77 +17342,10 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Ladataan</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Käyttäjältä</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Lomake</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Suosittu</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Uusi</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Ylimmäiseksi</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Tänään</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Eilen</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Tällä viikolla</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Tässä kuussa</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Tänä vuonna</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Lähetä uusi viesti</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Seur.</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">Retroshare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Luo tai valitse allekirjoitustunniste ennen äänestämistä</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Edellinen</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18943,7 +17365,17 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18953,15 +17385,15 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Ylläpitäjä:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">tuntematon</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">Jakelu:</translation>
     </message>
@@ -18971,42 +17403,42 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">Viestejä</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19026,7 +17458,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Suosittu</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">Haku</translation>
     </message>
@@ -19056,17 +17488,17 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19081,12 +17513,17 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Tyhjä</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19096,27 +17533,31 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Muokkaa</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished">tietoa</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19131,7 +17572,7 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation type="unfinished">Aloita tilaus</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Ei koskaan</translation>
     </message>
@@ -19205,6 +17646,16 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <source>No Channel Selected</source>
         <translation type="unfinished">Ei kanavaa valittuna</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -19213,14 +17664,6 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <source>Tabs</source>
         <translation>Välilehdet</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Avaa jokainen aihe uuteen välilehteen</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Linkit</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -19234,10 +17677,6 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Lähetetty</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -19306,16 +17745,16 @@ vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
         <translation>Profiilin hallinta</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -19427,7 +17866,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Muokkaa tilaviestiä</translation>
@@ -19443,7 +17882,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Profiilin hallinta</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Julkiset tiedot</translation>
     </message>
@@ -19478,12 +17917,12 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Linjoilla alkaen:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Muita tietoja</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Osoitteeni</translation>
     </message>
@@ -19527,51 +17966,27 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Lähettäjä</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Tili 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Tili 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Tili 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Lisää pulssiin</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">suodata</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">Linkin lisääjä</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Näytä muodossa</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19581,12 +17996,12 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished">Lähettäjä:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19616,13 +18031,13 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished">Kielteinen</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19634,12 +18049,22 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19648,17 +18073,13 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Lähetä pulssi lennättimeen</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19673,34 +18094,24 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Lähettäjä</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Päiväys</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Lataa kuvatiedosto</translation>
     </message>
 </context>
 <context>
@@ -19711,7 +18122,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished">Lomake</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19730,7 +18141,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19740,7 +18151,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19767,7 +18178,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19777,7 +18188,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19797,7 +18208,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19913,7 +18324,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19921,37 +18332,42 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19983,7 +18399,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19991,8 +18407,8 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Vahvistus</translation>
     </message>
@@ -20263,12 +18679,12 @@ Merkit &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; korvataan merkillä
         <translation>Vertaisen tiedot</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Tiedostopyyntö peruttu</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Tämä Retrosharen versio käyttää OpenPGP-SDK:ta. Tämän takia se ei käytä järjestelmäjaettua PGP-avainketjua, vaan sillä on oma avainketjunsa jaettuna kaikkien käynnissä olevien Retrosharejen kanssa.&lt;br&gt;&lt;br&gt;Sinulla ei näytä olevan tällaista avainketjua, vaikka olemassaolevissa Retroshare-tileissä mainitaan PGP-avaimet. Tämä johtuu todennäköisesti siitä, että siirryit juuri ohjelman uudempaan versioon.</translation>
     </message>
@@ -20299,7 +18715,7 @@ Merkit &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; korvataan merkillä
         <translation>Odottamaton virhe. Ole hyvä ja raportoi &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20335,7 +18751,7 @@ The error reported is:&quot;</source>
         <translation>Piilotetun palvelun käynnistäminen ei ollut mahdollista.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Useita instansseja</translation>
@@ -20358,6 +18774,26 @@ Lukitustiedosto:
 Lukitustiedosto:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20378,14 +18814,6 @@ Lukitustiedosto:
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
-        <translation type="vanished">Tunneli odottaa...Viestit toimitetaan mahdollisimman pian</translation>
-    </message>
-    <message>
-        <source>Secured tunnel is working. Messages are delivered immediately!</source>
-        <translation type="vanished">Suojattu tunneli toimii. Viestit toimitetaan välittömästi!</translation>
-    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -20448,7 +18876,7 @@ Virhe:
         <translation>Datan lähetys</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Sinulla näyttäisi olevan solmuja kytkettynä DSA-avaimiin:</translation>
     </message>
@@ -20458,7 +18886,7 @@ Virhe:
         <translation>Retroshare ei tällä hetkellä tue DSA-avaimia. Et voi käyttää näitä solmuja. Olemme pahoillamme. </translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>käytössä</translation>
     </message>
@@ -20468,7 +18896,7 @@ Virhe:
         <translation>estetty</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Lisää IP %1 sallittujen luetteloon</translation>
     </message>
@@ -20484,7 +18912,7 @@ Virhe:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>%1 sekuntia sitten</translation>
     </message>
@@ -20552,7 +18980,7 @@ Security: no anonymous IDs</source>
 Tietoturva: ei nimettömiä tunnisteita</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation>Liity keskusteluhuoneeseen</translation>
     </message>
@@ -20580,7 +19008,7 @@ Tietoturva: ei nimettömiä tunnisteita</translation>
         <translation>XML-tiedoston jäsentäminen epäonnistui!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation>Toistaiseksi</translation>
     </message>
@@ -20760,13 +19188,29 @@ Tietoturva: ei nimettömiä tunnisteita</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Nimi</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Solmu</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished">Osoite</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Tila</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20959,10 +19403,6 @@ Tietoturva: ei nimettömiä tunnisteita</translation>
         <source>Click to resume the hashing process</source>
         <translation>Napsauta jatkaaksesi tiivisteen laskentaa</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Tämä varmenne sisältää:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -21013,6 +19453,18 @@ Tietoturva: ei nimettömiä tunnisteita</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -21175,7 +19627,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Verkon laajuinen</translation>
     </message>
@@ -21358,7 +19810,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Upotettujen kuvien lataaminen on estetty.</translation>
     </message>
@@ -21371,7 +19823,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Sallittu oletuksena</translation>
     </message>
@@ -21544,12 +19996,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Tallenna kuva</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21557,12 +20019,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21592,14 +20054,6 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">Näytä sarake...</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[ei otsikkoa]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -22262,7 +20716,7 @@ Jos se on mielestäsi kunnollinen, poista mainittu rivi tiedostosta ja avaa se u
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nimi</translation>
@@ -22383,7 +20837,7 @@ Jos se on mielestäsi kunnollinen, poista mainittu rivi tiedostosta ja avaa se u
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
     </message>
@@ -22403,7 +20857,7 @@ Jos se on mielestäsi kunnollinen, poista mainittu rivi tiedostosta ja avaa se u
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22462,7 +20916,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished">Viesti tullaan välittämään ystävillesi.</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Muokattu viesti ... ]</translation>
     </message>
@@ -22476,11 +20930,6 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>[Unknown]</source>
         <translation type="unfinished">[Tuntematon]</translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Puuttuva viesti ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22494,6 +20943,11 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>From</source>
         <translation type="unfinished">Lähettäjä</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">Vastaanottaja</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22516,13 +20970,18 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Järjestä luettujen mukaan</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Järjestä lähettäjän mukaan</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22545,7 +21004,9 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22566,7 +21027,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Palauttaa KAIKKI tallennetut Retrosharen asetukset.</translation>
     </message>
@@ -22627,7 +21088,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Asettaa Retrosharen kielen.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Lokitiedoston &apos;%1&apos;: %2 avaaminen epäonnistui</translation>
     </message>
@@ -22648,11 +21109,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Datahakemistoa ei voitu luoda: %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Tarkistus</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation>käyttötapa</translation>
     </message>
@@ -22682,7 +21139,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Retrosharen graafisen käyttöliittymän käyttötiedot</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>Virheellinen kielikoodi määritelty:</translation>
     </message>
@@ -22700,7 +21157,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Rekisterin käyttövirhe. Tarvitset ehkä Järjestelmänvalvojan oikeudet.</translation>
@@ -22717,12 +21174,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Anna hakusana (vähintään 3 merkkiä)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Aloita haku</translation>
     </message>
@@ -22784,7 +21241,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Tyhjennä</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Hakusanat</translation>
     </message>
@@ -22799,7 +21256,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Hakutunniste</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Tiedostonimi</translation>
     </message>
@@ -22899,23 +21356,23 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Lataa valitut</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Tiedoston nimi</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Lataa</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopioi Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Lähetä Retroshare-linkki</translation>
     </message>
@@ -22925,7 +21382,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Lataushuomautus</translation>
     </message>
@@ -22962,7 +21419,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Poista kaikki</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Kansio</translation>
@@ -22973,17 +21430,17 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Uusi Retroshare-linkki/-linkit</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Avaa kansio</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Luo kokoelma...</translation>
     </message>
@@ -23003,7 +21460,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Lataa kokoelmatiedostosta...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Kokoelma</translation>
     </message>
@@ -23011,7 +21468,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Vertaisen tiedot</translation>
     </message>
@@ -23027,22 +21484,22 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Poista kohde</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>IP-osoite:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Vertaisen tunniste:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Sijainti:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Vertaisen nimi:</translation>
     </message>
@@ -23059,7 +21516,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation>mutta raportoitu:</translation>
     </message>
@@ -23084,8 +21541,8 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23093,7 +21550,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>haluaa olla ystäväsi Retrosharessa</translation>
     </message>
@@ -23124,7 +21581,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -23169,12 +21626,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Tila:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Kirjoita viesti</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Yhteydenottoyritys</translation>
     </message>
@@ -23194,17 +21651,22 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Tuntematon (lähtevä) yhteydenottoyritys</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Tuntematon tietoturvaongelma</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished">Tuntematon</translation>
     </message>
@@ -23214,11 +21676,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Tuntematon vertainen</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
@@ -23228,7 +21686,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Haluatko poistaa tämän ystävän?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Varmenteella on väärä allekirjoitus! Vertainen ei ole se, joka hän väittää olevansa.</translation>
     </message>
@@ -23238,12 +21696,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Puuttuva/vioittunut SSL-varmenne. Ei todellinen Retrosharen käyttäjä.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>Varmenne aiheutti sisäisen virheen.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Vertainen/solmu ei ole ystäväluettelossa (PGP tunniste=</translation>
     </message>
@@ -23302,12 +21760,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Paikallinen osoite</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -23328,22 +21786,22 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Portti:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Paikallinen verkko</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Ulkoisen IP-osoitteen paikallistaminen</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Tunnetut / aiemmat IP:t:</translation>
     </message>
@@ -23359,21 +21817,16 @@ jättäminen päälle helpottaa yhteydenottoa, kun sinulla on
 vähän ystäviä. Tämä auttaa myös, jos olet palomuurin tai VPN:n takana.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Salli Retrosharen kysyä IP:täni näiltä verkkosivuilta:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Hyväksyttävä porttiavaruus on välillä 10-65535. Porttia 1024 pienemmät ovat yleensä järjestelmäsi käyttöön varattuja.</translation>
     </message>
@@ -23383,23 +21836,46 @@ vähän ystäviä. Tämä auttaa myös, jos olet palomuurin tai VPN:n takana.</t
         <translation>Hyväksyttävä porttiavaruus on välillä 10-65535. Porttia 1024 pienemmät ovat yleensä järjestelmäsi käyttöön varattuja.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Onion-osoite</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Etsintä käytössä (suositus)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>Tor on Retrosharen automaattisesti määrittelemä. Sinun ei pitäisi tarvita muuttaa mitään tässä.</translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Etsintä ei käytössä</translation>
     </message>
@@ -23409,7 +21885,7 @@ vähän ystäviä. Tämä auttaa myös, jos olet palomuurin tai VPN:n takana.</t
         <translation>Piilotettu - Katso asetukset</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>I2P-osoite</translation>
     </message>
@@ -23434,41 +21910,95 @@ vähän ystäviä. Tämä auttaa myös, jos olet palomuurin tai VPN:n takana.</t
         <translation>saapuva ok</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>Välityspalvelin näyttää toimivan.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P-välityspalvelin ei ole käytössä</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
-        <translation>BOB on käynnissä ja saatavilla</translation>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
-        <translation>BOB ei ole saatavilla! Onko se käynnissä?</translation>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
-        <translation>Retroshare käyttää BOB:a määrittääkseen %1 -tunnelin %2:%3 (nimetty %4)
-
-Kun muutat asetuksia (esim. porttia) käytä painikkeita alhaalla käynnistääksesi uudelleen BOB:n.
-
-</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation>asiakas</translation>
     </message>
@@ -23483,73 +22013,7 @@ Kun muutat asetuksia (esim. porttia) käytä painikkeita alhaalla käynnistääk
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation>BOB käsittelee pyyntöä</translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation>yhteys tarkistus</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation>luodaan avainta</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation>käynnistyy</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation>suljetaan</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation>BOB käsittelee pyyntöä: %1</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation>BOB on rikki
-</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation>BOB virhe tapahtui:
-</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation>BOB-tunneli on käynnissä</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation>BOB toimii hyvin: tunneli toiminnassa</translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation>BOB-tunneli ei ole käynnissä</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation>BOB on toimeton: tunneli suljettu</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation>pyydä uutta palvelin-avainta</translation>
     </message>
@@ -23559,22 +22023,7 @@ Kun muutat asetuksia (esim. porttia) käytä painikkeita alhaalla käynnistääk
         <translation>lataa palvelin avain base64:sta</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation>pysäytä ensiksi BOB-tunneli luodaksesi uuden avaimen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation>pysäytä ensiksi BOB-tunneli ladataksesi avaimen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation>pysäytä ensiksi BOB-tunneli kytkeäksesi BOB:n pois päältä</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Olet tavoitettavissa piilotetun palvelun kautta.</translation>
     </message>
@@ -23588,12 +22037,12 @@ Ovatko kaikki palvelut päällä ja käynnissä??
 Tarkista myös porttisi!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Piilotettu tila]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23603,7 +22052,7 @@ Tarkista myös porttisi!</translation>
         <translation>Tyhjennä</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>Latausraja (KB/s) </translation>
     </message>
@@ -23618,23 +22067,23 @@ Tarkista myös porttisi!</translation>
         <translation>Lähetysraja (KB/s) </translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lähetysrajoitus käsittää koko ohjelman. Liian alhainen rajoitus voi lopulta estää alhaisen prioriteetin palvelut (foorumit, kanavat) Suositeltu vähimmäisarvo on 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23651,17 +22100,7 @@ Kirjoita nyt osoite (esim. 127.0.0.1) ja portti, jonka valitsit aiemmin I2P-väl
 Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi normaali Solmu, miksi et määrittäisi Tor ja/tai I2P?</translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation>Automaattinen I2P/BOB</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation>Salli I2P BOB - vaatii uudelleenkäynnistyksen toimiakseen</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation>sallii lisäasetukset</translation>
     </message>
@@ -23671,12 +22110,7 @@ Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi norm
         <translation>edistynyt tila</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation>I2P-instanssiosoite</translation>
     </message>
@@ -23686,17 +22120,7 @@ Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi norm
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation>I2P-välityspalvelinportti</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation>BOB saatavissa</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation>Osoite</translation>
     </message>
@@ -23736,7 +22160,7 @@ Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi norm
         <translation>lataa avain</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation>Käynnistä</translation>
     </message>
@@ -23751,12 +22175,7 @@ Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi norm
         <translation>Pysäytä</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation>BOB-tila</translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation>Saapuva</translation>
     </message>
@@ -23803,7 +22222,32 @@ Lopuksi varmista, että portit vastaavat asetuksia.
 Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokisi..</translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation>Välitys</translation>
     </message>
@@ -23858,7 +22302,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Yhteensä:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23883,7 +22327,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Poista palvelin</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23897,7 +22341,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>IP-suodattimet</translation>
     </message>
@@ -23920,7 +22364,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
@@ -23980,17 +22424,28 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Lisää sallittujen luetteloon</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Piilotetun palvelun asetukset</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä on Tor SOCKS-välityspalvelimen portti. Retroshare-solmusi voi käyttää tätä porttia yhdistääkseen&lt;/p&gt;&lt;p&gt;Piilotettuihin solmuihin. Tämä valo oikealla muuttuu vihreäksi, kun portti on käytössä tietokoneellasi. &lt;/p&gt;&lt;p&gt;Tämä ei kuitenkaan tarkoita sitä, että Retroshare-liikenteesi siirtyy Tor:n kautta. Näin tapahtuu ainoastaan, jos &lt;/p&gt;&lt;p&gt;sinä itse yhdistät Piilotettuihin solmuihin, tai käytät Piilotettua solmua itse.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24006,18 +22461,18 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P lähtevä ok</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Palvelun osoite</translation>
     </message>
@@ -24052,12 +22507,12 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Täytä palveluosoite</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>IP-avaruus</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>DHT raportoi IP:n naamioinnista</translation>
     </message>
@@ -24080,22 +22535,22 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Sinun lisäämäsi</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sallitut IP:t kerätään seuraavista lähteistä: käsin vaihdettuihin varmenteisiin sisältyvät IP:t, tässä ikkunassa lisäämäsi tai tietoturvasyötteen nimikkeistä poimimasi IP-alueet.&lt;/p&gt;&lt;p&gt;Oletuksena Retroshare (1) sallii aina yhteyden sallittujen luettelossa oleviin vertaisiin, myös IP-osoitteen ollessa estettyjen luettelossa; (2) valinnaisesti vaatii, että IP:t sisältyvät sallittujen luetteloon. Voit muuttaa toimintaa vertaiskohtaisesti jokaisen Retroshare-solmun &amp;quot;Tiedot&amp;quot;-ikkunassa.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT sallii sinun vastata ystäviesi yhteyspyyntöihin käyttäen BitTorrentin DHT:tä. Se parantaa yhteydenpitoa huomattavasti. DHT:lle ei kuitenkaan tallenneta mitään tietoa. Sitä käytetään ainoastaan välityspalvelin-järjestelmänä yhteydenmuodostamisessa muihin Retroshare-solmuihin.&lt;/p&gt;&lt;p&gt;Etsintä-palvelu lähettää solmun nimen ja luotetuttujen kontaktien tunnisteet yhdistetyille vertaisille, auttaen heitä valitsemaan uusia ystäviä. Ystävyys ei kuitenkaan ole milloinkaan automaattista ja molempien vertaisten pitää luottaa toisiinsa salliakseen yhteyden. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä tilailmaisin muuttuu vihreäksi heti, kun Retroshare onnistuu saamaan sinun oman IP:si alla olevilta verkkosivuilta, jos olet sallinut sen toiminnon. Retroshare yrittää myös saada muilla tavoin selville oman IP:si.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Luettelo täyttyy automaattisesti useista lähteistä kerätyn tiedon perusteella: DHT:n raportoimat naamioituneet vertaiset, ystäviesi raportoimat ja itse antamasi IP-avaruudet.&lt;/p&gt;&lt;p&gt;Naamioituneiden IP-osoitteiden automaattinen arvaaminen saattaa viedä ystäväsi estettyjen luetteloon. Tällaisissa tapauksissa voit käyttää pikavalikkoa lisätäksesi heidät sallittuihin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24130,26 +22585,22 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Automaattisesti aseta pannaan DHT:n naamioivat IP:t alkaen</translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Määritä Tor and I2P SOCKS-välityspalvelin tässä. &lt;br/&gt;Jos käytät mieluummin BOB:a automaattisesti hallitaksesi I2P tarkista toinen välilehti.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Tor SOCKS-välityspalvelin</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor lähtevä ok</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor-välityspalvelin ei ole käytössä</translation>
     </message>
@@ -24229,7 +22680,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>rastita vertaiset, joiden kanssa haluat jakaa yksityisen julkaisuavaimesi</translation>
     </message>
@@ -24239,12 +22690,12 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Jaa ystävälle</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Jaa</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -24263,7 +22714,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Jaettujen kansioiden hallinta</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation>Jaettu hakemisto</translation>
     </message>
@@ -24283,17 +22734,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation>Lisää uusi</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Lisää jaettava hakemisto</translation>
     </message>
@@ -24303,7 +22754,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Käytä ja sulje</translation>
     </message>
@@ -24394,7 +22845,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Hakemistoa ei löydy tai nimeä ei hyväksytty.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Tämä on luettelo jaetuista kansioista. Voit lisätä ja poistaa kansioita alareunan painikkeiden avulla. Kun lisäät uuden kansion, aluksi kaikki kyseisen kansion tiedostot jaetaan. Voit erikseen määritellä jakomerkkejä kullekin jaetulle kansiolle.</translation>
     </message>
@@ -24402,7 +22853,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Tiedostot</translation>
     </message>
@@ -24453,11 +22904,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>tarkista tiedostot</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Lataa valitut</translation>
     </message>
@@ -24467,7 +22923,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Lataa</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Kopioi Retroshare-linkit leikepöydälle</translation>
     </message>
@@ -24482,7 +22938,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Lähetä Retroshare-linkit</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation>Jotkin tiedostot on jätetty pois</translation>
     </message>
@@ -24498,7 +22954,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Suositukset</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Luo kokoelma...</translation>
     </message>
@@ -24523,7 +22979,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Lataa kokoelmatiedostosta...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Jotkin tiedostot on jätetty pois koska niitä ei ole luetteloitu vielä.</translation>
     </message>
@@ -24666,12 +23122,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Avataan asetuksia</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Luodaan käyttöliittymää</translation>
     </message>
@@ -24695,7 +23151,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Tallenna salasana</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Kirjaudu sisään</translation>
     </message>
@@ -25040,7 +23496,7 @@ This choice can be reverted in settings.</source>
         <translation>Tilaviesti</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Viesti:</translation>
     </message>
@@ -25285,7 +23741,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Poista kaikki merkkaukset</translation>
     </message>
@@ -25321,12 +23777,15 @@ p, li { white-space: pre-wrap; }
         <translation>Muodostetaan Tor-yhteys...</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation>Tor-tila:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation>Tuntematon</translation>
     </message>
@@ -25336,18 +23795,13 @@ p, li { white-space: pre-wrap; }
         <translation>Ei käynnistynyt</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
-        <translation>Piilotetun palvelun osoite:</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation>Ei asetettu</translation>
     </message>
@@ -25357,12 +23811,57 @@ p, li { white-space: pre-wrap; }
         <translation>Onion-osoite:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Virhe</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Ei yhteyttä</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation>[Odotetaan Tor...]</translation>
     </message>
@@ -25370,21 +23869,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Tämä Retrosharen versio käyttää Tor-verkkoa yhdistääkseen ystäviisi.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation>Tor ei ole nyt linjoilla</translation>
     </message>
@@ -25395,11 +23890,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Ei tor-asetuksia</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25427,7 +23923,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Siirtoasetukset</translation>
@@ -25438,7 +23934,7 @@ p, li { white-space: pre-wrap; }
         <translation>Samanaikaisten latausten maksimimäärä:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation>Jaetut hakemistot</translation>
     </message>
@@ -25448,22 +23944,27 @@ p, li { white-space: pre-wrap; }
         <translation>Jaa saapuvien hakemisto automaattisesti (suositeltavaa)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation>Muokkaa jakoa</translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation>Tarkista jaetut hakemistot automaattisesti joka</translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation>minuutti</translation>
     </message>
@@ -25548,7 +24049,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25557,7 +24058,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Enimmäislähetykset ystävää kohden (0 = ei rajaa)</translation>
     </message>
@@ -25582,7 +24088,12 @@ p, li { white-space: pre-wrap; }
         <translation>Salli suora lataaminen:</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Suoratoisto</translation>
     </message>
@@ -25641,38 +24152,13 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Retroshare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; kykenee siirtämään dataa ja etsimään hakuja vertaisten välillä, jotka eivät välttämättä ole ystäviä. Tämä liikenne kaikesta huolimatta kauttakulkee ainoastaan yhdistettynä ystäväluettelelossa olevien kautta ja on nimetöntä.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;Sinä voit erikseen asettaa jakoilmaisimia jokaiselle jaetulle hakemistolle Jaetut tiedostot-ikkunassa:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Ystävien selattavissa&lt;/span&gt;: tiedostot, jotka näkyvät ystäville.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Nimettömästi jaetut&lt;/span&gt;: tiedostot, jotka ovat nimettömästi saatavissa etäisten F2F-tunneleitten kautta.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Välitettyjen tunnelipyyntöjen maksimimäärä per sekunti:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare keskeyttää kaikki siirrot ja asetustiedoston tallennukset, jos levytila menee alle tämän rajoituksen. Se estää tiedon häviämisen joissakin järjestelmissä. Ponnahdusikkuna varoittaa sinua, kun näin käy.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -25682,7 +24168,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Varoitus</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation>Aseta saapuvien hakemisto</translation>
     </message>
@@ -25710,7 +24206,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Lataus suoritettu</translation>
     </message>
@@ -25734,39 +24230,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Sinulla on %1 kpl valmiita latauksia</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Sinulla on %1 valmis lataus</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 kpl valmiita latauksia</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 valmis lataus</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Lataukset</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Lähetykset</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nimi</translation>
@@ -25973,7 +24453,12 @@ p, li { white-space: pre-wrap; }
         <translation>Määritä...</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation>Siirrä jonossa...</translation>
     </message>
@@ -25998,7 +24483,7 @@ p, li { white-space: pre-wrap; }
         <translation>Valitse hakemisto</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Nimetön päästä-päähän salattu tunneli 0x</translation>
     </message>
@@ -26019,7 +24504,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -26052,7 +24537,17 @@ p, li { white-space: pre-wrap; }
         <translation>Tiedosto %1 ei ole valmis. Jos se on mediatiedosto, voit yrittää esikatsella sitä.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Varoitus</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Muuta tiedostonimeä</translation>
     </message>
@@ -26067,7 +24562,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kirjoita uusi ja validi tiedostonimi</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Laajenna kaikki</translation>
@@ -26194,23 +24689,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Sarakkeet</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Tiedostojen siirrot</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Polku</translation>
     </message>
@@ -26220,7 +24710,7 @@ p, li { white-space: pre-wrap; }
         <translation>Näytä Polku-sarake</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>Esikatselutiedostoa ei voitu poistaa</translation>
     </message>
@@ -26230,7 +24720,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yritä uudelleen?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Luo kokoelma...</translation>
     </message>
@@ -26245,7 +24735,7 @@ p, li { white-space: pre-wrap; }
         <translation>Näytä kokoelma...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation>Kokoelma</translation>
     </message>
@@ -26255,7 +24745,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 tunnelia</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Nimetön tunneli 0x</translation>
     </message>
@@ -26476,10 +24966,6 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">Nimettömiä tunneleita</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26673,12 +25159,17 @@ p, li { white-space: pre-wrap; }
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Salli Retroshare-verkkokäyttöliittymä</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Tila:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Verkkoparametrit</translation>
     </message>
@@ -26712,35 +25203,33 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Port:</source>
-        <translation type="vanished">Portti:</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation>Salli pääsy kaikista IP-osoitteista (Oletus: sisäinen verkkoliityntä ainoastaan)</translation>
     </message>
     <message>
-        <source>Apply setting and start browser</source>
-        <translation type="vanished">Käytä asetusta ja käynnistä selain</translation>
-    </message>
-    <message>
-        <source>Note: these settings do not affect retroshare-nogui. Retroshare-nogui has a command line switch to activate the web interface.</source>
-        <translation type="vanished">Huomautus: nämä asetukset eivät vaikuta retroshare-nogui:n. Retroshare-nogui:ssa on komentorivivalitsin verkkokäyttöliittymän aktivoimiseksi.</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Verkkokäyttöliittymä&lt;/h1&gt;       &lt;p&gt;Verkkokäyttöliittymä sallii sinun hallita Retrosharea selaimestasi. Lukuisat laitteet voivat jakaa yhden Retroshare-instanssin hallinnan. Voit aloittaa keskustelun tabletillasi ja myöhemmin käyttää pöytäkonetta sitä jatkaaksesi.&lt;/p&gt;     &lt;p&gt;Varoitus: älä paljasta verkkokäyttöliittymää internetille, sillä siihen ei ole mitään käytönhallintaa eikä salausta. Jos haluat käyttää verkkokäyttöliittymää internetin kautta, käytä SSH-tunnelia tai välityspalvelinta yhteyden suojaamiseen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>Verkkokäyttöliittymä ei ole käytössä</translation>
     </message>
@@ -26750,12 +25239,12 @@ p, li { white-space: pre-wrap; }
         <translation>Verkkokäyttöliittymä ei ole käytössä. Salli se Asetukset -&gt; Verkkokäyttöliittymä.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>verkkokäyttöliittymän käynnistys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Verkkokäyttöliittymä</translation>
     </message>
@@ -26892,11 +25381,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wikisivut</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Uusi ryhmä</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Sivun nimi</translation>
     </message>
@@ -26911,7 +25396,7 @@ p, li { white-space: pre-wrap; }
         <translation>Alkup. tunniste</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26999,7 +25484,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Muokkaushistoria</translation>
     </message>
@@ -27034,7 +25519,7 @@ p, li { white-space: pre-wrap; }
         <translation>PageId</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -27064,14 +25549,18 @@ p, li { white-space: pre-wrap; }
         <translation>Merkkaukset</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Historia</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Näytä muokkaushistoria</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
@@ -27092,7 +25581,7 @@ p, li { white-space: pre-wrap; }
         <translation>Palauta</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Lähetä</translation>
     </message>
@@ -27164,10 +25653,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">Aikaväli</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -27179,16 +25664,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Päivitä</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27203,7 +25679,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Muut</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27223,7 +25699,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27253,85 +25729,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Viime kuussa</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Viime viikolla</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Tänään</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Uusi</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">alkaen</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">päättyen</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Haku/suodatus</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Verkon laajuinen</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Hallitse tilejä</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Näyttää:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Sinä itse</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Ystävät</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Seurataan</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Räätälöity</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Tili 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Tili 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Tili 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">Valintaruutu</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Lähetä pulssi lennättimeen</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">Retroshare</translation>
@@ -27394,35 +25802,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Lomake</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Poista</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Sijainti:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -27467,11 +25882,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">Ei sovellu</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Seurataan</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Tuntematon</translation>
@@ -27549,7 +25994,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2d</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -27582,15 +26027,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Kuvat (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation>Hyväksytkö tämän profiilin allekirjoittamat yhteydet?</translation>
     </message>
@@ -27599,10 +26040,6 @@ p, li { white-space: pre-wrap; }
         <source>Name of the profile</source>
         <translation>Profiilin nimi</translation>
     </message>
-    <message>
-        <source>This column indicates trust level and whether you signed the profile PGP key</source>
-        <translation type="vanished">Tämä sarake osoittaa luottamustason ja mikäli olet allekirjoittanut profiilin PGP-avaimen.</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
@@ -27713,10 +26150,6 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> - </source>
-        <translation type="vanished"> - </translation>
-    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_fr.ts b/retroshare-gui/src/lang/retroshare_fr.ts
index cc9597926..876414b16 100644
--- a/retroshare-gui/src/lang/retroshare_fr.ts
+++ b/retroshare-gui/src/lang/retroshare_fr.ts
@@ -84,13 +84,6 @@
         <translation>Nœud caché seulement</translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Ajouter un commentaire</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>Retroshare : Recherche avancée</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Critère(s) de recherche</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Ajouter un critère de recherche.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Réinitialiser les critères de recherche.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Annuler la recherche.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Rechercher</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Créer un album </translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Nom de l&apos;album :</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Catégorie :</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Animaux</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Famille</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Amis</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Fleurs</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Vacances</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Paysages</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Animaux</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Portraits</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Voyage</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Travail</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Aléatoire</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Légende :</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Où :</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Photographe :</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Description :</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Options de partage</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Politique :</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Qualité :</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Commentaires :</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Identité :</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Public</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Limité</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Redimensionner les images (&lt; 1Mo)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Redimensionner les images (&lt; 10Mo)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Envoyer images originales</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Aucun commentaire admis</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Commentaires authentifiés</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Aucun commentaire admis</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Publier avec l&apos;identité</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Glissez &amp;amp; Déposez pour insérer des images. Cliquez sur une image pour modifier les détails ci-dessous.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Retour</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Ajouter photos</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Publier l&apos;album</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Album sans titre</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Donnez des détails sur cette album...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Où cela a été pris ?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Charger la miniature de l&apos;album</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Album</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Miniature de l&apos;album</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Résumé</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Légende</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Où :</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Quand :</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Description :</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">options de partage</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Commentaires</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Publier l&apos;identité</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Visibilité</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Avertissements : Ces services sont expérimentaux. Aidez nous à les tester
@@ -783,14 +569,6 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">GxsForums</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">ChaînesGxs</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation>Photos</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">Sauvegarder image</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Ko</translation>
     </message>
@@ -842,17 +633,13 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Ajouter avatar</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Mettre votre image d&apos;avatar</translation>
     </message>
@@ -871,10 +658,6 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Charger l&apos;avatar</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation>Réinitialiser</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Vitesse de réception</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Vitesse d&apos;émission</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Toujours visible</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Style</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <source>% Opaque</source>
         <translation>% opaque</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Sauvegarder</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Annuler</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Statistiques enregistrées depuis :</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Masquer les options</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,7 +822,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Commentaire</translation>
     </message>
@@ -1093,12 +852,12 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L&apos;auteur de ce message (avec l&apos;ID %1) est banni.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Voter pour</translation>
     </message>
@@ -1126,7 +885,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Voter pour</translation>
     </message>
@@ -1184,7 +943,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">Partager</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Changer l&apos;état de lecture du message</translation>
     </message>
@@ -1224,7 +983,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1232,12 +991,12 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">J&apos;aime ça</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1283,12 +1042,12 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,17 +1216,17 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Chaînes</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
@@ -1477,11 +1236,17 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Charger les messages en tâche de fond (fils, &quot;threads&quot;)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Téléchargements</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Ouvrir chaque chaîne dans un nouvel onglet</translation>
     </message>
@@ -1489,7 +1254,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">J&apos;aime ça</translation>
     </message>
@@ -1537,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1563,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -1573,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Commentaire</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished">Commentaires</translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Cacher</translation>
     </message>
@@ -1591,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -1782,7 +1537,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Afficher le salon de tchat</translation>
     </message>
@@ -1794,22 +1549,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>Tchats</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Vous avez %1 nouveaux messages</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Vous avez %1 nouveau message</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 nouveaux messages</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 nouveau message</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1831,13 +1570,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Salon inconnu</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Tout supprimer</translation>
     </message>
@@ -1845,13 +1585,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Participants</translation>
     </message>
@@ -1861,37 +1601,7 @@ into the image, so as to
         <translation>Sujet</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>Salons de tchat privés abonnés</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>Salons de tchat publics abonnés</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Salons de tchat privés</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Salons de tchat publics</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Salons de tchat&lt;/h1&gt; &lt;p&gt;Les salons de tchat fonctionnent à peu près comme l&apos;IRC. Ils vous permettent de discuter anonymement avec de nombreuses personnes sans avoir besoin d&apos;être des amis.
-
-Un salon de tchat peut être de type public (vos amis le voient) ou privé (vos amis ne le voient pas, à moins que vous les invitiez avec &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). Une fois que vous aurez été invité à un salon privé, vous serez capable de le voir lorsque vos amis l&apos;utiliseront.
-
-La liste à gauche montre les salons de tchat auxquels vos amis participent. Vous pouvez soit :&lt;ul&gt; &lt;li&gt;Faire un clic droit pour créer un nouveau salon de tchat&lt;/li&gt; &lt;li&gt;Faire un double clic sur un salon pour y entrer, tchatter, et le montrer à vos amis&lt;/li&gt; &lt;/ul&gt; Note : pour que les salons de tchat fonctionnent correctement, votre ordinateur doit être à l&apos;heure. Alors vérifiez l&apos;horloge de votre système ! &lt;/p&gt; </translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Créer salon de tchat</translation>
     </message>
@@ -1901,7 +1611,7 @@ La liste à gauche montre les salons de tchat auxquels vos amis participent. Vou
         <translation>Quitter ce salon</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Créer une identité non anonyme et entrer dans cette salle</translation>
     </message>
@@ -1960,12 +1670,12 @@ Sélectionnez un des salons de tchat à gauche pour en afficher les détails.
 Double-cliquez sur un salon pour y entrer et discuter.</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 vous invite à un salon de tchat nommée %2</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Choisissez une identité anonyme pour de salon de tchat.</translation>
     </message>
@@ -1975,31 +1685,31 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Choisissez une identité pour ce salon :</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Créer un nouveau salon de tchat</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Sans sujet déterminé]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Info du salon sélectionné</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Privé</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Public</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>IDs anonymes acceptées</translation>
     </message>
@@ -2009,42 +1719,25 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Retirer des abonnements auto</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Ajouter aux abonnements auto</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Rechercher des salons de tchat</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Rechercher par nom</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Abonné</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Colonnes</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Oui</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Non</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2056,47 +1749,47 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Nom du salon de chat :</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>ID du salon de chat :</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Sujet : </translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Sécurité :</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Contacts :</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
@@ -2111,13 +1804,24 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Aucune IDs anonymes</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Montrer</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>colonn</translation>
@@ -2131,7 +1835,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Supprimer</translation>
     </message>
@@ -2176,46 +1880,22 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Tchat distant</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Tout le monde</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Contacts</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Personne</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Accepter un tchat éloigné et chiffré de la part de</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Paramètres du tchat</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Activer les émoticônes pour le tchat privé</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Activer les émoticônes pour le tchat public</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Activer les polices personnalisées</translation>
     </message>
@@ -2224,10 +1904,6 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Enable custom font size</source>
         <translation>Activer la taille de la police personnalisée</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Taille de police minimale</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2239,7 +1915,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Activer l&apos;italique</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2264,11 +1940,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Charger les images intégrées</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Salons de tchat</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Icône d&apos;onglet clignotant</translation>
     </message>
@@ -2277,10 +1949,6 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Do not send typing notifications</source>
         <translation>N&apos;envoyez pas de notifications de frappe</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Tchat privé</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2302,11 +1970,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Fenêtre/Icône d&apos;onglet clignotant</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Police d&apos;écriture</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Changer la police du tchat</translation>
     </message>
@@ -2316,14 +1980,10 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Police d&apos;écriture :</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Historique</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Style</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2338,17 +1998,13 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Variant:</source>
         <translation>Variante&#xa0;:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Tchat public</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Tchat privé</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation>Choisissez votre police de caractère par défaut pour les tchats.</translation>
     </message>
@@ -2412,22 +2068,28 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Dans cet onglet, vous pouvez configurer le nombre de messages de tchat que Retroshare gardera sauvegardé sur le disque et combien de la conversation précédente, elle affiche, pour les différents systèmes de discussions. La période de stockage max permet de supprimer les anciens messages et empêche l&apos;historique des conversations de remplir les tchats volatiles (par exemple, les salons de tchat et tchat à distance).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Salons de tchat</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Activé :</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2437,7 +2099,17 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Salons de tchat</translation>
@@ -2534,11 +2206,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Période maximale de stockage, en jours (0=garde tout) :</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Recherche préconfigurée</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Respecter la casse</translation>
     </message>
@@ -2577,10 +2245,6 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Threshold for automatic search</source>
         <translation>Seuil pour recherche automatique</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Identité par défaut pour les salons de tchat :</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2648,7 +2312,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Afficher le tchat</translation>
     </message>
@@ -2684,7 +2348,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
@@ -2719,12 +2383,12 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Italique</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>Insérer émoticône</translation>
     </message>
@@ -2804,11 +2468,6 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Insert horizontal rule</source>
         <translation>Insérer ligne horizontale</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Sauvegarder image</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2846,7 +2505,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>écrit...</translation>
     </message>
@@ -2870,7 +2529,7 @@ après la conversion en HTML.</translation>
         <translation>Choisissez votre police de caractère.</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Etes-vous vraiment sûr de vouloir supprimer définitivement l&apos;historique ?</translation>
     </message>
@@ -2920,7 +2579,7 @@ après la conversion en HTML.</translation>
         <translation>est occupé et peut ne pas répondre</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Trouver en tenant compte de la casse</translation>
     </message>
@@ -2942,7 +2601,7 @@ après la conversion en HTML.</translation>
         <translation>Ne pas cesser de colorer après X articles trouvés (nécessite davantage de CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Trouver le précédent &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2957,16 +2616,12 @@ après la conversion en HTML.</translation>
         <translation>&lt;b&gt;Trouver &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Statut)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Régler police de caractères du texte et couleur</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Joindre un fichier</translation>
     </message>
@@ -2982,12 +2637,12 @@ après la conversion en HTML.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Marquer ce texte comme sélectionné&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation>Id d&apos;identité:</translation>
     </message>
@@ -2999,12 +2654,12 @@ Double click on it to add his name on text writer.</source>
 Double cliquez pour ajouter son nom dans le champ de saisie du message.</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation>Non signé</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>articles trouvés.</translation>
     </message>
@@ -3024,7 +2679,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Saisissez votre message ici</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Ne pas cesser de colorer après</translation>
     </message>
@@ -3050,7 +2705,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Afficher les détails :</translation>
     </message>
@@ -3072,7 +2727,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Cercles personnels</translation>
     </message>
@@ -3098,7 +2753,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Amis</translation>
     </message>
@@ -3158,7 +2813,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Amis des Amis</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Cercles extérieurs (Admin)</translation>
     </message>
@@ -3174,7 +2829,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
@@ -3226,43 +2881,48 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Erreur : impossible d&apos;obtenir les détails de ce contact.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3274,7 +2934,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Chiffrement</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>Non connecté</translation>
     </message>
@@ -3356,25 +3016,17 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>aucun</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Ce certificat contient :</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;un &lt;b&gt;ID de noeud&lt;/b&gt; et &lt;b&gt;nom&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">une &lt;b&gt;adresse onion&lt;/b&gt; et &lt;b&gt;port&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">une &lt;b&gt;addresse IP&lt;/b&gt; et &lt;b&gt;port&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vous pouvez utiliser ce certificat pour vous faire de nouveaux amis. Envoyez-le par courrier électronique, ou donnez-le de main à la main.&lt;/p&gt;</translation>
     </message>
@@ -3389,7 +3041,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ceci est la méthode de chiffrement utilisée par &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. La connexion aux noeuds amis est &lt;/p&gt;&lt;p&gt;toujours lourdement chiffrée, et si la DHE est présente la connexion utilise ensuite &lt;/p&gt;&lt;p&gt;&amp;quot;perfect forward secrecy&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>avec</translation>
     </message>
@@ -3406,118 +3058,16 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <source>Connect Friend Wizard</source>
         <translation>Assistant de connexion à un ami</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Ajouter un nouvel ami</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">Vous avez un possédez le certificat de votre ami dans un &amp;Fichier</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">Devenir a&amp;mi avec les amis sélectionnés de vos amis</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Email 
- (Your friend will receive an email with instructions how to download RetroShare)</source>
-        <translation type="vanished">&amp;Envoyer une invitation par Mail
-(Votre ami recevra un mail avec les instruction pour télécharger RetroShare)</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Inclure les signatures</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Copier votre certificat dans le presse-papier</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Enregistrer votre certificat dans un fichier</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Envoyer par courrier électronique</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Ouvrir le certificat de votre ami depuis un fichier</translation>
     </message>
-    <message>
-        <source>Open certificate</source>
-        <translation type="vanished">Ouvrir le certificat</translation>
-    </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">Veuillez coller le certificat de votre ami Retroshare dans la case ci-dessous</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Fichiers de certificats</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Utiliser des certificats PGP contenus dans des fichiers.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Importer le certificat d&apos;un ami...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Vous devez générer un fichier à partir de votre certificat et le transmettre à votre ami. Vous pouvez aussi utiliser un fichier généré auparavant.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Exporter mon certificat...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Glisser et déposer le certificat de votre ami dans cette fenêtre ou importez le à partir de votre disque dur</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Parcourir</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Amis de vos amis</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Veuillez selectionner avec qui vous souhaitez devenir ami.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Afficher :</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Devenir ami avec ces contacts</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>ID Retroshare</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Utilisez l&apos;ID Retroshare pour ajouter un ami qui est disponible dans votre réseau.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Ajouter l&apos;ID d&apos;amis Retroshare...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Coller l&apos;ID Retroshare d&apos;amis ci-dessous</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Entrez l&apos;ID Retroshare de votre ami, p. ex.. Contact@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3559,27 +3109,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Email</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Inviter un ami à rejoindre Retroshare par e-mail</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Entrez les adresses e-mail de vos amis (séparées par un point-virgule)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Destinataire(s) :</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Entrez l&apos;adresse e-mail de vos amis</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Sujet : </translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3595,77 +3125,32 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Détails de la demande</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Détails du contact</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">E-Mail :</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Noeud :</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">Veuillez noter que Retroshare nécessitera beaucoup de bande passante, mémoire et CPU si vous ajoutez de nombreux amis. Vous pouvez ajouter autant d&apos;amis que vous le souhaitez, mais avec avec plus de 40 cela nécessitera probablement trop de ressources.</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Emplacement :</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">Cet assistant vous aidera à vous connecter à vos amis avec Retroshare.&lt;br&gt;Il y a diverses possibilités pour le faire :</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Entrer manuellement le certificat</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">Entrer manuellement l&apos;ID Retroshare</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">Envoyez une invitation par me&amp;ssagerie électronique</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Recommander plusieurs amis les uns aux autres</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">Certificat Retroshare</translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">Veuillez coller ci-dessous le certificat de votre ami Retroshare</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Collez le certificat</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette boîte s&apos;attend au certificat de votre ami Retroshare. AVERTISSEMENT : cela est différent de la clé PGP de votre ami. Ne collez pas ici la clé de profil de votre ami (même pas une partie). Cela ne fonctionnera pas.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Ajouter l&apos;ami à un groupe :</translation>
     </message>
@@ -3675,7 +3160,7 @@ resources.</source>
         <translation>Ami authentifié (clé PGP signée)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3700,16 +3185,22 @@ resources.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Ajouter cet ami pour communiquer avec lui</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Pour accepter la demande d&apos;amitié, cliquez sur le bouton Terminer.</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Désolé, des erreurs sont survenues</translation>
     </message>
@@ -3729,32 +3220,27 @@ resources.</source>
         <translation>À propos de votre ami : </translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Validité de la clé :</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Ils lui font aussi confiance :</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signer la clé d&apos;un ami est un moyen d&apos;exprimer votre confiance en cet ami, à vos autres amis. Les signatures sous cryptographie attestent que les propriétaires des clés répertoriées reconnaissent la clé PGP actuelle comme authentique.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Ce contact est déjà dans votre liste d&apos;am. L&apos;ajouter se limitera à enregistrer son adresse IP.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3800,49 +3286,17 @@ resources.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Le chargement du certificat à échoué</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Impossible d&apos;obtenir les détails de la clé PGP %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Tous les contacts dont vous n&apos;avez pas signé les certificats</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Amis de vos amis qui vous ont déjà accordé leur confiance</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Contacts signées montrés comme refusés</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Nom du contact</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Également signé par</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">ID du contact</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">Le certificat semble valide</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Certificat Retroshare non valide!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Invitation Retroshare</translation>
     </message>
@@ -3864,12 +3318,12 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>C&apos;est votre propre certificat! Vous ne voulez pas devenir ami avec vous même. N&apos;est-ce pas?</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3877,7 +3331,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation>Cette clé est déjà dans votre liste de confiance.</translation>
     </message>
@@ -3917,7 +3371,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>Vous avez une demande d&apos;amitié de</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3942,7 +3396,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3952,47 +3406,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">L&apos;importation du certificat a échoué : le fichier %1 n&apos;a pas été trouvé</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Ce contact %1 n&apos;est pas disponible dans votre réseau</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Utiliser le nouveau format de certificat (plus sure, plus robuste)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Utilisez l&apos;ancien format de certificat (rétrocompatible)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Supprimer les signatures</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">Invitation Retroshare</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Aide pour l&apos;envoi du certificat</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Vous pouvez copier votre certificat et l&apos;envoyer à vos amis par courrier électronique ou par tout autre moyen</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Votre certificat a été copié dans le presse-papier, collez-le et envoyez-le par courrier electronique ou par tout autre moyen</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Enregistrer sous...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4031,11 +3445,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>*** Aucune ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Utiliser en source directe, quand disponible</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>Addr-IP :</translation>
     </message>
@@ -4045,7 +3455,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>Adresse IP</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Afficher les options avancées</translation>
     </message>
@@ -4054,10 +3464,6 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signer la clé d&apos;un ami est une façon d&apos;exprimer à vos autres amis votre confiance en cet ami. Cela les aide à décider, en se basant sur votre propre confiance, si ils doivent permettre des connexions depuis cette clé. Signer une clé est absolument facultatif et ne peut pas être défait, alors faites-le avec sagesse.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare vérifie périodiquement vos listes d&apos;amis pour les recherches de  fichier correspondant à vos transferts, afin d&apos;établir un transfert direct. Dans ce cas, votre ami sait que vous téléchargez le fichier.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Pour éviter ce comportement pour cet ami uniquement, décochez cette case. Vous pouvez toujours effectuer un transfert direct si vous le demandez explicitement, par ex. Téléchargement de la liste de fichiers de votre ami. Ce paramètre est appliqué à tous les emplacements de même ami.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4068,45 +3474,13 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les personnes qui ont cette option ne peuvent pas se connecter si leur adresse de connexion n&apos;est pas dans la liste blanche. Cela vous protège contre les attaques de transfert de trafic. Lorsqu&apos;ils sont utilisés, les homologues rejetés seront signalés par des &amp;quot;alertes de sécurité&amp;quot; dans le fil d&apos;actualité. De là, vous pouvez mettre en liste blanche ou noir leur IP. S&apos;applique à tous les emplacements de même personne.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Recommander plusieurs amis les uns aux autres</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Recommandations d&apos;amis</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">Le texte ci-dessous est votre certificat Retroshare. Vous devez le fournir à votre ami</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Message :</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Amis recommandés</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Pour</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Veuillez sélectionner au moins un ami à recommander.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Veuillez sélectionner au moins un destinataire.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Ajouter la clé au trousseau</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Cette clé est déjà dans votre trousseau</translation>
     </message>
@@ -4122,7 +3496,7 @@ l&apos;envoi de messages distants à ce
 contact même si vous n&apos;êtes pas amis.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Le certificat a un mauvais numéro de version. Souvenez-vous que les réseaux v0.6 et v0.5 sont incompatibles.</translation>
     </message>
@@ -4157,7 +3531,7 @@ contact même si vous n&apos;êtes pas amis.</translation>
         <translation>Ajouter l&apos;IP dans la liste blanche</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>Pas d&apos;IP dans ce certificat !</translation>
     </message>
@@ -4167,27 +3541,10 @@ contact même si vous n&apos;êtes pas amis.</translation>
         <translation>&lt;p&gt;Ce certificat n&apos;a pas d&apos;IP. Vous devrez compter sur la découverte et la DHT pour le trouver. Parce que vous exigez l&apos;autorisation liste blanche, le pair lèvera un avertissement de sécurité dans l&apos;onglet &quot;Fil d&apos;actualités&quot;. De là, vous pourrez passer son IP en liste blanche.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished">[Inconnu]</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Ajoutée avec certificat depuis %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Coller le certificat de votre ami depuis le presse-papier</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Échec de chargement du certificat : ne peut pas lire le fichier %1</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Échec de chargement du certificat : quelque chose ne va pas dans %1</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4249,7 +3606,7 @@ contact même si vous n&apos;êtes pas amis.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>Réglage UDP</translation>
     </message>
@@ -4285,7 +3642,7 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;vous pouvez fermer la fenêtre.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Assistant de connexion</translation>
     </message>
@@ -4295,17 +3652,20 @@ p, li { white-space: pre-wrap; }
         <translation>ID du contact incorrecte </translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>État inconnu</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Hors ligne</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Derrière un NAT symétrique</translation>
     </message>
@@ -4315,12 +3675,14 @@ p, li { white-space: pre-wrap; }
         <translation>Derrière un NAT &amp; Pas de DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Redémarrage du NET</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>Derrière un NAT</translation>
     </message>
@@ -4330,7 +3692,8 @@ p, li { white-space: pre-wrap; }
         <translation>Pas de DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>ÉTAT DU NET : BON !</translation>
     </message>
@@ -4355,7 +3718,7 @@ p, li { white-space: pre-wrap; }
         <translation>Recherche de contacts RS</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Lookup nécessite la DHT</translation>
     </message>
@@ -4647,7 +4010,7 @@ p, li { white-space: pre-wrap; }
         <translation>Veuillez réessayez d&apos;importer le certificat en entier</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4655,7 +4018,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>FORWARD INVÉRIFIABLE !</translation>
     </message>
@@ -4665,7 +4029,7 @@ p, li { white-space: pre-wrap; }
         <translation>FORWARD INVÉRIFIABLE &amp; PAS DE DHT</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Recherche</translation>
     </message>
@@ -4701,12 +4065,12 @@ p, li { white-space: pre-wrap; }
         <translation>Détails du cercle</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le nom du cercle, le contact de l&apos;auteur et la liste des membres invités sera visible à tous les invités. Si le cercle n&apos;est pas privé, ils seront également visibles aux nœuds voisins de ceux qui hébergent les invités.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </translation>
     </message>
@@ -4726,7 +4090,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>IDs</translation>
     </message>
@@ -4746,18 +4110,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtre</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Membres invités</translation>
     </message>
@@ -4772,15 +4136,7 @@ p, li { white-space: pre-wrap; }
         <translation>Personnes connues</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Type</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
@@ -4820,23 +4176,19 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les cercles peuvent être limités aux membres d&apos;un autre cercle. Seuls les membres de ce deuxième cercle seront autorisés à voir le nouveau cercle et son contenu (la liste des membres, etc)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Seulement visible par les membres de :</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>S&apos;il vous plaît donnez un nom à votre cercle</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Aucune restriction de cercle sélectionnée</translation>
     </message>
@@ -4846,12 +4198,24 @@ p, li { white-space: pre-wrap; }
         <translation>Aucune limitation de cercle sélectionnée</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Inconnu]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
@@ -4861,7 +4225,7 @@ p, li { white-space: pre-wrap; }
         <translation>Enlever</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Rechercher</translation>
@@ -4876,10 +4240,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Signé</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Signé par des noeuds connus</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4896,10 +4256,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>Identité PGP</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">ID anon</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4922,17 +4278,13 @@ p, li { white-space: pre-wrap; }
         <translation>Créer un nouveau cercle</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Créer</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">ID PGP liée</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Ajouter membre</translation>
     </message>
@@ -4951,7 +4303,7 @@ p, li { white-space: pre-wrap; }
         <translation>Créer un groupe</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Nom du groupe :</translation>
     </message>
@@ -4986,7 +4338,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Nouvel article sur la chaîne</translation>
     </message>
@@ -4996,7 +4348,7 @@ p, li { white-space: pre-wrap; }
         <translation>Message</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5057,23 +4409,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Utiliser &quot;glisser-déposer&quot; / le bouton d&apos;ajout, pour hacher de nouveaux fichiers.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copier/collez des liens Retroshare depuis vos partages.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Joindre un fichier</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Incorporer une miniature</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Message</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Sujet :</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5159,17 +4499,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5188,17 +4528,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Fichier déjà ajouté et hashé</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Veuillez ajouter un sujet à votre message</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Charger la miniature</translation>
     </message>
@@ -5213,18 +4554,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Générer des données en masse</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Voulez-vous vraiment générer %1 messages ?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Vous êtes sur le point d&apos;ajouter les fichiers que vous ne partagez pas actuellement. Voulez-vous toujours faire cela ?</translation>
     </message>
@@ -5258,7 +4593,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Poster un message sur le forum</translation>
     </message>
@@ -5267,10 +4602,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Sujet</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5291,8 +4622,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5311,7 +4642,7 @@ p, li { white-space: pre-wrap; }
         <translation>Vous pouvez joindre des fichiers par glisser/déposer</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5341,17 +4672,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Aucun forum</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>En réponse à</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Titre</translation>
     </message>
@@ -5405,7 +4736,7 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished">Charger le fichier image</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>Pas d&apos;ID compatible pour ce forum</translation>
     </message>
@@ -5415,8 +4746,8 @@ Voulez-vous annuler ce message?</translation>
         <translation>Aucune de vos identités n&apos;est autorisée à poster dans ce forum. Ceci pourrait être dû à un forum qui serait limité à un cercle qui ne contient aucune de vos identités, ou à des drapeaux de forum exigeant une identité signée en PGP.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Générer des données en masse</translation>
     </message>
@@ -5425,10 +4756,6 @@ Voulez-vous annuler ce message?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Voulez-vous vraiment générer %1 messages ?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Envoyer</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5443,23 +4770,7 @@ Voulez-vous annuler ce message?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Créer un salon de tchat</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Un salon de chat est un tchat en groupe décentralisé et anonyme. Tous les participants reçoivent tous les messages. Une fois que le salon est créé, vous pouvez inviter d&apos;autres amis à partir de l&apos;onglet Amis.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Nom du salon :</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Sujet du salon : </translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5494,7 +4805,7 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Créer</translation>
     </message>
@@ -5504,11 +4815,7 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si vous cochez ceci, seules les IDs signées en PGP peuvent être utilisées pour rejoindre ce salon et y parler. Cette limitation empêche le publipostage anonyme excessif car il devient possible pour au moins quelques personnes dans ce salon de localiser le noeud du spammeur.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>nécessite des identités signées PGP</translation>
     </message>
@@ -5523,11 +4830,7 @@ Voulez-vous annuler ce message?</translation>
         <translation>Selectionner les amis avec qui vous voulez communiquer.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Amis invités</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Créer un salon de tchat</translation>
@@ -5548,7 +4851,7 @@ Voulez-vous annuler ce message?</translation>
         <translation>Contacts :</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Identité à utiliser :</translation>
     </message>
@@ -5556,17 +4859,17 @@ Voulez-vous annuler ce message?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Information publique</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Emplacement :</translation>
     </message>
@@ -5576,12 +4879,12 @@ Voulez-vous annuler ce message?</translation>
         <translation>ID de l&apos;emplacement :</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Version du logiciel : </translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>En ligne depuis :</translation>
     </message>
@@ -5601,12 +4904,7 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5616,7 +4914,7 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Autres informations</translation>
     </message>
@@ -5626,17 +4924,12 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished">Profil</translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Certificat</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5646,11 +4939,7 @@ Voulez-vous annuler ce message?</translation>
         <translation>Inclure les signatures</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Enregistrer votre clé dans un fichier</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exporter l&apos;identité</translation>
     </message>
@@ -5724,33 +5013,33 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>Empreinte PGP :</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Information de noeud</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>ID PGP :</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Noeuds amis </translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5789,14 +5078,6 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>Node</source>
         <translation>Noeud</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Créer nouveau noeud ...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">afficher la fenêtre de statistiques</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5813,10 +5094,6 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Retroshare utilise la DHT de Bittorrent comme un proxy pour les connexions. Cela ne &quot;stocke&quot; pas votre IP dans la DHT. 				                        Au lieu de cela, la DHT est utilisée par vos amis pour vous atteindre tout en effectuant des requêtes DHT standards. 												Le voyant de statut deviendra vert aussitôt que Retroshare obtiendra une réponse DHT d&apos;un de vos amis.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5852,7 +5129,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>o</translation>
     </message>
@@ -6520,7 +5797,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Ouvrir le fichier</translation>
     </message>
@@ -6528,38 +5805,38 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>à</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>Ignorer la casse</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>jj.MM.aaaa</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>Ko</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>Go</translation>
     </message>
@@ -6567,12 +5844,12 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Expression Widget</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Supprimer cette expression</translation>
     </message>
@@ -6734,7 +6011,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Image</translation>
     </message>
@@ -6744,7 +6021,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6804,11 +6081,21 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Dossiers partagés de mes amis</translation>
     </message>
@@ -6930,7 +6217,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -6965,10 +6252,6 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>Show State</source>
         <translation>Afficher l&apos;état</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">Amis de confiance</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6976,7 +6259,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Afficher les groupes</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
@@ -7012,7 +6295,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Ajouter à un groupe</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Rechercher</translation>
@@ -7028,7 +6311,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Trier par état</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Détails du profil</translation>
     </message>
@@ -7273,7 +6556,7 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Accepter la demande d&apos;amitié</translation>
     </message>
@@ -7290,10 +6573,6 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Rechercher :</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7315,7 +6594,7 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Rechercher des amis</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Tout marquer</translation>
     </message>
@@ -7326,16 +6605,134 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Marquer aucun</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished">Adresse</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Statut</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Devenir ami</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished">Ce proxy n&apos;est pas activé ou est cassé.
+Tous les services sont-ils bien en marche ?
+Vérifiez aussi vos ports !</translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Modifier le message d&apos;état</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Tchat entre amis</translation>
     </message>
@@ -7418,33 +6815,38 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Réinitialiser à la valeur par défaut</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Trousseau</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Réseau&lt;/h1&gt; &lt;p&gt;L&apos;onglet réseau montre les noeuds de vos amis Retroshare : les noeuds Retroshare voisins qui sont connectés à vous.&lt;/p&gt; &lt;p&gt;Vous pouvez grouper les noeuds ensemble pour permettre un niveau d&apos;accès plus fin à l&apos;information, par exemple pour permettre seulement à quelques noeuds de voir vos fichiers.&lt;/p&gt; &lt;p&gt;Sur la droite, vous trouverez 3 onglets utiles : &lt;ul&gt; &lt;li&gt;Tchat entre amis (en anglais : &quot;broadcast&quot;) : diffuse les messages immédiatement à tous les noeuds amis connectés&lt;/li&gt; &lt;li&gt;Graphe réseau : ce graphe montre le réseau autours de vous, en se basant sur l&apos;information de découverte&lt;/li&gt; &lt;li&gt;Trousseau : contient les clés des noeuds que vous avez collecté, elles sont transférées jusqu&apos;à vous principalement par les noeuds de vos amis&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt; </translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retroshare broadcast chat : les messages sont envoyés à tous vos amis en ligne.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Graphe réseau</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Mettez ici votre message de statut.</translation>
     </message>
@@ -7462,7 +6864,17 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Tous les champs sont requis avec un minimum de 3 caractères</translation>
     </message>
@@ -7472,17 +6884,12 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Les mots de passe ne correspondent pas</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation>Utiliser BOB</translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Ce mot de passe est pour PGP</translation>
@@ -7503,50 +6910,38 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Échec lors de la génération de votre nouveau certificat, peut-être que votre mot de passe PGP est faux !</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="vanished">Options</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation>Longueur de la clé PGP</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mettez un mot de passe fort ici. Ce mot de passe protège votre clé privée!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;S&apos;il vous plaît déplacer votre souris afin de recueillir autant de données aléatoires que possible. Un minimum de 20% est nécessaire pour créer votre clé d&apos;emplacement&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Emplacement standard</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">Emplacement Caché TOR/I2P</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Votre nom d&apos;emplacement désigne l&apos;instance de Retroshare exécutée sur cet ordinateur.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Use existing profile</source>
-        <translation type="vanished">Utiliser un profil existant</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Nom de l&apos;emplacement</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7566,14 +6961,14 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le nom du profil vous identifie sur le réseau.
 Il est utilisé par vos amis pour accepter vos connexions.
 Vous pouvez créer plusieurs emplacement Retroshare avec le même profil sur différents ordinateurs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Exporter ce profil</translation>
     </message>
@@ -7583,7 +6978,7 @@ Vous pouvez créer plusieurs emplacement Retroshare avec le même profil sur dif
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cela doit être une adresse Tor Onion de la forme: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;ou une addresse I2P de cette forme: [52 characters].b32.i2p 
 
@@ -7592,39 +6987,40 @@ Pour en obtenir une, vous devez configurer Tor ou I2P pour créer un nouveau tun
 Vous pouvez également laisser ce champ vide, mais votre nœud ne fonctionnera que si vous définissez correctement l&apos;adresse de service Tor / I2P dans le panneau de configuration Préférences -&amp;gt; Réseaux -&amp;gt; Configuration Hidden Service.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les identités sont utilisées lorsque vous écrivez dans des salons de tchat, des forums et des commentaires de chaîne.
 
 Ils reçoivent/envoient également du courrier électronique sur le réseau Retroshare. Vous pouvez créer une identité signée maintenant, ou le faire plus tard lorsque vous en aurez besoin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>C&apos;est parti !</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation>Étiquette</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Options avancées</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>adresse cachée</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Votre profil est associé à une paire de clé PGP. Actuellement RetroShare ignore les clés DSA.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ceci est votre port de connexion.&lt;/p&gt;&lt;p&gt;N&apos;importe quelle valeur entre 1024 et 65535 &lt;/p&gt;&lt;p&gt; devrait être OK. Il vous sera possible de la changer plus tard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7672,13 +7068,13 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>Votre profil n&apos;a pas été sauvegardé. Une erreur est arrivée.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importer profil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Créer un nouveau profil et un nouveau emplacement Retroshare</translation>
     </message>
@@ -7688,7 +7084,7 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>Créer un nouveau emplacement Retroshare</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation>Adresse Tor/I2P</translation>
     </message>
@@ -7723,7 +7119,7 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7733,12 +7129,7 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La création du nœud est désactivée jusqu&apos;à ce que les champs soient correctement remplis.&lt;/p&gt;</translation>
     </message>
@@ -7748,12 +7139,7 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>&lt;p&gt;La création du nœud est désactivée jusqu&apos;à ce que suffisamment d&apos;éléments aléatoires soient collectés. Veuillez déplacer votre souris jusqu&apos;à ce que vous atteigniez au moins 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation>Adresse d&apos;instance I2P avec BOB activé</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation>Adresse d&apos;instance I2P</translation>
     </message>
@@ -7979,36 +7365,13 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>Mise en route</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Inviter des amis</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Retroshare n&apos;est rien sans vos amis. Cliquez sur le bouton pour démarrer le procédure&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Envoyez à vos amis un email avec votre &quot;certificat d&apos;identité&quot;.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Soyez sur de recevoir leur invitation en retour... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Vous ne pouvez vous connecter avec vos amis que si vous vous êtes mutuellement ajoutés les uns aux autres.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Ajouter vos amis à Retroshare</translation>
     </message>
@@ -8018,136 +7381,103 @@ p, li { white-space: pre-wrap; }
         <translation>Ajouter des amis</translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Soyez en ligne en même temps que vos amis et ainsi RetroShare vous connectera automatiquement !&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Votre client a besoin de trouver le réseau RetroShare avant qu&apos;il ne soit capable d&apos;effectuer des connexions.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Cela prend 5 à 30 minutes la première fois que vous démarrez RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;L&apos;indicateur DHT (dans la barre de statut) se colorera en vert lorsqu&apos;il pourra effectuer des connexions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Après deux minutes , l&apos;indicateur NAT (aussi situé dans la barre de statut) se colorera en jaune ou en vert.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Si il reste en rouge, alors vous avez un pare-feu ennuyeux, que RetroShare ne parvient pas à traverser.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Regardez dans la section &quot;Davantage d&apos;aide&quot; pour plus de conseils de connexion.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Se connecter aux amis</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Vous pouvez augmenter la performance de votre Retroshare en ouvrant un port externe. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Cela va augmenter la vitesse des connexions et permettre à davantage de personnes de se connecter à vous. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;La façon la plus facile de faire cela consiste à activer UPnP dans votre box Sans-fil ou Routeur.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Comme chaque routeur est conçu différemment, vous devrez découvrir votre modèle de routeur et rechercher dans Internet afin de trouver des instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Si rien de tout ceci ne vous paraît évident, ne vous inquiétez pas Retroshare marchera malgré tout.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avancé : ouvrir un port dans le pare-feu</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Rencontrez vous des difficultés pour débuter avec RetroShare ?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Lisez la FAQ située dans le Wiki. Elle est un peu vieille, nous essayons de l&apos;actualiser.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Regardez les forums en ligne. Posez des questions et discutez des fonctionnalités.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Essayez les forums internes à RetroShare &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- Ceux-ci arriveront en ligne lorsque vous serez connecté à des amis.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) Si vous êtes encore bloqué, écrivez-nous.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Appréciez Retroshare&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Se connecter aux amis</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Quand vos amis vous envoient leurs invitations, cliquez pour ouvrir la fenêtre Ajout d&apos;amis.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Collez les &amp;quot;Certificats ID&amp;quot; de vos amis dans la fenêtre puis ajoutez-les comme amis.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avancé : ouvrir un port dans le pare-feu</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Aide supplémentaire et support</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Ouvrir le site web de RS</translation>
     </message>
@@ -8172,7 +7502,7 @@ p, li { white-space: pre-wrap; }
         <translation>Commentaires par email</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>Invitation Retroshare</translation>
     </message>
@@ -8222,12 +7552,12 @@ p, li { white-space: pre-wrap; }
         <translation>Retour-utilisateur Retroshare</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>Aide Retroshare</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Il a de nombreuses fonctionnalités, telles qu&apos;un tchat intégré, messagerie,</translation>
     </message>
@@ -8351,7 +7681,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Afficher le Tchat public</translation>
     </message>
@@ -8359,7 +7689,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[Inconnu]</translation>
     </message>
@@ -8525,19 +7855,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Vous pouvez laisser vos amis prendre connaissance de votre forum en le partageant avec eux. Choisissez les amis avec lesquels vous voulez partager votre forum.</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">Partager les permissions d&apos;administration de sujet</translation>
-    </message>
-    <message>
-        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
-        <translation type="vanished">Vous pouvez permettre à vos amis d&apos;éditer le sujet. Choisissez-les dans la liste ci-dessous. Note : il n&apos;est pas possible de révoquer des permissions d&apos;administration Postées (Posted admin permissions).</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Titre</translation>
     </message>
@@ -8550,12 +7872,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8580,35 +7902,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">Trier Ordre décroissant</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">Trier Ordre croissant</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Trier par nom</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Trier par popularité</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Trier par dernier message</translation>
-    </message>
-    <message>
-        <source>Sort by Number of Posts</source>
-        <translation type="vanished">Trier par quantité de messages</translation>
-    </message>
-    <message>
-        <source>Sort by Unread</source>
-        <translation type="vanished">Trier par Non lus</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Vous êtes administrateur (modifiez les noms et la description en utilisant le menu Edition)</translation>
     </message>
@@ -8623,14 +7917,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Dernier commentaire</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
@@ -8641,17 +7935,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularité</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Jamais</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Affichage</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8664,7 +7954,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>et</translation>
     </message>
@@ -8800,7 +8090,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Chaînes</translation>
@@ -8811,34 +8101,22 @@ p, li { white-space: pre-wrap; }
         <translation>Créer une chaîne</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Activer le téléchargement automatique</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Vos chaînes</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chaînes&lt;/h1&gt; &lt;p&gt;Les chaînes vous permettent de poster des données (exemples : films, musiques) qui seront diffusées dans le réseau
-
-Vous pouvez voir les chaînes auxquelles sont abonnés vos amis, et vous transférez automatiquement à vos amis les chaînes auxquelles vous êtes abonné. Ceci promeut les bonnes chaînes dans le réseau.
-
-Seul le créateur d&apos;une chaîne peut poster dans cette chaîne. Les autres personnes dans le réseau peuvent seulement lire dedans, à moins que la chaîne ne soit privée. Vous pouvez cependant partager les droits de poster ou de lire avec vos amis Retroshare.
-
-Les chaînes peuvent être anonymes, ou attachées à une identité Retroshare afin que les lecteurs puissent prendre contact avec vous si besoin. Permettez &quot;Autoriser commentaires&quot; si vous voulez laisser la possibilité aux utilisateurs de commenter vos postages.
-
-Les publications sont conservés pendant %1  jours et synchronisés au cours des derniers %2 jours, à moins que vous ne les modifiez.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Chaînes abonnées</translation>
     </message>
@@ -8858,12 +8136,12 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation>Spécifier le répertoire de téléchargement pour cette chaîne</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Désactiver le téléchargement automatique</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>Spécifier le répertoire de téléchargement</translation>
     </message>
@@ -8898,22 +8176,22 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Ouvrir dossier</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
@@ -8933,17 +8211,17 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation>Vérification</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Êtes-vous sûr(e) de vouloir annuler et supprimer ce fichier ?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Impossible d&apos;ouvrir le dossier</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Lecture</translation>
     </message>
@@ -8953,37 +8231,10 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation type="unfinished">Le fichier %1 n&apos;existe pas à cet endroit.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulaire</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Nom du fichier</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Taille</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Titre</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Publié</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Statut</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Créer une nouvelle chaîne</translation>
     </message>
@@ -9021,9 +8272,19 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>S&apos;abonner à la chaîne</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9037,7 +8298,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Étendre</translation>
     </message>
@@ -9052,7 +8313,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation>Description de la chaîne</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Chargement</translation>
     </message>
@@ -9067,8 +8328,9 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Nouvelle chaîne</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Jamais</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -9079,7 +8341,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Nouveau commentaire&#xa0;:</translation>
     </message>
@@ -9100,7 +8362,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Lecture</translation>
     </message>
@@ -9156,28 +8418,24 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Avertissement ! Vous avez moins de %1 heure(s) et %2 minute(s) avant que ce fichier ne soit supprimé. Pensez à l&apos;enregistrer.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
@@ -9192,21 +8450,17 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation>Je n&apos;aime pas ça</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Chargement</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation>Commentaires</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9231,139 +8485,16 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation>Lire le média</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Poster dans la chaîne</translation>
-    </message>
-    <message>
-        <source>Add new post</source>
-        <translation type="vanished">Ajouter une nouvelle publication</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Chargement</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Chercher chaînes</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Titre</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Chercher titre</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Message</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Chercher message</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Nom du fichier</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Chercher nom de fichier</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Aucune chaîne sélectionnée</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Jamais</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Public</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle &quot;</source>
-        <translation type="vanished">Limité aux membres du cercle &quot;</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle </source>
-        <translation type="vanished">Limité aux membres du cercle</translation>
-    </message>
-    <message>
-        <source>Your eyes only</source>
-        <translation type="vanished">Vos yeux seulement</translation>
-    </message>
-    <message>
-        <source>You and your friend nodes</source>
-        <translation type="vanished">Vous et vos noeuds amis</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Désactiver le téléchargement automatique</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Activer le téléchargement automatique</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Afficher les flux</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Afficher les fichiers</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Administrateur :</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Dernier message :</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">inconnu</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Distribution :</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Flux</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Fichiers</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Abonnés</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Description :</translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">Posts (chez vos noeuds voisins) :</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Poster dans la chaîne</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished">Ajouter une nouvelle publication</translation>
     </message>
@@ -9433,7 +8564,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9469,7 +8600,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Commentaires</translation>
     </message>
@@ -9484,13 +8615,13 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation type="unfinished">Flux</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9505,7 +8636,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9520,7 +8651,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9580,12 +8711,22 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9660,12 +8801,13 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation type="unfinished">Vous et vos noeuds amis</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Abonné</translation>
     </message>
@@ -9716,17 +8858,17 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9746,27 +8888,11 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <source>Remove Item</source>
         <translation>Supprimer</translation>
     </message>
-    <message>
-        <source>for identity </source>
-        <translation type="vanished">pour l&apos;identité </translation>
-    </message>
-    <message>
-        <source>You received a membership request for circle:</source>
-        <translation type="vanished">Vous avez reçu une demande d&apos;adhésion pour le cercle:</translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Demande d&apos;adhésion</translation>
     </message>
-    <message>
-        <source>Revoke membership request</source>
-        <translation type="vanished">Révoquer la demande d&apos;adhésion</translation>
-    </message>
-    <message>
-        <source>You received an invitation for circle:</source>
-        <translation type="vanished">Vous avez reçu une invitation pour le cercle:</translation>
-    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -9857,7 +8983,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Le conteneur de commentaires</translation>
     </message>
@@ -9870,7 +8996,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9900,7 +9026,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation>Rafraîchir</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
@@ -9939,7 +9065,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Répondre au commentaire</translation>
     </message>
@@ -9963,6 +9089,21 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <source>Vote Down</source>
         <translation>Voter -</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9972,7 +9113,7 @@ Les publications sont conservés pendant %1  jours et synchronisés au cours des
         <translation>Commenter</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -10001,26 +9142,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Commentaire&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Signé par</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -10049,7 +9174,7 @@ before you can comment</source>
 avant de pouvoir commenter</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10091,14 +9216,6 @@ avant de pouvoir commenter</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Ajouter admins de forum</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Sélectionner admins de forum</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -10108,7 +9225,7 @@ avant de pouvoir commenter</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>S&apos;abonner au forum</translation>
     </message>
@@ -10124,7 +9241,7 @@ avant de pouvoir commenter</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Montrer</translation>
     </message>
@@ -10144,8 +9261,9 @@ avant de pouvoir commenter</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Chargement</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10176,13 +9294,13 @@ avant de pouvoir commenter</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Sujet : </translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Se désabonner du forum</translation>
     </message>
@@ -10193,7 +9311,7 @@ avant de pouvoir commenter</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Montrer</translation>
     </message>
@@ -10213,21 +9331,17 @@ avant de pouvoir commenter</translation>
         <translation>En réponse à :</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Chargement</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Flux de forum</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
@@ -10240,63 +9354,66 @@ avant de pouvoir commenter</translation>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Lancer un nouveau fil dans le forum sélectionné</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Chercher</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Dernier article</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation>Nouveau fil</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Affichage en arborescence</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Affichage à plat</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Titre</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Sauvegarder image</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Chargement</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10306,12 +9423,7 @@ avant de pouvoir commenter</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Répondre au message</translation>
     </message>
@@ -10335,10 +9447,6 @@ avant de pouvoir commenter</translation>
         <source>Download all files</source>
         <translation>Télécharger tous les fichiers</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Suivant non lu</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10355,36 +9463,23 @@ avant de pouvoir commenter</translation>
         <translation>Rechercher par auteur</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Contenu</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Rechercher contenu</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;L&apos;abonnement au forum rassemblera les messages disponibles à partir de vos amis qui y sont abonnés et rendra le forum visible à tous vos autres amis.
-Ensuite vous pourrez vous désabonner via le menu contextuel de la liste des forums à gauche.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Aucun nom</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10427,20 +9522,12 @@ Ensuite vous pourrez vous désabonner via le menu contextuel de la liste des for
         <translation>Copier le lien Retroshare</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Montrer</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Banni]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[inconnu]</translation>
     </message>
@@ -10470,8 +9557,8 @@ Ensuite vous pourrez vous désabonner via le menu contextuel de la liste des for
         <translation>Vos yeux seulement</translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation>Distribution</translation>
     </message>
@@ -10485,26 +9572,6 @@ Ensuite vous pourrez vous désabonner via le menu contextuel de la liste des for
         <source>Anti-spam</source>
         <translation>Anti-spam</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Message rédigé ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anonyme</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">Signé</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">Aucun</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Message manquant... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10574,16 +9641,12 @@ Ensuite vous pourrez vous désabonner via le menu contextuel de la liste des for
         <translation>Message d&apos;origine</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation>Nouveau fil</translation>
     </message>
     <message>
-        <source>Read status</source>
-        <translation type="vanished">Lire l&apos;état</translation>
-    </message>
-    <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
@@ -10644,7 +9707,7 @@ Ensuite vous pourrez vous désabonner via le menu contextuel de la liste des for
         <translation>Réputation de l&apos;auteur</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10664,7 +9727,7 @@ Ensuite vous pourrez vous désabonner via le menu contextuel de la liste des for
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Messages anonymes / inconnus transmis si la réputation est positive</translation>
     </message>
@@ -10716,7 +9779,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10726,7 +9789,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10741,26 +9804,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information for this identity is currently missing.</source>
-        <translation type="vanished">Les informations pour cette identité sont actuellement manquantes.</translation>
-    </message>
-    <message>
-        <source>You have banned this ID. The message will not be
-displayed nor forwarded to your friends.</source>
-        <translation type="vanished">Vous avez banni cet ID. Le message ne sera pas affiché ou transmis à vos amis.</translation>
-    </message>
-    <message>
-        <source>You have not set an opinion for this person,
- and your friends do not vote positively: Spam regulation 
-prevents the message to be forwarded to your friends.</source>
-        <translation type="vanished">Vous n&apos;avez pas donné d&apos;opinion pour cette personne et vos amis ne votent pas positivement: La régulation du spam empêche le message d&apos;être transmis à vos amis.</translation>
-    </message>
-    <message>
-        <source>Message will be forwarded to your friends.</source>
-        <translation type="vanished">Le message sera transmis à vos amis.</translation>
-    </message>
-    <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation>(Derniers)</translation>
     </message>
@@ -10769,10 +9813,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>(Old) </source>
         <translation>(Anciens)</translation>
     </message>
-    <message>
-        <source>You cant act on the author to a non-existant Message</source>
-        <translation type="vanished">Vous ne pouvez pas agir sur l&apos;auteur pour un message inexistant</translation>
-    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -10830,14 +9870,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt; &lt;p&gt;Les forums de Retroshare ressemblent aux forums d&apos;internet, mais ils fonctionnent de façon décentralisée.
-Vous voyez les forums auxquels sont abonnés vos amis, et vous transférez à vos amis les forums auxquels vous vous êtes abonné. Ceci promeut automatiquement dans le réseau les forums intéressants.
-Les messages du forum sont conservés pour %1 jours et synchronisés au cours des derniers %2 jours, à moins que vous ne les configuriez autrement.&lt;/p&gt;</translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forums</translation>
@@ -10868,35 +9906,16 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Autres forums</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">En attente</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Récupération</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Chargement</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Ajouter une icône</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Ceux avec qui vous partagez votre clé peuvent publier sur les types de groupe à accès limité, et  peuvent voir et publier sur les chaines à accès privé</translation>
     </message>
@@ -10905,22 +9924,14 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <source>Share Publish Key</source>
         <translation>Partager la clé de publication</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">Visualiser les personnes avec qui vous partagez votre clé de publication privée</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Clé partagée avec</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Distribution de message</translation>
     </message>
@@ -10928,7 +9939,7 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Public</translation>
     </message>
@@ -10947,14 +9958,6 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <source>New Thread</source>
         <translation>Nouveau fil</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Requis</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Msgs chiffrés</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10996,7 +9999,7 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Protection Spam</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Commentaires :</translation>
     </message>
@@ -11019,7 +10022,7 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Anti-spam :</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11035,12 +10038,12 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation>Limité au groupe :</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation>Limité à vos amis</translation>
     </message>
@@ -11057,23 +10060,23 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>Suivi de message</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>Signature PGP requise</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Jamais</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation>Seulement les noeuds d&apos;amis dans le groupe</translation>
     </message>
@@ -11089,30 +10092,28 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Veuillez ajoutez un nom</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>La signature PGP de l&apos;ID connue est exigée</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Charger le logo du groupe</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Soumettre des changements de groupe</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Echec à préparer les méta-données de groupe - veuillez examiner</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Sera utilisé pour envoyer du retour d&apos;information</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Propriétaire :</translation>
     </message>
@@ -11122,12 +10123,12 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Mettez ici une description descriptive</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -11137,7 +10138,7 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Dernier article</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les messages se propageront bien au-delà de vos nœuds amis, à condition que les gens s&apos;abonnent à la chaîne, au forum ou à la publication que vous créez.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -11212,7 +10213,12 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Défavoriser les IDs non signées et les IDs issues de noeuds inconnus</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Popularité</translation>
     </message>
@@ -11228,27 +10234,22 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Créer</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Auteur</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>GxsIdLabel</translation>
     </message>
@@ -11256,7 +10257,7 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Chargement</translation>
     </message>
@@ -11316,7 +10317,7 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Modifier détails</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation>Synchronisation des derniers messages...</translation>
     </message>
@@ -11373,16 +10374,12 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share publish permissions</source>
-        <translation type="vanished">Partager les permissions de publication</translation>
-    </message>
-    <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Copier le lien Retroshare</translation>
     </message>
@@ -11405,7 +10402,7 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Sans signature</translation>
     </message>
@@ -11418,40 +10415,24 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Chargement</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Non trouvé</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Sans signature</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Banni]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Authentification</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>clé inconnue</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">anonyme</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11461,7 +10442,12 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Nom&amp;nbsp;d&apos;identité</translation>
     </message>
@@ -11475,16 +10461,20 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <source>Node</source>
         <translation type="unfinished">Noeud</translation>
     </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">Signé&amp;nbsp;par</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Inconnu]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11496,7 +10486,7 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11544,17 +10534,13 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Inconnu]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Chargement</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11671,10 +10657,6 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <source>Group ID / Author</source>
         <translation>ID du groupe / Auteur</translation>
     </message>
-    <message>
-        <source>Number of messages / Publish TS</source>
-        <translation type="vanished">Nombre de message / Tampon Horaire de publication (TS)</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -11690,10 +10672,6 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <source>Popularity</source>
         <translation>Popularité</translation>
     </message>
-    <message>
-        <source>Details</source>
-        <translation type="vanished">Détails</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -11726,41 +10704,6 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <translation>Non</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">Tunnels authentifiés :</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">ID de tunnel : %1</translation>
-    </message>
-    <message>
-        <source>from: %1</source>
-        <translation type="vanished">depuis : %1</translation>
-    </message>
-    <message>
-        <source>to: %1</source>
-        <translation type="vanished">vers : %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">statut : %1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">total envoyé : %1 octets</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">total reçu : %1 octets</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Pair inconnu</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11973,48 +10916,12 @@ Les messages du forum sont conservés pour %1 jours et synchronisés au cours de
         <source>About</source>
         <translation>À propos</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare est une plateforme de communication décentalisée, sécurisée et privée, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;elle est open-source et trans-plateformes.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Elle vous laisse partager avec vos amis de façon sécurisée, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;en utilisant un web-de-confiance (web-of-trust) pour authentifier les pairs, et OpenSSL pour chiffrer toutes les communications. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare permet partage de fichiers, tchat, messages, et chaînes&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Liens externes utiles pour davantage d&apos;information :&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Forum de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Page du projet Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Blog de l&apos;équipe RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Twitter de dév RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+37"/>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -12030,7 +10937,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
@@ -12049,7 +10956,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -12062,36 +10969,6 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traductions RetroShare :&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traducteurs du site web de RetroShare :&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Suédois : &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Allemand : &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polonais : &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -12157,12 +11034,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+158"/>
+        <location line="+165"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12177,7 +11054,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12186,32 +11063,12 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Did you receive a certificate from a friend?</source>
-        <translation type="vanished">Avez-vous reçu le certificat d&apos;un ami ?</translation>
-    </message>
-    <message>
-        <source>Add friends certificate</source>
-        <translation type="vanished">Ajouter le certificat d&apos;un ami</translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">Ajouter un fichier de certificat</translation>
-    </message>
-    <message>
-        <source>Share your RetroShare Key</source>
-        <translation type="vanished">Partagez votre clé RetroShare</translation>
-    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
-        <translation type="vanished">Le texte ci-dessous est votre propre certificat Retroshare. Envoyez-le à vos amis</translation>
-    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -12222,20 +11079,12 @@ Plate-forme de communication décentralisée privée et sécurisée.
 </translation>
     </message>
     <message>
-        <source>Launch startup wizard</source>
-        <translation type="vanished">Lancez l&apos;assistant de démarrage</translation>
-    </message>
-    <message>
-        <source>Do you need help with RetroShare?</source>
-        <translation type="vanished">Besoin d&apos;aide avec RetroShare?</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+134"/>
         <source>Open Web Help</source>
         <translation>Ouvrir l&apos;aide Web</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Copiez votre Certificat en mémoire.</translation>
     </message>
@@ -12245,7 +11094,7 @@ Plate-forme de communication décentralisée privée et sécurisée.
         <translation>Sauvez votre Certificat dans un fichier</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>Envoyez votre Certificat par e-mail</translation>
     </message>
@@ -12265,13 +11114,37 @@ Plate-forme de communication décentralisée privée et sécurisée.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12283,17 +11156,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+57"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12302,19 +11170,11 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Bienvenu sur Retroshare!&lt;/h1&gt; &lt;p&gt;Vous devez &lt;b&gt;vous faire des amis&lt;/b&gt;! Une fois que vous avez créé un réseau d&apos;amis, ou que vous vous êtes joint à un réseau existant,	 vous pourrez échanger des fichiers, discuter, parler dans des forums, etc.&lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;    &lt;/div&gt; Pour ce faire, copier votre certificat dans cette page et l&apos;envoyer à vos amis. Ensuite, ajouter le certificat de vos amis.&lt;p&gt;  &lt;p&gt;Une autre option est de rechercher sur Internet des &quot;Retroshare chat servers&quot; (administré indépendamment ). Ces serveurs vous permettent d&apos;échanger	 votre certificat avec un emplacement Retroshare dédié, grâce auquel	 vous pourrez rencontrer d&apos;autres personnes anonymement.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Invitation Retroshare</translation>
     </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Votre certificat a été copié en mémoire, collez-le et envoyez-le par courrier électronique ou par tout autre moyen</translation>
-    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -12586,14 +11446,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Réputation</translation>
     </message>
@@ -12603,12 +11463,12 @@ p, li { white-space: pre-wrap; }
         <translation>Rechercher</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>ID anonyme</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Créer une nouvelle identité</translation>
     </message>
@@ -12618,7 +11478,7 @@ p, li { white-space: pre-wrap; }
         <translation>Créer un nouveau cercle</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>Personnes</translation>
     </message>
@@ -12633,27 +11493,27 @@ p, li { white-space: pre-wrap; }
         <translation>Personne</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation>Option de &quot;ban&quot; :</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Bannir automatiquement toutes les identités signées par la même personne</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation>Votes des Amis :</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Votes positifs</translation>
     </message>
@@ -12670,29 +11530,39 @@ p, li { white-space: pre-wrap; }
 Votes négatifs</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation>Statistiques d&apos;utilisation</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Nom du cercle</translation>
     </message>
@@ -12712,18 +11582,20 @@ Votes négatifs</translation>
         <translation>Cercles personnels</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Modifier l&apos;identité</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Supprimer l&apos;identité</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Tchater avec ce pair</translation>
     </message>
@@ -12733,78 +11605,78 @@ Votes négatifs</translation>
         <translation>Lancer un tchat distant avec ce pair</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>ID du noeud propriétaire :</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Nom de l&apos;identité :</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>ID de l&apos;identité</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Envoyer message</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Info d&apos;identité</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>ID de l&apos;identité :</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Nom du noeud propriétaire :</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation>Créer nouveau...</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Envoyer invitation</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Moyenne des avis des noeuds voisins concernant cette identité. Négatif est mauvais,&lt;/p&gt;&lt;p&gt; positif est bon. Zéro est neutre.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>Votre opinion :</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Négative</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Neutre</translation>
     </message>
@@ -12815,17 +11687,17 @@ Votes négatifs</translation>
         <translation>Positive</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le score de réputation global, représenté (accounting) pour vous et vos amis&lt;/p&gt;&lt;p&gt;Négatif est mauvais, positif est bon. Zéro est neutre. Si le score est trop bas,&lt;/p&gt;&lt;p&gt; l&apos;identité est indiquée comme néfaste et sera filtrée dans les forums, les salons de tchat,&lt;/p&gt;&lt;p&gt; les chaînes, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Générale :</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anonymes</translation>
     </message>
@@ -12840,24 +11712,24 @@ Votes négatifs</translation>
         <translation>Chercher ID</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Cette identité est possédée par vous-même</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>Mes propres identités</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>Mes contacts</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation>Options d&apos;affichage</translation>
     </message>
@@ -12872,7 +11744,12 @@ Votes négatifs</translation>
         <translation>Lié à mon noeud</translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>Autres cercles</translation>
     </message>
@@ -12882,7 +11759,7 @@ Votes négatifs</translation>
         <translation>Cercles auxquels j&apos;appartient</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>ID du cercle :</translation>
     </message>
@@ -12957,7 +11834,7 @@ Votes négatifs</translation>
         <translation>Pas un membre (n&apos;a pas d&apos;accès aux données limitées à ce cercle)</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>ID de l&apos;identité :</translation>
     </message>
@@ -12987,7 +11864,7 @@ Votes négatifs</translation>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>Invité(e)</translation>
     </message>
@@ -13002,7 +11879,7 @@ Votes négatifs</translation>
         <translation>Membre</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>Modifier le cercle</translation>
     </message>
@@ -13050,7 +11927,7 @@ Votes négatifs</translation>
         <translation>Autoriser à adhérer</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -13061,7 +11938,7 @@ Vous devriez vous en débarrasser maintenant et en utiliser une nouvelle.
 Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Noeud inconnu]</translation>
@@ -13104,7 +11981,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Identité anonyme</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13184,7 +12061,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation>information</translation>
     </message>
@@ -13200,34 +12077,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Copier identité vers le presse-papiers</translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Envoyer invitation ?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Voulez-vous vraiment envoyer une invitation avec votre certificat ?</translation>
-    </message>
-    <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Banni</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identités&lt;/h1&gt; &lt;p&gt;Dans cet onglet vous pouvez créer/éditer des &lt;b&gt;identités pseudo-anonymes&lt;/b&gt;, et des &lt;b&gt;cercles&lt;/b&gt;.
-&lt;p&gt;&lt;b&gt;Les identités&lt;/b&gt; sont utilisés pour identifier vos données de manière sécurisée : signez les messages dans les salons de tchat, les messages de forum et de canal, recevez des commentaires à l&apos;aide du système de messagerie intégré Retroshare, publiez des commentaires après les messages de canaux, discutez en utilisant des tunnels sécurisés, etc.&lt;/p&gt; 
-&lt;p&gt;Les identités peuvent éventuellement être &lt;b&gt;signées&lt;/b&gt; par le certificat de votre emplacement Retroshare. Les identités signées sont plus faciles à faire confiance mais sont facilement liées à l&apos;adresse IP de votre nœud.&lt;/p&gt; 
-&lt;p&gt;&lt;b&gt;Les Identités anonymes&lt;/b&gt; vous permettent d&apos;interagir anonymement avec d&apos;autres utilisateurs. Ils ne peuvent pas être falsifiés, mais personne ne peut prouver qui possède vraiment une identité donnée.&lt;/p&gt;
- &lt;p&gt;&lt;b&gt;Les Cercles &lt;/b&gt; sont des groupes d&apos;identités (anonymes ou signés), qui sont partagés à distance sur le réseau. Ils peuvent être utilisés pour restreindre la visibilité aux forums, chaînes, etc.&lt;/p&gt;
- &lt;p&gt;Un &lt;b&gt;cercle&lt;/b&gt; peut être restreint à un autre cercle, limitant ainsi sa visibilité aux membres de ce cercle ou même auto-restreint, ce qui signifie qu&apos;il est seulement visible pour les membres invités.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Unknown ID:</source>
-        <translation type="vanished">ID inconnu :</translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation> positif</translation>
     </message>
@@ -13271,19 +12126,11 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>Forums</source>
         <translation>Forums</translation>
     </message>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Publié</translation>
-    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Tchat</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Inconnu</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13304,14 +12151,6 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>Création d&apos;une signature d&apos;auteur en service %1</translation>
     </message>
-    <message>
-        <source>Message/vote/comment</source>
-        <translation type="vanished">Message/vote/commentaire</translation>
-    </message>
-    <message>
-        <source>%1 in %2 tab</source>
-        <translation type="vanished">%1 en %2 onglet</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -13332,19 +12171,11 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Signature dans un système de tunnel distant.</translation>
     </message>
-    <message>
-        <source>Update of identity data.</source>
-        <translation type="vanished">Mise à jour des données d&apos;identité.</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Validation de signature générique.</translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">Signature générique.</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -13356,11 +12187,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Déchiffrement générique.</translation>
     </message>
     <message>
-        <source>Membership verification in circle %1.</source>
-        <translation type="vanished">Vérification de l&apos;adhésion dans le cercle %1.</translation>
-    </message>
-    <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation>Ajouter aux contacts</translation>
     </message>
@@ -13410,21 +12237,21 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Salut,&lt;br&gt;je voudrais être ami avec vous sur RetroShare. &lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Pers.</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Votre avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>Liée(s) aux noeuds voisins</translation>
     </message>
@@ -13434,7 +12261,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Liée(s) aux noeuds distants</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Liée(s) à un noeud Retroshare ami</translation>
     </message>
@@ -13449,7 +12276,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Liée(s) à un noeud Retroshare inconnu</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Tchater avec cette personne </translation>
     </message>
@@ -13464,12 +12291,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Tchat distant avec cette personne refusé</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Dernièrement utilisée :</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP connue</translation>
     </message>
@@ -13489,12 +12316,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Voulez-vous vraiment supprimer cette identité ?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Possédé par </translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Nom de noeud : </translation>
     </message>
@@ -13504,7 +12331,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>ID de noeud :</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>Vraiment supprimer ?</translation>
     </message>
@@ -13512,7 +12339,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
@@ -13542,7 +12369,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Pseudonyme</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13552,12 +12379,19 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Nouvelle identité</translation>
     </message>
@@ -13571,7 +12405,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13581,7 +12415,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Modifier l&apos;identité</translation>
@@ -13592,27 +12431,27 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished">Mettre à jour</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13632,7 +12471,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13642,11 +12481,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Erreur lors de la récupération de la clé !</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Erreur ID de la clé invalide</translation>
     </message>
@@ -13661,7 +12496,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Vrai nom inconnu</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Créer une nouvelle identité</translation>
     </message>
@@ -13671,10 +12506,15 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13700,7 +12540,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Créer</translation>
     </message>
@@ -13710,17 +12550,13 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Votre avatar</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Mettre l&apos;avatar</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>Liée à votre profil</translation>
     </message>
@@ -13730,7 +12566,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Vous pouvez avoir une seule ou plusieurs identités. Elles sont utilisées lorsque vous écrivez dans des salons de tchat, forums, et dans les commentaires de chaînes. Elles agissent comme destination pour le tchat distant et pour le système de courrier distant de Retroshare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Ce pseudonyme est trop court. Veuillez saisir au moins %1 caractères.</translation>
     </message>
@@ -13789,10 +12625,6 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>PGP name:</source>
         <translation>Nom PGP :</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">Id GXS :</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13808,7 +12640,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
@@ -13818,12 +12650,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Tout marquer</translation>
     </message>
@@ -13842,26 +12674,38 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>Quote</source>
         <translation type="unfinished">Citer</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Envoyer</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Sauvegarder image</translation>
     </message>
     <message>
         <location line="-7"/>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Ne peut pas sauvegarder l&apos;image, le nom de fichier est invalide</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>Pas une image</translation>
     </message>
@@ -13879,27 +12723,32 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Port :</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13920,7 +12769,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13929,26 +12783,31 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Ouvrir le fichier</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Ouvrir le dossier de destination</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Vérification en cours...</translation>
     </message>
@@ -13958,7 +12817,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Vérifier vos fichiers</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation>Recommander par messagerie à ...</translation>
     </message>
@@ -13986,7 +12845,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Ajouter un ami</translation>
     </message>
@@ -14002,7 +12861,8 @@ Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Options</translation>
     </message>
@@ -14023,7 +12883,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
@@ -14034,12 +12894,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Assistant de configuration rapide</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>Retroshare %1 - Logiciel de communication sécurisé et décentralisé</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Inachevé</translation>
     </message>
@@ -14068,11 +12928,12 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Statut</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Notifications</translation>
     </message>
@@ -14083,31 +12944,35 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Ouvrir la messagerie</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Graphique de bande passante</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Réduire</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Agrandir</translation>
     </message>
@@ -14122,7 +12987,12 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 nouveau message</translation>
     </message>
@@ -14152,7 +13022,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>%1 amis connectés</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Etes-vous sûr de vouloir quitter Retroshare ?</translation>
     </message>
@@ -14172,7 +13042,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Afficher</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Assurez-vous que ce lien n&apos;a pas été créé pour vous emmener vers un site Web malveillant.</translation>
     </message>
@@ -14217,12 +13087,13 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Matrice des autorisations de services</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Afficher l&apos;interface web</translation>
     </message>
@@ -14237,7 +13108,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>dossier a beaucoup diminué ! (la limite actuelle est</translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>Voulez-vous vraiment quitter ?</translation>
     </message>
@@ -14246,17 +13117,17 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Écrire</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Paragraphe</translation>
     </message>
@@ -14292,12 +13163,12 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Titre 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Augmenter la police</translation>
     </message>
@@ -14312,32 +13183,32 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Gras</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Italique</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Alignement</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Insérer une image</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Paramétrer la police d&apos;écriture dans le code</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Souligné</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Sujet : </translation>
     </message>
@@ -14348,32 +13219,32 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Mots clés</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>Liste d&apos;adresses : </translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation>Recommander cet ami</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Définir la couleur du texte</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Définir la couleur de fond du texte</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Fichiers recommandés</translation>
     </message>
@@ -14443,7 +13314,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Ajouter une citation</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Envoyer à :</translation>
     </message>
@@ -14467,10 +13338,6 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <source>&amp;Justify</source>
         <translation>&amp;Justifier le texte</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">Toutes adresses (mélangé)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14482,7 +13349,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Mes contacts</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Bonjour, &lt;br&gt;Je vous recommande un(e) bon(nne) ami(e), vous pouvez lui faire confiance autant qu&apos;à moi. &lt;br&gt;</translation>
     </message>
@@ -14502,18 +13369,18 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>veut devenir ami(e) avec toi sur Retroshare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Bonjour %1,&lt;br&gt;&lt;br&gt;%2 veut devenir ton ami(e) sur Retroshare.&lt;br&gt;&lt;br&gt;Répondre maintenant :&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Merci,&lt;br&gt;L&apos;équipe de Retroshare</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Enregistrer le message</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Le message n&apos;a pas été envoyé
@@ -14525,7 +13392,17 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Coller le lien Retroshare</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Ajouter à &quot;A&quot;</translation>
     </message>
@@ -14545,7 +13422,7 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Ajouter comme fichier recommandé</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Message d&apos;origine</translation>
     </message>
@@ -14555,21 +13432,21 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Pour</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Eléments envoyés</translation>
     </message>
@@ -14584,7 +13461,7 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Sur %1, %2 à écrit :</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Re :</translation>
     </message>
@@ -14594,30 +13471,30 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Tr :</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Souhaitez-vous envoyer ce message sans sujet ?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Veuillez inscrire au moins un destinataire.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Cci</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
@@ -14732,13 +13609,13 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Détails</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Ouvrir un fichier...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Fichiers HTML (*.htm *.html);;tous les fichiers (*)</translation>
     </message>
@@ -14758,7 +13635,7 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Exporter en PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Le message n&apos;a pas été envoyé.
@@ -14780,7 +13657,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Ajouter un fichier supplémentaire</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Salut,&lt;br&gt;je voudrais être ami avec vous sur RetroShare. &lt;br&gt;</translation>
     </message>
@@ -14804,28 +13681,24 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">Vous avez une invitation de la part d&apos;un ami</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Répondre maintenant :</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>De :</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>Noeuds amis</translation>
     </message>
@@ -14870,13 +13743,13 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Liste ordonnée (romain majuscule)</translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Remerciements, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Identité distante :</translation>
     </message>
@@ -14886,12 +13759,12 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>[Manquante]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Veuillez créer une identité pour signer vos messages distants, ou enlever de la liste de destinations les pairs distants.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Nom de noeud et id:</translation>
     </message>
@@ -14969,7 +13842,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Par défaut</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Un nouvel onglet</translation>
     </message>
@@ -14979,7 +13852,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Une nouvelle fenêtre</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Modifier le mot clé</translation>
     </message>
@@ -15002,7 +13875,7 @@ Voulez-vous enregistrer votre message ?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Sous :</translation>
     </message>
@@ -15010,7 +13883,7 @@ Voulez-vous enregistrer votre message ?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Message</translation>
     </message>
@@ -15038,7 +13911,7 @@ Voulez-vous enregistrer votre message ?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Fichiers recommandés</translation>
     </message>
@@ -15048,37 +13921,37 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Télécharger tous les fichiers recommandés</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Sujet : </translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>De :</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Pour :</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Cc :</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Cci :</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Mots clés :</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Répondre</translation>
     </message>
@@ -15100,7 +13973,7 @@ Voulez-vous enregistrer votre message ?</translation>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Suivant</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -15118,7 +13991,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>Envoyer invitation</translation>
     </message>
@@ -15170,7 +14043,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Confirmer %1 comme ami</translation>
     </message>
@@ -15180,12 +14053,12 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Ajouter %1 comme ami</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Pas de sujet</translation>
     </message>
@@ -15195,17 +14068,22 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15215,21 +14093,23 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Envoyer invitation ?</translation>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Voulez-vous vraiment envoyer une invitation avec votre certificat ?</translation>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Tout télécharger</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Imprimer le document</translation>
     </message>
@@ -15244,12 +14124,12 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Fichiers HTML (*.htm *.html);;tous les fichiers (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Toujours charger les images pour ce message</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Cacher le panneau pièce jointe</translation>
     </message>
@@ -15271,42 +14151,6 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Compose</source>
         <translation>Écrire</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Répondre au(x) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Répondre</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Répondre à tous les destinataires du(des) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Répondre à tous</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Transférer le(s) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Suivante</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Supprimer le(s) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Supprimer</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Imprimer le(s) message(s) sélectionné(s)</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15385,7 +14229,7 @@ Voulez-vous enregistrer votre message ?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Nouveau message</translation>
     </message>
@@ -15395,60 +14239,16 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Écrire</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Répondre au(x) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Répondre</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Répondre à tous les destinataires du(des) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Répondre à tous</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Transférer le(s) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Transférer</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Supprimer le(s) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Supprimer</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Imprimer le(s) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Imprimer</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Affichage</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Mots clés</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Boîte de réception</translation>
@@ -15478,21 +14278,17 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Corbeille</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Tous les messages :</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Dossiers</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Vue rapide</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Imprimer...</translation>
@@ -15502,26 +14298,6 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Print Preview</source>
         <translation>Aperçu avant impression</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Icônes uniquement</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Texte à coté des icônes</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Icônes avec texte</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Texte en dessous des icônes</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Définir le texte sous les icônes</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15543,7 +14319,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Faire suivre le(s) message(s)</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Sujet</translation>
     </message>
@@ -15553,7 +14329,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>De</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
@@ -15563,39 +14339,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Contenu</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Cliquer pour trier par fichiers attachés</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Cliquer pour trier par sujet</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Cliquer pour trier par lu</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Cliquer pour trier par expéditeur</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Cliquer pour trier par date</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Cliquer pour trier par mots clés</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Cliquer pour trier par suivi</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Transférer le(s) message(s) sélectionné(s)</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Rechercher sujet</translation>
     </message>
@@ -15604,6 +14348,11 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Search From</source>
         <translation>Rechercher de</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15630,14 +14379,14 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Rechercher pièces jointes</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt; &lt;p&gt;Retroshare a son propre système de messagerie interne. Vous pouvez en envoyer/recevoir vers/depuis les noeuds de vos amis connectés.&lt;/p&gt; &lt;p&gt;Il est aussi possible d&apos;envoyer des messages vers les Identités d&apos;autres personnes en utilisant le système de routage global. Ces messages sont toujours chiffrés et sont relayés par des noeuds intermédiaires jusqu&apos;à ce qu&apos;ils atteignent leur destination finale. &lt;/p&gt; &lt;p&gt;Les messages distants restent dans votre boite d&apos;envoi jusqu&apos;à ce qu&apos;un accusé de réception soit reçu.&lt;/p&gt; &lt;p&gt;De façon générale, vous pouvez utiliser les messages afin de recommander des fichiers à vos amis en y collant des liens de fichiers, ou recommander des noeuds amis à d&apos;autres noeuds amis, afin de renforcer votre réseau, ou envoyer du retour d&apos;information (feedback) au propriétaire d&apos;une chaîne.&lt;/p&gt;</translation>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Suivi</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15711,7 +14460,7 @@ Voulez-vous enregistrer votre message ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15725,7 +14474,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15740,38 +14489,33 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Brouillons</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Il n&apos;y a pas de messages suivis. Suivre un message vous permettra de le retrouver plus facilement ultérieurement. Pour suivre un message, cliquez sur l&apos;étoile grise devant n&apos;importe quel message.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Aucun message système disponible.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Pour</translation>
+        <translation>Pour</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Cliquer pour trier par destinataire</translation>
-    </message>
-    <message>
-        <source>This message goes to a distant person.</source>
-        <translation type="vanished">Ce message va vers une personne distante.</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15779,26 +14523,6 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Total:</source>
         <translation>Total :</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Messages</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Cliquer pour trier par signature</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Ce message a été signé et la signature vérifiée</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Ce message a été signé mais la signature n&apos;a pas été vérifiée</translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">Ce message vient d&apos;une personne distante.</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15826,7 +14550,17 @@ Voulez-vous enregistrer votre message ?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">Sauvegarder image</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Coller comme texte brut</translation>
     </message>
@@ -15880,7 +14614,7 @@ Voulez-vous enregistrer votre message ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Développer</translation>
     </message>
@@ -15890,7 +14624,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Effacer le message</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation>depuis</translation>
     </message>
@@ -15925,18 +14659,10 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Message(s) en attente</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
-    <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Envoyer invitation ?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Voulez-vous vraiment envoyer une invitation avec votre certificat ?</translation>
-    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -16074,7 +14800,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>ID du contact</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Suppression des clés inutilisées...</translation>
     </message>
@@ -16084,7 +14810,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Nettoyer le trousseau</translation>
     </message>
@@ -16102,7 +14828,13 @@ Remarques : votre ancien trousseau sera sauvegardé.
 La suppression peut échouer lors de l&apos;exécution de plusieurs instances de Retroshare sur la même machine.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Info du trousseau</translation>
@@ -16138,18 +14870,13 @@ Par mesure de sécurité votre trousseau précédent à été sauvegardé sous f
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Incohérence des données dans le trousseau de clés. Il s&apos;agit très probablement d&apos;un bug. S&apos;il vous plaît contacter les développeurs.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>Exporter/créer un nouveau noeud</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Clés de confiance uniquement</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Chercher nom</translation>
     </message>
@@ -16159,12 +14886,12 @@ Par mesure de sécurité votre trousseau précédent à été sauvegardé sous f
         <translation>Chercher ID de pair</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>Détails du profil ...</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -16173,13 +14900,6 @@ Reported error:</source>
 Erreur remontée :</translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Réseau</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -16206,7 +14926,7 @@ Erreur remontée :</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16227,7 +14947,7 @@ Erreur remontée :</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Groupes</translation>
     </message>
@@ -16257,19 +14977,19 @@ Erreur remontée :</translation>
         <translation type="unfinished">Importer votre liste d&apos;amis en incluant les groupes</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished">Chercher ID</translation>
     </message>
@@ -16279,12 +14999,12 @@ Erreur remontée :</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished">Options d&apos;affichage</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16294,7 +15014,7 @@ Erreur remontée :</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Groupe</translation>
     </message>
@@ -16409,7 +15129,7 @@ Erreur remontée :</translation>
         <translation type="unfinished">Tout replier </translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Voulez-vous retirer ce noeud ?</translation>
     </message>
@@ -16419,7 +15139,7 @@ Erreur remontée :</translation>
         <translation type="unfinished">Désirez-vous supprimer cet ami ?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Terminé !</translation>
@@ -16534,11 +15254,7 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">Entrées du journal</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16553,11 +15269,7 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Tout effacer</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">C&apos;est un test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>Les plus récents en haut</translation>
     </message>
@@ -16567,21 +15279,12 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Les plus anciens en haut</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Fil d&apos;actualités&lt;/h1&gt; &lt;p&gt;Le fil d&apos;actualités affiche les derniers événements survenus dans votre réseau, triés selon le moment où vous les avez reçus. Cela vous donne un résumé de l&apos;activité de vos amis. Vous pouvez configurer les événements à afficher en cliquant sur &lt;b&gt;Options&lt;/ b&gt;.
-Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de connexion (utile pour ajouter de nouveaux amis et savoir qui essaie de vous contacter) &lt;/li&gt; &lt;li&gt; Les nouveaux articles dans les chaînes et les forums&lt;/li&gt; &lt;li&gt;Les nouvelles chaînes et forums auxquels vous pouvez vous abonner&lt;/li&gt; &lt;li&gt;Les messages privés de vos amis &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="vanished">Journal</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16636,10 +15339,6 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Sécurité</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16661,10 +15360,6 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
         <source>Message</source>
         <translation>Message</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Tentative de connexion</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16681,10 +15376,6 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
         <source>Ip security</source>
         <translation>Sécurité IP</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Journal</translation>
-    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -16695,10 +15386,6 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Liens</translation>
-    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -16751,26 +15438,6 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
         <source>Chat rooms</source>
         <translation>Salons de tchat</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">Salons de tchat</translation>
-    </message>
-    <message>
-        <source>Count occurrences of my current identity</source>
-        <translation type="vanished">Compter les occurrences de mon identité actuelle</translation>
-    </message>
-    <message>
-        <source>Count occurrences of any of the following texts (separate by newlines):</source>
-        <translation type="vanished">Compter les occurrences de n&apos;importe lequel des textes suivants (séparés par des retours à la ligne) :</translation>
-    </message>
-    <message>
-        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
-        <translation type="vanished">Sélectionné, si l&apos;identité et le texte ci-dessus de même origine doivent être dans le même cas pour déclencher le comptage.</translation>
-    </message>
-    <message>
-        <source>Case sensitive</source>
-        <translation type="vanished">Sensible à la casse</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16846,24 +15513,16 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
         <source>Disable All Toaster temporarily</source>
         <translation>Désactiver toutes les notifications grille-pain temporairement</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Flux</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Zone de notification</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">Compter tous les messages non lus</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation>Phrase de passe requise</translation>
     </message>
@@ -16883,12 +15542,12 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
         <translation>Mauvais mot de passe !</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Veuillez saisir votre phrase de passe Retroshare</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Extension/exécutable non enregistrée</translation>
     </message>
@@ -16903,19 +15562,7 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
         <translation>S&apos;il vous plaît vérifier votre horloge système.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Analyse des fichiers partagés...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Hachage fichier</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Enregistrement de l&apos;index des fichiers...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -16926,17 +15573,19 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Titre inconnu</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Message chiffré</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Afin que les salons de tchat fonctionnent correctement, l&apos;heure de votre ordinateur doit être correcte. Veuillez vérifier que c&apos;est le cas (un possible décalage de plusieurs minutes a été détecté avec vos amis).</translation>
     </message>
@@ -16944,7 +15593,7 @@ Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>En ligne</translation>
     </message>
@@ -16996,10 +15645,6 @@ Trafic faible : 10% du trafic standard et TODO : tous les transferts de fichiers
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Dialogue</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -17065,10 +15710,6 @@ Trafic faible : 10% du trafic standard et TODO : tous les transferts de fichiers
         <source>This profile has signed your own profile key</source>
         <translation>Ce profil a signé votre propre clé de profil</translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Signatures de clé :</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17098,23 +15739,20 @@ p, li { white-space: pre-wrap; }
         <translation>Clé PGP</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation>Ces options s&apos;appliquent à tous les emplacement du profil :</translation>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signer la clé d&apos;un ami est une façon d&apos;exprimer à vos autres amis votre confiance en cet ami. Cela les aide à décider, en se basant sur votre propre confiance, si ils doivent permettre des connexions depuis cette clé. Signer une clé est absolument facultatif et ne peut pas être défait, alors faites-le avec sagesse.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation>Ces options s&apos;appliquent à tous les emplacement du profil :</translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Signer la clé PGP</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17151,12 +15789,7 @@ p, li { white-space: pre-wrap; }
         <translation>Inclure les signatures</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Options</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare vérifie périodiquement les listes de votre ami pour trouver des fichiers parcourables correspondants à vos transferts, afin d&apos;établir un transfert direct. Dans ce cas, votre ami sait que vous téléchargez le fichier.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Pour empêcher ce comportement pour cet ami seulement, décochez cette boîte. Vous pouvez toujours exécuter un transfert direct si vous le demandez explicitement, par exemple en téléchargeant depuis la liste de fichiers de votre ami. Cet réglage est appliqué à tous les emplacements du même noeud.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -17170,10 +15803,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option vous permet de télécharger automatiquement un fichier qui serait recommandé dans un message venant de ce noeud. Ceci peut être utilisé par exemple pour envoyer des fichiers entre vos propres noeuds. L&apos;option est appliquée à tous les emplacements du même noeud.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -17206,21 +15835,21 @@ p, li { white-space: pre-wrap; }
         <translation>KO/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Erreur : impossible d&apos;obtenir les détails de ce contact.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>L&apos;algorithme de la clé fournie n&apos;est pas supporté par Retroshare
@@ -17241,7 +15870,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Attention: Dans vos Préférences de Fichiers, vous avez interdit le téléchargement direct pour tous.</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Le niveau de confiance est une façon d&apos;exprimer votre propre confiance en cette clé. Cela n&apos;est pas utilisé par le logiciel, ni partagé, mais cela peut être utile pour vous afin de vous rappeler les bonnes/mauvaises clés.</translation>
     </message>
@@ -17310,10 +15939,6 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Le mot de passe est peut-être incorrect</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -17321,12 +15946,12 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>Profil Retroshare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Ceci est votre propre clé PGP, et elle a été signée par : </translation>
     </message>
@@ -17352,7 +15977,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Tchat</translation>
     </message>
@@ -17373,7 +15998,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
@@ -17413,7 +16038,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>Décalage&#xa0;temps &#xa0;:</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Écrire un message</translation>
     </message>
@@ -17427,10 +16052,6 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>Friend Connected</source>
         <translation>Ami connecté</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Tentative de connexion</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17469,17 +16090,13 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Contact inconnu</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Envoyer le message</translation>
     </message>
@@ -17531,10 +16148,6 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>Chat with this person as...</source>
         <translation>Tchater avec cette personne en tant que ...</translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">Envoyer un message à cette personne</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17593,10 +16206,6 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Toute personne dans votre liste de contacts aura automatiquement une opinion positive si elle n&apos;est pas définie. Cela permet d&apos;augmenter automatiquement la réputation des nœuds utilisés.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
-        <translation type="vanished">Donner automatiquement l&apos;avis &quot;positif&quot; à mes contacts</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -17654,13 +16263,6 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Afin d&apos;empêcher les ID bannies supprimées de revenir parce qu&apos;ils sont utilisés dans, par ex. Forums ou canaux, les identités bannies sont conservées dans une liste pendant un certain temps. Après cela, ils sont &quot;effacés&quot; À partir de la liste d&apos;interdiction, et sera téléchargé à nouveau comme non autorisé s&apos;il est utilisé dans les forums, les salons de tchat, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulaire</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17668,23 +16270,11 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Photo</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Commentaire</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Résumé</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17745,14 +16335,6 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Ajouter un commentaire</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Ecrivez un commentaire...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17823,10 +16405,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Créer un album </translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Afficher l&apos;album</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17848,17 +16426,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diaporama</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Vos albums</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Albums abonnés</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Albums partagés</translation>
     </message>
@@ -17888,7 +16466,7 @@ avant de vouloir le modifier !</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Nom de l&apos;album</translation>
     </message>
@@ -17947,19 +16525,19 @@ avant de vouloir le modifier !</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17995,12 +16573,12 @@ avant de vouloir le modifier !</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>sera activé aprés le redémarrage de Retroshare</translation>
     </message>
@@ -18146,60 +16724,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Dossiers des extensions</translation>
     </message>
-    <message>
-        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="vanished">Plug-in désactivé. Cliquez le bouton &quot;activer&quot; puis redémarrez Retroshare</translation>
-    </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[désactivé]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Aucun numéro d&apos;API fourni. S&apos;il vous plaît lire le manuel de développement des extensions.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[problème de chargement]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Aucun numéro de SVN fourni. S&apos;il vous plaît lire le manuel de développement des extensions.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Erreur de chargement.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Symbole manquant. Mauvaise version ?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Pas d&apos;extension</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">L&apos;extension est chargée</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Statut inconnue.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Cochez cette case pour le développement des extensions. Elles ne seront pas
-vérifié par hachage. Toutefois, dans des conditions normales
-en vérifiant la valeur de hachage cela vous protège contre les
-comportements malveillants des extensions.</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Extensions&lt;/h1&gt; &lt;p&gt;Les extensions sont chargées depuis les répertoires affichés dans la liste tout en bas.&lt;/p&gt; &lt;p&gt;Pour des raisons de sécurité, les extensions reconnues sont chargées automatiquement, jusqu&apos;à ce que l&apos;exécutable principal Retroshare ou que de la bibliothèque de plug-in ne changent. Dans un tel cas, l&apos;utilisateur doit confirmer les plugins à nouveau. Après le démarrage du programme, vous pouvez activer un plugin manuellement en cliquant sur ​​le bouton &quot;Activer&quot; puis ensuite redémarrer Retroshare.&lt;/p&gt; &lt;p&gt;Si vous voulez développer vos propres extensions, contactez l&apos;équipe de développeurs, ils seront heureux de vous aider !&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -18269,12 +16793,27 @@ comportements malveillants des extensions.</translation>
         <translation>Mettre la fenêtre sur le dessus</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">Bannir cette personne (met une opinion négative)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished">Donne opinion neutre</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished">Donne opinion positive</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -18308,22 +16847,6 @@ comportements malveillants des extensions.</translation>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The person you are talking to has deleted the secured chat tunnel.</source>
-        <translation type="vanished">La personne à laquelle vous parliez a supprimé le tunnel de tchat sécurisé.</translation>
-    </message>
-    <message>
-        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
-        <translation type="vanished">Le partenaire de tchat a supprimé le tunnel sécurisé, les messages seront livrés dès que possible.</translation>
-    </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">La fermeture de cette fenêtre met fin à la conversation, informez le contact puis supprimez le tunnel chiffré.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Tuer ce tunnel ?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -18343,7 +16866,7 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Voter pour</translation>
     </message>
@@ -18363,8 +16886,8 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Commentaires</translation>
     </message>
@@ -18389,13 +16912,13 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Commentaire</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished">Commentaires</translation>
     </message>
@@ -18423,20 +16946,12 @@ comportements malveillants des extensions.</translation>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Signé par :</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Notes</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
@@ -18451,12 +16966,22 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Charger le fichier image</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18472,7 +16997,17 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18482,23 +17017,7 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Soumettre l&apos;article</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">Vous proposez un lien. La clé d&apos;une proposition réussie est un contenu intéressant et ayant un titre descriptif.</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Soumettre</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Soumettre un nouveau lien </translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Veuillez ajouter un titre</translation>
     </message>
@@ -18518,12 +17037,22 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18538,7 +17067,7 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">Poster en tant que</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18549,7 +17078,7 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">Image</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18559,7 +17088,7 @@ comportements malveillants des extensions.</translation>
         <translation>Titre</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Lien</translation>
     </message>
@@ -18567,44 +17096,12 @@ comportements malveillants des extensions.</translation>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Liens publiés</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Liens&lt;/h1&gt; &lt;p&gt;Le service de publication vous permet de partager des liens internet, qui se propagent entre les nœuds Retroshare à la manière des forums et des chaînes&lt;/p&gt; &lt;p&gt;Les liens peuvent être commentés par les utilisateurs inscrits. Un système de promotion donne également la possibilité de mettre en avant les liens importants.&lt;/p&gt; &lt;p&gt;Il n&apos;y a aucune restriction concernant les liens qui sont partagés. Soyez prudent lorsque vous cliquez sur eux.&lt;/p&gt; &lt;p&gt;Les liens publiés sont conservés pour %1 jours et synchronisés au cours des derniers %2 jours, à moins que vous ne les modifiez.&lt;/p&gt; </translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Créer un sujet</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Vos sujets</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Sujets abonnés</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Sujets populaires</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Autres sujets</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Liens</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18638,31 +17135,7 @@ comportements malveillants des extensions.</translation>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Sujet publié</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Ajouter des admins au sujet</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Selectionner les admins</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Créer un nouveau sujet</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Éditer le sujet</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Mettre à jour le sujet</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18700,7 +17173,17 @@ comportements malveillants des extensions.</translation>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>Abonné à Posté</translation>
     </message>
@@ -18716,7 +17199,7 @@ comportements malveillants des extensions.</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Montrer</translation>
     </message>
@@ -18731,24 +17214,17 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">Description postée</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Chargement</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">Nouveau post</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">Jamais</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18761,22 +17237,18 @@ comportements malveillants des extensions.</translation>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Site</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Commentaires</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18787,12 +17259,12 @@ comportements malveillants des extensions.</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished">Commentaires</translation>
     </message>
@@ -18802,7 +17274,7 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L&apos;auteur de ce message (avec l&apos;ID %1) est banni.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18812,21 +17284,17 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Voter pour</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Voter contre</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Définir comme lu et supprimer l&apos;élément</translation>
     </message>
@@ -18836,7 +17304,7 @@ comportements malveillants des extensions.</translation>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Nouveau commentaire&#xa0;:</translation>
     </message>
@@ -18846,7 +17314,7 @@ comportements malveillants des extensions.</translation>
         <translation>Valeur du commentaire</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -18887,77 +17355,10 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Chargement</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Par</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulaire</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Chaud</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nouveau</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Top</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Aujourd&apos;hui</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Hier</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Cette semaine</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Ce mois-ci</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Cette année</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Soumettre un nouveau lien</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Suivant</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Veuillez créer ou choisir une ID de signature avant de voter</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Précédent</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18977,7 +17378,17 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18987,15 +17398,15 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">Administrateur :</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">inconnu</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">Distribution :</translation>
     </message>
@@ -19005,42 +17416,42 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">Posts</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19057,10 +17468,10 @@ comportements malveillants des extensions.</translation>
     <message>
         <location line="+9"/>
         <source>Hot</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hot</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19090,17 +17501,17 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19115,12 +17526,17 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">Vide</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19130,27 +17546,31 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">Modifier</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished">information</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19165,7 +17585,7 @@ comportements malveillants des extensions.</translation>
         <translation type="unfinished">S&apos;abonner</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Jamais</translation>
     </message>
@@ -19239,6 +17659,16 @@ comportements malveillants des extensions.</translation>
         <source>No Channel Selected</source>
         <translation type="unfinished">Aucune chaîne sélectionnée</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -19247,14 +17677,6 @@ comportements malveillants des extensions.</translation>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Ouvrir chaque sujet dans un nouvel onglet</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Liens</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -19268,10 +17690,6 @@ comportements malveillants des extensions.</translation>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Publié</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -19340,25 +17758,17 @@ comportements malveillants des extensions.</translation>
         <translation>Gestionnaire de profil</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Ubuntu&apos;; font-size:11pt; 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;Sélectionnez une clé de noeud Retroshare depuis la liste ci-dessous afin de l&apos;utiliser sur un autre ordinateur, puis pressez &amp;quot;Exporter la clé sélectionnée.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Pour créer un nouvel emplacement sur un ordinateur différent, sélectionnez  le gestionnaire d&apos;identité dans la fenêtre de connexion (fenêtre de login). Depuis là vous pouvez importer le fichier clé puis créer une nouvel emplacement pour cette clé. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Créer un nouveau noeud avec la même clé permet à vos noeuds amis de vous accepter automatiquement.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -19469,7 +17879,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Modifier le message d&apos;état</translation>
@@ -19485,7 +17895,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Gestionnaire de profil</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Information publique</translation>
     </message>
@@ -19520,12 +17930,12 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>En ligne depuis :</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Autres informations</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Votre adresse</translation>
     </message>
@@ -19569,51 +17979,27 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Article de :</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Compte 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Compte 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Compte 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Ajouter a Pulse</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">filtre</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">Additionneur URL</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Afficher en tant que</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19623,12 +18009,12 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished">De :</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19658,13 +18044,13 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished">Négative</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19676,12 +18062,22 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19690,17 +18086,13 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Publier Pulse sur Wire</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19715,34 +18107,24 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">De</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Date</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Charger le fichier image</translation>
     </message>
 </context>
 <context>
@@ -19753,7 +18135,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19772,7 +18154,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19782,7 +18164,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19809,7 +18191,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19819,7 +18201,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19839,7 +18221,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19955,7 +18337,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19963,37 +18345,42 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -20025,7 +18412,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20033,8 +18420,8 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Confirmation</translation>
     </message>
@@ -20304,12 +18691,12 @@ Les caractères &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; seront rem
         <translation>Détails du contact</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Demande de fichier annulée</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Cette version de Retroshare utilise OpenPGP SDK. En contre partie, elle n&apos;utilise plus le système de trousseau de clés PGP, mais possède son propre trousseau de clés partagé par toutes les instances de Retroshare. &lt;br&gt;&lt;br&gt; Vous ne semblez pas posséder un tel trousseau, bien que des clés PGP apparaissent pour les comptes Retroshare existants, probablement parce que vous venez d&apos;installer cette nouvelle version du logiciel.</translation>
     </message>
@@ -20340,7 +18727,7 @@ Les caractères &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; seront rem
         <translation>Une erreur inattendue s&apos;est produite. Vous pouvez la reporter &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation>Ne peut pas démarrer le Tor Manager !</translation>
     </message>
@@ -20378,7 +18765,7 @@ L&apos;erreur rapportée est : &quot;</translation>
         <translation>Il n&apos;était pas possible de démarrer un service caché.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Instances multiples</translation>
@@ -20400,6 +18787,26 @@ Fichier verrouillé :</translation>
  Fichier verrouillé :
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20420,14 +18827,6 @@ Fichier verrouillé :</translation>
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
-        <translation type="vanished">Le tunnel est en suspens ... Les messages seront livrés dès que possible</translation>
-    </message>
-    <message>
-        <source>Secured tunnel is working. Messages are delivered immediately!</source>
-        <translation type="vanished">Le tunnel sécurisé est en marche. Les messages sont livrés immédiatement !</translation>
-    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -20490,7 +18889,7 @@ L&apos;erreur rapportée est :
         <translation>Données transférées</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Vous semblez avoir des noeuds associés à vos clés DSA :</translation>
     </message>
@@ -20500,7 +18899,7 @@ L&apos;erreur rapportée est :
         <translation>Les clés DSA ne sont pas encore supportées par cette version de RetroShare. Tous ces noeuds seront inutilisables. Nous sommes vraiment désolés pour cela.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>activé</translation>
     </message>
@@ -20510,7 +18909,7 @@ L&apos;erreur rapportée est :
         <translation>désactivé</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Ajouter l&apos;IP %1 en liste blanche</translation>
     </message>
@@ -20526,7 +18925,7 @@ L&apos;erreur rapportée est :
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>%1 secondes avant</translation>
     </message>
@@ -20594,7 +18993,7 @@ Security: no anonymous IDs</source>
 Securité : pas d&apos;IDs anomymes</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation>Rejoindre le salon de tchat</translation>
     </message>
@@ -20622,7 +19021,7 @@ Securité : pas d&apos;IDs anomymes</translation>
         <translation>incapable de faire l&apos;analyse syntaxique (anglais: parse) du fichier XML !</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation>Indéfiniment</translation>
     </message>
@@ -20802,13 +19201,29 @@ Securité : pas d&apos;IDs anomymes</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Noeud</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished">Adresse</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Statut</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21001,10 +19416,6 @@ Securité : pas d&apos;IDs anomymes</translation>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Ce certificat contient :</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -21055,6 +19466,18 @@ Securité : pas d&apos;IDs anomymes</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -21217,7 +19640,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Anonyme</translation>
     </message>
@@ -21400,7 +19823,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Le chargement des images intégrées est bloqué.</translation>
     </message>
@@ -21413,7 +19836,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Autorisé par défaut</translation>
     </message>
@@ -21586,12 +20009,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Sauvegarder image</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21599,12 +20032,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation>Options d&apos;affichage d&apos;arborescence</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21634,14 +20067,6 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">Afficher la colonne...</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[pas de titre]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -22304,7 +20729,7 @@ Si vous pensez qu&apos;il est correct, supprimez la ligne correspondante du fich
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nom</translation>
@@ -22425,7 +20850,7 @@ Si vous pensez qu&apos;il est correct, supprimez la ligne correspondante du fich
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -22445,7 +20870,7 @@ Si vous pensez qu&apos;il est correct, supprimez la ligne correspondante du fich
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22501,7 +20926,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished">Le message sera transmis à vos amis.</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Message rédigé ... ]</translation>
     </message>
@@ -22515,11 +20940,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[Inconnu]</translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Message manquant... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22533,6 +20953,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">De</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22555,13 +20980,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Cliquer pour trier par lu</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Cliquer pour trier par expéditeur</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22584,7 +21014,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22605,7 +21037,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Réinitialisation de tous les paramètres de Retroshare.</translation>
     </message>
@@ -22666,7 +21098,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Définit la langue de Retroshare.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Impossible d&apos;ouvrir le journal &apos;%1&apos;: %2</translation>
     </message>
@@ -22687,11 +21119,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>N&apos;a pas pu créer le dossier de données : %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Révision</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22721,7 +21149,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Information concernant le GUI de Retroshare</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>Le code de langue indiqué n&apos;est pas valide :</translation>
     </message>
@@ -22739,7 +21167,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Erreur d&apos;accès au registre. Peut-être vous avez besoin des droits d&apos;administrateur.</translation>
@@ -22756,12 +21184,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Entrez un mot clé ici (minimum 3 caractères)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Lancer la recherche</translation>
     </message>
@@ -22823,7 +21251,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Mots clés</translation>
     </message>
@@ -22838,7 +21266,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>ID de recherche</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Nom du fichier</translation>
     </message>
@@ -22938,23 +21366,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Télécharger la sélection</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Nom du fichier</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Copier le lien Retroshare</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Envoyer le lien Retroshare</translation>
     </message>
@@ -22964,7 +21392,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Télécharger la notice</translation>
     </message>
@@ -23001,7 +21429,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Tout supprimer</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Dossier</translation>
@@ -23012,17 +21440,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nouveau(x) lien(s) Retroshare</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Ouvrir répertoire</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Créer une collection ...</translation>
     </message>
@@ -23042,7 +21470,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Télécharger à partir d&apos;un fichier collection...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Collection</translation>
     </message>
@@ -23050,7 +21478,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Détails du pair</translation>
     </message>
@@ -23066,22 +21494,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Supprimer élément</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>Adresse IP :</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>ID du pair :</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Emplacement :</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Nom du pair :</translation>
     </message>
@@ -23098,7 +21526,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation>mais signalé :</translation>
     </message>
@@ -23123,8 +21551,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Ceci est l&apos;IP à laquelle votre ami prétend être connecté. Si vous avez juste changé d&apos;IPs, ceci est une fausse alerte. Sinon, cela signifie que votre connexion à cet ami est retransmise via un pair intermédiaire, ce qui serait suspect.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cet avertissement est ici pour vous protéger contre les attaques visant le traffic transféré. Dans un tel cas, l&apos;ami auquel vous êtes connecté ne verra pas votre IP externe, mais celle de l&apos;attaquant. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Cependant, si vous avez juste changé d&apos;IP pour quelque raison que ce soit (quelques fournisseurs d&apos;accès Internet forcent régulièrement le changement d&apos;IPs) cet avertissement vous informe juste qu&apos;un ami s&apos;est connecté à la nouvelle IP avant que Retroshare n&apos;aie compris que l&apos;IP avait changé. Dans ce cas tout va bien.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Vous pouvez facilement supprimer les fausses alertes en mettant en liste blanche vos propres IPs (par exemple la plage d&apos;adresses de votre votre fournisseur d&apos;accès Internet), ou en mettant complètement hors de service ces avertissements dans Options -&amp;gt; Notifications -&amp;gt; le Fil d&apos;actualités.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23132,7 +21560,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>veut devenir ton ami(e) sur Retroshare</translation>
     </message>
@@ -23163,7 +21591,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Déplier</translation>
     </message>
@@ -23208,12 +21636,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Statut : </translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Envoyer un message</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Tentative de connexion</translation>
     </message>
@@ -23233,17 +21661,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Tentative de connexion (sortante) inconnue</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Problème de sécurité inconnue</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23253,11 +21686,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Contact inconnu</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
@@ -23267,7 +21696,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Désirez-vous supprimer cet ami ?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Ce certificat a une signature erronée ! Cette personne n&apos;est pas celle qu&apos;elle prétend être.</translation>
     </message>
@@ -23277,12 +21706,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Certificat manquant/endommagé. Ce n&apos;est pas un utilisateur réel de Retroshare.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>Ce certificat a provoqué une erreur interne.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Le pair/noeud n&apos;est pas dans la liste d&apos;amis (ID PGP=</translation>
     </message>
@@ -23341,12 +21770,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Adresse locale</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -23367,22 +21796,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port :</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Réseau local</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Découverte de l&apos;adresse IP externe</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>IPs connues / précédentes :</translation>
     </message>
@@ -23398,21 +21827,16 @@ que si vous vous connectez à quelqu&apos;un. Laisser cette case cochée vous ai
 derrière un pare-feu ou un VPN (virtual private network).</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Autoriser Retroshare à récupérer mon adresse IP à partir de ces sites :</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>Ko/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>La gamme de ports acceptables s&apos;étend de 10 à 65535. Normalement les ports en dessous de 1024 sont réservés à votre système.</translation>
     </message>
@@ -23422,23 +21846,46 @@ derrière un pare-feu ou un VPN (virtual private network).</translation>
         <translation>La gamme de ports acceptables s&apos;étend de 10 à 65535. Normalement les ports en dessous de 1024 sont réservés à votre système.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Adresse Onion</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Découverte activée (recommandé)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>Tor a été configuré automatiquement par Retroshare. Vous ne devriez rien avoir à changer ici.</translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Découverte désactivée</translation>
     </message>
@@ -23448,7 +21895,7 @@ derrière un pare-feu ou un VPN (virtual private network).</translation>
         <translation>Caché - Voir config</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>Adresse I2P</translation>
     </message>
@@ -23473,39 +21920,95 @@ derrière un pare-feu ou un VPN (virtual private network).</translation>
         <translation>entrant OK</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>Le proxy semble fonctionner.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>proxy I2P non activé</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
-        <translation>BOB en cours d&apos;exécution et accessible</translation>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
-        <translation>BOB n&apos;est pas accessible ! Est-il en cours d&apos;exécution ?</translation>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
-        <translation>RetroShare utilise BOB pour installer un tunnel %1 à %2: % 3 (nommé %4)
-
-Si vous modifiez des options (par exemple le port), utilisez les boutons du bas afin de redémarrer BOB.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation>client</translation>
     </message>
@@ -23520,73 +22023,7 @@ Si vous modifiez des options (par exemple le port), utilisez les boutons du bas
         <translation>inconnu</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation>BOB traite une requête</translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation>vérification de connectivité</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation>génération de clé</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation>démarrage</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation>en cours d&apos;arrêt</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation>BOB traite une requête : %1</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation>BOB est cassé
-</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation>BOB a rencontré une erreur :
-</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation>Le tunnel BOB fonctionne</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation>BOB marche bien : tunnel établi</translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation>Le tunnel BOB ne fonctionne pas</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation>BOB est inactif : tunnel fermé</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23596,22 +22033,7 @@ Si vous modifiez des options (par exemple le port), utilisez les boutons du bas
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Vous êtes accessible à travers ce service caché.</translation>
     </message>
@@ -23625,12 +22047,12 @@ Tous les services sont-ils bien en marche ?
 Vérifiez aussi vos ports !</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Mode caché]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ceci vide la liste d&apos;adresses connues. Cette action est utile si, pour une raison quelconque, votre liste d&apos;adresse contient une adresse invalide/sans rapport/expirée que vous voulez éviter de passer à vos amis en tant qu&apos;adresse de contact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23640,7 +22062,7 @@ Vérifiez aussi vos ports !</translation>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>Limite de téléchargement (KB/s)</translation>
     </message>
@@ -23655,23 +22077,23 @@ Vérifiez aussi vos ports !</translation>
         <translation>Limite d&apos;envoi (KB/s)</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La limite de téléversement (upload) concerne le logiciel entier. Une trop petite limite de téléversement pourrait éventuellement bloquer des services à basse priorité (forums, chaînes). La valeur minimum recommandée est 50 Ko/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23688,17 +22110,7 @@ Maintenant saisissez l&apos;adresse (ex: 127.0.0.1) et le port que vous avez cho
 Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noeud standard, alors pourquoi ne pas paramétrer Tor et/ou I2P ?</translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation>Automatique I2P/BOB</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation>Permettre BOB dans I2P - modifier ceci exige un redémarrage pour prendre effet</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation>paramètres avancés permis</translation>
     </message>
@@ -23708,12 +22120,7 @@ Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noe
         <translation>mode avancé</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation>I2P Basic Open Bridge</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation>Adresse d&apos;instance I2P</translation>
     </message>
@@ -23723,17 +22130,7 @@ Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noe
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation>Port du proxy I2P</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation>BOB accessible</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
@@ -23773,7 +22170,7 @@ Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noe
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
@@ -23788,12 +22185,7 @@ Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noe
         <translation>Stopper</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation>Statut du BOB</translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation>Entrant</translation>
     </message>
@@ -23840,7 +22232,32 @@ Assurez-vous finalement que les Ports correspondent à la configuration.
 Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs de Tor aussi.</translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation>Relais</translation>
     </message>
@@ -23895,7 +22312,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Total :</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation>Avertissement : cette bande passante s&apos;ajoute à la bande passante max.</translation>
     </message>
@@ -23920,7 +22337,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Supprimer serveur</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23932,7 +22349,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>Filtres d&apos;IP</translation>
     </message>
@@ -23955,7 +22372,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Statut</translation>
     </message>
@@ -24015,17 +22432,28 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Ajouter en liste blanche</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Configuration de service caché</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ceci est le port du proxy Socks de Tor. Votre noeud Retroshare peut utiliser ce port pour se connecter à &lt;/p&gt;&lt;p&gt;des noeuds cachés. La led à droite devient verte quand le port est actif sur votre ordinateur. &lt;/p&gt;&lt;p&gt;Ceci ne signifie pas cependant que votre traffic Retroshare traffic transite à travers Tor. Cela le signifie seulement si &lt;/p&gt;&lt;p&gt;vous vous connectez à des noeuds cachés, ou si vous exécutez vous-même un noeud caché.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette led est verte dans le port d&apos;écoute sur la gauche est active dans votre ordinateur. Cela ne signifie pas&lt;/p&gt;&lt;p&gt;que le traffic de votre Retroshare transite à travers Tor. Cela sera le cas seulement si&lt;/p&gt;&lt;p&gt;vous vous connectez à des noeuds cachés, ou si vous exécutez vous-même un noeud caché.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24041,18 +22469,18 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette led est verte dans le port d&apos;écoute sur la gauche est active dans votre ordinateur. Cela ne signifie pas&lt;/p&gt;&lt;p&gt;que le traffic de votre Retroshare transite à travers I2P. Cela sera le cas seulement si&lt;/p&gt;&lt;p&gt;vous vous connectez à des noeuds cachés, ou si vous exécutez vous-même un noeud caché.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P sortant OK</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Adresse de service</translation>
     </message>
@@ -24087,12 +22515,12 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Veuillez remplir par une adresse de service</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>Plage d&apos;IP</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Rapporté par la DHT concernant masquerading d&apos;IP (se fait passer pour).</translation>
     </message>
@@ -24115,22 +22543,22 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Ajouté par vous</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les adresses IP de la liste blanche sont rassemblées depuis les sources suivantes : IPs venant à l&apos;intérieur d&apos;un certificat échangé manuellement, gammes IP entrées par vous dans cette fenêtre, ou dans les articles du flux de sécurité.&lt;/p&gt;&lt;p&gt;Le comportement par défaut de Retroshare est de (1) toujours permettre la connexion aux pairs ayant leur IP dans la liste blanche, même si cette IP est aussi présente dans la liste noire; (2) exiger facultativement que les IPs soient dans la liste blanche. Vous pouvez changer ce comportement pour chaque pair à partir de la fenêtre &amp;quot;Détails&amp;quot de chaque noeud Retroshare. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La DHT vous permet de répondre aux demandes de connexion de vos amis utilisant la DHT de BitTorrent. Elle améliore grandement la connectivité. Aucune informations ne sont stockées en réalité dans la DHT. Elle est seulement utilisé comme un système de proxy afin de se mettre en contact avec d&apos;autres noeuds Retroshare.&lt;/p&gt;&lt;p&gt;Le service de Découverte envoie le nom de noeud et les IDs de vos contacts éprouvés à vos pairs connectés, afin de les aider à choisir de nouveaux amis. L&apos;amitié n&apos;est cependant jamais automatique, et deux pairs doivent toujours avoir confiance l&apos;un en l&apos;autre pour permettre la connexion. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La balle devient verte aussitôt que Retroshare réussit à obtenir votre propre IP depuis les sites Web listés ci-dessous, si vous avez permis cette action. Retroshare utilisera aussi d&apos;autres moyens pour découvrir votre propre IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette liste est automatiquement remplie d&apos;informations rassemblées depuis des sources multiples : pairs en mode masquerading rapportés par la DHT, plages IP entrées par vous et plages IP rapportées par vos amis. Les réglages par défaut devraient vous protéger contre le relayage de trafic de grande échelle.&lt;/p&gt;&lt;p&gt;Devenir automatiquement les IPs employant le masquage peut avoir pour conséquence de placer vos IPs amies dans la liste noire. Dans ce cas, utilisez le menu de contexte afin de les mettre en liste blanche.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24165,26 +22593,22 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Bannir automatiquement de la DHT les plages auxquelles débutent les IP masquerading</translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configurer ici votre proxy SOCKS Tor et I2P. &lt;br/&gt;Si vous préférez utiliser BOB afin qu&apos;il se débrouille automatiquement avec I2P, alors vérifiez l&apos;autre onglet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Proxy Socks de Tor</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor sortant OK</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>Le proxy de Tor n&apos;est pas activé</translation>
     </message>
@@ -24264,7 +22688,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Visualiser les contacts avec qui vous partagez votre clé de publication privée</translation>
     </message>
@@ -24274,12 +22698,12 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Partager avec vos amis</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Partager</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Vous pouvez laisser vos amis connaître vos chaînes en les partageant avec eux.
@@ -24299,7 +22723,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Gestionnaire des dossiers partagés</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation>Dossier partagé</translation>
     </message>
@@ -24319,17 +22743,17 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Visibilité</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation>Ajouter un nouveau</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Ajouter un dossier à partager</translation>
     </message>
@@ -24339,7 +22763,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Appliquer et fermer</translation>
     </message>
@@ -24430,7 +22854,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Le dossier n&apos;a pas été trouvé ou le nom du dossier n&apos;est pas accepté.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Il s&apos;agit d&apos;une liste des dossiers partagés. Vous pouvez ajouter et supprimer des dossiers en utilisant les boutons en bas. Lorsque vous ajoutez un nouveau dossier, initialement tous les fichiers contenus dans ce dossier sont partagés. Vous pouvez configurer séparément le type de partage pour chaque répertoire sélectionné.</translation>
     </message>
@@ -24438,7 +22862,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
@@ -24489,11 +22913,16 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>Vérifier vos fichiers</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Télécharger la sélection</translation>
     </message>
@@ -24503,7 +22932,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Copier le lien Retroshare</translation>
     </message>
@@ -24518,7 +22947,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Envoyer le lien Retroshare</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation>Certains fichiers ont été omis</translation>
     </message>
@@ -24534,7 +22963,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Recommandation(s)</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Créer une collection ...</translation>
     </message>
@@ -24559,7 +22988,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Télécharger à partir d&apos;un fichier collection...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Certains fichiers ont été omis car leur hachage n&apos;est pas encore disponible.</translation>
     </message>
@@ -24702,12 +23131,12 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Chargement de la configuration</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Création de l&apos;interface</translation>
     </message>
@@ -24731,7 +23160,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Se rappeler du mot de passe</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Se connecter</translation>
     </message>
@@ -25088,7 +23517,7 @@ Ce choix peut être inversé dans des paramétrages.</translation>
         <translation>Message d&apos;état</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Message :</translation>
     </message>
@@ -25333,7 +23762,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Supprimer tout les mots clés</translation>
     </message>
@@ -25369,12 +23798,15 @@ p, li { white-space: pre-wrap; }
         <translation>Paramétrage de Tor ...</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation>Statut de Tor :</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
@@ -25384,18 +23816,13 @@ p, li { white-space: pre-wrap; }
         <translation>Non démarré</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
-        <translation>Adresse du service caché :</translation>
+        <location line="+13"/>
+        <source>Hidden address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation>Statut de l&apos;amorçage de Tor :</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation>Non défini</translation>
     </message>
@@ -25405,12 +23832,57 @@ p, li { white-space: pre-wrap; }
         <translation>Adresse Onion :</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Erreur</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Non connecté</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation>Vérification que Tor est accessible dans votre chemin d&apos;exécutables</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation>[En attente de Tor ...]</translation>
     </message>
@@ -25418,21 +23890,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Cette version de Retroshare utilise Tor pour se connecter à vos amis.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation>Tor est hors ligne actuellement</translation>
     </message>
@@ -25443,11 +23911,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Pas de configuration de Tor</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25475,7 +23944,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Options de transfert</translation>
@@ -25486,7 +23955,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum de téléchargements simultanés :</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation>Dossiers partagés</translation>
     </message>
@@ -25496,22 +23965,27 @@ p, li { white-space: pre-wrap; }
         <translation>Partager automatiquement le dossier de réception (recommandé)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation>Modifier le partage</translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished">Configurer les dossier partagés</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation>Vérifier automatiquement le partage toutes les :</translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation> minute(s)</translation>
     </message>
@@ -25596,7 +24070,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25605,7 +24079,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25630,7 +24109,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -25689,38 +24173,13 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; est capable de transférer des fichiers et d&apos;effectuer des recherches entre personnes qui ne sont pas amies. Cependant, ce trafic se fait à travers une liste de contacts anonymes.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;Vous pouvez paramétrer le type de partage dans la fenêtre de partage de dossier :&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Visible par mes amis&lt;/span&gt;: les fichiers sont visibles par mes amis.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Partage anonyme&lt;/span&gt;: les fichiers sont accessibles anonymement par des tunnels F2F.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Nombre max. de requêtes de tunnels transmises par sec. :</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt; a pour conséquence que le transfert demande des morceaux de fichier de taille de 1 Mo en ordre croissant, ceci facilitant la prévisualisation lors du téléchargement. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; est purement aléatoire et favorise le comportement en essaimage. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressif&lt;/span&gt; est un compromis, choisissant le prochain morceau au hasard dans moins de 50 Mo après la fin du fichier partiel. Cela permet un certain aléatoire tout en empêchant des grands temps d&apos;initialisation de fichiers vides.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare suspendra tous les transferts et la sauvegarde de fichier de configuration si l&apos;espace disque descend en dessous de cette limite. Cela empêche la perte d&apos;informations sur certains systèmes. Une fenêtre contextuelle vous avertira si cela arrive.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -25730,7 +24189,17 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette valeur contrôle le nombre de requêtes de tunnels que votre pair peut transmettre par seconde.  &lt;/p&gt;&lt;p&gt; Si vous avez une grande bande passante, vous pouvez l&apos;augmenter jusqu&apos;à 30-40, pour permettre statistiquement aux tunnels plus long de passer. Soyez très prudent cependant, car cela génère de nombreux petits paquets qui peuvent considérablement ralentir le transfert de vos propres fichiers.  &lt;/p&gt;&lt;p&gt;La valeur par défaut est de 20. Si vous n&apos;êtes pas certain, gardez là ainsi.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Attention</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation>Spécifier le dossier des fichiers terminés</translation>
     </message>
@@ -25758,7 +24227,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Téléchargement terminé</translation>
     </message>
@@ -25782,39 +24251,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Vous avez %1 téléchargements terminés</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Vous avez %1 téléchargement terminé</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 téléchargements terminés</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 téléchargement terminé</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Téléchargements</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Envois</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nom</translation>
@@ -26021,11 +24474,7 @@ p, li { white-space: pre-wrap; }
         <translation>Spécifier...</translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Partage de fichiers&lt;/h1&gt; &lt;p&gt;Retroshare utilise deux modes de transfert de fichiers : les transferts directs depuis vos amis, et les transferts distants anonymes par tunnels. En plus, le transfert de fichier est multi-source et permet l&apos;essaimage (vous pouvez être une source pendant le téléchargement) &lt;/p&gt; &lt;p&gt;Vous pouvez partager des fichiers en utilisant l&apos;icône &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; dans la barre latérale gauche. Ces fichiers seront listés dans l&apos;onglet &quot;Vos fichiers&quot;. Vous pouvez décider pour chaque groupe d&apos;amis s&apos;ils peuvent ou pas voir ces fichiers dans l&apos;onglet Mes amis&lt;/p&gt; &lt;p&gt;L&apos;onglet &quot;Rechercher&quot; liste les fichiers de vos amis et des fichiers distants qui peuvent être atteints anonymement en utilisant le système à effet tunnel à sauts multiples.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+253"/>
+        <location line="+262"/>
         <source>Move in Queue...</source>
         <translation>Mettre en file d&apos;attente...</translation>
     </message>
@@ -26050,7 +24499,7 @@ p, li { white-space: pre-wrap; }
         <translation>Choisir le répertoire</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Tunnel chiffré de bout en bout anonyme 0x</translation>
     </message>
@@ -26071,7 +24520,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -26104,7 +24553,17 @@ p, li { white-space: pre-wrap; }
         <translation>Le fichier %1 n&apos;est pas terminé. Si c&apos;est un fichier multimédia, essayez de le prévisualiser.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Attention</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Changer le nom du fichier</translation>
     </message>
@@ -26119,7 +24578,7 @@ p, li { white-space: pre-wrap; }
         <translation>S&apos;il vous plaît entrez un nouveau--et valide--nomdefichier</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Tout déplier</translation>
@@ -26246,23 +24705,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Colonnes</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Transferts de fichiers</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Chemin</translation>
     </message>
@@ -26272,7 +24726,7 @@ p, li { white-space: pre-wrap; }
         <translation>Afficher la colonne des chemins</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>N&apos;a pas pu supprimer le fichier d&apos;aperçu</translation>
     </message>
@@ -26282,7 +24736,7 @@ p, li { white-space: pre-wrap; }
         <translation>Le réessayer ?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Créer une collection ...</translation>
     </message>
@@ -26297,7 +24751,12 @@ p, li { white-space: pre-wrap; }
         <translation>Vue collection ...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+74"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
         <source>Collection</source>
         <translation>Collection</translation>
     </message>
@@ -26307,7 +24766,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 tunnels</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Tunnel anonyme 0x</translation>
     </message>
@@ -26528,10 +24987,6 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">Tunnels anonymes</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26725,12 +25180,17 @@ p, li { white-space: pre-wrap; }
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Activer l&apos;interface WEB de Retroshare</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Paramètres web</translation>
     </message>
@@ -26764,27 +25224,33 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Port:</source>
-        <translation type="vanished">Port:</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Interface WEB&lt;/h1&gt;       &lt;p&gt;L&apos;interface web vous permet de contrôler Retroshare à partir de votre navigateur. Plusieurs périphériques peuvent partager le contrôle d&apos;une instance Retroshare. Donc, vous pourriez commencer une conversation sur une tablette et utiliser plus tard un ordinateur de bureau pour la continuer.&lt;/p&gt;&lt;p&gt;Attention : ne pas exposer l&apos;interface web à l&apos;Internet, car il n&apos;y a aucun contrôle d&apos;accès et aucun chiffrement. Si vous voulez utiliser l&apos;interface web sur Internet, utiliser un tunnel SSH ou un proxy afin de sécuriser la connexion.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>Interface web non permise</translation>
     </message>
@@ -26794,12 +25260,12 @@ p, li { white-space: pre-wrap; }
         <translation>L&apos;interface web n&apos;est pas activée. Activez là via Options -&gt; Interface web.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>échec de lancement de l&apos;interface web</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Interface web</translation>
     </message>
@@ -26936,11 +25402,7 @@ p, li { white-space: pre-wrap; }
         <translation>Pages Wiki</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Nouveau groupe</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Nom de la page</translation>
     </message>
@@ -26955,7 +25417,7 @@ p, li { white-space: pre-wrap; }
         <translation>Id d&apos;origine</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -27043,7 +25505,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Historique des modifications de la page</translation>
     </message>
@@ -27078,7 +25540,7 @@ p, li { white-space: pre-wrap; }
         <translation>PageId</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -27108,14 +25570,18 @@ p, li { white-space: pre-wrap; }
         <translation>Mots clés</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Historique</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Afficher l&apos;historique des modifications</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Statut</translation>
     </message>
@@ -27136,7 +25602,7 @@ p, li { white-space: pre-wrap; }
         <translation>Revenir</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Soumettre</translation>
     </message>
@@ -27208,10 +25674,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">TimeRange</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -27223,16 +25685,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Rafraîchir</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27247,7 +25700,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Autres</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27267,7 +25720,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27297,85 +25750,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Mois dernier</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Semaine dernière</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Aujourd&apos;hui</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nouveau</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">De</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">jusqu&apos;à</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Rechercher/Filtrer</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Tout le réseau</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Gestionnaire de comptes</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Affichage :</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Moi</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Amis</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Following</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Personnalisé</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Compte 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Compte 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Compte 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">CheckBox</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Publier Pulse sur Wire</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -27438,35 +25823,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Emplacement :</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -27511,11 +25903,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Following</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Inconnue</translation>
@@ -27593,7 +26015,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1a %2j</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -27626,15 +26048,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Images (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27753,10 +26171,6 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> - </source>
-        <translation type="vanished"> - </translation>
-    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_hu.ts b/retroshare-gui/src/lang/retroshare_hu.ts
index 7ef052108..c2e111012 100644
--- a/retroshare-gui/src/lang/retroshare_hu.ts
+++ b/retroshare-gui/src/lang/retroshare_hu.ts
@@ -84,13 +84,6 @@
         <translation>Csak rejtett csomópont</translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Hozzászólás írása</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: Összetett keresés</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Keresési feltétel</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>További keresési feltétel hozzáadása.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Keresési feltételek törlése.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Keresés megszakítása.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Keresés</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Album létrehozása</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Album neve:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Kategória:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Állatok</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Család</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Barátok</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Virágok</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Vakáció</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Tájegységek</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Háziállatok</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Portrék</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Utazás</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Munka</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Véletlenszerű</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Képaláírás:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Helyszín:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fényképezte:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Leírás:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Megosztási beállítások</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Szabályok:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Minőség:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Hozzászólások:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Személyazonosság:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Publikus</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Korlátozott</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Képek átméretezése (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Képek átméretezése (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Eredeti képek küldése</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Hozzászólások letiltva</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Hitelesített hozzászólások</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Minden hozzászólás engedélyezve</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Küldés személyazonossággal</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Dobd be ide a képeket, majd kattints rájuk, hogy szerkeszd a részleteiket.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Vissza</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Fényképek hozzáadása</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Album közzététele</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Névtelen album</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Mondj valamit az albumról...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Ezek hol készültek?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Album bélyegkép betöltése</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Album</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Album bélyegkép</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Címke</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Összefoglalva</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Képaláírás</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Helyszín:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Mikor</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Leírás:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Megosztási beállítások</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Hozzászólások</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Személyazonosság közzététele</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Láthatóság</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Vigyázat: Az itt látható szolgáltatások kísérleti jellegűek, viszont örömmel fogadjuk segítséged a tesztelésben. 
@@ -783,14 +569,6 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>Körök</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">Gxs fórumok</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">Gxs csatornák</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ p, li { white-space: pre-wrap; }
         <translation>Fényképek</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">Kép mentése</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -842,17 +633,13 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Avatár hozzáadása</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Avatár beállítása</translation>
     </message>
@@ -871,10 +658,6 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Avatár betöltése</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ p, li { white-space: pre-wrap; }
         <translation>Visszaállítás</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Fogadási arány</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Küldési arány</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Mindig felül</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stílus</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% átlátszóság</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Mentés</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Mégse</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Átvitel kezdete:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Beállítások elrejtése</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,7 +822,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Hozzászólás</translation>
     </message>
@@ -1093,12 +852,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Az üzenet szerzője (azonosító: %1) bannolva van.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Szavazás mellette</translation>
     </message>
@@ -1126,7 +885,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Szavazás mellette</translation>
     </message>
@@ -1184,7 +943,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Megosztás</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Üzenet olvasottságának váltása</translation>
     </message>
@@ -1224,7 +983,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Új</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1232,12 +991,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Tetszik</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Avatár</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Lenyitás</translation>
     </message>
@@ -1283,12 +1042,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,17 +1216,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Csatornák</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Fülek</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Általános</translation>
     </message>
@@ -1477,11 +1236,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Hozzászólások betöltése a háttérben (Fonál)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Letöltések</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Minden egyes csatorna megnyitása új fülön</translation>
     </message>
@@ -1489,7 +1254,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Tetszik</translation>
     </message>
@@ -1537,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">Avatár</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Lenyitás</translation>
     </message>
@@ -1563,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
@@ -1573,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Hozzászólás</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished">Hozzászólások</translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Elrejt</translation>
     </message>
@@ -1591,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
@@ -1782,7 +1537,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Társalgószoba megjelenítése</translation>
     </message>
@@ -1794,22 +1549,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>Társalgószobák</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">%1 új üzeneted van</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">%1 új üzeneted van</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 új üzenet</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 új üzenet</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1831,13 +1570,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Ismeretlen szoba</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Összes eltávolítása</translation>
     </message>
@@ -1845,13 +1585,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Résztvevők száma</translation>
     </message>
@@ -1861,33 +1601,7 @@ into the image, so as to
         <translation>Téma</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>Feliratkozásaid: Privát társalgószobák</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>Feliratkozásaid: Nyilvános társalgószobák</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Privát társalgószobák</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Nyilvános társalgószobák</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Társalgószobák&lt;/h1&gt;                              	                      &lt;p&gt;A társalgószobák az IRC-hez hasonlóan működnek.                                      	                      Névtelen módon beszélgethetsz, anélkül, hogy fel kellene venned a személyeket barátnak.&lt;/p&gt;                    	                      &lt;p&gt;Egy társalgószoba lehet nyilvános (a barátaid látják) vagy privát (a barátaid nem látják, mindaddig míg nem hívod meg őket: &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Ha meghívnak egy privát szobába, akkor válik számodra láthatóvá, ha egy barátod is   	                      belépett az adott szobába.&lt;/p&gt;                                                                                               	                      &lt;p&gt;A bal oldali listában találhatók                                                                                     	                      azok a szobák, amikbe a barátaid bejelentkeztek. Továbbá                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Létrehozatsz új szobát Jobb klikkel&lt;/li&gt;                                                              		     &lt;li&gt;Dupla kattintással belépsz a szobába. Ekkor a szoba láthatóvá válik a további barátaid számára.&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Megjegyzés: A társalgószobák zökkenőmentes működéséhez nem árt ha pontos a számítógép órája. Vess rá egy pillantást!	                      &lt;/p&gt;                                      	                      </translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Társalgószoba létrehozása</translation>
     </message>
@@ -1897,7 +1611,7 @@ into the image, so as to
         <translation>Szoba elhagyása</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Hozz létre egy személyazonosságot, amely nem Álnév típusú és lépj be a szobába</translation>
     </message>
@@ -1956,12 +1670,12 @@ Kattints egy társalgószobára a bal oldali listában, hogy lásd a részleteke
 Kattints duplán egy társalgószobára a belépéshez.</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 meghívott téged a %2 nevű társalgószobába</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Ehhez a társalgószobához válassz nyilvános felhasználónevet:</translation>
     </message>
@@ -1971,31 +1685,31 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Válassz személyazonosságot ehhez a szobához:</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Társalgószoba létrehozása</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Nincs téma beállítva]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Kiválasztott csevegőszoba adatai</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Privát</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Publikus</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>Névtelen azonosítók elfogadottak</translation>
     </message>
@@ -2005,42 +1719,25 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Automatikus feliratkozás megszüntetése</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Automatikus feliratkozás engedélyezése</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Társalgószobák keresése</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Név keresése</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Feliratkozva</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Oszlopok</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Igen</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Nem</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2052,47 +1749,47 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Társalgószoba neve:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>Társalgószoba azonosító:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Téma:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Típus:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Biztonság:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Partnerek:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Szövegcímke</translation>
     </message>
@@ -2107,13 +1804,24 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Névtelen azonosítók nem engedélyezettek</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Megjelenítés</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>oszlop</translation>
@@ -2127,7 +1835,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Eltávolítás</translation>
     </message>
@@ -2172,46 +1880,22 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Általános</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Távoli beszélgetés</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Mindenki</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Kapcsolatok</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Senki</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Titkosított távoli beszélgetés fogadása tőle:</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Beszélgetés beállításai</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Hangulatjelek engedélyezése Privát beszélgetésnél</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Hangulatjelek engedélyezése Csoportos beszélgetésnél</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Egyéni betűtípus engedélyezése</translation>
     </message>
@@ -2220,10 +1904,6 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Enable custom font size</source>
         <translation>Egyéni betűméret engedélyezése</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Minimális betűméret</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2235,7 +1915,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Dőlt betűk engedélyezése</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2260,11 +1940,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Beágyazott képek betöltése</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Társalgószoba</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Villogó ikon a fülön</translation>
     </message>
@@ -2273,10 +1949,6 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Do not send typing notifications</source>
         <translation>Ne küldjön értesítést arról, ha írok</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Privát beszélgetés</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2298,11 +1970,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Villogó ikon az ablakon/fülön</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Beszélgetés betűtípusa</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Beszélgetés betűtípusának megváltoztatása</translation>
     </message>
@@ -2312,14 +1980,10 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Beszélgetés betűtípusa:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Előzmények</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stílus</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2334,17 +1998,13 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Variant:</source>
         <translation>Változat:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Csoportos beszélgetés</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Privát beszélgetés</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation>Válassz betűtípust a Beszélgetéshez.</translation>
     </message>
@@ -2408,22 +2068,28 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Ezen a fülön beállíthatod, hogy a különböző típusú üzenetekből mennyit tároljon el a RetroShare a merevlemezen és hogy mennyi előző beszélgetést állítson vissza az aktuális ablakba. A maximális tárolási idő beállítása lehetővé teszi a régi üzenetek mellőzését, illetve segít megakadályozni, hogy az előzmények tele legyenek kevésbé fontos beszélgetésekkel (például egyes társalgószobák vagy távoli üzenetek előzményei). &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Társalgószobák</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Engedélyezve:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">Keresés</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2433,7 +2099,17 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Társalgószobák</translation>
@@ -2530,11 +2206,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Tárolási idő napokban (0=végtelen)</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Keresés alapértelmezései</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Kis- és nagybetű érzékeny</translation>
     </message>
@@ -2573,10 +2245,6 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Threshold for automatic search</source>
         <translation>Automatikus keresés küszöb</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Alapértelmezett személyazonosság a társalgószobákhoz:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2644,7 +2312,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Beszélgetés mutatása</translation>
     </message>
@@ -2680,7 +2348,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
@@ -2715,12 +2383,12 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Dőlt</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>Hangulatjel beillesztése</translation>
     </message>
@@ -2729,10 +2397,6 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Attach a Picture</source>
         <translation>Kép csatolása</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2804,11 +2468,6 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Insert horizontal rule</source>
         <translation>Vízszintes vonalzó beillesztése</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Kép mentése</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2846,7 +2505,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>éppen ír...</translation>
     </message>
@@ -2870,7 +2529,7 @@ a HTML átalakítás után.</translation>
         <translation>Válassz betütípust.</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Tényleg törölni akarod az előzményeket?</translation>
     </message>
@@ -2920,7 +2579,7 @@ a HTML átalakítás után.</translation>
         <translation>elfoglalt és valószínűleg nem fog válaszolni</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Kis- és nagybetű érzékenység szerinti keresés</translation>
     </message>
@@ -2942,7 +2601,7 @@ a HTML átalakítás után.</translation>
         <translation>Ne hagyd abba a színezést X elem megtalálása után (több CPU erőforrás szükséges)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Előző keresése &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2957,16 +2616,12 @@ a HTML átalakítás után.</translation>
         <translation>&lt;b&gt;Keresés &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Állapot)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Betűtípus és szín beállítása</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Fájl csatolása</translation>
     </message>
@@ -2982,12 +2637,12 @@ a HTML átalakítás után.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Kiválasztott szöveg megjelölése&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation>Személyazonosító</translation>
     </message>
@@ -2999,12 +2654,12 @@ Double click on it to add his name on text writer.</source>
 A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation>Aláiratlan</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>találat.</translation>
     </message>
@@ -3024,7 +2679,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Írj be egy üzenetet ide</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Ne állj le a színezéssel, miután</translation>
     </message>
@@ -3050,7 +2705,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Részletek megjelenítése:</translation>
     </message>
@@ -3072,7 +2727,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Személyes köreim</translation>
     </message>
@@ -3098,7 +2753,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Barátok</translation>
     </message>
@@ -3158,7 +2813,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Barátok barátai</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Külső körök (Admin)</translation>
     </message>
@@ -3174,7 +2829,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Körök</translation>
     </message>
@@ -3226,43 +2881,48 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Hiba: a partner adatai nem elérhetőek.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3274,7 +2934,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Titkosítás</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>Nem csatlakozott</translation>
     </message>
@@ -3356,25 +3016,17 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>nincs</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Ez a tanúsítvány tartalmaz:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;egy &lt;b&gt;csomópont azonosítót&lt;/b&gt; és &lt;b&gt;nevet&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">egy &lt;b&gt;onion címet&lt;/b&gt; és &lt;b&gt;portot&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">egy &lt;b&gt;IP címet&lt;/b&gt; és &lt;b&gt;portot&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Használd ezt a tanúsítványt, hogy új barátokat szerezz. Küldd el emailben, vagy juttasd el a címzettnek egyéb módon.&lt;/p&gt;</translation>
     </message>
@@ -3389,7 +3041,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ez az &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt; által használt titkosítási eljárás. Az összeköttetés a barátok csomópontjaihoz&lt;/p&gt;&lt;p&gt;mindig erősen titkosított és ha a DHE jelen van, akkor az összeköttetés további &lt;/p&gt;&lt;p&gt;&amp;quot;tökéletes továbbítási titkosítást&amp;quot;.&lt;/p&gt; használ.&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>­</translation>
     </message>
@@ -3406,118 +3058,16 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <source>Connect Friend Wizard</source>
         <translation>Barát hozzáadása varázsló</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Új barát hozzáadása</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Tanúsítvány fájl érkezett a barátodtól</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;Barátaim barátjainak felvétele barátként</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Email 
- (Your friend will receive an email with instructions how to download RetroShare)</source>
-        <translation type="vanished">&amp;Küldj meghívót emailben 
- (A címzett emailben kapja meg hogyan kell letölteni a Retroshare-t)</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Aláírásokat tartalmaz</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Tanúsítványod másolása a vágólapra</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Tanúsítványod mentése fájlba</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Levelező program indítása</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Ismerős tanúsítványának megnyitása fájlból</translation>
     </message>
-    <message>
-        <source>Open certificate</source>
-        <translation type="vanished">Tanusítvány megnyitása</translation>
-    </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">Kérlek illeszd be a barátod Retroshare tanúsítványát az alábbi mezőbe</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Tanúsítvány fájlok</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Fájlokba mentett PGP tanúsítványok használata.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Barát tanúsítványának importálása</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Készíttetned kell egy fájlt, ami tartalmazza a tanúsítványodat, majd ezt el kell juttatnod a barátodhoz. Természetesen használhatsz korábban készített fájlt is.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Tanúsítványom exportálása...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Dobd be ebbe az ablakba a barátod tanúsítványát, vagy add meg az elérési útját az alábbi mezőben</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Böngészés</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Barátok barátai</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Most válaszd ki, hogy kivel szeretnél baráti kapcsolatot létrehozni.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Mutasd</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Barátkozás velük</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare azonosító</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">RetroShare azonosító használata egy a hálózatodban elérhető barát felvételéhez.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Barát RetroShare azonosítójának megadása...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Illeszd be az alábbi mezőbe a barát RetroShare azonosítóját</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Írd be a barátod RetroShare azonosítóját! Pl.: Partner@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3559,27 +3109,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Email</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Barátok meghívása emailben</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Írd be a barátaid email címeit (különítsd el őket egy-egy pontosvesszővel)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">A barátaid email címei:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Írd be a barátaid email címeit</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Tárgy:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3595,78 +3125,32 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>A kérelem részletei</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Partner részletei</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Email:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Csomópont:</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">Kérlek vedd figyelembe, hogy a RetroShare sok sávszélességet, memóriát vagy CPU használatot igényel, ha túl sok barátot veszel fel. Természetesen annyi barátot vehetsz fel amennyit csak szeretnél, de 40-nél több barát felvétele esetleg túl sok 
-erőforrást igényel.</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">Ez a varázsló segít abban, hogy csatlakozhass a barát(ok)hoz a RetroShare hálózaton keresztül. &lt;br&gt;Válaszd ki, miként szeretnéd felvenni:</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Tanúsítvány beírása kézzel</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">RetroShare azonosító beírása kézzel</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">&amp;Küldés és meghívás webes email kiszolgálókon keresztül</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Ajánlj barátokat egymásnak</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">RetroShare tanúsítvány</translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">Kérlek illeszd be alább a barátod Retroshare tanúsítványát</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Tanúsítvány beillesztése</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A mezőbe a barátod Retroshare tanúsítványát illeszd be. FIGYELEM:  ez különbözik a barátod profil kulcsától. Ne illeszd be ide a barátod profil kulcsát (vagy annak egy részét), mert nem fog működni!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Barát hozzáadása a csoporthoz:</translation>
     </message>
@@ -3676,7 +3160,7 @@ erőforrást igényel.</translation>
         <translation>Barát azonosítása (PGP kulcs aláírása)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3701,16 +3185,22 @@ erőforrást igényel.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Barát hozzáadása</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">A baráti kérelem elfogadásához kattints a Kész gombra.</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Sajnálom, hiba történt</translation>
     </message>
@@ -3730,32 +3220,27 @@ erőforrást igényel.</translation>
         <translation>A barátod részletei:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Kulcs érvényessége:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Aláírók</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;A barátod kulcsának aláírása alkalmas arra, hogy kifejezd a bizalmad iránta és ezt jelezd a többiek felé. Az aláírások kriptográfiailag bizonyítják, hogy az alábbi kulcsok hitelesnek ismerik el az aktuális PGP kulcsot.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>A személy már szerepel a barátlistádon. Az újbóli felvétele csak az IP címét fogja változtatni.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3801,49 +3286,17 @@ erőforrást igényel.</translation>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>A tanúsítvány betöltése sikertelen</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">A %1 PGP kulcshoz tartozó partner adatainak lehívása sikertelen</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Akárki, akit nem írtam alá</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Barátaim barátai, akik már megbíznak bennem</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Aláírt partnerek elutasítottként jelennek meg</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Partner neve</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Aláírva általa is</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Partner azonosító</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">Úgy tűnik, érvényes a tanúsítvány</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Érvénytelen Retroshare tanúsítvány!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare meghívás</translation>
     </message>
@@ -3865,12 +3318,12 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Ez a saját tanusítványod! Ugye nem saját magadat akarod ismerősként megadni?!</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3878,7 +3331,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation>A kulcs már fenn van a megbízhatók listáján</translation>
     </message>
@@ -3918,7 +3371,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>Van egy barát felkérésed tőle</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3943,7 +3396,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3953,47 +3406,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Tanúsítvány betöltése sikertelen: nem található ez a fájl: %1</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Nem elérhető a hálózatodban %1 azonosítójú partner</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Új tanúsítvány formátum használata (biztonságosabb, robusztusabb)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Régi típusú tanúsítvány használata (visszafelé kompatibilis)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Aláírások eltávolítása</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">RetroShare meghívás</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Barát csatlakozása súgó</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Ezt a szöveget másolhatod, majd elküldheted a barátodnak emailben, illetve megoszthatod vele egyéb módon is.</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">A tanúsítványod a vágólapra lett másolva. Illeszd be és küld el a barátodnak emailben vagy oszd meg vele egyéb módon</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Mentés másként...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4032,11 +3445,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>*** Nincs ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Közvetlen forrásként használat, amikor lehetséges</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>IP-cím:</translation>
     </message>
@@ -4046,7 +3455,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>IP-cím:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Haladó beállítások megjelenítése</translation>
     </message>
@@ -4055,10 +3464,6 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;A barátod kulcsának aláírása alkalmas arra, hogy kifejezd a bizalmad iránta és ezt jelezd a többiek felé. Ez segíthet nekik eldönteni, hogy elfogadják-e a kapcsolódást az adott kulcs tulajdonosától. Egy kulcs aláírása csak egy lehetőség, de visszavonhatatlan. Ezért fontold meg és dönts okosan.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;A Retroshare időnként ellenőrzi a barátlistád kereshető fájlokért, melyek megegyeznek az átviteli fájlokkal, azért, hogy közvetlen fájlátvitel valósulhasson meg. Ebben az esetben a barátod tudni fogja, hogy letöltöd azt a fájlt.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Hogy elkerüld ezt a viselkedést, és ki szeretnéd hagyni ebből ezt a barátodat, akkor szüntesd meg a doboz kijelölését. Továbbra is lehetőséged lesz a fájl letöltésére tőle, ehhez azonban előbb igényelned kell azt. Például az adott fájl manuális letöltésével a barátod megosztott mappájából. Ez a beállítás egy adott csomóponthoz tartozó összes helyszínre érvényes lesz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4069,45 +3474,13 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Azon ismerősök, akiknél ez a beállítás szerepel, nem tudnak kapcsolódni, ha a címük hiányzik az engedélyezettek listájáról. Ez védelmet nyújt az adatforgalom-átirányítás jellegű támadásokkal szemben. Ha ez van beállítva, akkor az elutasított kapcsolatot a &amp;quot;biztonsági hírcsatorna tétel&amp;quot; a Hírcsatornába irányítja. Ott letilthatod vagy engedélyezheted az IP címüket. Ugyanazon csomópont összes helyszinére vonatkozik. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Barátaid ajánlása egymásnak</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Ajánlott barátok</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">Ez a személyes Retroshare tanúsítványod. Ezt kell eljuttatnod a barátaidhoz</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Üzenet:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Barátok ajánlása</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Címzett</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Kérlek, válassz ki az ajánláshoz legalább egy barátot.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Kérlek, válassz ki legalább egy barátot címzettnek.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Kulcs hozzáadása a kulcstartóhoz</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Ez a kulcs már szerepel a kulcstartódban</translation>
     </message>
@@ -4123,7 +3496,7 @@ távoli üzeneteket szeretnél küldeni ennek a partnernek,
  de nem veszed fel barátnak.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>A tanúsítvány verziója rossz. Kérlek vedd figyelembe, hogy a v0.6 és a v0.5 hálózatok nem kompatibilisek egymással.</translation>
     </message>
@@ -4158,7 +3531,7 @@ távoli üzeneteket szeretnél küldeni ennek a partnernek,
         <translation>IP hozzáadása a fehérlistához</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>Ez a tanúsítvány nem tartalmaz IP-t!</translation>
     </message>
@@ -4168,27 +3541,10 @@ távoli üzeneteket szeretnél küldeni ennek a partnernek,
         <translation>&lt;p&gt;Ez a tanúsítvány nem tartalmaz IP-t. A felfedezésre és a DHT-re vagy utalva, hogy megtaláld. Mivel fehérlistás engedélyezést kértél, ezért egy biztonsági figyelmeztetést fogsz kapni a Hírek fülön. Itt hozzáadhatod a partner IP-jét a fehérlistához.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished">[Ismeretlen]</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Tanúsítvánnyal hozzáadva innen: %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Barát tanúsítványának beillesztése a Vágólapról</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Tanúsítvány betöltése sikertelen: nem olvasható az alábbi fájl: %1</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Tanúsítvány betöltése sikertelen: valami gond van ezzel: %1</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4250,7 +3606,7 @@ távoli üzeneteket szeretnél küldeni ennek a partnernek,
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>UDP kapcsolat létrehozása</translation>
     </message>
@@ -4278,7 +3634,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Kapcsolódási segéd</translation>
     </message>
@@ -4288,17 +3644,20 @@ p, li { white-space: pre-wrap; }
         <translation>Érvénytelen partner azonosító</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Ismeretlen állapot</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Kilépett</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Szimmetrikus NAT mögött</translation>
     </message>
@@ -4308,12 +3667,14 @@ p, li { white-space: pre-wrap; }
         <translation>NAT mögött, DHT nélkül</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Hálózat újraindítása</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>NAT mögött</translation>
     </message>
@@ -4323,7 +3684,8 @@ p, li { white-space: pre-wrap; }
         <translation>Nincs DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>A hálózat elérhető!</translation>
     </message>
@@ -4348,7 +3710,7 @@ p, li { white-space: pre-wrap; }
         <translation>RS partnerek keresése</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>A felkutatáshoz DHT szükséges</translation>
     </message>
@@ -4640,7 +4002,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kérlek, próbáld meg újból importálni a tanúsítványt</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4648,7 +4010,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>Végrehajthatatlan továbbítás!</translation>
     </message>
@@ -4658,7 +4021,7 @@ p, li { white-space: pre-wrap; }
         <translation>Végrehajthatatlan továbbítás és nincs DHT</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Keresés</translation>
     </message>
@@ -4694,12 +4057,12 @@ p, li { white-space: pre-wrap; }
         <translation>Kör részletei</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A kör neve, a kapcsolattartó és a meghívott tagok listája látható lesz az összes meghívott számára. Ha a kör nem privát, akkor látható lesz a meghívott csomópontok szomszédos csomópontjai által is.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4719,7 +4082,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>Azonosító</translation>
     </message>
@@ -4739,18 +4102,18 @@ p, li { white-space: pre-wrap; }
         <translation>Szűrő</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Becenév</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Meghívott tagok</translation>
     </message>
@@ -4765,15 +4128,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ismert személyek</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">Azonosító</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Típus</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
@@ -4813,23 +4168,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Csak a következő csoportok tagjai számára látható:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Kérlek, nevezd el a körödet</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Nincs korlátozás kiválasztva.</translation>
     </message>
@@ -4839,12 +4190,24 @@ p, li { white-space: pre-wrap; }
         <translation>Nincs határ kiválasztva.</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Ismeretlen]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Hozzáadás</translation>
     </message>
@@ -4854,7 +4217,7 @@ p, li { white-space: pre-wrap; }
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Keresés</translation>
@@ -4869,10 +4232,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Aláírt</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Ismert csomópontok által aláírva</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4889,10 +4248,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP Személyazonosság</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Névtelen azonosító</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4915,17 +4270,13 @@ p, li { white-space: pre-wrap; }
         <translation>Új kör létrehozása</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Létrehoz</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP-hez linkelt azonosító</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Tag hozzáadása</translation>
     </message>
@@ -4944,7 +4295,7 @@ p, li { white-space: pre-wrap; }
         <translation>Csoport létrehozása</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Csoport neve:</translation>
     </message>
@@ -4979,7 +4330,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Új bejegyzés a csatornán</translation>
     </message>
@@ -4989,7 +4340,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üzenet</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5050,23 +4401,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Dobáld be a fájlokat / Használd a fájl hozzáadása gombot új fájlok megosztásához.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Másolj/Illessz be RetroShare hivatkozásokat a megosztásaidból&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Melléklet csatolása</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Előnézeti kép hozzáadása</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Üzenet</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Tárgy:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5152,17 +4491,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5181,17 +4520,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">A fájl már hozzá van adva és hashelve van.</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Kérlek, adj meg egy tárgyat</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Előnézeti kép betöltése</translation>
     </message>
@@ -5206,18 +4546,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Adattömeg létrehozása</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Valóban generálni szeretnél %1 üzenetet ?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Fájlokat fogsz hozzáadni a megosztásodhoz. Biztos ezt szeretnéd tenni?</translation>
     </message>
@@ -5251,7 +4585,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Fórum üzenet beküldése</translation>
     </message>
@@ -5260,10 +4594,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Fórum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Tárgy</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5284,8 +4614,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5304,7 +4634,7 @@ p, li { white-space: pre-wrap; }
         <translation>Fájlokat az ablakba dobálva csatolhatsz</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5334,17 +4664,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Nincs fórum</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>Válasz</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Cím</translation>
     </message>
@@ -5398,7 +4728,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished">Kép betöltése</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>Nem kompatibilis azonosító ehhez a fórumhoz</translation>
     </message>
@@ -5408,8 +4738,8 @@ Törölni szeretnéd?</translation>
         <translation>Egyetlen személyazonosságod számára sem engedélyezett a hozzászólás ezen a fórumon. Ennek oka az lehet, hogy a fórum korlátozva van egy olyan körre, amely nem tartalmazza semelyik személyazonosságod, vagy pedig a fórum jelölők megkövetelik a PGP hitelesítésű azonosítókat.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Adattömeg létrehozása</translation>
     </message>
@@ -5418,10 +4748,6 @@ Törölni szeretnéd?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Valóban generálni szeretnél %1 üzenetet ? </translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Küldés</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5436,23 +4762,7 @@ Törölni szeretnéd?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Társalgószoba létrehozása</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">A társalgószoba egy központosítatlan, névtelen helyszín a beszélgetésekhez. Az összes résztvevő megkapja az összes üzenetet. A szoba létrehozása után meghívhatod abba barátaidat a barátlistádról.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Chatszoba neve:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">A szoba témája:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5487,7 +4797,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5497,7 +4807,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>PGP hitelesítésű azonosító megkövetelése</translation>
     </message>
@@ -5512,11 +4822,7 @@ Törölni szeretnéd?</translation>
         <translation>Válassz ki barátokat a csoportos beszélgetéshez.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Meghívott barátok</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Társalgószoba létrehozása</translation>
@@ -5537,7 +4843,7 @@ Törölni szeretnéd?</translation>
         <translation>Kapcsolatok:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Használandó személyazonosság: </translation>
     </message>
@@ -5545,17 +4851,17 @@ Törölni szeretnéd?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Publikus adatok</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
@@ -5565,12 +4871,12 @@ Törölni szeretnéd?</translation>
         <translation>Helyszín azonosító:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Alkalmazás verziója:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Online ettől kezdve:</translation>
     </message>
@@ -5590,12 +4896,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5605,7 +4906,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Egyéb adatok</translation>
     </message>
@@ -5615,17 +4916,12 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished">Profil</translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Tanúsítvány</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5635,11 +4931,7 @@ Törölni szeretnéd?</translation>
         <translation>Aláírásokat tartalmaz</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Kulcs mentése fájlba</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Személyazonosság exportálása</translation>
     </message>
@@ -5711,33 +5003,33 @@ az importálás gombot, hogy betöltsd.</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Szövegcímke</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP ujjlenyomat:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Csomópont információ</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP azonosító : </translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Barát csomópontok:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5776,14 +5068,6 @@ az importálás gombot, hogy betöltsd.</translation>
         <source>Node</source>
         <translation>Csomópont</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Új csomópont létrehozása...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">Statisztika megjelenítése</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5835,7 +5119,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6503,7 +5787,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Fájl indítása</translation>
     </message>
@@ -6511,38 +5795,38 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>neki</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>nagybetűk figyelmen kívül hagyása</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>yyyy.MM.dd</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6550,12 +5834,12 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Feltételek beállítása</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Feltétel törlése</translation>
     </message>
@@ -6717,7 +6001,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Kép</translation>
     </message>
@@ -6727,7 +6011,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Videó</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Hang</translation>
     </message>
@@ -6787,11 +6071,21 @@ az importálás gombot, hogy betöltsd.</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Barátok mappái</translation>
     </message>
@@ -6913,7 +6207,7 @@ az importálás gombot, hogy betöltsd.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation>Azonosító</translation>
     </message>
@@ -6948,10 +6242,6 @@ az importálás gombot, hogy betöltsd.</translation>
         <source>Show State</source>
         <translation>Állapot megjelenítése</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">Megbízható csomópontok</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6959,7 +6249,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Csoportok mutatása</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Csoport</translation>
     </message>
@@ -6995,7 +6285,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Hozzáadás a csoporthoz</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Keresés</translation>
@@ -7011,7 +6301,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Rendezés állapot szerint</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Profil részletek</translation>
     </message>
@@ -7255,7 +6545,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Baráti felkérés jóváhagyása</translation>
     </message>
@@ -7272,10 +6562,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Keresés:</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7297,7 +6583,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Barát keresése</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Jelöld mind</translation>
     </message>
@@ -7308,16 +6594,132 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Egyiket se jelöld</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Név</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished">Cím</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Állapot</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Barátság kezdeményezése</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Állapot szerkesztése</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Üzenőfal</translation>
     </message>
@@ -7400,33 +6802,38 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Alapértelmezett betűtípus visszaállítása</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Kulcstartó</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Hálózat&lt;/h1&gt;                                       &lt;p&gt;A Hálózat fül tartalmazza a barátaid Retroshare csomópontjait: pontosabban azokat a szomszédos Retroshare csomópontokat, akik kapcsolódtak hozzád.     &lt;/p&gt;                                                       &lt;p&gt;Csoportokba rendezheted őket, és így beállíthatod például azt, hogy mely csoportok férhessenek hozzá egy-egy fájlodhoz.&lt;/p&gt;     &lt;p&gt;Jobb oldalt 3 hasznos fület találsz:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Az Üzenőfal segítségével egyszerre küldhetsz üzenetet az összes csomópontnak&lt;/li&gt;                                   &lt;li&gt;A Hálózat gráf a felfedezés információit felhasználva megmutatja, hogy kikkel állasz kapcsolatban.&lt;/li&gt;                       &lt;li&gt;A Kulcstartóban találhatók az összegyűjtött csomópontok kulcsai, leginkább a barátiad csomópontjain keresztül jutnak el hozzád ezek a kulcsok.&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retroshare üzenőfal: az ide írt üzeneteidet az összes barátod láthatja.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Hálózat</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Hálózat gráf</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Add meg az állapotüzenetedet.</translation>
     </message>
@@ -7444,7 +6851,17 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Jelszó</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Az összes adatnak legalább 3 karakter hosszúnak kell lennie</translation>
     </message>
@@ -7454,17 +6871,12 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>A jelszavak nem egyeznek</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation>Használj BOB-t</translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Ez egy PGP jelszó</translation>
@@ -7485,50 +6897,38 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Az új tanúsítványod létrehozása meghiúsult, talán rossz PGP jelszót adtál meg.</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="vanished">Beállítások</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation>PGP kulcs hossza</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Alap csomópont</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">TOR/I2P rejtett csomópont</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use existing profile</source>
-        <translation type="vanished">Meglévő profil használata</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Csomópont neve</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7548,12 +6948,12 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Profil mentése</translation>
     </message>
@@ -7563,42 +6963,43 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>Nyomás!</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation>Szövegcimke</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Haladó beállítások</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>rejtett cím</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7646,13 +7047,13 @@ Most már átmásolhatod egy másik számítógépre
         <translation>Hiba történt. A profilodat nem sikerült elmenteni.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Profil importálása</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Új profil és Retroshare csomópont létrehozása</translation>
     </message>
@@ -7662,7 +7063,7 @@ Most már átmásolhatod egy másik számítógépre
         <translation>Új Retroshare csomópont létrehozása</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation>Tor/I2P cím</translation>
     </message>
@@ -7697,7 +7098,7 @@ Most már átmásolhatod egy másik számítógépre
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7707,12 +7108,7 @@ Most már átmásolhatod egy másik számítógépre
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7722,12 +7118,7 @@ Most már átmásolhatod egy másik számítógépre
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation>I2P hivatkozás bekapcsolt BOB-val</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation>I2P hivatkozás címe</translation>
     </message>
@@ -7953,36 +7344,13 @@ Most már átmásolhatod egy másik számítógépre
         <translation>Első lépések</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Barátok meghívása</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;A RetroShare nem működhet barátok nélkül. Kattints a gombra a folyamat elindításához.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Küldj emailben egy meghívót a tanúsítványoddal együtt a barátaidnak.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Gondoskodj róla, hogy te is megkapd az ő tanúsítványukat... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Csak akkor csatlakozhattok a barátoddal egymáshoz, ha már mindketten felvettétek a másikat.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Barátaid hozzáadása a RetroSharehez</translation>
     </message>
@@ -7992,95 +7360,103 @@ p, li { white-space: pre-wrap; }
         <translation>Barát hozzáadása</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Csatlakozás a barátokhoz</translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+76"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Haladó: Port nyitása a tűzfalon</translation>
+    </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Csatlakozás a barátokhoz</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Mikor a barátaid meghívót küldenek, kattints rá, hogy megnyisd a Barátok hozzáadása ablakot.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Illeszd be az abalakba a barátaid tanúsítványait és vedd fel őket!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Haladó: Port nyitása a tűzfalon</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>További segítség és támogatás</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>RetroShare weboldal megnyitása</translation>
     </message>
@@ -8105,7 +7481,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visszajelzés emailben</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare meghívás</translation>
     </message>
@@ -8155,12 +7531,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare visszajelzés</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>RetroShare támogatás</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Sok funkciója van, többek között beépített társalgó és üzenetküldő.</translation>
     </message>
@@ -8284,7 +7660,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Csoportos beszélgetés mutatása</translation>
     </message>
@@ -8292,7 +7668,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[Ismeretlen]</translation>
     </message>
@@ -8462,7 +7838,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Cím</translation>
     </message>
@@ -8475,12 +7851,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Leírás</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8505,35 +7881,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">Csökkenő sorbarendezés</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">Növekvő sorbarendezés</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Rendezés név szerint</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Rendezés népszerűség szerint</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Rendezés utolsó üzenet szerint</translation>
-    </message>
-    <message>
-        <source>Sort by Number of Posts</source>
-        <translation type="vanished">Bejegyzések száma szerinti rendezés</translation>
-    </message>
-    <message>
-        <source>Sort by Unread</source>
-        <translation type="vanished">Olvasatlanság szerinti rendezés</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8548,14 +7896,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Azonosító</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Utolsó bejegyzés</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
@@ -8566,17 +7914,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Soha</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Megjelenítés beállításai</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8589,7 +7933,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>és</translation>
     </message>
@@ -8725,7 +8069,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Csatornák</translation>
@@ -8736,22 +8080,22 @@ p, li { white-space: pre-wrap; }
         <translation>Csatorna létrehozása</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Automatikus letöltés engedélyezése</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Csatornáim</translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Feliratkozások</translation>
     </message>
@@ -8771,12 +8115,12 @@ p, li { white-space: pre-wrap; }
         <translation>Válassz a csatornához letöltési könyvtárat</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Automatikus letöltés tiltása</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>Állítsd be a letöltési könyvtárat</translation>
     </message>
@@ -8811,22 +8155,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Lejátszás</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Mappa megnyitása</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
@@ -8846,17 +8190,17 @@ p, li { white-space: pre-wrap; }
         <translation>Ellenőrzés</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>A mappa nem nyitható meg</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Fájl lejátszása</translation>
     </message>
@@ -8866,37 +8210,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nem található %1 fájl</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Forma</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Fájlnév</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Méret</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Cím</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Közzétéve</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Állapot</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Új csatorna létrehozása</translation>
     </message>
@@ -8934,9 +8251,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Feliratkozás a csatornára</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8950,7 +8277,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -8965,7 +8292,7 @@ p, li { white-space: pre-wrap; }
         <translation>Csatorna leírása</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Töltés</translation>
     </message>
@@ -8980,8 +8307,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Új csatorna</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Soha</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8992,7 +8320,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Új hozzászólás:</translation>
     </message>
@@ -9013,7 +8341,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Lejátszás</translation>
     </message>
@@ -9069,28 +8397,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Fájlok</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Vigyázz! A fájl törlődni fog kevesbb, mint %1 óra %2 perc múlva. Ha menteni szeretnéd, tedd meg időben.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Hozzászólás</translation>
     </message>
@@ -9105,21 +8429,17 @@ p, li { white-space: pre-wrap; }
         <translation>Nem tetszik</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Töltés</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation>Hozzászólások</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9144,115 +8464,16 @@ p, li { white-space: pre-wrap; }
         <translation>Média lejátszása</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Új bejegyzés</translation>
-    </message>
-    <message>
-        <source>Add new post</source>
-        <translation type="vanished">Új hozzászólás</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Töltés</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Keresés a csatornákban</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Cím</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Cím keresése</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Üzenet</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Üzenet keresése</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Fájlnév</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Keresés a fájlok között</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Nincs csatorna kiválasztva</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Soha</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Nyilvános</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Automatikus letöltés tiltása</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Automatikus letöltés engedélyezése</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Mutasd a fájlokat</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Adminisztrátor:</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Utolsó bejegyzés</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">ismeretlen</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Megosztás</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Hírcsatornák</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Fájlok</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Feliratkozottak</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Leírás:</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Új bejegyzés</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished">Új hozzászólás</translation>
     </message>
@@ -9322,7 +8543,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9358,7 +8579,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Hozzászólások</translation>
     </message>
@@ -9373,13 +8594,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Hírcsatornák</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9394,7 +8615,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9409,7 +8630,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9469,12 +8690,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9549,12 +8780,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Feliratkozva</translation>
     </message>
@@ -9605,17 +8837,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9635,19 +8867,11 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Tétel törlése</translation>
     </message>
-    <message>
-        <source>for identity </source>
-        <translation type="vanished">előle: </translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Tagsági kérelem jóváhagyása</translation>
     </message>
-    <message>
-        <source>Revoke membership request</source>
-        <translation type="vanished">Tagsági kérelem visszavonása</translation>
-    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -9738,7 +8962,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Hozzászólás a tárolóhoz</translation>
     </message>
@@ -9751,7 +8975,7 @@ p, li { white-space: pre-wrap; }
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9781,7 +9005,7 @@ p, li { white-space: pre-wrap; }
         <translation>Frissítés</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Hozzászólás</translation>
@@ -9820,7 +9044,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Válasz a hozzászólásra</translation>
     </message>
@@ -9844,6 +9068,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Szavazás ellene</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9853,7 +9092,7 @@ p, li { white-space: pre-wrap; }
         <translation>Hozzászólás írása</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9882,26 +9121,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Hozzászólás&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Aláírva általa</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9930,7 +9153,7 @@ before you can comment</source>
 mielőtt hozzászólhatsz</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,14 +9195,6 @@ mielőtt hozzászólhatsz</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Fórum adminisztrátorok hozzáadása</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Fórum adminisztrátorok kiválasztása</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9989,7 +9204,7 @@ mielőtt hozzászólhatsz</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Feliratkozás a fórumra</translation>
     </message>
@@ -10005,7 +9220,7 @@ mielőtt hozzászólhatsz</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -10025,8 +9240,9 @@ mielőtt hozzászólhatsz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Töltés</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10057,13 +9273,13 @@ mielőtt hozzászólhatsz</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Tárgy:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Leiratkozás a fórumról</translation>
     </message>
@@ -10074,7 +9290,7 @@ mielőtt hozzászólhatsz</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -10094,21 +9310,17 @@ mielőtt hozzászólhatsz</translation>
         <translation>Válasz címzettje:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Töltés</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
@@ -10121,63 +9333,66 @@ mielőtt hozzászólhatsz</translation>
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Új fonál indítása a kiválasztotta fórumban</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Fórumok keresése</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Utolsó beküldés</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation>Új szál</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Fa nézet</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Egyszerű nézet</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Cím</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Szerző</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Kép mentése</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Töltés</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10187,12 +9402,7 @@ mielőtt hozzászólhatsz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Válasz az üzenetre</translation>
     </message>
@@ -10216,10 +9426,6 @@ mielőtt hozzászólhatsz</translation>
         <source>Download all files</source>
         <translation>Összes fájl letöltése</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Következő olvasatlan</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10236,31 +9442,23 @@ mielőtt hozzászólhatsz</translation>
         <translation>Szerző keresése</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Tartalom</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Tartalom keresése</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Nincs név</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Válasz</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10303,20 +9501,12 @@ mielőtt hozzászólhatsz</translation>
         <translation>RetroShare hivatkozás másolása</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Lenyitás</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Letiltva]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[ismeretlen]</translation>
     </message>
@@ -10346,8 +9536,8 @@ mielőtt hozzászólhatsz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10361,26 +9551,6 @@ mielőtt hozzászólhatsz</translation>
         <source>Anti-spam</source>
         <translation>Szemétszűrő</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Szerkesztett üzenet ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Névtelen</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">aláírt</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">nincs</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Hiányzó üzenet ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10450,16 +9620,12 @@ mielőtt hozzászólhatsz</translation>
         <translation>Eredeti üzenet</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation>Új szál</translation>
     </message>
     <message>
-        <source>Read status</source>
-        <translation type="vanished">Elolvasott / nem olvasott</translation>
-    </message>
-    <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation>Szerkesztés</translation>
     </message>
@@ -10520,7 +9686,7 @@ mielőtt hozzászólhatsz</translation>
         <translation>Szerző megitélése</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10540,7 +9706,7 @@ mielőtt hozzászólhatsz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10592,7 +9758,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10602,7 +9768,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10617,17 +9783,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information for this identity is currently missing.</source>
-        <translation type="vanished">A személyazonossághoz tartozó információ jelenleg hiányzik.</translation>
-    </message>
-    <message>
-        <source>You have banned this ID. The message will not be
-displayed nor forwarded to your friends.</source>
-        <translation type="vanished">Tiltottad ezt az azonosítót. Az üzenet nem lesz
-megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
-    </message>
-    <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation>(Legutóbbi)</translation>
     </message>
@@ -10693,12 +9849,12 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Fórum</translation>
@@ -10729,35 +9885,16 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation>Egyéb fórumok</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Várakozás</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Lekérdezés</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Töltés</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Ikon hozzáadása</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Kulccsal rendelkező személyek írhatnak a korlátozott csoportokban és olvashatják, valamint írhatnak a privát csatornákra is.</translation>
     </message>
@@ -10766,22 +9903,14 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <source>Share Publish Key</source>
         <translation>Közzétételi kulcs megosztása</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">Jelöld ki azon partnereidet, akikkel szeretnél privát kulcsot megosztani.</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Kulcs megosztása velük:</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Leírás</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Üzenet elosztás</translation>
     </message>
@@ -10789,7 +9918,7 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Publikus</translation>
     </message>
@@ -10808,14 +9937,6 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <source>New Thread</source>
         <translation>Új fonál</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Szükséges</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Titkosított üzenetek</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10857,7 +9978,7 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Hozzászólások</translation>
     </message>
@@ -10880,7 +10001,7 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10896,12 +10017,12 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10918,23 +10039,23 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>Üzenet követése</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>PGP hitelesítés szükséges</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Soha</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10950,22 +10071,28 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation>Kérlek, adj meg egy nevet</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>Szükség van PGP aláírásra egy ismert azonosítótól</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Csoport logó betöltése</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Tulajdonos</translation>
     </message>
@@ -10975,12 +10102,12 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Információ</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>Azonosító</translation>
     </message>
@@ -10990,7 +10117,7 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation>Utolsó beküldés</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11065,7 +10192,12 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation>Aláíratlan és ismeretlen csomóponthoz tartozó azonosítók eltávolítása a kedvencek közül</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Népszerűség</translation>
     </message>
@@ -11081,27 +10213,22 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Szerző</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>Gxs azonosító címke</translation>
     </message>
@@ -11109,7 +10236,7 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Töltés</translation>
     </message>
@@ -11169,7 +10296,7 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation>Részletek szerkesztése</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation>Add meg a szinkronizálandó elmúlt időtartamot...</translation>
     </message>
@@ -11226,16 +10353,12 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share publish permissions</source>
-        <translation type="vanished">Nyilvános engedélyek megosztása</translation>
-    </message>
-    <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare hivatkozás másolása</translation>
     </message>
@@ -11258,7 +10381,7 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Nincs aláírás</translation>
     </message>
@@ -11271,40 +10394,24 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Töltés</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Nem található</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Nincs aláírás</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Letiltva]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Azonosítás</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>ismeretlen kulcs</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">névtelen</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11314,7 +10421,12 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Személyazonosság&amp;nbsp;név</translation>
     </message>
@@ -11334,6 +10446,14 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation>[Ismeretlen]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11345,7 +10465,7 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11393,17 +10513,13 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Ismeretlen]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Töltés</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11535,10 +10651,6 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <source>Popularity</source>
         <translation>Népszerüség</translation>
     </message>
-    <message>
-        <source>Details</source>
-        <translation type="vanished">Részletek</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -11571,33 +10683,6 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <translation>Nem</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">Azonosított csatornák</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">Alagút azonosító: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">állapot: %1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">elküldve: %1 byte</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">fogadva: %1 byte</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Ismeretlen kapcsolat</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11810,48 +10895,12 @@ megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
         <source>About</source>
         <translation>Névjegy</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;A RetroShare egy Nyílt Forrású platformok közötti, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;privát és biztonságos decentralizált kommunikációt nyújtó szolgáltatás.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Segítségével biztonságosan oszthatod meg a barátlistádat, mert &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;egy megbízhatósági hálózat: &quot;web-of-trust&quot; által hitelesíti a partnereket és OpenSSL használatával titkosít minden kommunikációt.  &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;A RetroShare lehetőséget biztosít fájlmegosztásra, beszélgetésre, üzenetküldésre valamint csatornák használatára&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Hasznos linkek további információhoz:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Weboldal&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Fórum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Projekt Oldala&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Csapat Blogja&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Fejlesztői Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+37"/>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11867,7 +10916,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Szerzők</translation>
     </message>
@@ -11886,7 +10935,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11964,12 +11013,12 @@ p, li { white-space: pre-wrap; }
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+158"/>
+        <location line="+165"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11984,7 +11033,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11993,32 +11042,12 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Did you receive a certificate from a friend?</source>
-        <translation type="vanished">Kaptál egy tanúsítványt egy barátodtól?</translation>
-    </message>
-    <message>
-        <source>Add friends certificate</source>
-        <translation type="vanished">Ismerősök tanusítványainak hozzáadása.</translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">Tanusítvány-fájl hozzáadása</translation>
-    </message>
-    <message>
-        <source>Share your RetroShare Key</source>
-        <translation type="vanished">Saját RetroShare kulcsod megosztása</translation>
-    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
-        <translation type="vanished">Az alábbi szöveghalmaz a te RetroShare tanusítványod. Küld el a barátaidnak.</translation>
-    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -12029,20 +11058,12 @@ privát és biztonságos decentralizált kommunikációt nyújtó szolgáltatás
 </translation>
     </message>
     <message>
-        <source>Launch startup wizard</source>
-        <translation type="vanished">Nyisd meg az indító varázslót</translation>
-    </message>
-    <message>
-        <source>Do you need help with RetroShare?</source>
-        <translation type="vanished">Segítségre van szükséged?</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+134"/>
         <source>Open Web Help</source>
         <translation>Nyisd meg a segítség honlapot</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Tanúsítványod másolása a vágólapra</translation>
     </message>
@@ -12052,7 +11073,7 @@ privát és biztonságos decentralizált kommunikációt nyújtó szolgáltatás
         <translation>Mentsd el egy fájlba a tanusítványodat</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>Küld el emailben</translation>
     </message>
@@ -12072,13 +11093,37 @@ privát és biztonságos decentralizált kommunikációt nyújtó szolgáltatás
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12090,12 +11135,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12110,12 +11155,7 @@ new short format</source>
         <translation>RetroShare meghívó</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation>Mentés mint...</translation>
     </message>
@@ -12380,14 +11420,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Összes</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Népszerűség</translation>
     </message>
@@ -12397,12 +11437,12 @@ p, li { white-space: pre-wrap; }
         <translation>Keresés</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>Névtelen azonosító</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Új személyazonosság létrehozása</translation>
     </message>
@@ -12412,7 +11452,7 @@ p, li { white-space: pre-wrap; }
         <translation>Hozz létre új kört</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>Személyek</translation>
     </message>
@@ -12427,27 +11467,27 @@ p, li { white-space: pre-wrap; }
         <translation>Személy</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation>Letiltási opció:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Automatikusan bannolj minden Személyazonosságot amelyet ugyanez a csomópont írt alá</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation>Ismerős szavazatai:</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Elismerő szavazatok</translation>
     </message>
@@ -12463,29 +11503,39 @@ p, li { white-space: pre-wrap; }
         <translation>Bíráló szavazatok</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation>Használati statisztika</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Körök</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Kör neve</translation>
     </message>
@@ -12505,18 +11555,20 @@ p, li { white-space: pre-wrap; }
         <translation>Személyes körök</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Személyazonosság szerkesztése</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Személyazonosság törlése</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Beszélgetés ezzel a partnerrel</translation>
     </message>
@@ -12526,78 +11578,78 @@ p, li { white-space: pre-wrap; }
         <translation>Távoli beszélgetést kezdeményez ezzel a partnerrel</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>Tulajdonos csomópont azonosító :</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Személyazonosság név :</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>Személyazonosság azonosító</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Üzenet elküldése</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Személyazonosság információ</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Személyazonosság azonosító :</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Csomópont tulajdonos neve:</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation>Új létrehozása</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Típus:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Meghívó küldése</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>A véleményed:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>rossz</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>semleges</translation>
     </message>
@@ -12608,17 +11660,17 @@ p, li { white-space: pre-wrap; }
         <translation>jó</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Általánosan</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Névtelen</translation>
     </message>
@@ -12633,24 +11685,24 @@ p, li { white-space: pre-wrap; }
         <translation>Azonosító keresése</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Ez a személyazonosság a tiéd</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>Saját személyazonosságaim</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>Kapcsolataim</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation>Elemek megjelenítése</translation>
     </message>
@@ -12665,7 +11717,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>Más körök</translation>
     </message>
@@ -12675,7 +11732,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>Kör azonosító:</translation>
     </message>
@@ -12750,7 +11807,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nem-tag (nem férsz hozzá a kör adataihoz)</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>Személyazonosság azonosító:</translation>
     </message>
@@ -12780,7 +11837,7 @@ p, li { white-space: pre-wrap; }
         <translation>ismeretlen</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>Meghívott</translation>
     </message>
@@ -12795,7 +11852,7 @@ p, li { white-space: pre-wrap; }
         <translation>Tag</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>Kör szerkesztése</translation>
     </message>
@@ -12843,7 +11900,7 @@ p, li { white-space: pre-wrap; }
         <translation>Tagság megadása</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12854,7 +11911,7 @@ Szabadulj meg tőle és készíts egy újat.
 Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Ismeretlen csomópont]</translation>
@@ -12897,7 +11954,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Névtelen személyazonosság</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12977,7 +12034,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation>Információ</translation>
     </message>
@@ -12993,25 +12050,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Személyazonosság másolása a vágólapra</translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Küldesz meghívót</translation>
-    </message>
-    <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Letiltva</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Személyazonosságok&lt;/h1&gt;    			&lt;p&gt;Ezen a fülön készíthetsz új vagy szerkesztheted a már meglévő &lt;b&gt;ál-névtelen személyazonosságokat&lt;/b&gt;, és &lt;b&gt;köröket&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;A &lt;b&gt;személyazonosságokat&lt;/b&gt; használjuk az adataid biztonságos azonosításához: aláírják az üzeneteid a társalgószobákban, a fórum- és csatorna hozzászólásaidat, 				visszajelzést kapnak a Retroshare beépített e-mail rendszerén keresztül, hozzászólhatsz 				csatorna bejegyzésekhez, biztonságos alagutakon keresztül beszélgethetsz, stb.&lt;/p&gt; 			&lt;p&gt;Személyazonosságaidat&lt;b&gt;aláírhatod&lt;/b&gt; a Retroshare csomópontod tanúsítványával.   			Az aláírt Személyazonosságok jobban ellenőrizhetőbbek ezért megbízhatóbbnak számíthatnak, ugyanakkor hozzá vannak kapcsolva a csomópontod IP címéhez.&lt;/p&gt;  			&lt;p&gt;Az úgynevezett&lt;b&gt;Álnevek&lt;/b&gt; segítségével névtelenséged megőrzésével léphetsz kapcsolatba a többiekkel. Nem visszakereshető,  			ezáltal senki sem tudhatja, hogy pontosan kihez is tartozik egy ilyen személyazonosság.&lt;/p&gt;                     &lt;p&gt;A &lt;b&gt;Körök&lt;/b&gt; tulajdonképpen a hálózat személyazonosságainak (Álnév típusú, vagy aláírt) részhalmazai. Felhasználhatók  arra,              		hogy szigorítsuk a hozzáférést egy fórumhoz, csatornához, stb. &lt;/p&gt;                     &lt;p&gt;Egy &lt;b&gt;kör&lt;/b&gt; szűkíthető további körökkel, ezáltal láthatatlanná téve bizonyos tartalmakat olyanok számára akik nem tagjai a szűkebb köröknek. Sőt egy kör önmaga is lehet korlátozott, ez azt jelenti, hogy csak a meghívott személyek számára lesz látható a tartalom.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Unknown ID:</source>
-        <translation type="vanished">Ismeretlen azonosító:</translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -13060,10 +12104,6 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>Chat</source>
         <translation>Beszélgetés</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Ismeretlen</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13104,19 +12144,11 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>Signature in distant tunnel system.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Update of identity data.</source>
-        <translation type="vanished">Személyazonosság adat frissítése.</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Általános aláírás hitelesítés.</translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">Általános aláírás</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -13128,7 +12160,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Titkosítás feloldása (általános)</translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation>Hozzáadás a kapcsolatokhoz</translation>
     </message>
@@ -13178,21 +12210,21 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Személyek</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Saját avatár</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13202,7 +12234,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13217,7 +12249,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Beszélgetés ezzel a személlyel</translation>
     </message>
@@ -13232,12 +12264,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>A távoli beszélgetés nem engedélyezett ezzel a személlyel.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Utoljára használva:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>50-nél több ismert PGP</translation>
     </message>
@@ -13257,12 +12289,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Tényleg törölni szeretnéd ezt a személyazonosságot?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13272,7 +12304,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Csomópont azonosító :</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>Tényleg törlöd?</translation>
     </message>
@@ -13280,7 +12312,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Becenév</translation>
     </message>
@@ -13310,7 +12342,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Álnév</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13320,12 +12352,19 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Új személyazonosság</translation>
     </message>
@@ -13339,7 +12378,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13349,7 +12388,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Személyazonosság szerkesztése</translation>
@@ -13360,27 +12404,27 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished">Frissít</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13400,7 +12444,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13410,11 +12454,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Hiba a kulcs beolvasásakor!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Hiba, érvénytelen Kulcs azonosító</translation>
     </message>
@@ -13429,7 +12469,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Ismeretlen igazi név</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Új személyazonosság létrehozása</translation>
     </message>
@@ -13439,10 +12479,15 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Típus</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Eltávolítás</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13468,7 +12513,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Hozzáadás</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13478,17 +12523,13 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Saját avatár</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Avatár beállítása</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13498,7 +12539,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Rendelkezhetsz egy vagy több személyazonossággal. Írhatsz velük társalgószobákba, hozzászólhatsz fórumokhoz és csatorna bejegyzésekhez. Végpontként viselkednek távoli beszélgetések valamint Retroshare távoli üzenetküldés esetén.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13557,10 +12598,6 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>PGP name:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">GXS azonosító:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13576,7 +12613,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
@@ -13586,12 +12623,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Összes megjelölése</translation>
     </message>
@@ -13610,26 +12647,38 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>Quote</source>
         <translation type="unfinished">Idézés</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Küldés</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Kép mentése</translation>
     </message>
     <message>
         <location line="-7"/>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Kép mentése sikertelen, érvénytelen fájlnév</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>Ez nem kép</translation>
     </message>
@@ -13647,27 +12696,32 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Állapot:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13688,7 +12742,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13697,26 +12756,31 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Fájl megnyitása</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Mappa megnyitása</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Ellenőrzés...</translation>
     </message>
@@ -13726,7 +12790,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Fájlok ellenőrzése</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13754,7 +12818,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Barát hozzáadása</translation>
     </message>
@@ -13770,7 +12834,8 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Beállítások</translation>
     </message>
@@ -13791,7 +12856,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Kilépés</translation>
     </message>
@@ -13802,12 +12867,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Gyors beállítások varázsló</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 egy biztonságos, központosítatlan kommunikációs platform</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Befejezetlen</translation>
     </message>
@@ -13836,11 +12901,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Értesítés</translation>
     </message>
@@ -13851,31 +12917,35 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Levelek megnyitása</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Sávszélesség grafikon</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Alkalmazások</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Súgó</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Minimalizálás</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Teljes képernyő</translation>
     </message>
@@ -13890,7 +12960,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 új üzenet</translation>
     </message>
@@ -13920,7 +12995,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>%1 csatlakozott barát</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Tényleg ki szeretnél lépni a RetroShareből?</translation>
     </message>
@@ -13940,7 +13015,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Mutat</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Bizonyosodj meg róla, hogy ez a hivatkozás nem egy veszélyes weboldalra mutat.</translation>
     </message>
@@ -13985,12 +13060,13 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Szolgáltatás jogosultságok mátrix</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Statisztika</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Beépített böngésző megnyitása</translation>
     </message>
@@ -14005,7 +13081,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>Tényleg kilépsz?</translation>
     </message>
@@ -14014,17 +13090,17 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Írás</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Kapcsolatok</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Bekezdés</translation>
     </message>
@@ -14060,12 +13136,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Címsor 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Betűméret</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Betűméret növelése</translation>
     </message>
@@ -14080,32 +13156,32 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Félkövér</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Dőlt</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Igazítás</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Kép hozzáadása</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Kódrészlet beállítása</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Aláhúzott</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Tárgy:</translation>
     </message>
@@ -14116,32 +13192,32 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Címkék</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>Címek listája:</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Szövegszin beállítása</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Szöveg háttérszinének beállítása</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Ajánlott fájlok</translation>
     </message>
@@ -14211,7 +13287,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Hosszabb idézet</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Küldés neki:</translation>
     </message>
@@ -14235,10 +13311,6 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>&amp;Justify</source>
         <translation>&amp;sorkizárt</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">Minden cím (vegyes)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14250,7 +13322,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Kapcsolataim</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Szia,&lt;br&gt;Szeretném a figyelmedbe ajánlani egy barátomat. Ha bennem megbízol, benne is megbízhatsz. &lt;br&gt;</translation>
     </message>
@@ -14270,18 +13342,18 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>szeretne a barátod lenni</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Szia %1,&lt;br&gt;&lt;br&gt;%2 szeretne a barátod lenni.&lt;br&gt;&lt;br&gt;Válaszolj neki:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Köszönettel,&lt;br&gt;a RetroShare csapat</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Üzenet mentése</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Az üzenet nem lett elküldve.
@@ -14293,7 +13365,17 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>RetroShare link beillesztése</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Hozzáadás címzettként</translation>
     </message>
@@ -14313,7 +13395,7 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>Hozzáadás ajánlottként</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Eredeti üzenet</translation>
     </message>
@@ -14323,21 +13405,21 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Neki</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Másolat</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Küldve</translation>
     </message>
@@ -14352,7 +13434,7 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>%1, %2 írta:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Vá:</translation>
     </message>
@@ -14362,30 +13444,30 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>Tov:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Tárgy nélkül szeretnéd elküldeni az üzenetet?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Kérlek, adj meg legalább egy fogadót.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Rejtett másolat</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
@@ -14500,13 +13582,13 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>Részletek</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Fájl megnyitása...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-Fájlok (*.htm *.html);;Összes fájl (*)</translation>
     </message>
@@ -14526,7 +13608,7 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>PDF Exportálása</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Az üzenet nem lett elküldve.
@@ -14548,7 +13630,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Extra fájl hozzáadása</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14572,28 +13654,24 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">Van egy barát felkérésed</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Válasz most:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Feladó:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>Barát csomópontok</translation>
     </message>
@@ -14638,13 +13716,13 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Kösz, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Távoli személyazonosság:</translation>
     </message>
@@ -14654,12 +13732,12 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>[Hiányzik]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Hozz létre egy személyazonosságot, hogy aláírd a távoli üzeneteket, vagy töröld a távoli partnereket a cél listáról.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Csomópont név &amp; azonosító:</translation>
     </message>
@@ -14737,7 +13815,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Alapértelmezett</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Új fül</translation>
     </message>
@@ -14747,7 +13825,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Új ablak</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Címke szerkesztése</translation>
     </message>
@@ -14770,7 +13848,7 @@ Szeretnéd menteni az üzenetet?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Tárgy:</translation>
     </message>
@@ -14778,7 +13856,7 @@ Szeretnéd menteni az üzenetet?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Üzenet</translation>
     </message>
@@ -14806,7 +13884,7 @@ Szeretnéd menteni az üzenetet?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Ajánlott fájlok</translation>
     </message>
@@ -14816,37 +13894,37 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Az összes ajánlott fájl letöltése</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Tárgy:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Feladó:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Címzett:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Másolat:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Rejtett másolat:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Címkék:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Válasz</translation>
     </message>
@@ -14886,7 +13964,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>Meghívó küldése</translation>
     </message>
@@ -14938,7 +14016,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Elfogadom %1 baráti felkérését</translation>
     </message>
@@ -14948,12 +14026,12 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>%1 hozzáadása barátként</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Nincs tárgy</translation>
     </message>
@@ -14963,17 +14041,22 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Letöltés</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14983,17 +14066,23 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Küldesz meghívót?</translation>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Az összes letöltése</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Dokumentum nyomtatása</translation>
     </message>
@@ -15008,12 +14097,12 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Html-Fájlok (*.htm *.html);;Összes fájl (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Ezen üzenethez mindig töltse be a képeket</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Csatolmány mező elrejtése</translation>
     </message>
@@ -15035,42 +14124,6 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Compose</source>
         <translation>Írás</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Válasz a kijelölt üzenetre</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Válasz</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Válasz az összes kijelölt üzenetre</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Válasz mindenre</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Kijelölt üzenet továbbítása</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Előre</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Kijelölt üzenet eltávolítása</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Törlés</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Kijelölt üzenet nyomtatása</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15149,7 +14202,7 @@ Szeretnéd menteni az üzenetet?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Új üzenet</translation>
     </message>
@@ -15159,60 +14212,16 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Írás</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Válasz a kiválasztott üzenetre</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Válasz</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Válasz az összes kiválasztott üzenetre</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Válasz mindenre</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Kiválasztott üzenet továbbítása</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Továbbítás</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Kiválasztott üzenet eltávolítása</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Törlés</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Kiválasztott üzenet nyomtatása</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Nyomtatás</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Megjelenítés beállításai</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Címkék</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Beérkezett üzenetek</translation>
@@ -15242,21 +14251,17 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Kuka</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Összes beérkezett:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Mappák</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Gyors nézet</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Nyomtatás...</translation>
@@ -15266,26 +14271,6 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Print Preview</source>
         <translation>Nyomatási kép</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Gombok csak ikonokként</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Szöveg az ikonok mellett</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Gombok csak szöveggel</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Gombok ikon alatti szöveggel</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Szöveg beállítása</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15307,7 +14292,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Üzenet továbbítása</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Tárgy</translation>
     </message>
@@ -15317,7 +14302,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
@@ -15327,39 +14312,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Tartalom</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Rendezés mellékletek szerint</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Rendezés tárgy szerint</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Rendezés olvasottság szerint</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Rendezés alak szerint</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Rendezés dátum szerint</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Rendezés címkék szerint</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Rendezés csillagozottság szerint</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Kijelölt üzenet továbbítása</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Tárgy keresése</translation>
     </message>
@@ -15368,6 +14321,11 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Search From</source>
         <translation>Keresés ebből</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15394,14 +14352,14 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Mellékletek keresése</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Csillagozott</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15475,7 +14433,7 @@ Szeretnéd menteni az üzenetet?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15489,7 +14447,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15504,34 +14462,33 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Piszkozatok</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Nincs elérhető csillagozott üzenet. A csillagokkal megjelölheted fontos üzeneteidet, hogy azokat könnyen megtaláld. Ehhez kattints a világosszürke csillagra az üzenet mellett.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Nincs elérhető rendszerüzenet.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Címzett</translation>
+        <translation>Címzett</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Rendezés címzett szerint</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15539,22 +14496,6 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Total:</source>
         <translation>Összes:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Üzenetek</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Rendezés aláírás szerint</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Az üzenet aláírást tartalmazott és az értéke egyezett</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Az üzenet aláírást tartalmazott, de az értéke nem egyezik meg</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15582,7 +14523,17 @@ Szeretnéd menteni az üzenetet?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">Kép mentése</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Beillesztés sima szövegként</translation>
     </message>
@@ -15636,7 +14587,7 @@ Szeretnéd menteni az üzenetet?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -15646,7 +14597,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished">tőle</translation>
     </message>
@@ -15681,14 +14632,10 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Függő üzenetek</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
-    <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Küldesz meghívót?</translation>
-    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -15826,7 +14773,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Partner azonosító</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Használatlan kulcsok eltávolítása...</translation>
     </message>
@@ -15836,7 +14783,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Kulcstartó takarítása</translation>
     </message>
@@ -15854,7 +14801,13 @@ Megyjegyzés: A régi kulcstartódról biztonsági másolat készül.
 Az eltávolítás sikertelenül végződhet, ha egyszerre több Retroshare klienst futtatsz ugyanazon a gépen.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Kulcstartó adatai</translation>
@@ -15890,18 +14843,13 @@ A biztonság kedvéért a kulcstartód ezt megelőzően el lett mentve egy fájl
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Adatrendezési hiba a kulcstartóban. Ez valószínűleg egy programhiba. Kérlek lépj kapcsolatba a fejlesztőkkel.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Csak megbízható kulcsok</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Név keresése</translation>
     </message>
@@ -15911,25 +14859,18 @@ A biztonság kedvéért a kulcstartód ezt megelőzően el lett mentve egy fájl
         <translation>Partner azonosító keresése</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>Profil részletei</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Hálózat</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -15956,7 +14897,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15977,7 +14918,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Csoportok</translation>
     </message>
@@ -16007,19 +14948,19 @@ Reported error:</source>
         <translation type="unfinished">barátlista visszaállítása a megtartott csoportokkal</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Keresés</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">Azonosító</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished">Azonosító keresése</translation>
     </message>
@@ -16029,12 +14970,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished">Elemek megjelenítése</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16044,7 +14985,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Csoport</translation>
     </message>
@@ -16159,7 +15100,7 @@ Reported error:</source>
         <translation type="unfinished">Összes becsukása</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">El szeretnéd távolítani ezt a csomópontot?</translation>
     </message>
@@ -16169,7 +15110,7 @@ Reported error:</source>
         <translation type="unfinished">El szeretnéd távolítani ezt a barátot?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Kész!</translation>
@@ -16283,11 +15224,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">Naplóbejegyzések</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16302,11 +15239,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Összes eltávolítása</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Ez egy teszt.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>A legújabb felül</translation>
     </message>
@@ -16316,16 +15249,12 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>A legrégibb felül</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Log</source>
-        <translation type="vanished">Napló</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16380,10 +15309,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Blogs</source>
         <translation>Blogok</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Biztonság</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16405,10 +15330,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Message</source>
         <translation>Üzenet</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Csatlakozási kísérlet</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16425,10 +15346,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Ip security</source>
         <translation>IP biztonság</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Napló</translation>
-    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -16439,10 +15356,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Circles</source>
         <translation>Körök</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Hivatkozások</translation>
-    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -16495,14 +15408,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Chat rooms</source>
         <translation>Társalgószobák</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">Társalgószobák</translation>
-    </message>
-    <message>
-        <source>Case sensitive</source>
-        <translation type="vanished">Kis- és nagybetű érzékeny</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16578,10 +15483,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Hírcsatorna</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -16591,7 +15492,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16611,12 +15512,12 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Rossz jelszó!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Nem regisztrált beépülő/futtatható állomány</translation>
     </message>
@@ -16631,19 +15532,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Kérlek, ellenőrízd a rendszerórádat.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Megosztott fájlok vizsgálata...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Fájl hashelése</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Fájlindex mentése</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Teszt</translation>
     </message>
@@ -16654,17 +15543,19 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Ismeretlen cím</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Titkosított üzenet</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Ahhoz, hogy a társalgószobák megfelelően működjenek, a számítógép órájának pontosnak kell lennie. Kérlek ellenőrizd (Lehetséges időeltérést tapasztaltunk a barátaidhoz képest).</translation>
     </message>
@@ -16672,7 +15563,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Bejelentkezett barát</translation>
     </message>
@@ -16724,10 +15615,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Párbeszéd</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -16793,10 +15680,6 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>This profile has signed your own profile key</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Kulcs aláírások:</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16822,23 +15705,20 @@ p, li { white-space: pre-wrap; }
         <translation>PGP kulcs</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation>Ezek a beállítások a következő profil összes csomópontjára érvényesek:</translation>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;A barátod kulcsának aláírása alkalmas arra, hogy kifejezd a bizalmad iránta és ezt jelezd a többiek felé. Ez segíthet nekik eldönteni, hogy elfogadják-e a kapcsolódást az adott kulcs tulajdonosától. Egy kulcs aláírása csak egy lehetőség, de visszavonhatatlan. Ezért fontold meg és dönts okosan.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation>Ezek a beállítások a következő profil összes csomópontjára érvényesek:</translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">PGP kulcs aláírása</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16875,29 +15755,20 @@ p, li { white-space: pre-wrap; }
         <translation>Aláírásokat tartalmaz</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Beállítások</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;A Retroshare időnként ellenőrzi a barátlistád kereshető fájlokért, melyek megegyeznek az átviteli fájlokkal, azért, hogy közvetlen fájlátvitel valósulhasson meg. Ebben az esetben a barátod tudni fogja, hogy letöltöd azt a fájlt.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Hogy elkerüld ezt a viselkedést, és ki szeretnéd hagyni ebből ezt a barátodat, akkor szüntesd meg a doboz kijelölését. Továbbra is lehetőséged lesz a fájl letöltésére tőle, ehhez azonban előbb igényelned kell azt. Például az adott fájl manuális letöltésével a barátod megosztott mappájából. Ez a beállítás egy adott csomóponthoz tartozó összes helyszínre érvényes lesz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use as direct source, when available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Közvetlen forrásként használat, amikor csak lehetséges</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ez az opció lehetővé teszi, hogy önműködően letöltsd az ennek a csomópontnak valamelyik üzenetben javasolt fájlt. Arra is használhatod, hogy saját csomópontjaid között fájlokat továbbíts. Ugyanazon csomópont összes helyszinére vonatkozik.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -16930,21 +15801,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/másodpercenként</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Hiba: a partner adatai nem elérhetőek.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>A RetroShare nem támogatja a kulcsot.
@@ -16965,7 +15836,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen letöltést.</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17034,10 +15905,6 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Talán rossz a jelszó</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -17045,12 +15912,12 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>RetroShare profil</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17076,7 +15943,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Beszélgetés</translation>
     </message>
@@ -17097,7 +15964,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
@@ -17137,7 +16004,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>Időeltolódás:</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Üzenet írása</translation>
     </message>
@@ -17151,10 +16018,6 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>Friend Connected</source>
         <translation>Barát bejelentkezett</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Kapcsolódási kísérlet</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17193,17 +16056,13 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>Unknown</source>
         <translation type="unfinished">Ismeretlen</translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Ismeretlen partner</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Üzenet küldése</translation>
     </message>
@@ -17255,10 +16114,6 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>Chat with this person as...</source>
         <translation>Beszélgetés ezzel a személlyel mint...</translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">Üzenet küldése ennek a személynek</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17374,13 +16229,6 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Forma</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17388,23 +16236,11 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>PhotoShare</source>
         <translation>Fényképmegosztás</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Fénykép</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Címke</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Hozzászólás</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Összefoglalva</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17465,14 +16301,6 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Hozzászólás írása</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Hozzászólás írása...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17543,10 +16371,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Album létrehozása</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Album megnézése</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17568,17 +16392,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diavetítés</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Albumaim</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Album feliratkozások</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Megosztott albumok</translation>
     </message>
@@ -17607,7 +16431,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Album neve</translation>
     </message>
@@ -17666,19 +16490,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17714,12 +16538,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Szövegcímke</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Beépülő részleteinek mutatása</translation>
     </message>
@@ -17865,51 +16689,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Beéplők könyvtárai</translation>
     </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[leállítva]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Nincs támogatott API szám. Kérlek, olvasd el a beépülők fejlesztéséhez kapcsolódó leírást.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[betöltési hiba]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Nincs támogatott SVN szám. Kérlek, olvasd el a beépülők fejlesztéséhez kapcsolódó leírást.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Hiba a betöltéskor</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Hizányzó szimbólum. Rossz verzió?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Nem található beépülő</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Beépülő betöltve.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Ismeretlen állapot.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Fejlesztő verziók használatáért jelöld be ezt, így a hash értékeik nem
-lesznek ellenőrízve. Alapállapotban a hash érték ellenőrzése megvéd
-a kártevőként működő beépülők használatától.</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -17979,12 +16758,27 @@ a kártevőként működő beépülők használatától.</translation>
         <translation>Mindig felül</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">Személy bannolása (Negatív véleményt állít be)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -18018,14 +16812,6 @@ a kártevőként működő beépülők használatától.</translation>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Ha bezárod ezt az ablakot, akkor a beszélgetés megszakad és megszűnik titkosított alagút.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Alagút bezárása?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -18045,7 +16831,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Új</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Szavazás mellette</translation>
     </message>
@@ -18065,8 +16851,8 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Hozzászólások</translation>
     </message>
@@ -18091,13 +16877,13 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Hozzászólás</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished">Hozzászólások</translation>
     </message>
@@ -18125,20 +16911,12 @@ a kártevőként működő beépülők használatától.</translation>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Általa aláírva:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Jegyzetek</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -18153,12 +16931,22 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Kép betöltése</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18174,7 +16962,17 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18184,19 +16982,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Beküldés</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Jóváhagyás</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Új hozzászólás beküldése</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Kérlek, adj meg egy címet</translation>
     </message>
@@ -18216,12 +17002,22 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18236,7 +17032,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Hozzászólás mint</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18247,7 +17043,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Kép</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18257,7 +17053,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation>Cím</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Hivatkozás</translation>
     </message>
@@ -18265,40 +17061,12 @@ a kártevőként működő beépülők használatától.</translation>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Közzétett hivatkozások</translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Téma létrehozása</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Topikjaim</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Feliratkozott témák</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Népszerű témák</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Egyéb témák</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Hivatkozások</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18332,31 +17100,7 @@ a kártevőként működő beépülők használatától.</translation>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Beküldött téma</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Téma adminok hozzáadása</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Téma adminok kiválasztása</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Új téma létrehozása</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Téma szerkesztése</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Téma frissítése</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18394,7 +17138,17 @@ a kártevőként működő beépülők használatától.</translation>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18410,7 +17164,7 @@ a kártevőként működő beépülők használatától.</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -18425,16 +17179,17 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Töltés</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">Soha</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18447,22 +17202,18 @@ a kártevőként működő beépülők használatától.</translation>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Oldal</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Hozzászólások</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18473,12 +17224,12 @@ a kártevőként működő beépülők használatától.</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Hozzászólás</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished">Hozzászólások</translation>
     </message>
@@ -18488,7 +17239,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Az üzenet szerzője (azonosító: %1) bannolva van.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18498,21 +17249,17 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Szavazás mellette</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Szavazás ellene</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Megjelölés olvasottként és eltávolítás</translation>
     </message>
@@ -18522,7 +17269,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation>Új</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Új hozzászólás</translation>
     </message>
@@ -18532,7 +17279,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
@@ -18573,77 +17320,10 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Töltés</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">által</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Forma</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Népszerű</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Új</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Magas</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Ma</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Tegnap</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">A héten</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">A hónapban</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Az évben</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Új hozzászólás beküldése</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Következő</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Kérlek, hozz létre vagy válassz ki egy Aláíró azonosítót a szavazás előtt</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Előző</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18663,7 +17343,17 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18673,15 +17363,15 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Adminisztrátor:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">ismeretlen</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18691,42 +17381,42 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">Bejegyzések</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18746,7 +17436,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Népszerű</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">Keresés</translation>
     </message>
@@ -18776,17 +17466,17 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18801,12 +17491,17 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Üres</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18816,27 +17511,31 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Szerkesztés</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished">Információ</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18851,7 +17550,7 @@ a kártevőként működő beépülők használatától.</translation>
         <translation type="unfinished">Feliratkozás</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Soha</translation>
     </message>
@@ -18925,6 +17624,16 @@ a kártevőként működő beépülők használatától.</translation>
         <source>No Channel Selected</source>
         <translation type="unfinished">Nincs csatorna kiválasztva</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -18933,14 +17642,6 @@ a kártevőként működő beépülők használatától.</translation>
         <source>Tabs</source>
         <translation>Fülek</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Minden egyes téma megnyitása új fülön</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Hivatkozások</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -18954,10 +17655,6 @@ a kártevőként működő beépülők használatától.</translation>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Beküldve</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -19026,16 +17723,16 @@ a kártevőként működő beépülők használatától.</translation>
         <translation>Profilkezelő</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -19145,7 +17842,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Állapot szerkesztése</translation>
@@ -19161,7 +17858,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Profilkezelő</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Publikus adatok</translation>
     </message>
@@ -19196,12 +17893,12 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Online ettől kezdve:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Egyéb adatok</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Címem</translation>
     </message>
@@ -19245,51 +17942,27 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Küldés ebből:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Profil 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Profil 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Profil 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Pulzushoz adás</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">szűrő</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">URL hozzáadó</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Mutatás mint</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19299,12 +17972,12 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished">Feladó:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19334,13 +18007,13 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished">rossz</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19352,12 +18025,22 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19366,17 +18049,13 @@ az importálás gombot, hogy betöltsd.</translation>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Pulzus küldése a vezetékhez</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19391,34 +18070,24 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Feladó</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Dátum</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Kép betöltése</translation>
     </message>
 </context>
 <context>
@@ -19429,7 +18098,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished">Forma</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19448,7 +18117,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19458,7 +18127,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19485,7 +18154,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19495,7 +18164,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19515,7 +18184,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19631,7 +18300,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19639,37 +18308,42 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19701,7 +18375,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19709,8 +18383,8 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Megerősítés</translation>
     </message>
@@ -19981,12 +18655,12 @@ A &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; karakterek le lesznek cs
         <translation>Partner részletei</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Fájl kérése megszakítva</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>A RetroShare ezen verziója OpenPGP-SDK-t használ. Ennek hála, nem használja a rendszer PGP kulcstartóját, viszont van egy saját kulcstartója, amit az összes futó RetroShare elérhet. &lt;br&gt;&lt;br&gt;Úgy tűnik, hogy még nem rendelkezel ilyen kulcstartóval annak ellenére, hogy már létrehozott RetroShare fiókjaidban szerepelnek PGP kulcsok. Ez valószínűleg azért lehetséges, mert most frissítettél az alkalmazás új verziójára.</translation>
     </message>
@@ -20017,7 +18691,7 @@ A &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; karakterek le lesznek cs
         <translation>Váratlan hiba történt. Kérlek jelentsd &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation>A Tor-kezelő nem indul!</translation>
     </message>
@@ -20053,7 +18727,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Több példány</translation>
@@ -20076,6 +18750,26 @@ Kérlek, először zárd be azt. Zárolt fájl:
 Zárolófájl:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20158,7 +18852,7 @@ A hibajelentés:
         <translation>Adat továbbítása</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20168,7 +18862,7 @@ A hibajelentés:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>elindítva</translation>
     </message>
@@ -20178,7 +18872,7 @@ A hibajelentés:
         <translation>leállítva</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20194,7 +18888,7 @@ A hibajelentés:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>%1 másodperccel ezelőtt</translation>
     </message>
@@ -20262,7 +18956,7 @@ Security: no anonymous IDs</source>
 Biztonság: névtelen azonosítók nem engedélyezettek</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation>Belépés a társalgószobába</translation>
     </message>
@@ -20290,7 +18984,7 @@ Biztonság: névtelen azonosítók nem engedélyezettek</translation>
         <translation>nem lehet értelmezni az XML fájlt!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20470,13 +19164,29 @@ Biztonság: névtelen azonosítók nem engedélyezettek</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Név</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Csomópont</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished">Cím</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Állapot</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20669,10 +19379,6 @@ Biztonság: névtelen azonosítók nem engedélyezettek</translation>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Ez a tanúsítvány tartalmaz:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -20723,6 +19429,18 @@ Biztonság: névtelen azonosítók nem engedélyezettek</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -20885,7 +19603,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Egész hálózat</translation>
     </message>
@@ -21068,7 +19786,7 @@ p, li { white-space: pre-wrap; }
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>A beágyazott képek megjelenítése tiltva van.</translation>
     </message>
@@ -21081,7 +19799,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Alapértelmezetten engedélyezve</translation>
     </message>
@@ -21254,12 +19972,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Kép mentése</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21267,12 +19995,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation>Fa nézet beállítása</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21302,14 +20030,6 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">Mutatandó oszlop...</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[nincs cím]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -21970,7 +20690,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Név</translation>
@@ -22091,7 +20811,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
@@ -22111,7 +20831,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22168,7 +20888,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Szerkesztett üzenet ... ]</translation>
     </message>
@@ -22182,11 +20902,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[Ismeretlen]</translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Hiányzó üzenet ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22200,6 +20915,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22222,13 +20942,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Rendezés olvasottság szerint</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Rendezés alak szerint</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22251,7 +20976,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22272,7 +20999,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Az összes tárolt RetroShare beállítás visszaváltása alapértelmezettre.</translation>
     </message>
@@ -22333,7 +21060,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>RetroShare nyelvi beállítása.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Naplófájl megnyitása sikertelen: &apos;%1&apos;: %2</translation>
     </message>
@@ -22354,11 +21081,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Változat</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation>működési mód</translation>
     </message>
@@ -22388,7 +21111,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22406,7 +21129,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -22423,12 +21146,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Írj be egy kulcsszót (legalább három karakter hosszú legyen)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Keresés indítása</translation>
     </message>
@@ -22490,7 +21213,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Tisztítás</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Kulcsszavak</translation>
     </message>
@@ -22505,7 +21228,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Keresés azonosító</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Fájlnév</translation>
     </message>
@@ -22605,23 +21328,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Kiválasztott letöltése</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Fájlnév</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Letöltés</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare link másolása</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>RetroShare hivatkozás küldése</translation>
     </message>
@@ -22631,7 +21354,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Megjegyzés letöltése</translation>
     </message>
@@ -22668,7 +21391,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Összes eltávolítása</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Mappa</translation>
@@ -22679,17 +21402,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Új RetroShare hivatkozás(ok)</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Mappa megnyitása</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Gyűjtemény létrehozása</translation>
     </message>
@@ -22709,7 +21432,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Letöltés kollekciófájlból...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Kollekció</translation>
     </message>
@@ -22717,7 +21440,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Partner részletei</translation>
     </message>
@@ -22733,22 +21456,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>IP cím:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Partner azonosító:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Kapcsolat neve:</translation>
     </message>
@@ -22765,7 +21488,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22790,8 +21513,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22799,7 +21522,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>a barátod szeretne lenni</translation>
     </message>
@@ -22830,7 +21553,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -22875,12 +21598,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Állapot:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Üzenet írása</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Csatlakozási kísérlet</translation>
     </message>
@@ -22900,17 +21623,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ismeretlen (kimenő) csatlakozási kísérlet</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Ismeretlen biztonsági kockázat</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished">Ismeretlen</translation>
     </message>
@@ -22920,11 +21648,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Ismeretlen partner</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
@@ -22934,7 +21658,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>El szeretnéd távolítani ezt a barátot?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22944,12 +21668,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Partner/csomópont nincs a barátlistádon (PGP azonosító=</translation>
     </message>
@@ -23008,12 +21732,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Helyi cím</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -23034,22 +21758,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Helyi hálózat</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Külső IP cím kereső</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Ismert / Előző IP címek:</translation>
     </message>
@@ -23062,21 +21786,16 @@ behind a firewall or a VPN.</source>
         <translation>Amennyiben ezt nem jelölöd be, a RetroShare csak akkor tudja meghatározni az IP címedet, ha már csatlakoztál valakihez. Engedélyezve hagyva akkor segíthet, ha csak kevés barátod van, vagy tűzfal mögül csatlakozol, illetve VPN-t használsz.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Engedélyezem a RetroSharenek, hogy a következő oldalakon lekérdezze az IP címemet:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>KB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23086,23 +21805,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Onion cím</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23112,7 +21854,7 @@ behind a firewall or a VPN.</source>
         <translation>Rejtett - Lásd Beállítások</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>I2P cím</translation>
     </message>
@@ -23137,37 +21879,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation>ügyfél</translation>
     </message>
@@ -23182,71 +21982,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation>ismeretlen</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation>kapcsolat ellenőrzése</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation>kulcs létrehozása</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation>indulás</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation>leállás</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23256,22 +21992,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Elérhető vagy a rejtett szolgáltatáson keresztül.</translation>
     </message>
@@ -23283,12 +22004,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Rejtett mód]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23298,7 +22019,7 @@ Also check your ports!</source>
         <translation>Tisztítás</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>Letöltési korlát (KB/s)</translation>
     </message>
@@ -23313,23 +22034,23 @@ Also check your ports!</source>
         <translation>Feltöltési korlát (KB/s)</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23340,17 +22061,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation>Önműködő I2P/BOB</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23360,12 +22071,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23375,17 +22081,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation>Cím</translation>
     </message>
@@ -23425,7 +22121,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>kulcs betöltése</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation>Indítás</translation>
     </message>
@@ -23440,12 +22136,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>Leállítás</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation>Bejövő</translation>
     </message>
@@ -23481,7 +22172,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation>Közvetítő</translation>
     </message>
@@ -23536,7 +22252,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Összesen:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23561,7 +22277,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Kiszolgáló eltávolítása</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23573,7 +22289,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Hálózat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>IP szűrők</translation>
     </message>
@@ -23596,7 +22312,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
@@ -23656,17 +22372,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Hozzáadás a fehérlistához</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Rejtett szolgáltatás beállításai</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23682,18 +22409,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P kimenő kapcsolat rendben</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Kiszolgáló címe</translation>
     </message>
@@ -23728,12 +22455,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Kérlek adj meg egy szolgáltatás címet</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>IP tartomány</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23756,22 +22483,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Hozzáadva általad</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23806,7 +22533,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23816,12 +22543,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks Proxy</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor kimenő forgalom Rendben</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor proxy nincs engedélyezve</translation>
     </message>
@@ -23901,7 +22628,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Jelöld be, hogy mely partnereiddel szeretnél privát kulcsot megosztani</translation>
     </message>
@@ -23911,12 +22638,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Megosztás barátnak</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Megosztás</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -23935,7 +22662,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Megosztáskezelő</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation>Megosztott mappa</translation>
     </message>
@@ -23955,17 +22682,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Láthatóság</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation>Hozzáadás</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Mappa hozzáadása a megosztáshoz</translation>
     </message>
@@ -23975,7 +22702,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Alkalmazás és bezárás</translation>
     </message>
@@ -24066,7 +22793,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Nem található mappa, vagy a neve nem elfogadható.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Ezen listán a megosztott mappákat láthatod. Hozzáadhatsz újakat vagy eltávolíthatsz már megosztottakat az alul található gombok használatával.  Mikor egy új mappát adsz hozzá, az összes benne található fájl meg lesz osztva. Megosztási módokat egyenként testreszabhatod ki a listán szereplő mappákra.</translation>
     </message>
@@ -24074,7 +22801,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Fájlok</translation>
     </message>
@@ -24125,11 +22852,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>Megosztás ellenőrzése</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Kiválasztott letöltése</translation>
     </message>
@@ -24139,7 +22871,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Letöltés</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>RetroShare hivatkozás másolása a vágólapra</translation>
     </message>
@@ -24154,7 +22886,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>RetroShare hivatkozás küldése</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24170,7 +22902,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Ajánlás(ok)</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Gyűjtemény létrehozása</translation>
     </message>
@@ -24195,7 +22927,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Letöltés kollekciófájlból...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24338,12 +23070,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Beállítások betöltése</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Felület létrehozása</translation>
     </message>
@@ -24367,7 +23099,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Jelszó megjegyzése</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Bejelentkezés</translation>
     </message>
@@ -24708,7 +23440,7 @@ This choice can be reverted in settings.</source>
         <translation>Állapot üzenet</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Üzenet:</translation>
     </message>
@@ -24953,7 +23685,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Összes címke eltávolítása</translation>
     </message>
@@ -24989,12 +23721,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
@@ -25004,18 +23739,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation>Nincs beállítva</translation>
     </message>
@@ -25025,12 +23755,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Hiba</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Nem csatlakozott</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25038,7 +23813,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
@@ -25048,7 +23823,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25059,11 +23834,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25091,7 +23867,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Átvitel beállításai</translation>
@@ -25102,7 +23878,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum egyidejű letöltések száma:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation>Megosztott könyvtárak</translation>
     </message>
@@ -25112,22 +23888,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">A kész letöltések automatikus megosztása (Ajánlott)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished">Megosztott könyvtárak beállításai</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25212,7 +23993,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25221,7 +24002,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Ismewrősök feltöltéseinek száma legfeljebb (0=korlátlan)</translation>
     </message>
@@ -25246,7 +24032,12 @@ p, li { white-space: pre-wrap; }
         <translation>Közvetlen letöltés engedélyezése:</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Streamelés</translation>
     </message>
@@ -25311,12 +24102,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maximális továbbított csatornák száma másodpercenként:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25326,7 +24112,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Vigyázat</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation>Fogadó könyvtár beállítása</translation>
     </message>
@@ -25354,7 +24150,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Letöltés elkészült</translation>
     </message>
@@ -25378,39 +24174,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">%1 letöltésed elkészült</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">%1 letöltésed elkészült</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 elkészült letöltés</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 elkészült letöltés</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Letöltések</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Feltöltések</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Név</translation>
@@ -25617,7 +24397,12 @@ p, li { white-space: pre-wrap; }
         <translation>Meghatározás...</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation>Mozgatás a sorban...</translation>
     </message>
@@ -25642,7 +24427,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mappa kiválasztása</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25663,7 +24448,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -25696,7 +24481,17 @@ p, li { white-space: pre-wrap; }
         <translation>%1 fájl nem teljes. Amennyiben ez egy médiafájl, próbáld ki az előnézetet.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Vigyázat</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Fájlnév megváltoztatása</translation>
     </message>
@@ -25711,7 +24506,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kérlek, írj be egy új --és megfelelő-- fájlnevet</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Összes lenyitása</translation>
@@ -25838,23 +24633,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Oszlopok</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Fájl átvitelek</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Elérési út</translation>
     </message>
@@ -25864,7 +24654,7 @@ p, li { white-space: pre-wrap; }
         <translation>Elérési útvonal mutatása</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25874,7 +24664,7 @@ p, li { white-space: pre-wrap; }
         <translation>Újból megpróbálod?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Gyűjtemény létrehozása</translation>
     </message>
@@ -25889,7 +24679,7 @@ p, li { white-space: pre-wrap; }
         <translation>Gyűjtemény megtekintése</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation>Kollekció</translation>
     </message>
@@ -25899,7 +24689,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 alagút</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26120,10 +24910,6 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">Névtelen alagutak</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26317,12 +25103,17 @@ p, li { white-space: pre-wrap; }
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Állapot:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26362,21 +25153,27 @@ p, li { white-space: pre-wrap; }
         <translation>Engedélyezd a hozzáférést az összes IP cím részére (Alapértelmezett: csak localhost)</translation>
     </message>
     <message>
-        <source>Apply setting and start browser</source>
-        <translation type="vanished">Beállítások alkalmazása és a böngésző indítása</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>A beépített böngésző nincs engedélyezve</translation>
     </message>
@@ -26386,12 +25183,12 @@ p, li { white-space: pre-wrap; }
         <translation>A beépített böngészőt a menü &quot;Beállítások&quot; -&gt; &quot;Böngésző&quot; pontjai alatt engedélyezheted.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>a böngészőt nem sikerült elindítani</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Böngésző</translation>
     </message>
@@ -26528,11 +25325,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki oldalak</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Új csoport</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Oldalnév</translation>
     </message>
@@ -26547,7 +25340,7 @@ p, li { white-space: pre-wrap; }
         <translation>Eredeti azonosító</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26635,7 +25428,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Oldalszerkesztés előzményei</translation>
     </message>
@@ -26670,7 +25463,7 @@ p, li { white-space: pre-wrap; }
         <translation>Oldal azonosító</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -26700,14 +25493,18 @@ p, li { white-space: pre-wrap; }
         <translation>Címkék</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Előzmények</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Szerkesztési előzmények mutatása</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
@@ -26728,7 +25525,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visszaállítás</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Jóváhagyás</translation>
     </message>
@@ -26800,10 +25597,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">Időhatár</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -26815,16 +25608,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Frissítés</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26839,7 +25623,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Többiek</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26859,7 +25643,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26889,85 +25673,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Utolsó hónap</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Utolsó hét</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Ma</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Új</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">tőle</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">eddig</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Kereső/Szűrés</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Egész hálózat</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Profilok kezelése</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Mutatás:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Saját magad</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Barátok</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Követve</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Testreszabott</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Profil 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Profil 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Profil 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">Jelölőnégyzet</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Pulzus küldése a vezetékhez</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -27030,35 +25746,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Forma</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Eltávolítás</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Hely:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -27103,11 +25826,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Követve</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Ismeretlen</translation>
@@ -27185,7 +25938,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2d</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -27218,15 +25971,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Képek (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27345,10 +26094,6 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> - </source>
-        <translation type="vanished"> - </translation>
-    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_it.ts b/retroshare-gui/src/lang/retroshare_it.ts
index 389d7d42d..4cfb28a4d 100644
--- a/retroshare-gui/src/lang/retroshare_it.ts
+++ b/retroshare-gui/src/lang/retroshare_it.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Aggiungi un commento</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: Ricerca Avanzata</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Criteri di Ricerca</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Aggiungi un altro criterio di ricerca.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Reinizializza i criteri di ricerca.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Annulla la ricerca.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Ricerca</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Creare Album</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Nome album:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Categoria:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Animali</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Famiglia</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Amici</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Fiori</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Vacanze</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Panorami</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Animali domestici</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Ritratti</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Viaggi</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Lavoro</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Casuale</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Didascalia:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Dove:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotografo:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descrizione:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Opzioni condivisione</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Politica:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Qualità:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Commenti:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Identità:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Pubblico</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Limitato</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Ridimensionare le immagini (&lt; 1 Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Ridimensionare le immagini (&lt; 10 Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Invia le immagini originali</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Nessun commento permesso</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Commenti autenticati</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Eventuali commenti ammessi</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Pubblica con identità</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Trascina &amp;amp; Lascia per inserire immagini. Clicca sull&apos;immagine per modificare i dettagli in basso.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Indietro</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Aggiungi foto</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Pubblicare Album</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Togli titolo Album</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Dì qualcosa su questo album...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Dove sono state prese queste?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Miniatura dell&apos;Album Load</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Album</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Miniatura dell&apos;album</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>EtichettaTesto</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Riassunto</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Didascalia</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Dove:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Quando</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descrizione:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Opzioni condivisione</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Commenti</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Pubblicare l&apos;identità</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Visibilità</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Avvertimento: I servizi qui presenti sono sperimentali. Per favore aiutaci a testarli.
@@ -783,14 +569,6 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <source>Circles</source>
         <translation>Circoli</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">GxsForums</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">Canali Gxs </translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation>Fotografie</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">Salva immagine</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -842,17 +633,13 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Aggiungi Avatar</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Imposta immagine Avatar</translation>
     </message>
@@ -871,10 +658,6 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Carica Avatar</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation>Reimposta</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Velocità di Ricezione</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Velocità di Invio</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Sempre in Primopiano</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stile</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <source>% Opaque</source>
         <translation>% Opacità</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Salva</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Annulla</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Dal:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Nascondi Impostazioni</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,7 +822,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Commento</translation>
     </message>
@@ -1093,12 +852,12 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L’autore di questo messaggio (con ID %1) è bloccato.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Vota per</translation>
     </message>
@@ -1126,7 +885,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Vota per</translation>
     </message>
@@ -1184,7 +943,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">Condividi</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Cambia lo stato dei messaggi letti</translation>
     </message>
@@ -1224,7 +983,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">Nuovo</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1232,12 +991,12 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Mi piace</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Allarga</translation>
     </message>
@@ -1283,12 +1042,12 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,17 +1216,17 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Canali</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Tabs</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
@@ -1477,11 +1236,17 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Carica i post in sottofondo (Argomento)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Scaricamenti</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Apri ogni canale in una nuova tab</translation>
     </message>
@@ -1489,7 +1254,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Mi piace</translation>
     </message>
@@ -1537,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Allarga</translation>
     </message>
@@ -1563,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -1573,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Commento</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Nascondi</translation>
     </message>
@@ -1591,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -1782,7 +1537,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Mostra Chat di Gruppo</translation>
     </message>
@@ -1794,22 +1549,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>Chat</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Hai %1 nuovi messaggi</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Hai %1 nuovo messaggio</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 nuovi messaggi</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 nuovo messaggio</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1831,13 +1570,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Gruppo di interesse sconosciuto</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Rimuovi tutto</translation>
     </message>
@@ -1845,13 +1585,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Count</translation>
     </message>
@@ -1861,33 +1601,7 @@ into the image, so as to
         <translation>Argomento</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>Stanze di conversazione private sottoscritte</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>Stanze di conversazione pubbliche sottoscritte</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Stanze di conversazione private</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Stanze di conversazione pubbliche</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Stanze di conversazione&lt;/h1&gt;                              	                      &lt;p&gt;Le stanze di conversazione funzionano similmente a IRC.                                      	                      Esse ti permettono di parlare anonimamente con moltissime persone senza la necessità di avere amici.&lt;/p&gt;                    	                      &lt;p&gt;Una stanza di conversazione può essere pubblica (i tuoi amici la vedono) o privata (i tuoi amici non possono vederla, a meno che tu non li inviti con &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Una volta che sei stato invitato ad una stanza di conversazione privata, sarai in grado di vederla quando i tuoi amici la staranno usando.&lt;/p&gt;                                                                                               	                      &lt;p&gt;La lista a sinistra mostra il gruppo di conversazione alla quale i tuoi amici stanno partecipando.  Puoi sia                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Fare clic sul pulsante destro per creare una nuova stanza di conversazione&lt;/li&gt;                                                              		     &lt;li&gt;Fare doppio clic su una stanza di conversazione per entrare, chiacchierare e mostrare la stanza stessa ai tuoi amici&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Nota: Per far funzionare adeguatamente le stanze di conversazione, il tuo computer deve avere l&apos;ora impostata correttamente. Quindi controlla l&apos;ora del tuo sistema!&lt;/p&gt;                                      	                      </translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Crea chat room</translation>
     </message>
@@ -1897,7 +1611,7 @@ into the image, so as to
         <translation>Lascia questa stanza</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Crea un&apos;identità non anonima ed entra in questa stanza</translation>
     </message>
@@ -1956,12 +1670,12 @@ Seleziona delle stanze di conversazione sulla sinistra per vederne i dettagli.
 Fai doppio clic su una stanza di conversazione per entrare e conversare.</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 ti invita alla stanza di conversazione chiamata %2</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1971,31 +1685,31 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Scegli un&apos;identità per questa stanza di conversazione:</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Crea chat di gruppo</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Nessun argomento disponibile]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Informazioni sul gruppo di interesse selezionato</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Privato</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Pubblico</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>ID anonime accettati</translation>
     </message>
@@ -2005,42 +1719,25 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Disabilita Abbonamento Automatico</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Abilita Abbonamento Automatico</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Cerca i gruppi delle chat</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Cerca nome</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Sottoscritto</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Colonne</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Sì</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">No</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2052,47 +1749,47 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Nome chat room:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>ID chat room:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Argomento:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Sicurezza:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Amici:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Etichetta Testo</translation>
     </message>
@@ -2107,13 +1804,24 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Nessuna ID anonima</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>colonna</translation>
@@ -2127,7 +1835,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Rimuovi Elemento</translation>
     </message>
@@ -2172,46 +1880,22 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Conversazione a distanza</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Tutti</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Contatti</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Nessuno</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Accetta una conversazione criptata a distanza da</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Impostazioni  Chat</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Abilita Emoticons nella Conversazione Privata</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Abilita Emoticons per la Chat di Gruppo</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Attivare i caratteri personalizzati</translation>
     </message>
@@ -2220,10 +1904,6 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Enable custom font size</source>
         <translation>Abilita dimensione del carattere personalizzata</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Dimensioni minime del font</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2235,7 +1915,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Abilitare il corsivo</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2260,11 +1940,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Carica immagini incorporate</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Grippo di discussione</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Lampeggiare l&apos;icona sulla scheda</translation>
     </message>
@@ -2273,10 +1949,6 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Do not send typing notifications</source>
         <translation>Non inviare le notifiche di digitazione</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Chat Privata</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2298,11 +1970,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Lampeggiare l&apos;icona finestra/scheda</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Chat Font</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Cambia Font per la Chat</translation>
     </message>
@@ -2312,14 +1980,10 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Font per la Chat</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Storico</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stile</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2334,17 +1998,13 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Variant:</source>
         <translation>Variante</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Chat di gruppo</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Chat privata</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2408,22 +2068,28 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In questa finestra puoi impostare quanti messaggi delle aree di conversazione RetroShare conserverà salvati sul disco e quanto verrà mostrato delle previe conversazioni, per i diversi sistemi di chat. Il periodo massimo di archiviazione consente di eliminare i messaggi vecchi e previene che lo storico delle conversazioni si riempa con chiacchiere volatili (p.es. aree di conversazione e conversazioni a distanza).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Gruppi di chat</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Abilitato:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2433,7 +2099,17 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Chat room</translation>
@@ -2530,11 +2206,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Periodo massimo di archiviazione, in giorni (0 = mantieni tutti):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Ricerca predefinita</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Maiusc./minusc. significativo</translation>
     </message>
@@ -2573,10 +2245,6 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Threshold for automatic search</source>
         <translation>Soglia per la ricerca automatica</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Identità predefinita per le aree di conversazione:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2644,7 +2312,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Mostra Chat</translation>
     </message>
@@ -2680,7 +2348,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
@@ -2715,12 +2383,12 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Corsivo</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>Inserisci emoticon</translation>
     </message>
@@ -2800,11 +2468,6 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Insert horizontal rule</source>
         <translation>Inserisci riga orizzontale</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Salva immagine</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2842,7 +2505,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>sta scrivendo...</translation>
     </message>
@@ -2866,7 +2529,7 @@ dopo la conversione in HTML.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Vuoi veramente cancellare lo storico dal disco?</translation>
     </message>
@@ -2916,7 +2579,7 @@ dopo la conversione in HTML.</translation>
         <translation>è occupato probabilmente non risponderà</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Ricerca rispettando maiuscole/minuscole</translation>
     </message>
@@ -2938,7 +2601,7 @@ dopo la conversione in HTML.</translation>
         <translation>Non smettere di colorare dopo X elementi trovati (richiede più potenza CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Trova precedente &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2953,16 +2616,12 @@ dopo la conversione in HTML.</translation>
         <translation>&lt;b&gt;Trova &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Stato)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Imposta font e colore del testo</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Allega un file</translation>
     </message>
@@ -2978,12 +2637,12 @@ dopo la conversione in HTML.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Contrassegna questo testo selezionato&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctr+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2994,12 +2653,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation>Non firmato</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>elementi trovati.</translation>
     </message>
@@ -3019,7 +2678,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Digitare un messaggio qui</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Non smettere di colorare dopo</translation>
     </message>
@@ -3045,7 +2704,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Visualizzando i dettagli: </translation>
     </message>
@@ -3067,7 +2726,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Circoli personali</translation>
     </message>
@@ -3093,7 +2752,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Amici</translation>
     </message>
@@ -3153,7 +2812,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Amico di Amici</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Cerchia Esterna (Admin)</translation>
     </message>
@@ -3169,7 +2828,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Circoli</translation>
     </message>
@@ -3221,43 +2880,48 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Errore: impossibile ottenere dettagli contatto</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3269,7 +2933,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Cifratura</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>Non connesso</translation>
     </message>
@@ -3351,25 +3015,17 @@ Double click on it to add his name on text writer.</source>
         <translation>nessuno</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Questo certificato contiene:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;un &lt;b&gt;ID nodo&lt;/b&gt; ed un &lt;b&gt;nome&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">un &lt;b&gt;indirizzo onion&lt;/b&gt; ed una &lt;b&gt;porta&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">un &lt;b&gt;indirizz IP&lt;/b&gt; ed una &lt;b&gt;porta&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Puoi usare questo certificato per farti nuovi amici. Invialo per email, o consegnalo di persona.&lt;/p&gt;</translation>
     </message>
@@ -3384,7 +3040,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo è un metodo di criptazione usato da &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. La connessione ai nodi amici&lt;/p&gt;&lt;p&gt;è sempre pesantemente criptata e in caso sia presente il DHE la connessione utilizzerà anche &lt;/p&gt;&lt;p&gt;&amp;quot;la perfetta segretezza in avanti&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>con</translation>
     </message>
@@ -3401,108 +3057,16 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Wizard Connessione Amici</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Aggiungere un nuovo amico</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Y-Ottieno un file di certificato dal tuo amico</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">Fatti a&amp;mico con amici degli amici selezionati </translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Includi firme</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Copia nel PortaBlocco il Certificato</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Salva il tuo certificato in un File</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Lancia il programma di posta elettronica</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">Per favore, incolla il certificato Retroshare del tuo amico nel riquadro sottostante</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">File di certificato</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Utilizzo di certificati PGP salvato nel file.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Importare il certificato di un amico...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">È necessario generare un file con il tuo certificato e darlo al tuo amico. Inoltre, è possibile utilizzare un file già generato.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Esportare il mio certificato...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Trascinare e rilasciare il certificato di tuoi amici in questa finestra o specificare il percorso nella casella sottostante</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Scorri</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Amici di amici</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Selezionare ora con chi desideri fare amicizia.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Fammi vedere:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Farti amico con questi contatti</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>ID RetroShare</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Utilizzare ID RetroShare per aggiuntgere un amico disponibile in rete.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Aggiungere l&apos;ID RetroShare degli amici....</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Incollare ID degli amici RetroShare nella casella sottostante</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Immettere l&apos;ID RetroShare del tuo amico, ad esempio Peer@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3544,27 +3108,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Email</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Invitare gli amici via Email</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Inserire indirizzi email dei tuoi amici (separare ognuno con un punto e virgola)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Indirizzi email dei tuoi amici:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Inserisci gli indirizzi Email di amici</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Oggetto: </translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3580,77 +3124,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Dettagli su richiesta</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Dettagli contatto</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Posta elettronica:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Nodo :</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">Tieni conto che se aggiungi troppi amici RetroShare richiederà quantità eccessive di banda, memoria e CPU. Puoi aggiungere quanti amici vuoi, ma oltre i 40 probabilmente serviranno troppo risorse.</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Località:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">Questa procedura guidata aiuterà a collegarti ai tuoi amici nella rete RetroShare.&lt;br&gt;Scegli come vorresti aggiungere un amico:</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Inserisce il certificato manualmente</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">Inserisce l’ID RetroShare manualmente</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">&amp;Spedisci un Invinto tramite gestori di Web Mail</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Raccomanda molti amici a vicenda</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">Certificato Retroshare</translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">Per favore, incolla il certificato Retroshare del tuo amico</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Incollare il certificato</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo riquadro richiede il certificato Retroshare del tuo amico. ATTENZIONE: Si tratta di una cosa diversa dalla chiave di profilo del tuo amico. Non incollare la chiave di profilo del tuo amico qui (nemmeno una sua parte). Non funzionerebbe.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Aggiungi i tuoi amici al gruppo:</translation>
     </message>
@@ -3660,7 +3159,7 @@ resources.</source>
         <translation>Autenticare amico (firma chiave PGP)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3685,16 +3184,22 @@ resources.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Aggiungi come amico per connettersi con</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Per accettare la Richiesta di Amicizia, fai clic sul bottone Fine.</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Siamo spiacenti, si è verificato qualche errore</translation>
     </message>
@@ -3714,32 +3219,27 @@ resources.</source>
         <translation>Dettagli sul tuo amico:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Chiave validità:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Firmatari</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmare la chiave di un amico è un modo di esprimergli la tua fiducia davanti agli altri amici. Le firme qui sotto attestano crittologicamente che i possessori delle chiavi elencate riconoscono l&apos;attuale chiave PGP come autentica.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Questo contatto è già sulla tua lista amici. Aggiungendolo potrebbe aver appena impostato l&apos;indirizzo ip.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3785,49 +3285,17 @@ resources.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Errore caricando il certificato</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Non è possibile ottenere dettagli contatto della chiave PGP %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Qualsiasi contatto che non ho firmato</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Amici dei miei amici che già si fidano di me</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Contatti Firmati appaiono come non accettati</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Nome contatto</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Firmato anche da</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Id contatto</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">Il certificato sembra valido</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Non è un certificato Retroshare valido!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Inviti RetroShare</translation>
     </message>
@@ -3847,12 +3315,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3860,7 +3328,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3900,7 +3368,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Hai una richiesta di amicizia da</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3925,7 +3393,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3935,47 +3403,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Fallito caricamento certificato: file %1 introvabile</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Questo contatto %1 indisponibile sulla tua rete</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Utilizza nuovo formato di certificato (più sicuro, più robusto)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Usa precedente formato di certificato (compatibile)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Rimuovi firme</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">Invito RetroShare</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Aiuto connessione amico </translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Puoi copiare questo testo e inviarlo al tuo amico via email o qualche altra maniera</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Il vostro Certificato è copiato nel PortaBlocco, incollalo e invialo ai tuoi amici via email o qualche altro modo</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Salva come...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4014,11 +3442,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Nessuno ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Usa come fonte diretta, quando disponibile</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>Ind. IP:</translation>
     </message>
@@ -4028,7 +3452,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Indirizzo IP</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Mostra Opzioni avanzate</translation>
     </message>
@@ -4037,10 +3461,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmare la chiave di un amico è un modo di esprimergli la tua fiducia davanti agli altri amici. Li aiuta a decidere quando accettare connessioni basate su quella chiave, fidandosi di te. Firmare una chiave è assolutamente facoltativo e la firma non si può revocare, quindi scegli saggiamente quando farlo.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare cerca periodicamente, nelle liste dei tuoi amici, files corrispondenti ai tuoi trasferimenti, così da poter stabilire dei trasferimenti diretti. In questo caso, il tuo amico saprà che tu stai scaricando uno dei suoi files.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Per prevenire questo comportamento solo per questo amico, deseleziona questa opzione. Puoi comunque effettuare un trasferimento diretto se lo richiedi esplicitamente, ad es. scaricando qualcosa dalla lista di files del tuo amico. Questa impostazione è applicata a tutte le locazioni dello stesso nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4051,45 +3471,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gli utenti con questa opzione abilitata non possono connettersi se il loro indirizzo di connessione non è nella lista degli indirizzi permessi. Questo ti protegge da attacchi basati sul traffico. Quando l&apos;opzione viene utilizzata, gli utenti rifiutati vengono riportati su &amp;quot;elementi sulla sicurezza dei dati in arrivo&amp;quot; nella sezione relativa alle novità sui dati in arrivo. Da li, potrai permettere/bloccare i loro indizzi IP. Si applica a tutte le locazioni dello stesso nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Raccomanda molti amici gli uni agli altri</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Consigli dell&apos;amico</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">Il testo sottostante è il tuo certificato Retroshare. Dovrai darlo al tuo amico.</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Messaggio:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Raccomanda amici</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">A</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Si prega di selezionare almeno un amico da raccomandare.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Si prega di selezionare almeno un amico come destinatario.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Aggiungi chiave al portachiavi.</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Questa chiave è già presente nel portachiavi</translation>
     </message>
@@ -4105,7 +3493,7 @@ messaggi distanti a questo contatto
 anche se non hai amici.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Il certificato ha un numero di versione errato. Ricorda che la versione 0.5 e la 0.6 delle reti sono incompatibili.</translation>
     </message>
@@ -4140,7 +3528,7 @@ anche se non hai amici.</translation>
         <translation>Aggiungi IP alla whitelist</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>Nessun IP in questo certificato</translation>
     </message>
@@ -4150,27 +3538,10 @@ anche se non hai amici.</translation>
         <translation>&lt;p&gt;Questo certificato non ha indirizzo IP. Dovrai utilizzare la ricerca e la DHT per trovare il tuo amico. Dato che richiedi l&apos;uso di una lista di IP autorizzati, l&apos;utente sarà segnalato nella lista degli elementi di sicurezza in ingresso. Da li potrai autorizzare il suo indirizzo IP.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Aggiunto con certificato da %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Incolla il Certificato del tuo amico dal PortaBlocco</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Fallito caricamento certificato: impossibile leggere dal file %1</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Fallito caricamento certificato: qualcosa non va con %1</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4232,7 +3603,7 @@ anche se non hai amici.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>Impostazione UDP</translation>
     </message>
@@ -4260,7 +3631,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Assistente di connessione</translation>
     </message>
@@ -4270,17 +3641,20 @@ p, li { white-space: pre-wrap; }
         <translation>ID dell&apos;amico non valido</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Stato sconosciuto</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Dietro ad un NAT simmetrico</translation>
     </message>
@@ -4290,12 +3664,14 @@ p, li { white-space: pre-wrap; }
         <translation>Dietro un NAT &amp; nessun DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Riavvio rete</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>Dietro un NAT</translation>
     </message>
@@ -4305,7 +3681,8 @@ p, li { white-space: pre-wrap; }
         <translation>Nessun DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>Stato della rete buono!</translation>
     </message>
@@ -4330,7 +3707,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ricerca degli amici RS in corso</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Il controllo richiede DHT</translation>
     </message>
@@ -4622,7 +3999,7 @@ p, li { white-space: pre-wrap; }
         <translation>Si prega di riprovare importando l&apos;intero Certificato</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4630,7 +4007,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/D</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>FORWARD NON VERIFICABILE!</translation>
     </message>
@@ -4640,7 +4018,7 @@ p, li { white-space: pre-wrap; }
         <translation>FORWARD NON VERIFICABILE E NESSUNA DHT!</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Cercando</translation>
     </message>
@@ -4676,12 +4054,12 @@ p, li { white-space: pre-wrap; }
         <translation>Dettagli della cerchia</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4701,7 +4079,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4721,18 +4099,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtro</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Soprannome</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Membri invitati</translation>
     </message>
@@ -4747,15 +4125,7 @@ p, li { white-space: pre-wrap; }
         <translation>Persone conosciute</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Tipo</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -4795,23 +4165,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Visibile soltanto ai membri di:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Per favore imposta un nome per la tua cerchia</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Nessuna cerchia ristretta selezionata </translation>
     </message>
@@ -4821,12 +4187,24 @@ p, li { white-space: pre-wrap; }
         <translation>Nessuna cerchia limitata selezionata</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
@@ -4836,7 +4214,7 @@ p, li { white-space: pre-wrap; }
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Cerca</translation>
@@ -4851,10 +4229,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Firmato</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Firmato da Nodi conosciuti</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4871,10 +4245,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>Identità PGP</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Id Anonimo</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4897,17 +4267,13 @@ p, li { white-space: pre-wrap; }
         <translation>Crea una nuova cerchia</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Crea</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP Id Collegato</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Aggiungere membro</translation>
     </message>
@@ -4926,7 +4292,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crea un Gruppo</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Nome gruppo:</translation>
     </message>
@@ -4961,7 +4327,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Nuovo post nel canale</translation>
     </message>
@@ -4971,7 +4337,7 @@ p, li { white-space: pre-wrap; }
         <translation>Post del canale</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5032,23 +4398,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Usa i bottoni Trascina-Lascia / Aggiungi Files, per segmentare nuovi files.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copia/Incolla collegamenti RetroShare dalle tue condivisioni&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Aggiungi un file da allegare</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Aggiungi miniature del canale</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Messaggio</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Oggetto:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5134,17 +4488,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5163,17 +4517,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">File già aggiunto e codificato</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Aggiungi un Oggetto</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Carica una miniatura d&apos;immagine</translation>
     </message>
@@ -5188,18 +4543,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Genera dati di massa</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Vuoi davvero generare %1 messaggi ?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Stai per aggiungere dei file che non stai condividendo veramente. Vuoi comunque che questo succeda?</translation>
     </message>
@@ -5233,7 +4582,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Posta un Messaggio nel Forum</translation>
     </message>
@@ -5242,10 +4591,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Oggetto</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5266,8 +4611,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5286,7 +4631,7 @@ p, li { white-space: pre-wrap; }
         <translation>Puoi allegare files con Trascina  e Lascia qui in questa finestra</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5316,17 +4661,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Nessun forum</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>In Risposta a</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Titolo</translation>
     </message>
@@ -5379,7 +4724,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Carica un file immagine</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>ID non compatibile con questo forum</translation>
     </message>
@@ -5389,8 +4734,8 @@ Do you want to discard this message?</source>
         <translation>A nessuna delle tue identità è permesso scrivere in questo forum. Questo può derivare dalla limitazione del forum ad una cerchia nella quale non è presente nessuna delle tue identità, oppure perché il forum richiede identità firmate con PGP.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Genera dati di massa</translation>
     </message>
@@ -5399,10 +4744,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Vuoi davvero generare %1 messaggi ?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Invia</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5417,23 +4758,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Crea un gruppo di Chat</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Un gruppo di discussione (lobby) è un gruppo di conversazione anonimo e decentralizzato. Tutti i partecipanti ricevono tutti i messaggi. Una volta creata la lobby è possibile invitare altri amici dalla scheda amici.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Nome del gruppo:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Argomento Gruppo di Conversazione:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5468,7 +4793,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Crea</translation>
     </message>
@@ -5478,11 +4803,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">Se la imposti, solo le identità firmate con PGP potranno essere usate per unirsi e parlare in questo gruppo. Questa limitazione previene lo spamming anonimo dato che diventa possibile, almeno per qualcuno del gruppo, localizzare il nodo dello spammer.</translation>
-    </message>
-    <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>richiede identità firmate-PGP</translation>
     </message>
@@ -5497,11 +4818,7 @@ Do you want to discard this message?</source>
         <translation>Seleziona gli Amici con cui avere conversazione di gruppo.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Amici invitati</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Crea una stanza di conversazione</translation>
@@ -5522,7 +4839,7 @@ Do you want to discard this message?</source>
         <translation>Contatti:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Identità da utilizzare:</translation>
     </message>
@@ -5530,17 +4847,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Informazioni pubbliche</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Località:</translation>
     </message>
@@ -5550,12 +4867,12 @@ Do you want to discard this message?</source>
         <translation>ID della località:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Versione del software:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Online dal:</translation>
     </message>
@@ -5575,12 +4892,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5590,7 +4902,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Altre informazioni</translation>
     </message>
@@ -5600,17 +4912,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished">Profilo</translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Certicato</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5620,11 +4927,7 @@ Do you want to discard this message?</source>
         <translation>Includi Firma</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Salvare la chiave in un file</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Esporta Identità</translation>
     </message>
@@ -5696,33 +4999,33 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Etichetta Testo</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>Impronta PGP:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Informazioni nodo</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>Id PGP :</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Nodi amici:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5761,14 +5064,6 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>Node</source>
         <translation>Nodo</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Crea nuovo nodo...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">Mostra la finestra delle statistiche</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5785,10 +5080,6 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Retroshare usa il DHT di Bittorrent come proxy per le connessioni. Non &quot;salva&quot; il tuo indirizzo IP nel DHT. 				                        Al contrario il DHT è utilizzato dai tuoi amici per raggiungerti, tramite delle normali richieste al DHT. 												La pallina di stato diventerà verde non appena Retroshare otterrà una risposta DHT da uno dei tuoi amici.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5824,7 +5115,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6492,7 +5783,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>File di avvio</translation>
     </message>
@@ -6500,38 +5791,38 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>a</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>ignora maius./minus.</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>gg.MM.aaaa</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6539,12 +5830,12 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Widget di Espressione</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Cancella Espressione</translation>
     </message>
@@ -6706,7 +5997,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Immagine</translation>
     </message>
@@ -6716,7 +6007,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>File audio</translation>
     </message>
@@ -6776,11 +6067,21 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>C </source>
         <translation>C </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Cartelle amici</translation>
     </message>
@@ -6902,7 +6203,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -6937,10 +6238,6 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>Show State</source>
         <translation>Mostra Stato</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">Nodi fidati</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6948,7 +6245,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Mostra Grupppi</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
@@ -6984,7 +6281,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Aggiungi al gruppo</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Cerca</translation>
@@ -7000,7 +6297,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Ordina per stato</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Dettagli profilo</translation>
     </message>
@@ -7244,7 +6541,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Conferma richiesta di amicizia</translation>
     </message>
@@ -7261,10 +6558,6 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Cerca:</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7286,7 +6579,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Cerca Amici</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Contrassegna tutto</translation>
     </message>
@@ -7297,16 +6590,134 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Fatti amico</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished">Il proxy non è abilitato, o è danneggiato.
+I servizi sono tutti sù e ben funzionanti??
+Controlla anche le tue porte!</translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Modificare il messaggio di stato</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Trasmetti</translation>
     </message>
@@ -7389,33 +6800,38 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Reinizializza carattere predefinito</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Deposito delle Chiavi</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Rete&lt;/h1&gt; &lt;p&gt;La scheda Rete mostra i tui nodi RetroShare amici: i nodi di RetroShare adiacenti che sono collegati a te. &lt;/p&gt; &lt;p&gt;Puoi raggruppare assieme i nodi per consentire un accesso più granulare alle informazioni, p.es. consentire solo ad alcuni nodi di vedere certi tuoi file.&lt;/p&gt; &lt;p&gt;A destra, troverai 3 schede utili: &lt;ul&gt;&lt;li&gt;Diffusione, per inviare messaggi contemporaneamente a tutti i nodi connessi&lt;/li&gt; &lt;li&gt;Grafico rete locale, mostra la rete intorno a te, basandosi sulle informazioni di rilevamento&lt;/li&gt; &lt;li&gt;Portachiavi, contiene le chiavi di nodo che hai raccolto, per lo più trasmesse dai tuoi nodi amici&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Grafico della rete</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Imposta il tuo messaggio di stato qui</translation>
     </message>
@@ -7433,7 +6849,17 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Parola chiave</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Ogni campio deve avere minimo 3 caratteri</translation>
     </message>
@@ -7443,17 +6869,12 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Le password non corrispondono</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Questa Password è per PGP</translation>
@@ -7474,46 +6895,38 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Impossibile generare il nuovo certificato, forse la password PGP è errata!</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="vanished">Opzioni</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation>Lunghezza chiave PGP</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Nodo standard</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">Nodo TOR/I2P nascosto</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Nome nodo</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7533,12 +6946,12 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Esporta questo profilo</translation>
     </message>
@@ -7548,42 +6961,43 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Opzioni avanzate</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>indirizzo nascosto</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Il tuo profilo è associato ad una coppia di chiavi PGP. RetroShare attualmente ignora chiavi DSA.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questa è la porta di connessione.&lt;/p&gt;&lt;p&gt;Qualsiasi valore tra 1024 e 65535 &lt;/p&gt;&lt;p&gt;dovrebbe andar bene. Puoi modificarlo in seguito.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7631,13 +7045,13 @@ il bottone IMPORT per caricarlo</translation>
         <translation>Profilo non salvato. Si è verificato un errore.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importa profilo</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7647,7 +7061,7 @@ il bottone IMPORT per caricarlo</translation>
         <translation>Crea nuovo nodo Retroshare</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation>Indirizzo Tor/I2P</translation>
     </message>
@@ -7682,7 +7096,7 @@ il bottone IMPORT per caricarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7692,12 +7106,7 @@ il bottone IMPORT per caricarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7707,12 +7116,7 @@ il bottone IMPORT per caricarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7938,36 +7342,13 @@ il bottone IMPORT per caricarlo</translation>
         <translation>Avvio</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Invita amici</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare è nulla senza i tuoi amici. Fai click sul bottone per cominciare il processo.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Manda un invito via mail col tuo &amp;quot;ID Certificato&amp;quot; ai tuoi amici  &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Assicurati di ricevere anche il loro invito... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Puoi connetterti agli amici solo se vi siete aggiunti reciprocamente.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Aggiungi i tuoi amici a RetroShare</translation>
     </message>
@@ -7977,89 +7358,103 @@ p, li { white-space: pre-wrap; }
         <translation>Aggiungi amici</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Connetti con amici</translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+76"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avanzate: Apri porta nel firewall</translation>
+    </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Connetti con amici</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avanzate: Apri porta nel firewall</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Ulteriore aiuto e supporto</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Apri il sito di RS</translation>
     </message>
@@ -8084,7 +7479,7 @@ p, li { white-space: pre-wrap; }
         <translation>Opinioni via email</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>Inviti RetroShare</translation>
     </message>
@@ -8134,12 +7529,12 @@ p, li { white-space: pre-wrap; }
         <translation>Opinioni su RetroShare</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>Supporto RetroShare</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Ha molte funzionalità, come conversazioni integrate, messaggerie,</translation>
     </message>
@@ -8263,7 +7658,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Mostra conversazioni di gruppo</translation>
     </message>
@@ -8271,7 +7666,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[Sconosciuto]</translation>
     </message>
@@ -8437,15 +7832,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Puoi far sapere agli amici del tuo forum condividendolo con loro. Seleziona gli amici con cui vuoi condividere il forum.</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">Condividi i permessi amministrativi dell’argomento</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Titolo</translation>
     </message>
@@ -8458,12 +7849,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8488,27 +7879,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">Ordinamento decrescente</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">Ordinamento crescente</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Ordina per nome</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Ordina per popolarità</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Ordina per post recente</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8523,14 +7894,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Ultimo post</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
@@ -8541,17 +7912,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popolarità</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Mostra</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8564,7 +7931,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>e</translation>
     </message>
@@ -8700,7 +8067,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Canali</translation>
@@ -8711,22 +8078,22 @@ p, li { white-space: pre-wrap; }
         <translation>Cra canale</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Abilita scaricamento automatico</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Miei canali</translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Canali sottoscritti</translation>
     </message>
@@ -8746,12 +8113,12 @@ p, li { white-space: pre-wrap; }
         <translation>Seleziona la cartella di download per il canale</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Annulla scaricamento automatico</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>Imposta la cartella di download</translation>
     </message>
@@ -8786,22 +8153,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Esegui</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Apri cartella</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
@@ -8821,17 +8188,17 @@ p, li { white-space: pre-wrap; }
         <translation>Verifica</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Sei sicuro di voler annullare ed eliminare questo file?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Non è possibile aprire la cartella</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Riprodurre File</translation>
     </message>
@@ -8841,37 +8208,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Il file %1 non esiste nella posizione.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Modulo</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Nome file</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Dimensioni</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Titolo</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Pubblicato</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Status</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Crea un Nuovo Canale</translation>
     </message>
@@ -8909,9 +8249,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Abbonati al Canale</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8925,7 +8275,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -8940,7 +8290,7 @@ p, li { white-space: pre-wrap; }
         <translation>Descrizione Canale</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Sto caricando...</translation>
     </message>
@@ -8955,8 +8305,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Nuovo canale</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Mai</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8967,7 +8318,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Nuovo commento:</translation>
     </message>
@@ -8988,7 +8339,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Esegui</translation>
     </message>
@@ -9045,28 +8396,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Files</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Attenzione! Hai meno di %1 ore e %2 minuti prima che questo file venga eliminato. Considera di salvarlo.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Commento</translation>
     </message>
@@ -9081,21 +8428,17 @@ p, li { white-space: pre-wrap; }
         <translation>Non mi piace</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Sto caricando...</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9120,119 +8463,16 @@ p, li { white-space: pre-wrap; }
         <translation>Esegui Media</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Posta sul Canale</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Sto caricando...</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Cerca canali</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Titolo</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Ricerca Titolo</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Messaggio</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Cerca Messaggio</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Nome file</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Cerca Nome File</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Nessun Canale Selezionato</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Mai</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Pubblico</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Disabilita Download Automatico</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Abilita Download Automatico</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Mostra notizie</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Mostra files</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Amministratore:</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Ultimo post:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">sconosciuto</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Distribuzione:</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Dispaccio</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Files</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Iscritti</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Descrizione:</translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">Posts (a nodi adiacenti):</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Posta sul Canale</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9302,7 +8542,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9338,7 +8578,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Commenti</translation>
     </message>
@@ -9353,13 +8593,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Dispaccio</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9374,7 +8614,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9389,7 +8629,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9449,12 +8689,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9501,7 +8751,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Scononsciuto</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -9529,12 +8779,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Sottoscritto</translation>
     </message>
@@ -9566,12 +8817,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+59"/>
         <source>Disable Auto-Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Annulla scaricamento automatico</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Enable Auto-Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abilita scaricamento automatico</translation>
     </message>
 </context>
 <context>
@@ -9585,17 +8836,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9710,7 +8961,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Commenta Contenitore</translation>
     </message>
@@ -9723,7 +8974,7 @@ p, li { white-space: pre-wrap; }
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9753,7 +9004,7 @@ p, li { white-space: pre-wrap; }
         <translation>Aggiornamento</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Commento</translation>
@@ -9792,7 +9043,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Risposta al commento</translation>
     </message>
@@ -9816,6 +9067,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Vota contro</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9825,7 +9091,7 @@ p, li { white-space: pre-wrap; }
         <translation>Commento di rendere</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9854,26 +9120,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//IT&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Commento&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">FIrmato da</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9902,7 +9152,7 @@ before you can comment</source>
 prima che tu possa commentare</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9944,14 +9194,6 @@ prima che tu possa commentare</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Aggiungi Amministratori al Forum</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Seleziona Amministratori del Forum</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9961,7 +9203,7 @@ prima che tu possa commentare</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Abbonati al Forum</translation>
     </message>
@@ -9977,7 +9219,7 @@ prima che tu possa commentare</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -9997,8 +9239,9 @@ prima che tu possa commentare</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Sto caricando...</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10029,13 +9272,13 @@ prima che tu possa commentare</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Oggetto:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Abbandona Forum</translation>
     </message>
@@ -10046,7 +9289,7 @@ prima che tu possa commentare</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -10066,21 +9309,17 @@ prima che tu possa commentare</translation>
         <translation>In Risposta a:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Sto caricando...</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Forum Notizie</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
@@ -10093,63 +9332,66 @@ prima che tu possa commentare</translation>
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Avvia un nuovo argomento nel forum selezionato</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Ricerca forums</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Ultimo post</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished">Nuovo Thread</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Vista per argomento</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Vista semplice</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Autore</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Salva immagine</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Sto caricando</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10159,12 +9401,7 @@ prima che tu possa commentare</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Messaggio di risposta</translation>
     </message>
@@ -10188,10 +9425,6 @@ prima che tu possa commentare</translation>
         <source>Download all files</source>
         <translation>Scarica tutti i files</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Successivo non letto</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10208,31 +9441,23 @@ prima che tu possa commentare</translation>
         <translation>Cerca autore</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Contenuto</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Ricerca di contenuti</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Nessun nome</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Rispondi</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10275,20 +9500,12 @@ prima che tu possa commentare</translation>
         <translation>Copia collegamento RetroShare</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Allarga</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Bloccato]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[sconosciuto]</translation>
     </message>
@@ -10318,8 +9535,8 @@ prima che tu possa commentare</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation>Distribuzione</translation>
     </message>
@@ -10333,26 +9550,6 @@ prima che tu possa commentare</translation>
         <source>Anti-spam</source>
         <translation>Anti-spam</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Messaggio Redatto ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anonimo</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">firmato</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">nessuno</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Messaggio Perso ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10422,12 +9619,12 @@ prima che tu possa commentare</translation>
         <translation>Messaggio Originale</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
@@ -10488,7 +9685,7 @@ prima che tu possa commentare</translation>
         <translation>Reputazione autore</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10508,7 +9705,7 @@ prima che tu possa commentare</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10560,7 +9757,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10570,7 +9767,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10585,7 +9782,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10651,12 +9848,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forums</translation>
@@ -10687,35 +9884,16 @@ This message is missing. You should receive it later.</source>
         <translation>Altri froum</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">in attesa</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Recupero</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Caricamento</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Aggiungi icona</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>I destinatari della chiave possono pubblicare nei canali di tipo limitato, e vedere e pubblicare in questi canali.</translation>
     </message>
@@ -10724,22 +9902,14 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Condividi chiave pubblicazione</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">verifica i contatti con cui vuoi condividere la chiave privata di pubblicazione</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Condividi chiave con</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Distribuzione messaggio</translation>
     </message>
@@ -10747,7 +9917,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Pubblico</translation>
     </message>
@@ -10766,14 +9936,6 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nuovo Thread</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Obbligatorio</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Messaggi cifrati</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10815,7 +9977,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Commenti:</translation>
     </message>
@@ -10838,7 +10000,7 @@ This message is missing. You should receive it later.</source>
         <translation>Anti-spam:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10854,12 +10016,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10876,23 +10038,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>Richiesta firma PGP</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10908,30 +10070,28 @@ This message is missing. You should receive it later.</source>
         <translation>Aggiungi un Nome</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>caricamento Logo Gruppo</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Applica Modifiche al Gruppo</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Non è stato possibile preparare i MetaDati del Gruppo — procedi con la Revisione</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Verrà utilizzato per inviare feedback</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Proprietario:</translation>
     </message>
@@ -10941,12 +10101,12 @@ This message is missing. You should receive it later.</source>
         <translation>Inserisci qui una descrizione</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10956,7 +10116,7 @@ This message is missing. You should receive it later.</source>
         <translation>Ultimo post</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11031,7 +10191,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Popolarità</translation>
     </message>
@@ -11047,27 +10212,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Crea</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Autore</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>GxsIdLabel</translation>
     </message>
@@ -11075,7 +10235,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Sto caricando...</translation>
     </message>
@@ -11135,7 +10295,7 @@ This message is missing. You should receive it later.</source>
         <translation>Modifica Dettagli</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11192,12 +10352,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Copia Collegamento RetroShare</translation>
     </message>
@@ -11220,7 +10380,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Nessuna firma</translation>
     </message>
@@ -11233,40 +10393,24 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Sto caricando...</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Non trovato</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Nessuna firma</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Bloccato]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Autenticazione</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>Chiave sconosciuta</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">Anonimo</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11276,7 +10420,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Nome&amp;nbsp;dell’identità</translation>
     </message>
@@ -11290,16 +10439,20 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished">Nodo</translation>
     </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">Firmato&amp;nbsp;da</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Scononsciuto]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11311,7 +10464,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11359,17 +10512,13 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Sto caricando...</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11501,10 +10650,6 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation type="unfinished">Popolarità</translation>
     </message>
-    <message>
-        <source>Details</source>
-        <translation type="vanished">Dettagli</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -11514,7 +10659,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+31"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Contatto sconosciuto</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -11524,7 +10669,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+15"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Scononsciuto</translation>
     </message>
     <message>
         <location line="+54"/>
@@ -11537,29 +10682,6 @@ This message is missing. You should receive it later.</source>
         <translation>No</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">ID tunnel: %1</translation>
-    </message>
-    <message>
-        <source>from: %1</source>
-        <translation type="vanished">da: %1</translation>
-    </message>
-    <message>
-        <source>to: %1</source>
-        <translation type="vanished">a: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">stato: %1</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Nodo sconosciuto</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11777,7 +10899,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11793,7 +10915,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Autori</translation>
     </message>
@@ -11812,7 +10934,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11890,7 +11012,7 @@ p, li { white-space: pre-wrap; }
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11900,7 +11022,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11928,7 +11050,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11938,7 +11060,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Copia nel PortaBlocco il Certificato</translation>
     </message>
@@ -11948,7 +11070,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Salva il tuo certificato in un File</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>Invia via email</translation>
     </message>
@@ -11968,13 +11090,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11986,12 +11132,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12006,12 +11152,7 @@ new short format</source>
         <translation>Invito RetroShare</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation>Salva come...</translation>
     </message>
@@ -12276,14 +11417,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Tutto</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Reputazione</translation>
     </message>
@@ -12293,12 +11434,12 @@ p, li { white-space: pre-wrap; }
         <translation>Cerca</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>Id Anonimo</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Crea nuova identità</translation>
     </message>
@@ -12308,7 +11449,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12323,27 +11464,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Voti positivi</translation>
     </message>
@@ -12359,29 +11500,39 @@ p, li { white-space: pre-wrap; }
         <translation>Voti negativi</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Circoli</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Nome della cerchia</translation>
     </message>
@@ -12401,18 +11552,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Circoli personali</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Modifica Identità</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Cancella identità</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Conversa con questo contatto</translation>
     </message>
@@ -12422,78 +11575,78 @@ p, li { white-space: pre-wrap; }
         <translation>Avvia una conversazione a distanza con questo contatto</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>ID nodo proprietario :</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Nome dell’identità :</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>ID dell&apos;identità</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Invia Messaggio</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Info sull&apos;identità</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>ID dell’identità :</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Nome nodo proprietario :</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Manda invito</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Opinione media dei nodi adiacenti riguardo questa identità. Negativa è male,&lt;/p&gt;&lt;p&gt;positiva è buono. Zero è neutrale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>La tua opinione:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Negativo</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Neutrale</translation>
     </message>
@@ -12504,17 +11657,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positivo</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Punteggio complessivo della reputazione, tenendo conto del tuo voto e quello dei tuoi amici.&lt;/p&gt;&lt;p&gt;Negativo è male, positivo è bene. Zero è neutrale. Se il punteggio è troppo basso, l’identità viene marchiata come pessima, e sarà filtrata via nei forum, nelle aree di conversazione, nei canali, ecc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Complessivo:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anonimo</translation>
     </message>
@@ -12529,24 +11682,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Questa identità ti appartiene</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>Le mie identità</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12561,7 +11714,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12571,7 +11729,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12646,7 +11804,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>ID dell&apos;identità:</translation>
     </message>
@@ -12676,7 +11834,7 @@ p, li { white-space: pre-wrap; }
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12691,7 +11849,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished">Modifica Circolo</translation>
     </message>
@@ -12739,7 +11897,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12747,7 +11905,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -12790,7 +11948,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Identità anonima</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12870,7 +12028,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12886,17 +12044,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Bloccato</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation>positivo</translation>
     </message>
@@ -12945,10 +12098,6 @@ These identities will soon be not supported anymore.</source>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Sconosciuto</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13005,7 +12154,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13055,21 +12204,21 @@ These identities will soon be not supported anymore.</source>
         <translation>Ciao,&lt;br&gt;vorrei essere tuo amico sul network RetroShare.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Persone</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Il Tuo Avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>Collegato a nodi adiacenti</translation>
     </message>
@@ -13079,7 +12228,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Collegato a nodi distanti</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Collegato a un nodo RetroShare tuo amico</translation>
     </message>
@@ -13094,7 +12243,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Collegato a un nodo RetroShare sconosciuto</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Conversa con questa persona</translation>
     </message>
@@ -13109,12 +12258,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Conversazione a distanza con questa persona: rifiutata.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Ultimo utilizzo:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP Conosciuta</translation>
     </message>
@@ -13134,12 +12283,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Vuoi davvero eliminare questa identità?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Appartenente a</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Nome nodo:</translation>
     </message>
@@ -13149,7 +12298,7 @@ These identities will soon be not supported anymore.</source>
         <translation>ID Nodo :</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>Cancellare davvero?</translation>
     </message>
@@ -13157,7 +12306,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Soprannome</translation>
     </message>
@@ -13187,7 +12336,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudonimo</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13197,12 +12346,19 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Nuova identità</translation>
     </message>
@@ -13216,7 +12372,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13226,7 +12382,12 @@ These identities will soon be not supported anymore.</source>
         <translation>N/D</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Modifica Identità</translation>
@@ -13237,27 +12398,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Aggiorna</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13277,7 +12438,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13287,11 +12448,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Errore ricevendo la chiave!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Errore KeyId non valido</translation>
     </message>
@@ -13306,7 +12463,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Nome reale sconosciuto</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Crea Nuova Identità</translation>
     </message>
@@ -13316,10 +12473,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Rimuovi</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13345,7 +12507,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Crea</translation>
     </message>
@@ -13355,17 +12517,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Il Tuo Avatar</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Imposta Avatar</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>Collegato al tuo profilo</translation>
     </message>
@@ -13375,7 +12533,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Puoi avere una o più identità. Vengono impiegate quando scrivi nelle aree di discussione, sui forum e per i commenti nei canali. Fungono da destinazione per le conversazioni a distanza e per il sistema postale a distanza di RetroShare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Nickname troppo corto. Inserisci almeno %1 caratteri.</translation>
     </message>
@@ -13434,10 +12592,6 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>Nome PGP:</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">id GXS:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13453,7 +12607,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -13463,12 +12617,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Contrassegna tutto</translation>
     </message>
@@ -13487,26 +12641,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Cita</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Invia</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Salva immagine</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13524,27 +12690,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Porta:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Stato:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13565,7 +12736,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13574,26 +12750,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Aprire file</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Apri cartella</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Verifica...</translation>
     </message>
@@ -13603,7 +12784,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Verifica file</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13631,7 +12812,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Aggiungi amico</translation>
     </message>
@@ -13647,7 +12828,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
@@ -13668,7 +12850,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
@@ -13679,12 +12861,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Auto configuratore rapido</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 una piattaforma di comunicazione sicura decentralizzata</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Non finito</translation>
     </message>
@@ -13711,11 +12893,12 @@ Libera un po&apos; di spazio e clicca OK.</translation>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Notifica</translation>
     </message>
@@ -13726,31 +12909,35 @@ Libera un po&apos; di spazio e clicca OK.</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Apri messaggi</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Grafico banda passante</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Riduci</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Ingrandisci</translation>
     </message>
@@ -13765,7 +12952,12 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 nuovo messaggio</translation>
     </message>
@@ -13795,7 +12987,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>amici connessi %1</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Vuoi davvero uscire da RetroShare?</translation>
     </message>
@@ -13815,7 +13007,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Accertati che questo link non sia stato creato per condurti a siti malevoli.</translation>
     </message>
@@ -13860,12 +13052,13 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Matrice dei permessi sui servizi</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Statistiche</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Mostra interfaccia web</translation>
     </message>
@@ -13880,7 +13073,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>Uscire davvero?</translation>
     </message>
@@ -13889,17 +13082,17 @@ Libera un po&apos; di spazio e clicca OK.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Componi</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Paragrafo</translation>
     </message>
@@ -13935,12 +13128,12 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Titolo 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Dimensione carattere</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Ingrandisci carattere</translation>
     </message>
@@ -13955,32 +13148,32 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Grassetto</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Corsivo</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Allinemento</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Aggiungere un&apos;immagine</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Predefinisci il carattere di testo con stile di codice</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Sottolinea</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Oggetto: </translation>
     </message>
@@ -13991,32 +13184,32 @@ Libera un po&apos; di spazio e clicca OK.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Etichette</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Imposta colore del testo</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Imposta colore di sfondo del testo</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Files raccomandati</translation>
     </message>
@@ -14086,7 +13279,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Aggiungi citazione</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Invia a:</translation>
     </message>
@@ -14121,7 +13314,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Contatti</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Ciao, &lt;br&gt;ti raccomando un mio buon amico; ci si può fidare di lui quanto di me. &lt;br&gt;</translation>
     </message>
@@ -14141,19 +13334,19 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>vuole essere amico con te su RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hi %1,&lt;br&gt;&lt;br&gt;%2 vuole esserti amico su RetroShare.&lt;br&gt;&lt;br&gt;Rispondi ora:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Grazie,&lt;br&gt;Il Team RetroShare
 </translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Salva messaggio</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Messaggio non inviato
@@ -14165,7 +13358,17 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Incolla collegamento RetroShare</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Aggiungi in &quot;A:&quot;</translation>
     </message>
@@ -14185,7 +13388,7 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Aggiungi come raccomandato</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Messaggio Originale</translation>
     </message>
@@ -14195,21 +13398,21 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Da</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Inviato</translation>
     </message>
@@ -14224,7 +13427,7 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Su %1, %2 scrive:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -14234,30 +13437,30 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Inoltra:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Invio messaggio senza oggetto?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Inserisci almeno un destinatario.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>BCC</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Scononsciuto</translation>
     </message>
@@ -14372,13 +13575,13 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Dettagli</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Apri file ...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-Files (*.htm *.html);;Tutti Files (*)</translation>
     </message>
@@ -14398,7 +13601,7 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Esporta PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Messaggio non inviato.
@@ -14420,7 +13623,7 @@ Vuoi salvarlo?</translation>
         <translation>Aggiungi File Extra</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Ciao,&lt;br&gt;vorrei essere tuo amico sul network RetroShare.&lt;br&gt;</translation>
     </message>
@@ -14444,28 +13647,24 @@ Vuoi salvarlo?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">Hai una richiesta di amicizia</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Rispondi subito:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Da:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>Nodi Amici</translation>
     </message>
@@ -14510,13 +13709,13 @@ Vuoi salvarlo?</translation>
         <translation>Elenco ordinato (romani maiuscolo)</translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Grazie, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Identità distante:</translation>
     </message>
@@ -14526,12 +13725,12 @@ Vuoi salvarlo?</translation>
         <translation>[Mancante]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Devi crearti un’identità per firmare i messaggi a distanza, altrimenti rimuovi i contatti a distanza dalla lista di destinazione.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Nome &amp; ID nodo:</translation>
     </message>
@@ -14609,7 +13808,7 @@ Vuoi salvarlo?</translation>
         <translation>Predefinito</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Una nuova cartella</translation>
     </message>
@@ -14619,7 +13818,7 @@ Vuoi salvarlo?</translation>
         <translation>Una nuova finestra</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Modifica etichetta</translation>
     </message>
@@ -14642,7 +13841,7 @@ Vuoi salvarlo?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Sotto:</translation>
     </message>
@@ -14650,7 +13849,7 @@ Vuoi salvarlo?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Messaggio</translation>
     </message>
@@ -14678,7 +13877,7 @@ Vuoi salvarlo?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Files raccomandati</translation>
     </message>
@@ -14688,37 +13887,37 @@ Vuoi salvarlo?</translation>
         <translation>Scarica tutti i files raccomandati</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Oggetto: </translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Da:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Copia a:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Etichette:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Rispondi</translation>
     </message>
@@ -14758,7 +13957,7 @@ Vuoi salvarlo?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>Manda invito</translation>
     </message>
@@ -14810,7 +14009,7 @@ Vuoi salvarlo?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Conferma %1 come amico</translation>
     </message>
@@ -14820,12 +14019,12 @@ Vuoi salvarlo?</translation>
         <translation>Aggiungi %1 come amico</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Nessun oggetto</translation>
     </message>
@@ -14835,17 +14034,22 @@ Vuoi salvarlo?</translation>
         <translation>Scarica</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14854,14 +14058,24 @@ Vuoi salvarlo?</translation>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Scarica tutto</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Stampa Documento</translation>
     </message>
@@ -14876,12 +14090,12 @@ Vuoi salvarlo?</translation>
         <translation>HTML-Files (*.htm *.html);;Tutti Files (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Carica sempre le immagini per questo messaggio</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Nascondi pannello allegati</translation>
     </message>
@@ -14903,42 +14117,6 @@ Vuoi salvarlo?</translation>
         <source>Compose</source>
         <translation>Compose</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Rispondi al messaggio selezionato</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Rispondi</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Rispondi a tutti i messaggi</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Rispondi a tutti</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Inoltra messaggio selezionato</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Avanti</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Rimuovi messaggio selezionato</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Cancella</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Stampa messaggio selzionato</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15017,7 +14195,7 @@ Vuoi salvarlo?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Nuovo messaggio</translation>
     </message>
@@ -15027,60 +14205,16 @@ Vuoi salvarlo?</translation>
         <translation>Componi</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Rispondi al messaggio selezionato</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Rispondi</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Rispondi a tutti i messaggi</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Rispondi a tutti</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Inoltra messaggio selezionato</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Inoltra:</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Rimuovi messaggio selezionato</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Cancella</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Stampa messaggio selzionato</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Stampa</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Mostra</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Etichette</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Casella di posta:</translation>
@@ -15110,21 +14244,17 @@ Vuoi salvarlo?</translation>
         <translation>Cestino</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Totale ricezione:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Cartelle</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Panoramica</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Stampa...</translation>
@@ -15134,26 +14264,6 @@ Vuoi salvarlo?</translation>
         <source>Print Preview</source>
         <translation>Anteprima stampa</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Solo icone bottoni</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Testo bottoni accanto alle icone</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Bottoni con testo</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Testo bottoni sotto le icone</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Predisponi testo sotto icone</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15175,7 +14285,7 @@ Vuoi salvarlo?</translation>
         <translation>Inoltra messaggio</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Oggetto</translation>
     </message>
@@ -15185,7 +14295,7 @@ Vuoi salvarlo?</translation>
         <translation>Da</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
@@ -15195,39 +14305,7 @@ Vuoi salvarlo?</translation>
         <translation>Contenuti</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Clicca per ordinare per allegato</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Clicca per ordinare per oggetto</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Clicca per ordinare per lettura</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Clicca per ordinare per mittente</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Clicca per ordinare per data</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Clicca per ordinare per etichetta</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Clicca per ordinare per evidenziatura</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Inoltra messaggio selezionato</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Oggetto 
 ricerca</translation>
@@ -15237,6 +14315,11 @@ ricerca</translation>
         <source>Search From</source>
         <translation>Ricerca da</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15263,14 +14346,14 @@ ricerca</translation>
         <translation>Ricerca allegati</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messaggi&lt;/h1&gt;                          &lt;p&gt;RetroShare ha un suo sistema postale email interno. Puoi inviare/ricevere email a/da nodi amici a cui sei connesso.&lt;/p&gt;  &lt;p&gt;È altresì possibile inviare messaggi alle Identità altrui utilizzando il sistema di instradazione globale. Questi messaggi sono sempre crittografati e firmati, e vengono reinstradati da nodi intermedi finché non raggiungono la destinazione finale.&lt;/p&gt;    &lt;p&gt;I messaggi a distanza rimangono nella tua Casella in Uscita fin quando non ricevono una ricevuta di confermata consegna.&lt;/p&gt; &lt;p&gt;Generalmente, puoi utilizzare i messaggi per raccomandare file ai tuoi amici, incollandovi i link ai file, o per raccomandare nodi amici ad altri nodi amici, al fine di irrobustire la tua rete, o per inviare un feedback al titolare di un canale.&lt;/p&gt;                    </translation>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Evidenziato</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15344,7 +14427,7 @@ ricerca</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15358,7 +14441,7 @@ ricerca</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15373,34 +14456,33 @@ ricerca</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Bozze</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Messaggi speciali non disponibili. I contrassegni (star) consentono di dare ai messaggi uno status speciale per renderli più facili da trovare. Per contrassegnare  un messaggio, fare clic sulla stella grigia accanto a un qualsiasi messaggio.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Nessun messaggio sistema.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">A</translation>
+        <translation>A</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Clicca per ordinare per</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15408,26 +14490,6 @@ ricerca</translation>
         <source>Total:</source>
         <translation>Totale:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Messaggi</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Clicca per ordinare per firma</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Questo messaggio è stato firmato, e la firma corrisponde</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Questo messaggio è stato firmato, ma la firma non corrisponde</translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">Questo messaggio proviene da una persona distante</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15455,7 +14517,17 @@ ricerca</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">Salva immagine</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Incolla come testo non formattato</translation>
     </message>
@@ -15509,7 +14581,7 @@ ricerca</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -15519,7 +14591,7 @@ ricerca</translation>
         <translation>Rimuovi elemento</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished">Da</translation>
     </message>
@@ -15554,7 +14626,7 @@ ricerca</translation>
         <translation>Messaggio in attesa</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
@@ -15695,7 +14767,7 @@ ricerca</translation>
         <translation>ID contatto</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Rimuovi chiavi non usate...</translation>
     </message>
@@ -15705,7 +14777,7 @@ ricerca</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Pulisci il portachiavi</translation>
     </message>
@@ -15723,7 +14795,13 @@ Nota: Il tuo vecchio portachiavi sarà salvato.
 La rimozione potrebbe fallire quando istanze multiple di Retroshare sono in esecuzione sulla stessa macchina.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Informazioni sul Portachiavi</translation>
@@ -15759,18 +14837,13 @@ Per sicurezza, il tuo portachiavi è stato precedentemente salvato su di un file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Inconsistenza nei dati nel portachiavi. Questo è molto probabilmente un bug. Per favore contatta gli sviluppatori.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>Esporta/crea un nuovo nodo</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Solo chiavi fidate</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Cerca nome</translation>
     </message>
@@ -15780,12 +14853,12 @@ Per sicurezza, il tuo portachiavi è stato precedentemente salvato su di un file
         <translation>Ricerca ID contatto</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -15794,13 +14867,6 @@ Reported error:</source>
 Errore riportato:</translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Rete</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -15827,7 +14893,7 @@ Errore riportato:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15848,7 +14914,7 @@ Errore riportato:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Gruppi</translation>
     </message>
@@ -15878,19 +14944,19 @@ Errore riportato:</translation>
         <translation type="unfinished">Esporta il tuo elenco amici, inclusi i gruppi</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15900,12 +14966,12 @@ Errore riportato:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15915,7 +14981,7 @@ Errore riportato:</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Gruppo</translation>
     </message>
@@ -16030,7 +15096,7 @@ Errore riportato:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Vuoi rimuovere questo nodo?</translation>
     </message>
@@ -16040,7 +15106,7 @@ Errore riportato:</translation>
         <translation type="unfinished">Vuoi rimuovere questo amico?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Fatto!</translation>
@@ -16154,7 +15220,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16169,11 +15235,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Rimuovi tutto</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Questo è un test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>Più recenti in cima</translation>
     </message>
@@ -16183,12 +15245,12 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Più vecchi in cima</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16243,10 +15305,6 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Sicurezza</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16268,10 +15326,6 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <source>Message</source>
         <translation>Messaggio</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Tentativo connessione</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16298,10 +15352,6 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <source>Circles</source>
         <translation type="unfinished">Circoli</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Link</translation>
-    </message>
     <message>
         <location line="+35"/>
         <source>Mails</source>
@@ -16430,24 +15480,16 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Disabilita temporaneamente tutte le notifiche del Toaster</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Dispaccio</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Riquadro sistema</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">Conta tutti i messaggi non letti</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16467,12 +15509,12 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Password errata !</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Plugin/eseguibile non registrato</translation>
     </message>
@@ -16487,19 +15529,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Per favore controlla l&apos;orologio di sistema.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Esame files condivisi...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Calcolando l&apos; hash del file</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Salvataggio indice file...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -16510,17 +15540,19 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Titolo sconosciuto</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Messaggio criptato</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Perché le aree di discussione funzionino correttamente, l&apos;orario del tuo computer deve essere corretto. Per favore controlla che questo sia il tuo caso (Una probabile differenza di diversi minuti è stata rilevata con i tuoi amici).</translation>
     </message>
@@ -16528,7 +15560,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Amico online</translation>
     </message>
@@ -16580,10 +15612,6 @@ Basso Traffico: 10% di traffico standard e TODO: sospende tutti i trasferimenti
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Dialogo</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -16649,10 +15677,6 @@ Basso Traffico: 10% di traffico standard e TODO: sospende tutti i trasferimenti
         <source>This profile has signed your own profile key</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Firme chiave :</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16678,23 +15702,20 @@ p, li { white-space: pre-wrap; }
         <translation>Chiave PGP</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
+        <location line="+41"/>
+        <source>Friend options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmare la chiave di un amico è un modo di esprimergli la tua fiducia davanti agli altri amici. Li aiuta a decidere quando accettare connessioni basate su quella chiave, fidandosi di te. Firmare una chiave è assolutamente facoltativo e la firma non si può revocare, quindi scegli saggiamente quando farlo.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Firma Chiave PGP</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16731,12 +15752,7 @@ p, li { white-space: pre-wrap; }
         <translation>Includi firme</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Opzioni</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare cerca periodicamente, nelle liste dei tuoi amici, files corrispondenti ai tuoi trasferimenti, così da poter stabilire dei trasferimenti diretti. In questo caso, il tuo amico saprà che tu stai scaricando uno dei suoi files.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Per prevenire questo comportamento solo per questo amico, deseleziona questa opzione. Puoi comunque effettuare un trasferimento diretto se lo richiedi esplicitamente, ad es. scaricando qualcosa dalla lista di files del tuo amico. Questa impostazione è applicata a tutte le locazioni dello stesso nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -16750,10 +15766,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questa opzione ti permette di scaricare automaticamente un file raccomandato in un qualche messaggio arrivato da questo nodo. Può essere utile, ad esempio, per inviare files tra i tuoi nodi. L&apos;opzione viene applicata a tutte le locazioni dello stesso nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -16786,21 +15798,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Errore: impossibile ottenere dettagli contatto</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>L&apos;algoritmo a chiave fornito non è supportato da RetroShare (chiavi RSA solo sono supportate al momento)</translation>
@@ -16818,7 +15830,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Il livello di fiducia è un modo per esprimere la fiducia che riponi in questa chiave. Non viene utilizzato dal programma, né viene condiviso, ma può esserti utile a ricordare le chiavi buone e quelle cattive.</translation>
     </message>
@@ -16887,10 +15899,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Forse la password è sbagliata</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -16898,12 +15906,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>Profilo Retroshare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Questa è la tua chiave PGP, ed è firmata da : </translation>
     </message>
@@ -16929,7 +15937,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Conversazione</translation>
     </message>
@@ -16950,7 +15958,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Rimuovi elemento</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -16990,7 +15998,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Scrivi messaggio</translation>
     </message>
@@ -17004,10 +16012,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Amico connesso</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Tentativo connessione</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17044,11 +16048,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+1"/>
         <location line="+1"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Contatto sconosciuto</translation>
+        <translation type="unfinished">Scononsciuto</translation>
     </message>
     <message>
         <location line="+106"/>
@@ -17056,7 +16056,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Invia Messaggio</translation>
     </message>
@@ -17223,13 +16223,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Modulo</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17237,23 +16230,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>Sondivisione Foto</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Foto</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Etichetta Testo</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Commento</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Riassunto</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17314,14 +16295,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Aggiungi un commento</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Scrivi un commento...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17388,10 +16361,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Creare Album</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Vista Album</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17413,17 +16382,17 @@ p, li { white-space: pre-wrap; }
         <translation>Proiezione</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Miei album</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Album Sottoscritti</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Album condivisi</translation>
     </message>
@@ -17452,7 +16421,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Nome album</translation>
     </message>
@@ -17511,19 +16480,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17559,12 +16528,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>EtichettaTesto</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Visualizza ulteriori dettagli su questo plugin</translation>
     </message>
@@ -17710,59 +16679,6 @@ Altro...
         <source>Plugin look-up directories</source>
         <translation>Cartella scorcio moduli aggiuntivi</translation>
     </message>
-    <message>
-        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="vanished">Plugin disattivato. Cliccare il bottone &quot;attiva&quot; e riavviare RetroShare.</translation>
-    </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[disattivato]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Nessun numero di API in dotazione. Si prega di leggere manuale di sviluppo  plugin.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[problema di caricamento]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Nessun numero SVN in dotazione. Si prega di leggere manuale di sviluppo  plugin.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Errore caricamento.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Simbolo errato. Versione sbagliata?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Nessun oggetto modulo aggiuntivo</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Modulo aggiuntivo caricato.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Stato sconosciuto.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Abilita se stai sviluppando dei plugins.
-Su di essi non verrà effettuato il controllo dell&apos;hash.
-Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin contraffatti.</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;I Plugin&lt;/h1&gt;                   &lt;p&gt;I plugins vengono caricati dalle cartelle elencate nella lista sottostante.&lt;/p&gt;&lt;p&gt;Per motivi di sicurezza, i plugin accettati vengono caricati automaticamente fino a quando non vengono modificati l&apos;eseguibile principale di RetroShare o la libreria dei plugin. In tal caso, l&apos;utente dovrà riconfermarli. Dopo l&apos;avvio del programma, puoi abilitare manualmente un plugin cliccando sul bottone &quot;Abilita&quot; e riavviando RetroShare.&lt;/p&gt;                                            &lt;p&gt;Se vuoi sviluppare un tuo plugin, contatta il team degli sviluppatori, saranno felici di aiutarti!&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -17832,12 +16748,27 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation>Disponi finestra in cima</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">Banna persona (esprimi ufficialmente parere negativo)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished">Esprimi parere neutro</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished">Esprimi parere positivo</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -17871,14 +16802,6 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Chiudere questa finestra terminerà la conversazione, verrà notificato all&apos;altro peer e rimuoverà il tunnel cifrato.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Terminare il tunnel?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -17898,7 +16821,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Nuovo</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Vota per</translation>
     </message>
@@ -17918,8 +16841,8 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Commenti</translation>
     </message>
@@ -17944,13 +16867,13 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Commento</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17978,20 +16901,12 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Firmato da:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Note</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -18006,12 +16921,22 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Carica un file immagine</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18027,7 +16952,17 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18037,23 +16972,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Inviare Post</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">Stai proponendo un link. La chiave per una proposizione di successo è: contenuti interessanti, e un titolo descrittivo.</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Invia</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Invia un nuovo Post</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Aggiungi un Titolo</translation>
     </message>
@@ -18073,12 +16992,22 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18093,7 +17022,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Pubblica come</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18104,7 +17033,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Immagine</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18114,7 +17043,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation>Titolo</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Collegamento</translation>
     </message>
@@ -18122,40 +17051,12 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Link Postato</translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Crea Argomento</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Miei argomenti</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Argomenti sottoscritti</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Argomenti popolari</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Altri argomenti</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Link</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18189,31 +17090,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Argomento inviato</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Aggiungi Amministratore degli Argomenti</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Seleziona Amministratore degli Argomenti</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Crea Nuovo Argomento</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Modifica Argomento</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Aggiorna Argomento</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18251,7 +17128,17 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18267,7 +17154,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -18282,16 +17169,17 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Sto caricando...</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">Mai</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18304,22 +17192,18 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Sito</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Commenti</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18330,12 +17214,12 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Commento</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18345,7 +17229,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L’autore di questo messaggio (con ID %1) è bloccato.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18355,21 +17239,17 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Vota per</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Vota contro</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Definisci letto e rimuovi elemento</translation>
     </message>
@@ -18379,7 +17259,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Nuovo commento:</translation>
     </message>
@@ -18389,7 +17269,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -18430,77 +17310,10 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Sto caricando...</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Da</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Modulo</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Scottante</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nuovo</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">In alto</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Oggi</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Ieri</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Questa settimana</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Questo mese</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Quest&apos;anno</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Invia un nuovo Post</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Successivo</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Per favore crea o scegli un Id per firmare prima di votare</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Precedente</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18520,7 +17333,17 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18530,15 +17353,15 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Amministratore:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">sconosciuto</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">Distribuzione:</translation>
     </message>
@@ -18548,42 +17371,42 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">Post</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18603,7 +17426,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Scottante</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18633,17 +17456,17 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18658,12 +17481,17 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Vuoto</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18673,27 +17501,31 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18708,7 +17540,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation type="unfinished">Entra</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Mai</translation>
     </message>
@@ -18750,7 +17582,7 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
     <message>
         <location line="+2"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Scononsciuto</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -18782,6 +17614,16 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <source>No Channel Selected</source>
         <translation type="unfinished">Nessun Canale Selezionato</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -18790,10 +17632,6 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <source>Tabs</source>
         <translation>Tabs</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Apri ciascun argomento in una nuova scheda</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -18807,10 +17645,6 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Pubblicato</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -18879,16 +17713,16 @@ Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin
         <translation>Gestore Profilo</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -18998,7 +17832,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Modificare il messaggio di stato</translation>
@@ -19014,7 +17848,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Gestore Profilo</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Informazioni pubbliche</translation>
     </message>
@@ -19049,12 +17883,12 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>in linea dal:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Altre informazioni</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Il mio indirizzo</translation>
     </message>
@@ -19098,51 +17932,27 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Post da:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Conto 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Conto 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Conto 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Aggiungere al segnale</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">filtro</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">Aggiunge URL</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Visualizzare come</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19152,12 +17962,12 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished">Da:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19187,13 +17997,13 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished">Negativo</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19205,12 +18015,22 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19219,17 +18039,13 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Manda un segnale sul filo</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19244,34 +18060,24 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Da</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Data</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Carica un file immagine</translation>
     </message>
 </context>
 <context>
@@ -19282,7 +18088,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19301,7 +18107,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19311,7 +18117,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19338,7 +18144,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19348,7 +18154,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19368,7 +18174,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19484,7 +18290,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19492,37 +18298,42 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19554,7 +18365,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19562,8 +18373,8 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Conferma</translation>
     </message>
@@ -19833,12 +18644,12 @@ Caratteri &lt;b&gt;&quot;, |, \, &amp;lt;&amp;gt;,, *,?&lt;/b&gt; saranno sostit
         <translation>Dettagli contatto</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Richiesta file cancellata</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Questa versione di RetroShare usa OpenPGP-SDK. Come effetto collaterale, non utilizza il portachiavi PGP condiviso di sistema, ma ha il proprio portachiavi condiviso da tutte le istanze di RetroShare. &lt;br&gt;&lt;br&gt;Non sembri avere un tale portachiavi, sebbene chiavi PGP siano menzionati da account RetroShare esistenti, probabilmente perché hai appena cambiato per questa nuova versione del software.</translation>
     </message>
@@ -19869,7 +18680,7 @@ Caratteri &lt;b&gt;&quot;, |, \, &amp;lt;&amp;gt;,, *,?&lt;/b&gt; saranno sostit
         <translation>Errore inatteso. Riferisci &quot;RsInit::InitRetroShare unexpected return code %1&quot;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19903,7 +18714,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Istanze multiple</translation>
@@ -19927,6 +18738,26 @@ Blocca file.
 Blocco del file:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20009,7 +18840,7 @@ L’errore segnalato è:
         <translation>Inoltro dati</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Sembri avere nodi associati a chiavi DSA:</translation>
     </message>
@@ -20019,7 +18850,7 @@ L’errore segnalato è:
         <translation>Chiavi DSA non sono ancora supportate da questa versione di RetroShare. Tutti questi nodi saranno inutilizzabili. Siamo molto spiacenti per questo.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>abilitato</translation>
     </message>
@@ -20029,7 +18860,7 @@ L’errore segnalato è:
         <translation>disabilitato</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Sposta l’IP %1 alla lista bianca</translation>
     </message>
@@ -20045,7 +18876,7 @@ L’errore segnalato è:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>%1 secondi fa</translation>
     </message>
@@ -20112,7 +18943,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20140,7 +18971,7 @@ Security: no anonymous IDs</source>
         <translation>impossibile analizzare il file XML!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20320,13 +19151,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Nome</translation>
+    </message>
     <message>
         <location line="+1"/>
-        <source>Status</source>
+        <source>Node</source>
+        <translation type="unfinished">Nodo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20397,7 +19244,7 @@ Security: no anonymous IDs</source>
         <location line="+12"/>
         <location line="+33"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Scononsciuto</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20519,10 +19366,6 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Questo certificato contiene:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -20573,6 +19416,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -20735,7 +19590,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Tutta la rete</translation>
     </message>
@@ -20918,7 +19773,7 @@ p, li { white-space: pre-wrap; }
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Caricamento immagini bloccato</translation>
     </message>
@@ -20931,7 +19786,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Concesso di default</translation>
     </message>
@@ -21104,12 +19959,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Salva immagine</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21117,12 +19982,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21814,7 +20679,7 @@ Se ritieni sia corretto, rimuovi dal file la riga corrispondente e ri-aprilo con
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Nome</translation>
@@ -21929,13 +20794,13 @@ Se ritieni sia corretto, rimuovi dal file la riga corrispondente e ri-aprilo con
     <message>
         <location line="+1"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Scononsciuto</translation>
     </message>
 </context>
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -21955,7 +20820,7 @@ Se ritieni sia corretto, rimuovi dal file la riga corrispondente e ri-aprilo con
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22011,7 +20876,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Messaggio Redatto ... ]</translation>
     </message>
@@ -22025,11 +20890,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Messaggio Perso ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22043,6 +20903,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Da</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">A</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22065,13 +20930,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Clicca per ordinare per lettura</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Clicca per ordinare per mittente</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22094,7 +20964,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22115,7 +20987,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Ripristina TUTTI i parametri Retroshare memorizzati</translation>
     </message>
@@ -22176,7 +21048,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Definisci lingua RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Impossibile aprire file di LOG &apos;%1&apos;: %2</translation>
     </message>
@@ -22197,11 +21069,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Impossibile creare la cartella dati: %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Revisione</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22231,7 +21099,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>Codice linguaggio incorretto:</translation>
     </message>
@@ -22249,7 +21117,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -22266,12 +21134,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Immetti una chiave (di almeno 3 caratteri)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Inizia ricerca</translation>
     </message>
@@ -22332,7 +21200,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Parole Chiave</translation>
     </message>
@@ -22347,7 +21215,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Rierca ID</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Nome File</translation>
     </message>
@@ -22447,23 +21315,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Scarica selezionati</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Nome File</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Scarica</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Copia collegamento RetroShare</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Invia collegamento RetroShare</translation>
     </message>
@@ -22473,7 +21341,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Scarica Informativa</translation>
     </message>
@@ -22510,7 +21378,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Rimuovi tutto</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Cartella</translation>
@@ -22521,17 +21389,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nuovo collegamento(i) RetroShare</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Apri cartella</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Crea Raccolta...</translation>
     </message>
@@ -22551,7 +21419,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Scarica da una raccolta di file...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Raccolta</translation>
     </message>
@@ -22559,7 +21427,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Dettagli contatto</translation>
     </message>
@@ -22575,22 +21443,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Rimuovi Elemento</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>Indirizzo IP:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>ID contatto:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Località:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Nome contatto:</translation>
     </message>
@@ -22607,7 +21475,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22632,8 +21500,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Questo è l’IP a cui il tuo amico sostiene di essere connesso. Se avete appena cambiato gli IP, allora questo è un falso allarme. Altrimenti, significa che la tua connessione a questo amico è inoltrata da un peer intermedio, ed è una cosa sospetta.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo avviso serve a proteggerti dagli attacchi tramite inoltro del traffico. In simili casi, l’amico a cui sei connesso non vedrà il tuo IP esterno, vedrà invece l’IP di chi esegue l’attacco.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Però, se per qualche motivo avete appena cambiato gli IP (alcuni ISP ti cambiano l’IP a intervalli regolari), allora questo avviso ti sta solo dicendo che un amico si è connesso al tuo nuovo IP prima che RetroShare si sia accorto che l’IP è cambiato. In questo caso, non c’è nulla che non vada.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Puoi facilmente evitare falsi allarmi mettendo in lista bianca i tuoi indirizzi IP (p.es. l’intervallo dei tuoi IP), o disabilitando del tutto questi avvisi in Opzioni-&amp;gt;Notifica-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22641,7 +21509,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>vuole essere amico con te su RetroShare</translation>
     </message>
@@ -22672,7 +21540,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -22717,12 +21585,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Stato:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Scrivi messaggio</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Tentativo Connessione</translation>
     </message>
@@ -22742,31 +21610,32 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Tentativi di connessione sconosciuto (uscente)</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Evento di sicurezza sconosciuto</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
-        <source>Unknown</source>
+        <location line="+7"/>
+        <source>An unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-31"/>
+        <source>Unknown</source>
+        <translation type="unfinished">Scononsciuto</translation>
+    </message>
     <message>
         <location line="+0"/>
         <source>Profile ID: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Contatto sconosciuto</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
@@ -22776,7 +21645,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Vuoi rimuovere questo amico?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Il Certificato ha una firma errata!! Questo contatto non è chi afferma di essere.</translation>
     </message>
@@ -22786,12 +21655,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Certificato Mancante/Danneggiato. Non è un vero utente RetroShare.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>Il certificato ha causato un errore interno.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Peer/nodo non in lista-amici (PGP id=</translation>
     </message>
@@ -22850,12 +21719,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Indirizzo Locale</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22876,22 +21745,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Porta:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Rete locale</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Rilevatore di indirizzo IP esterno</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>IP conosciuti / precedenti:</translation>
     </message>
@@ -22904,21 +21773,16 @@ behind a firewall or a VPN.</source>
         <translation>Se si deseleziona questo, RetroShare può determinare solo il tuo IP quando si connette a qualcuno. Lasciare questo selezionato, aiuta a connettersi quando si hanno pochi amici. Aiuta anche se sei dietro un firewall o una VPN.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Permetti a RetroShare di chiedere il mio IP a questi siti:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>L’intervallo di porte consentite va da 10 a 65535. In genere le porte al di sotto della 1024 sono riservate al sistema.</translation>
     </message>
@@ -22928,23 +21792,46 @@ behind a firewall or a VPN.</source>
         <translation>L’intervallo di porte consentite va da 10 a 65535. In genere le porte al di sotto della 1024 sono riservate al sistema.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Indirizzo Onion</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Scoperta Attivata (raccomandato)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Scoperta Disattivata</translation>
     </message>
@@ -22954,7 +21841,7 @@ behind a firewall or a VPN.</source>
         <translation>Nascosto - Vedi Configurazione</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>Indirizzo I2P</translation>
     </message>
@@ -22979,37 +21866,95 @@ behind a firewall or a VPN.</source>
         <translation>in entrata ok</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>Il proxy sembra funzionare.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>proxy di I2P non abilitato</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23024,71 +21969,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">sconosciuto</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23098,22 +21979,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Sei raggiungibile tramite servizio nascosto.</translation>
     </message>
@@ -23127,12 +21993,12 @@ I servizi sono tutti sù e ben funzionanti??
 Controlla anche le tue porte!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Modalità Nascosta]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo azzera la lista degli indirizzi noti. Questa azione è utile se per qualche ragione la tua lista di indirizzi contenesse un indirizzo non valido/irrilevante/scaduto che vorresti evitare di passare ai tuoi amici come indirizzo di contatto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23142,7 +22008,7 @@ Controlla anche le tue porte!</translation>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>Limite scaricamento (KB/s)</translation>
     </message>
@@ -23157,23 +22023,23 @@ Controlla anche le tue porte!</translation>
         <translation>Limite caricamento (KB/s)</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Il limite di upload copre l’intero software. Un limite di upload troppo piccolo potrebbe eventualmente bloccare i servizi a bassa priorità (forum, canali). Il valore minimo raccomandato è di 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23184,17 +22050,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23204,12 +22060,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23219,17 +22070,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23269,7 +22110,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
@@ -23284,12 +22125,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stop</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">In arrivo</translation>
     </message>
@@ -23325,7 +22161,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished">Relay</translation>
     </message>
@@ -23380,7 +22241,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Totale:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23405,7 +22266,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23417,7 +22278,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>Filtro IP</translation>
     </message>
@@ -23440,7 +22301,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -23500,17 +22361,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Aggiungi alla lista bianca</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Configurazione Servizio Nascosto</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23526,18 +22398,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P in uscita ok</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Indirizzo Servizio</translation>
     </message>
@@ -23572,12 +22444,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>Intervallo IP</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Segnalato dalla DHT per mascheramento IP</translation>
     </message>
@@ -23600,22 +22472,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Aggiunto da te</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gli IP della lista bianca vengono ottenuti dalle seguenti fonti: IP provenienti da un certificato scambiato manualmente; gamme di IP inserite da te in questa finestra o negli elementi immessi nella sicurezza.&lt;/p&gt;&lt;p&gt;Il comportamento di default di RetroShare è di (1) autorizzare sempre la connessione ai peer il cui IP è nella lista bianca, anche se quell’IP appare anche nella lista nera; (2) opzionalmente richiede che gli IP siano nella lista bianca. Puoi modificare questo comportamento per ciascun contatto nella finestra &amp;quot;Dettagli&amp;quot; di ciascun nodo RetroShare. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La DHT ti consente di rispondere a richieste di connessione dai tuoi amici che usano la DHT di BitTorrent. Migliora notevolmente la connettività. Nessuna informazione viene memorizzata nella DHT; viene impiegata solo come sistema di proxy per entrare in contatto con altri nodi di RetroShare.&lt;/p&gt;&lt;p&gt;Il servizio Discovery invia il nome del nodo e gli ID dei tuoi contatti fidati ai peers connessi, per aiutarli a scegliere nuovi amici. Però l’amicizia non è mai automatica, ed entrambi i peer dovranno pur sempre aggiudicarsi la fiducia a vicenda per consentire la connessione. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Il punto diventa verde non appena RetroShare riesce ad ottenere il tuo IP dai siti elencati qui sotto, se hai abilitato l’operazione. RetroShare utilizzerà anche altri metodi per scoprire il tuo IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questa lista viene compilata automaticamente con informazioni reperite da molteplici fonti: i contatti mascherati segnalati dalla DHT; gli intervalli IP immessi da te; e gli intervalli IP segnalati dai tuoi amici. Le impostazioni di default dovrebbero proteggerti dal relaying del traffico su larga scala.&lt;/p&gt;&lt;p&gt;L&apos;individuazione automatizzata degli IP mascherati potrebbe far finire in lista nera gli IP dei tuoi amici. In questo caso, usa il menù contestuale per metterli in lista bianca.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23650,7 +22522,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Blocca automaticamente gli intervalli degli IP mascherati della DHT che iniziano da</translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23660,12 +22532,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks Proxy</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor in uscita ok</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>proxy di Tor non abilitato</translation>
     </message>
@@ -23745,7 +22617,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>verifica i contatti con cui vuoi condividere la chiave privata di pubblicazione</translation>
     </message>
@@ -23755,12 +22627,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Condividi con amici</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Condividi</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Puoi far sapere agli amici del tuo Canale condividendolo con loro.
@@ -23780,7 +22652,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Gestore cartella condivisa</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23800,17 +22672,17 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Aggiungi cartella condivisa</translation>
     </message>
@@ -23820,7 +22692,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Applicare e chiudere</translation>
     </message>
@@ -23911,7 +22783,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Cartella non trovata o nome Cartella non accettato.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Questo è un elenco delle cartelle condivise. Puoi aggiungere e rimuovere cartelle usando i bottoni in fondo. Quando aggiungi una nuova cartella, all’inizio tutti i file in essa contenuti vengono condivisi. Puoi impostare separatamente i parametri di condivisione per ciascuna cartella condivisa.</translation>
     </message>
@@ -23919,7 +22791,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Files</translation>
     </message>
@@ -23970,11 +22842,16 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>controllare i file</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Scarica selezionati</translation>
     </message>
@@ -23984,7 +22861,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Scarica</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Copia negli Appunti Collegamenti RetroShare</translation>
     </message>
@@ -23999,7 +22876,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Invia collegamento RetroShare</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24015,7 +22892,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Raccomandazione(i)</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Crea Raccolta...</translation>
     </message>
@@ -24040,7 +22917,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Scarica da una raccolta di file...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24183,12 +23060,12 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Carica configurazione</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Crea interfaccia</translation>
     </message>
@@ -24212,7 +23089,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Ricorda parola-chiave</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Login</translation>
     </message>
@@ -24565,7 +23442,7 @@ Questa scelta può essere ripristinata in Impostazioni.</translation>
         <translation>Messaggio di stato</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Messaggio:</translation>
     </message>
@@ -24810,7 +23687,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Rimuovi tutte le etichette</translation>
     </message>
@@ -24846,14 +23723,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Scononsciuto</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -24861,18 +23741,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24882,12 +23757,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Errore</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Non connesso</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24895,7 +23815,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24905,7 +23825,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24916,11 +23836,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24948,7 +23869,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Opzioni traferimento</translation>
@@ -24959,7 +23880,7 @@ p, li { white-space: pre-wrap; }
         <translation>Massimo scaricamenti simultanei:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24969,22 +23890,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Condividi automaticamente cartella ricezione (Raccomandato)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation> minuto(i)</translation>
     </message>
@@ -25069,7 +23995,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25078,7 +24004,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25103,7 +24034,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -25168,12 +24104,7 @@ p, li { white-space: pre-wrap; }
         <translation>Massimo numero di richieste di tunnel inoltrate per secondo:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;costringe il trasferimento a richiedere chunk di file da 1MB in ordine crescente, facilitando l’anteprima durante lo scaricamento. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; è puramente casuale e favorisce lo swarming. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressivo&lt;/span&gt; è un compromesso: seleziona il prossimo chunk casualmente entro un margine che non superi i 50MB di distanza dalla fine del file parziale. Questo consente una randomizzazione parziale ma al contempo previene lunghi tempi di inizializzazione per grossi file vuoti.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RetroShare sospenderà tutti i trasferimenti ed il salvataggio del file di configurazione qualora lo spazio libero sul disco dovesse scendere al di sotto di questo limite. Su alcuni sistemi, questo previene la perdita di informazioni. Una finestra di popup ti avviserà quando questo accade.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -25183,7 +24114,17 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo valore controlla quante richieste di tunnel al secondo può inoltrare il tuo contatto.&lt;/p&gt;&lt;p&gt;Se disponi di una connessione Internet a banda larga, può portarlo su fino a 30-40, consentendo così il passaggio di tunnel statisticamente più lunghi. Fai molta attenzione però: questo genererà molti pacchetti piccoli che possono rallentare notevolmente il tuo trasferimento di file.&lt;/p&gt;&lt;p&gt;Il valore predefinito è 20. Nel dubbio, lascialo così.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Avvertimento</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25211,7 +24152,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Completato scaricamento</translation>
     </message>
@@ -25235,39 +24176,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Hai scaricato il %1 </translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Hai completato il %1 di scaricamento</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">completato %1 scaricamenti</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">completato %1 scaricamento</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Scaricamenti</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Caricamenti</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nome</translation>
@@ -25474,11 +24399,7 @@ p, li { white-space: pre-wrap; }
         <translation>Specifica...</translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Trasferimento File&lt;/h1&gt; &lt;p&gt;RetroShare offre due modi per trasferie file: trasferimenti diretti dai tuoi amici, e trasferimenti a distanza anonimizzati con tunnel. Inoltre, il trasferimento file è multi-fonte e consente lo swarming (puoi essere una fonta mentre scarichi).&lt;/p&gt; &lt;p&gt;Puoi condividere file usando l’icona &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; bekka barra laterale sinistra. Queste file verranno elencati nella finestrella &quot;I Miei File&quot;. Per ciascun gruppo di amici, puoi stabilire se potranno vedere o meno questi file nella finestra &quot;File degli Amici&quot;.&lt;/p&gt; &lt;p&gt;La finestra di ricerca riporta i file nelle liste dei file dei tuoi amici, ed i file distanti che possono essere raggiunti anonimamente tramite il sistema di tunneling a multi-hop.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+253"/>
+        <location line="+262"/>
         <source>Move in Queue...</source>
         <translation>Sposta in coda...</translation>
     </message>
@@ -25503,7 +24424,7 @@ p, li { white-space: pre-wrap; }
         <translation>Scegli la cartella</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25524,7 +24445,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -25557,7 +24478,17 @@ p, li { white-space: pre-wrap; }
         <translation>File %1 non completato. Se file multimediale, provane un anteprima.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Avvertimento</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Cambia il nome del file</translation>
     </message>
@@ -25572,7 +24503,7 @@ p, li { white-space: pre-wrap; }
         <translation>Per favore inserisci un nuovo--e valido--nome per il file</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Espandi tutto</translation>
@@ -25699,23 +24630,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Colonne</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Trasferimento file</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Tracciato</translation>
     </message>
@@ -25725,7 +24651,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visualizza colonna dei Percorsi</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>Impossibile eliminare il file anteprima</translation>
     </message>
@@ -25735,7 +24661,7 @@ p, li { white-space: pre-wrap; }
         <translation>Riprovare?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Crea Raccolta...</translation>
     </message>
@@ -25750,7 +24676,12 @@ p, li { white-space: pre-wrap; }
         <translation>Guarda Raccolta...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+74"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
         <source>Collection</source>
         <translation>Raccolta</translation>
     </message>
@@ -25760,7 +24691,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 tunnel</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Tunnel anonimo 0x</translation>
     </message>
@@ -25889,7 +24820,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-190"/>
         <location line="+19"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Contatto sconosciuto</translation>
     </message>
 </context>
 <context>
@@ -25981,10 +24912,6 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">Tunnel anonimi</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26178,12 +25105,17 @@ p, li { white-space: pre-wrap; }
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Abilita l’Interfaccia Web di RetroShare</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Stato:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Parametri web</translation>
     </message>
@@ -26217,27 +25149,33 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Port:</source>
-        <translation type="vanished">Porta:</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Interfaccia Web&lt;/h1&gt;&lt;p&gt;L’Interfaccia Web ti consente di controllare RetroShare tramite browser. Più dispositivi possono condividere il controllo di un’istanza di RetroShare. Quindi, potresti avviare una conversazione su un tablet, per poi proseguirla su un PC da tavolo.&lt;/p&gt; &lt;p&gt;Attenzione: non esporre l’Interfaccia Web all’Internet, dato che non dispone di alcun sistema di controllo dell’accesso, né di cifratura. Se vuoi usare l’Interfaccia Web tramite Internet, usa un tunnel SSH o un proxy verso una connessione sicura.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>Interfaccia Web non abilitata</translation>
     </message>
@@ -26247,12 +25185,12 @@ p, li { white-space: pre-wrap; }
         <translation>L’Interfaccia Web non è abilitata. Attivala in Impostazioni -&gt; Interfaccia Web</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>Non so riuscito ad avviare l’Interfaccia Web</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Interfaccia Web</translation>
     </message>
@@ -26389,11 +25327,7 @@ p, li { white-space: pre-wrap; }
         <translation>Pagine wiki</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Nuovo gruppo</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Nome della Pagina</translation>
     </message>
@@ -26408,7 +25342,7 @@ p, li { white-space: pre-wrap; }
         <translation>Id originale</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26496,7 +25430,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Storico modifiche pagina</translation>
     </message>
@@ -26531,7 +25465,7 @@ p, li { white-space: pre-wrap; }
         <translation>Id pagina</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -26561,14 +25495,18 @@ p, li { white-space: pre-wrap; }
         <translation>Etichette</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Storico</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Visualizza storico modifiche</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -26589,7 +25527,7 @@ p, li { white-space: pre-wrap; }
         <translation>Rimposta</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Invia</translation>
     </message>
@@ -26661,10 +25599,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">Lasso di tempo</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -26676,16 +25610,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Aggiornamento</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26700,7 +25625,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Altri</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26720,7 +25645,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26750,85 +25675,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Mese scorso</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">La settimana scorsa</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Oggi</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nuovo</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">Da</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">fino al</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Ricerca/filtro</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Livello di rete</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Gestire gli account</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Mostrando:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Te stesso</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Amici</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Seguendo</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Personalizzato</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Conto 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Conto 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Conto 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">Casella da baffare</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Posta segnale sil filo</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -26891,35 +25748,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Rimuovi</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Località:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -26964,11 +25828,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/D</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Seguendo</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Scononsciuto</translation>
@@ -27046,7 +25940,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2d</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -27079,15 +25973,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Immagini (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_ja_JP.ts b/retroshare-gui/src/lang/retroshare_ja_JP.ts
index ce4e63aeb..89bf9c9f2 100644
--- a/retroshare-gui/src/lang/retroshare_ja_JP.ts
+++ b/retroshare-gui/src/lang/retroshare_ja_JP.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">コメントを追加</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: 高度な検索</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>検索基準</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>さらに検索基準を追加</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>検索基準をリセット</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>検索をキャンセル</translation>
     </message>
@@ -164,121 +157,6 @@
         <translation>検索</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">アルバムを作成</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">アルバム名:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">カテゴリー</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">動物</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">家庭</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">友達</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">花</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">旅行</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">風景</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished"> ペット</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">肖像画</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">トラベル</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">仕事</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">ランダム</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">キャプション</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">位置:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">写真家:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">説明：</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">共有のオプション</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">ポリシー：</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">画質：</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">コメント:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">パブリック</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">イメージのサイズを変更 (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">イメージのサイズを変更 (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">戻る</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">写真を追加</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">いつ撮りましたか？</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -307,22 +185,6 @@
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">位置:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">説明：</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">共有のオプション</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">コメント</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -679,7 +541,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -705,10 +567,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -751,7 +626,7 @@ p, li { white-space: pre-wrap; }
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,22 +713,10 @@ p, li { white-space: pre-wrap; }
         <translation>リセット</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">受信速度</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">送信速度</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>常に手前に表示</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">スタイル</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -869,23 +732,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% 不透明</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">保存</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">キャンセル</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>開始:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">設定を非表示</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -958,7 +809,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">コメント</translation>
     </message>
@@ -988,12 +839,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1001,7 +852,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1021,7 +872,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1059,7 +910,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1079,7 +930,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1109,7 +960,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">未読/既読の切り替え</translation>
     </message>
@@ -1119,7 +970,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">新規</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
@@ -1127,12 +978,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1152,18 +1003,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">展開</translation>
     </message>
@@ -1178,12 +1029,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">アイテムを削除</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1352,17 +1203,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
@@ -1372,7 +1223,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1380,7 +1241,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1403,7 +1264,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1428,18 +1289,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">展開</translation>
     </message>
@@ -1454,7 +1315,7 @@ into the image, so as to
         <translation type="unfinished">アイテムを削除</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
@@ -1464,17 +1325,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">コメント</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">非表示</translation>
     </message>
@@ -1482,7 +1333,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
@@ -1673,7 +1524,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>チャットロビーを表示</translation>
     </message>
@@ -1706,13 +1557,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1720,13 +1572,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>カウント</translation>
     </message>
@@ -1736,29 +1588,7 @@ into the image, so as to
         <translation>話題</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>プライベートチャット</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>公開チャット</translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1768,7 +1598,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1825,12 +1655,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1840,27 +1670,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">チャットロビーを作成</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[話題はありません]</translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>プライベート</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-770"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-557"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>パブリック</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1870,38 +1715,25 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">はい</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">いいえ</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1913,47 +1745,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>話題:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>ラベル</translation>
     </message>
@@ -1968,7 +1800,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
@@ -1988,7 +1820,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>アイテムを削除</translation>
     </message>
@@ -2033,7 +1865,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
@@ -2048,15 +1880,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">チャット設定</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">グループチャットで顔文字を有効にする</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2076,7 +1900,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2101,7 +1925,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2110,10 +1934,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">プライベートチャット</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2135,11 +1955,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">チャットフォント</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>チャットフォントを変更</translation>
     </message>
@@ -2149,14 +1965,10 @@ Double click a chat room to enter and chat.</source>
         <translation>チャットフォント:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>履歴</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">スタイル</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2171,17 +1983,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">グループチャット</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>プライベートチャット</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2251,12 +2059,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">検索</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2266,7 +2084,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2313,7 +2141,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">説明</translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2363,7 +2191,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>大文字・小文字を区別</translation>
     </message>
@@ -2469,7 +2297,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>チャットを表示</translation>
     </message>
@@ -2505,7 +2333,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
@@ -2540,12 +2368,12 @@ Double click a chat room to enter and chat.</source>
         <translation>斜体</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2625,11 +2453,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2667,7 +2490,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>書き込み中...</translation>
     </message>
@@ -2689,7 +2512,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>本当に履歴を削除しますか？</translation>
     </message>
@@ -2739,7 +2562,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2761,7 +2584,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2776,12 +2599,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2797,12 +2620,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2813,12 +2636,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2838,7 +2661,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2864,7 +2687,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2886,7 +2709,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2912,7 +2735,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>友達</translation>
     </message>
@@ -2972,7 +2795,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2988,7 +2811,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3040,45 +2863,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>エラー: ピア詳細を取得できません.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3088,7 +2911,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3170,12 +2993,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3195,7 +3023,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3217,10 +3045,6 @@ Double click on it to add his name on text writer.</source>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">ブラウズ</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
@@ -3267,7 +3091,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Eメール</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3283,12 +3107,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
@@ -3298,17 +3122,17 @@ Double click on it to add his name on text writer.</source>
         <translation>場所:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3318,7 +3142,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3343,12 +3167,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3368,32 +3202,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3439,17 +3268,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>証明書の読み込みに失敗</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3469,12 +3298,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3482,7 +3311,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3522,7 +3351,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3547,7 +3376,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3557,11 +3386,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save as...</source>
-        <translation type="vanished">名前を付けて保存</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3600,7 +3425,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3610,7 +3435,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3635,7 +3460,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3648,7 +3473,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3683,7 +3508,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3693,12 +3518,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3763,7 +3583,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3791,7 +3611,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3801,17 +3621,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3821,12 +3644,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3836,7 +3661,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3861,7 +3687,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4153,7 +3979,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4161,7 +3987,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4171,7 +3998,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4207,12 +4034,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4232,7 +4059,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4252,18 +4079,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4278,15 +4105,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">タイプ</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">名前:</translation>
     </message>
@@ -4326,19 +4145,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4348,12 +4167,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>追加</translation>
     </message>
@@ -4363,7 +4194,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>検索</translation>
@@ -4416,13 +4247,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">作成</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4441,7 +4272,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4476,7 +4307,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4486,7 +4317,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4546,10 +4377,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Channel Thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">件名:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4635,17 +4462,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4670,7 +4497,12 @@ p, li { white-space: pre-wrap; }
         <translation>件名を追加してください</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4685,18 +4517,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">非表示</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4730,7 +4556,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4739,10 +4565,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">件名</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4763,8 +4585,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4783,7 +4605,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4813,17 +4635,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">タイトル</translation>
     </message>
@@ -4876,7 +4698,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">画像ファイルを開く</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4886,8 +4708,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4896,10 +4718,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">送信</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4914,7 +4732,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4949,7 +4767,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">作成</translation>
     </message>
@@ -4959,7 +4777,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4974,7 +4792,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4995,7 +4813,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5003,17 +4821,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>場所:</translation>
     </message>
@@ -5023,12 +4841,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5048,12 +4866,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5063,7 +4876,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5073,17 +4886,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5093,7 +4901,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5163,33 +4971,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>ラベル</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5279,7 +5087,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5947,7 +5755,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5955,38 +5763,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5994,12 +5802,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6161,7 +5969,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6171,7 +5979,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6231,11 +6039,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6357,7 +6175,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6399,7 +6217,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6435,7 +6253,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>検索</translation>
@@ -6451,7 +6269,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6688,7 +6506,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6726,7 +6544,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6737,16 +6555,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">名前</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">状態</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6829,33 +6763,38 @@ at least one peer was not added to a group</source>
         <translation>フォントをデフォルトに戻す</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6873,7 +6812,17 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>すべてのフィールドは最低3文字以上必要です</translation>
     </message>
@@ -6883,17 +6832,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>ポート</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6914,38 +6858,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6965,12 +6909,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6980,38 +6924,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7055,13 +7004,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7071,7 +7020,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7106,7 +7055,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7116,12 +7065,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7131,12 +7075,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7362,27 +7301,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7392,39 +7317,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7432,49 +7375,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7499,7 +7438,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7549,12 +7488,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7678,7 +7617,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7686,7 +7625,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7856,7 +7795,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>タイトル</translation>
     </message>
@@ -7869,12 +7808,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7899,7 +7838,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7914,14 +7853,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">最新の投稿</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
@@ -7932,17 +7871,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">人気度</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="obsolete">表示</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7955,7 +7890,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8091,7 +8026,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8102,22 +8037,22 @@ p, li { white-space: pre-wrap; }
         <translation>チャンネルを作成</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>自動ダウンロード有効</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>購読済みのチャンネル</translation>
     </message>
@@ -8137,12 +8072,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>自動ダウンロード無効</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8177,22 +8112,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">再生</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8212,17 +8147,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8232,25 +8167,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">フォーム</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">タイトル</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">状態</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8288,9 +8208,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>チャンネルを購読</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">ラベル</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8304,7 +8234,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -8319,7 +8249,7 @@ p, li { white-space: pre-wrap; }
         <translation>チャンネルの説明</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>ロード中</translation>
     </message>
@@ -8334,8 +8264,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">新規チャンネル</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8346,7 +8277,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8367,7 +8298,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>再生</translation>
     </message>
@@ -8429,18 +8360,18 @@ p, li { white-space: pre-wrap; }
         <translation>非表示</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>新規</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>コメント</translation>
     </message>
@@ -8455,21 +8386,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">ロード中</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8494,51 +8421,16 @@ p, li { white-space: pre-wrap; }
         <translation>メディアを再生</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">チャンネルに投稿</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">ロード中</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">タイトル</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">チャンネルが選択されていません。</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">自動ダウンロード無効</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">自動ダウンロード有効</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">ファイル</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">説明</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">チャンネルに投稿</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8608,7 +8500,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8644,7 +8536,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">コメント</translation>
     </message>
@@ -8659,13 +8551,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8680,7 +8572,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8695,7 +8587,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8755,12 +8647,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8835,12 +8737,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8891,17 +8794,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9016,7 +8919,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9029,7 +8932,7 @@ p, li { white-space: pre-wrap; }
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9059,7 +8962,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>コメント</translation>
@@ -9098,7 +9001,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9122,6 +9025,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9131,7 +9049,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9160,7 +9078,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9191,7 +9109,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9242,7 +9160,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9258,7 +9176,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -9278,8 +9196,9 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">ロード中</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">ラベル</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9310,13 +9229,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9327,7 +9246,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -9347,21 +9266,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">ロード中</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
@@ -9374,63 +9289,66 @@ before you can comment</source>
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">最新の投稿</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>タイトル</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>期日</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>ロード中</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9440,12 +9358,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9485,23 +9398,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9544,16 +9457,12 @@ before you can comment</source>
         <translation>RetroShareリンクをコピー</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">展開</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9583,8 +9492,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9667,12 +9576,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9733,7 +9642,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9753,7 +9662,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9805,7 +9714,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9815,7 +9724,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9830,7 +9739,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9896,12 +9805,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9932,23 +9841,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">ロード中</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9959,12 +9861,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,7 +9874,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>パブリック</translation>
     </message>
@@ -10032,7 +9934,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>コメント:</translation>
     </message>
@@ -10055,7 +9957,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10071,12 +9973,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10093,23 +9995,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10125,22 +10027,28 @@ This message is missing. You should receive it later.</source>
         <translation>名前を追加してください</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>所有者:</translation>
     </message>
@@ -10150,12 +10058,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>情報</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10165,7 +10073,7 @@ This message is missing. You should receive it later.</source>
         <translation>最新の投稿</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10240,7 +10148,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>人気度</translation>
     </message>
@@ -10256,27 +10169,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">作成</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10284,7 +10192,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>ロード中</translation>
     </message>
@@ -10344,7 +10252,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,12 +10309,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShareリンクをコピー</translation>
     </message>
@@ -10429,7 +10337,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10442,18 +10350,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">ロード中</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10463,7 +10367,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10473,7 +10377,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10493,6 +10402,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10504,7 +10421,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10552,17 +10469,13 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">ロード中</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10943,7 +10856,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10959,7 +10872,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10978,7 +10891,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11052,7 +10965,7 @@ p, li { white-space: pre-wrap; }
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11062,7 +10975,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11090,7 +11003,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11100,7 +11013,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11110,7 +11023,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11130,13 +11043,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11148,12 +11085,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11168,12 +11105,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished">名前を付けて保存</translation>
     </message>
@@ -11438,14 +11370,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11455,12 +11387,12 @@ p, li { white-space: pre-wrap; }
         <translation>検索</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11470,7 +11402,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11485,27 +11417,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished">閉じる</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11521,29 +11453,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11563,18 +11505,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11584,78 +11528,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11666,17 +11610,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11691,24 +11635,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11723,7 +11667,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11733,7 +11682,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11808,7 +11757,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11838,7 +11787,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11853,7 +11802,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11901,7 +11850,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11909,7 +11858,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11952,7 +11901,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12032,7 +11981,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12048,17 +11997,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12163,7 +12107,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12213,21 +12157,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12237,7 +12181,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12252,7 +12196,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12267,12 +12211,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12292,12 +12236,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12307,7 +12251,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12315,7 +12259,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12345,7 +12289,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12359,7 +12309,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12369,7 +12319,12 @@ These identities will soon be not supported anymore.</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12380,27 +12335,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12420,7 +12375,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12430,12 +12385,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12445,12 +12406,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12460,7 +12416,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12470,10 +12426,15 @@ These identities will soon be not supported anymore.</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">削除</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12499,7 +12460,7 @@ These identities will soon be not supported anymore.</source>
         <translation>追加</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">作成</translation>
     </message>
@@ -12509,13 +12470,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12525,7 +12486,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12599,7 +12560,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12609,12 +12570,12 @@ These identities will soon be not supported anymore.</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12633,26 +12594,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">送信</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12670,27 +12643,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">状態:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12711,7 +12689,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12720,26 +12703,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12749,7 +12737,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12777,7 +12765,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12793,7 +12781,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12814,7 +12803,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>終了</translation>
     </message>
@@ -12825,12 +12814,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12855,11 +12844,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>状態</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12870,31 +12860,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>ヘルプ</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12909,7 +12903,12 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12939,7 +12938,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12959,7 +12958,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13004,12 +13003,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13024,7 +13024,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13033,17 +13033,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13079,12 +13079,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13099,32 +13099,32 @@ These identities will soon be not supported anymore.</source>
         <translation>太字</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>斜体</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>下線</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13135,32 +13135,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13230,7 +13230,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13270,7 +13270,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13290,18 +13290,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13312,7 +13312,17 @@ Do you want to save message to draft box?</source>
         <translation>RetroShareリンクを貼り付け</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13332,7 +13342,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13342,21 +13352,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13371,7 +13381,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13381,30 +13391,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13519,13 +13529,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished">詳細</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>ファイルを開く...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13545,7 +13555,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13566,7 +13576,7 @@ Do you want to save message ?</source>
         <translation>さらにファイルを追加</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13596,18 +13606,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13647,13 +13657,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13663,12 +13673,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13746,7 +13756,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13756,7 +13766,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13779,7 +13789,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13787,7 +13797,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13815,7 +13825,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13825,37 +13835,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13895,7 +13905,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13947,7 +13957,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13957,12 +13967,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13972,17 +13982,22 @@ Do you want to save message ?</source>
         <translation>ダウンロード</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13991,14 +14006,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14013,12 +14038,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14040,10 +14065,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">進む</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14122,7 +14143,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14132,24 +14153,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Print</source>
-        <translation type="vanished">印刷</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">表示</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14179,17 +14192,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14220,7 +14233,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>件名</translation>
     </message>
@@ -14230,7 +14243,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>期日</translation>
     </message>
@@ -14240,7 +14253,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14249,6 +14262,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14275,13 +14298,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14356,7 +14379,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14370,7 +14393,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14385,18 +14408,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14431,7 +14464,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14485,7 +14528,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -14495,7 +14538,7 @@ Do you want to save message ?</source>
         <translation>アイテムを削除</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14530,7 +14573,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
@@ -14671,7 +14714,7 @@ Do you want to save message ?</source>
         <translation>ピア ID</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14681,7 +14724,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14695,7 +14738,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14728,18 +14777,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14749,12 +14793,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14787,7 +14831,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14808,7 +14852,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14838,19 +14882,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">検索</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14860,12 +14904,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14875,7 +14919,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14990,7 +15034,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15000,7 +15044,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15107,7 +15151,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15122,7 +15166,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15132,12 +15176,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15375,7 +15419,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15395,12 +15439,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15415,7 +15459,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15426,17 +15470,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15444,7 +15490,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15583,7 +15629,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15628,12 +15679,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15679,21 +15725,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>エラー: ピア詳細を取得できません.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15711,7 +15757,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15780,10 +15826,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">おそらくパスワードが間違っています</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15791,12 +15833,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15822,7 +15864,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>チャット</translation>
     </message>
@@ -15843,7 +15885,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>アイテムを削除</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
@@ -15883,7 +15925,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>メッセージを作成</translation>
     </message>
@@ -15941,7 +15983,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>非表示</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16108,13 +16150,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">フォーム</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16127,10 +16162,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>TextLabel</source>
         <translation>ラベル</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">コメント</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16191,10 +16222,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">コメントを追加</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16274,17 +16301,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16313,7 +16340,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16372,19 +16399,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16420,12 +16447,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>ラベル</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16567,10 +16594,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">&lt;無効&gt;</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16640,12 +16663,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16698,7 +16736,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">新規</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16718,8 +16756,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">コメント</translation>
     </message>
@@ -16744,13 +16782,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">コメント</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16778,16 +16816,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Notes</source>
-        <translation type="vanished">メモ</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16802,12 +16836,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">画像ファイルを開く</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16823,7 +16867,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16833,11 +16887,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit</source>
-        <translation type="vanished">投稿</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>タイトルを追加してください</translation>
     </message>
@@ -16857,12 +16907,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16877,7 +16937,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16888,7 +16948,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16898,7 +16958,7 @@ p, li { white-space: pre-wrap; }
         <translation>タイトル</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>リンク</translation>
     </message>
@@ -16906,12 +16966,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -16945,7 +17005,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16983,7 +17043,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">ラベル</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16999,7 +17069,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -17014,16 +17084,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">ロード中</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17036,18 +17107,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>コメント</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
@@ -17058,12 +17129,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>コメント</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17073,7 +17144,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17083,17 +17154,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">非表示</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17103,7 +17174,7 @@ p, li { white-space: pre-wrap; }
         <translation>新規</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17113,7 +17184,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
@@ -17154,50 +17225,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>ロード中</translation>
     </message>
 </context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">フォーム</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">新規</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">今日</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">昨日</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">今週</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">今月</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">今年</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
-</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17216,7 +17248,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17226,15 +17268,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17244,42 +17286,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17299,7 +17341,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">検索</translation>
     </message>
@@ -17329,17 +17371,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17354,12 +17396,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17369,27 +17416,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17404,7 +17455,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">購読</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17478,6 +17529,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">チャンネルが選択されていません。</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17567,16 +17628,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17684,7 +17745,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17700,7 +17761,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17735,12 +17796,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17784,27 +17845,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17814,12 +17875,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17849,13 +17910,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17867,12 +17928,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17887,7 +17958,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17902,30 +17973,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>Date</source>
-        <translation type="vanished">期日</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">画像ファイルを開く</translation>
     </message>
 </context>
 <context>
@@ -17936,7 +18001,7 @@ and use the import button to load it</source>
         <translation type="unfinished">フォーム</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -17955,7 +18020,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17965,7 +18030,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17992,7 +18057,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18002,7 +18067,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18022,7 +18087,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18138,7 +18203,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18146,37 +18211,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18208,7 +18278,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18216,8 +18286,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18485,12 +18555,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18521,7 +18591,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18555,7 +18625,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18574,6 +18644,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18653,7 +18743,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18663,7 +18753,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18673,7 +18763,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18689,7 +18779,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18756,7 +18846,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18784,7 +18874,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18964,13 +19054,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">名前</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">状態</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19213,6 +19319,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19352,7 +19470,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19519,7 +19637,7 @@ p, li { white-space: pre-wrap; }
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19532,7 +19650,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19705,12 +19823,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19718,12 +19846,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20411,7 +20539,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">名前</translation>
@@ -20532,7 +20660,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
@@ -20552,7 +20680,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20608,7 +20736,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20622,11 +20750,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20640,6 +20763,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20662,12 +20790,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20691,7 +20824,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20712,7 +20847,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>保存された Retoroshare の設定をすべてリセット.</translation>
     </message>
@@ -20773,7 +20908,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Retoroshare の言語を設定.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>ログファイル &apos;%1&quot; が開けません: %2</translation>
     </message>
@@ -20794,7 +20929,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20824,7 +20959,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20842,7 +20977,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20859,12 +20994,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20925,7 +21060,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20940,7 +21075,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21040,23 +21175,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>ダウンロード</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShareリンクをコピー</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21066,7 +21201,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>ダウンロード</translation>
     </message>
@@ -21103,7 +21238,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -21114,17 +21249,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21144,7 +21279,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21152,7 +21287,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21168,22 +21303,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>アイテムを削除</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>場所:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,7 +21335,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>非表示</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21225,8 +21360,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21234,7 +21369,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21265,7 +21400,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -21310,12 +21445,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>状態:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>メッセージを作成</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21335,17 +21470,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21355,7 +21485,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
@@ -21365,7 +21505,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21375,12 +21515,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21439,12 +21579,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>ローカル アドレス</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21465,22 +21605,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21493,21 +21633,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21517,23 +21652,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21543,7 +21701,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21568,37 +21726,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21613,71 +21829,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21687,22 +21839,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21714,12 +21851,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21729,7 +21866,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21744,23 +21881,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21771,17 +21908,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21791,12 +21918,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21806,17 +21928,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21856,7 +21968,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21871,12 +21983,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">受信</translation>
     </message>
@@ -21912,7 +22019,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21967,7 +22099,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21992,7 +22124,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22004,7 +22136,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22027,7 +22159,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>状態</translation>
     </message>
@@ -22087,17 +22219,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22113,18 +22256,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22159,12 +22302,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22187,22 +22330,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22237,7 +22380,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22247,12 +22390,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22332,7 +22475,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22342,12 +22485,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22366,7 +22509,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22386,17 +22529,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22406,7 +22549,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22497,7 +22640,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22505,7 +22648,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>ファイル</translation>
     </message>
@@ -22556,11 +22699,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22570,7 +22718,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>ダウンロード</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22585,7 +22733,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22601,7 +22749,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22626,7 +22774,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22769,12 +22917,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22798,7 +22946,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>ログイン</translation>
     </message>
@@ -23137,7 +23285,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23374,7 +23522,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23410,12 +23558,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23425,18 +23576,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23446,12 +23592,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23459,7 +23650,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23469,7 +23660,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23480,11 +23671,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23512,7 +23704,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23523,7 +23715,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23533,22 +23725,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23633,7 +23830,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23642,7 +23839,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23667,7 +23869,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23732,12 +23939,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23747,7 +23949,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23775,7 +23987,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23803,19 +24015,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>名前</translation>
@@ -24022,7 +24234,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24047,7 +24264,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24068,7 +24285,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24101,7 +24318,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24116,7 +24343,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24243,23 +24470,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24269,7 +24491,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24279,7 +24501,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24294,7 +24516,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24304,7 +24526,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24718,12 +24940,17 @@ p, li { white-space: pre-wrap; }
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">状態:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24763,17 +24990,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24783,12 +25020,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24925,7 +25162,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24940,7 +25177,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25028,7 +25265,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25063,7 +25300,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25093,14 +25330,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">履歴</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>状態</translation>
     </message>
@@ -25121,7 +25362,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>投稿</translation>
     </message>
@@ -25204,16 +25445,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25228,7 +25460,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25248,7 +25480,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25278,29 +25510,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Today</source>
-        <translation type="vanished">今日</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">新規</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">友達</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25363,35 +25583,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">フォーム</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">削除</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">場所:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25436,11 +25663,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25518,7 +25775,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25555,7 +25812,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_ko.ts b/retroshare-gui/src/lang/retroshare_ko.ts
index d3aa306a1..8867098a1 100644
--- a/retroshare-gui/src/lang/retroshare_ko.ts
+++ b/retroshare-gui/src/lang/retroshare_ko.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">설명 추가</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>레트로 쉐어: 고급 검색</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>검색 문구</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>검색 문구 더 추가합니다.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>검색 문구를 초기화합니다.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>검색을 취소합니다.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>검색</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">앨범 만들기</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">앨범 이름:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">분류:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">동물</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">가족</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">친구</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">화훼</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">휴일</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">수평 사진</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">반려동물</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">수직 사진</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">여행</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">작업</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">임의</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">자막설명:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">장소:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">사진가:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">설명:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">공유 옵션</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">정책:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">화질:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">설명:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">식별:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">공용</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">제한</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">그림 크기 조절(&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">그림 크기 조절(&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">원본 그림 보내기</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">설명을 추가할 수 없습니다</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">인증한 설명</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">어떤 설명이든 추가할 수 있음</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">신원 정보와 함께 게시</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; 그림을 추가하려면 끌어다놓으십시오. 하단 세부 정보를 편집하려면 그림을 누르십시오.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">뒤로</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">사진 추가</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">앨범 게시</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">제목 없는 앨범</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">이 앨범의 설명을 적으세요...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">어디서 찍었을까요?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">앨범 미리 보기 그림 불러오기</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>앨범</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">앨범 미리 보기 그림</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">요약</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,30 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>자막 설명</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">장소:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">일시</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">설명:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">공유 옵션</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">설명</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">게시 신원</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -755,7 +545,7 @@ p, li { white-space: pre-wrap; }
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -781,10 +571,23 @@ p, li { white-space: pre-wrap; }
         <translation>사진</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%pKb</translation>
     </message>
@@ -821,17 +624,13 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">아바타 추가</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>아바타 사진 설정</translation>
     </message>
@@ -850,10 +649,6 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">아바타 불러오기</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -922,22 +717,10 @@ p, li { white-space: pre-wrap; }
         <translation>초기화</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">수신율</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">송신율</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>항상 위로</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">스타일</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -953,23 +736,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% 투명도</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">저장</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">취소</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>시초:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">설정 숨기기</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1042,7 +813,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">답글 달기</translation>
     </message>
@@ -1072,12 +843,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1085,7 +856,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1105,7 +876,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1143,7 +914,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,7 +934,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1193,7 +964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1203,7 +974,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
@@ -1211,12 +982,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1236,18 +1007,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">확장</translation>
     </message>
@@ -1262,12 +1033,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">항목 제거</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1436,17 +1207,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
@@ -1456,7 +1227,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1464,7 +1245,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1487,7 +1268,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,18 +1293,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">확장</translation>
     </message>
@@ -1538,7 +1319,7 @@ into the image, so as to
         <translation type="unfinished">항목 제거</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -1548,17 +1329,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">답글 달기</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">숨김</translation>
     </message>
@@ -1566,7 +1337,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -1757,7 +1528,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>대화 대기방 보이기</translation>
     </message>
@@ -1790,13 +1561,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1804,13 +1576,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>계수</translation>
     </message>
@@ -1820,29 +1592,7 @@ into the image, so as to
         <translation>주제</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1852,7 +1602,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1909,12 +1659,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1924,27 +1674,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">대화 대기방 만들기</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[설정한 주제가 없습니다]</translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>개인용</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-770"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-557"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>공용</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1954,27 +1719,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1989,47 +1749,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>유형:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
@@ -2044,7 +1804,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">표시</translation>
@@ -2064,7 +1824,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>항목 제거</translation>
     </message>
@@ -2109,7 +1869,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
@@ -2124,15 +1884,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">대화 설정</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">이모티콘 집단 대화 활성화</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2152,7 +1904,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2177,7 +1929,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2186,10 +1938,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">개인 대화</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2211,11 +1959,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">대화 글꼴</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>대화 글꼴 바꾸기</translation>
     </message>
@@ -2225,14 +1969,10 @@ Double click a chat room to enter and chat.</source>
         <translation>대화 글꼴:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>기록</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">스타일</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2247,17 +1987,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">집단 대화</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>개인 대화</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2327,12 +2063,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">검색</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2342,7 +2088,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2439,7 +2195,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>대소문자 구분</translation>
     </message>
@@ -2545,7 +2301,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>대화 보이기</translation>
     </message>
@@ -2581,7 +2337,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>닫기</translation>
     </message>
@@ -2616,12 +2372,12 @@ Double click a chat room to enter and chat.</source>
         <translation>기울임</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2701,11 +2457,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2743,7 +2494,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>입력중 ...</translation>
     </message>
@@ -2765,7 +2516,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>실제 기록을 정말로 삭제하시겠습니까?</translation>
     </message>
@@ -2815,7 +2566,7 @@ after HTML conversion.</source>
         <translation>다른 용무중이며 응답하지 않을 수도 있습니다</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2837,7 +2588,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2852,12 +2603,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2873,12 +2624,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2889,12 +2640,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2914,7 +2665,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2940,7 +2691,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2962,7 +2713,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2988,7 +2739,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>친구</translation>
     </message>
@@ -3048,7 +2799,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3064,7 +2815,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3116,45 +2867,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>오류 : 동료 세부 정보를 가져올 수 없습니다</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3164,7 +2915,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3246,12 +2997,17 @@ Double click on it to add his name on text writer.</source>
         <translation>없음</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3271,7 +3027,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3288,10 +3044,6 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>친구 연결 마법사</translation>
     </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">서명 포함</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
@@ -3302,10 +3054,6 @@ Double click on it to add his name on text writer.</source>
         <source>RetroShare ID</source>
         <translation>레트로 쉐어 ID</translation>
     </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">친구 레트로 쉐어 ID 추가...</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3347,11 +3095,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">이메일</translation>
     </message>
     <message>
-        <source>Subject:</source>
-        <translation type="vanished">제목:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3367,12 +3111,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>이름:</translation>
     </message>
@@ -3382,17 +3126,17 @@ Double click on it to add his name on text writer.</source>
         <translation>지역:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>옵션</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3402,7 +3146,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3427,12 +3171,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3452,32 +3206,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3523,17 +3272,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>서명 불러오기에 실패했습니다</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>레트로 쉐어 초대</translation>
     </message>
@@ -3553,12 +3302,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3566,7 +3315,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3606,7 +3355,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3631,7 +3380,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3641,15 +3390,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">레트로 쉐어 초대</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">다른 이름으로 저장...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3688,7 +3429,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3698,7 +3439,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3723,7 +3464,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3736,7 +3477,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3771,7 +3512,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3781,12 +3522,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3851,7 +3587,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3879,7 +3615,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3889,17 +3625,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3909,12 +3648,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3924,7 +3665,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3949,7 +3691,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4241,7 +3983,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4249,7 +3991,8 @@ p, li { white-space: pre-wrap; }
         <translation>없음</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4259,7 +4002,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4295,12 +4038,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4320,7 +4063,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4340,18 +4083,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4366,15 +4109,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">형식</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">이름:</translation>
     </message>
@@ -4414,19 +4149,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4436,12 +4171,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>추가</translation>
     </message>
@@ -4451,7 +4198,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>검색</translation>
@@ -4504,13 +4251,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">만들기</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4529,7 +4276,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4564,7 +4311,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4574,7 +4321,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4634,10 +4381,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Channel Thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">제목 :</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4723,17 +4466,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4758,7 +4501,12 @@ p, li { white-space: pre-wrap; }
         <translation>제목을 입력해주십시오</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4773,18 +4521,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">숨김</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4818,7 +4560,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4827,10 +4569,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>포럼</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">제목</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4851,8 +4589,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4871,7 +4609,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4901,17 +4639,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">제목</translation>
     </message>
@@ -4964,7 +4702,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">그림 파일 불러오기</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4974,8 +4712,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4984,10 +4722,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">보내기</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5002,7 +4736,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5037,7 +4771,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">만들기</translation>
     </message>
@@ -5047,7 +4781,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5062,7 +4796,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -5083,7 +4817,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5091,17 +4825,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>이름:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>지역:</translation>
     </message>
@@ -5111,12 +4845,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5136,12 +4870,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5151,7 +4880,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5161,17 +4890,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>인증</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5181,7 +4905,7 @@ Do you want to discard this message?</source>
         <translation>서명 포함</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5251,33 +4975,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5367,7 +5091,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6035,7 +5759,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6043,38 +5767,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6082,12 +5806,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6249,7 +5973,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6259,7 +5983,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6319,11 +6043,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6445,7 +6179,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6487,7 +6221,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6523,7 +6257,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished">검색</translation>
@@ -6539,7 +6273,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6776,7 +6510,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6814,7 +6548,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6825,16 +6559,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">이름</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">상태</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6917,33 +6767,38 @@ at least one peer was not added to a group</source>
         <translation>글꼴을 기본으로 재설정</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6961,7 +6816,17 @@ at least one peer was not added to a group</source>
         <translation>암호</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>모든 분야의 3 문자의 최소 필요합니다</translation>
     </message>
@@ -6971,17 +6836,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>포트</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -7002,38 +6862,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7053,12 +6913,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7068,38 +6928,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7143,13 +7008,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7159,7 +7024,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7194,7 +7059,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7204,12 +7069,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7219,12 +7079,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7450,27 +7305,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>레트로 쉐어에 친구 추가하기</translation>
     </message>
@@ -7480,39 +7321,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7520,49 +7379,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7587,7 +7442,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>레트로 쉐어 초대</translation>
     </message>
@@ -7637,12 +7492,12 @@ p, li { white-space: pre-wrap; }
         <translation>레트로 쉐어 피드백</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>레트로 쉐어 지원</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7766,7 +7621,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7774,7 +7629,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7944,7 +7799,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>제목</translation>
     </message>
@@ -7957,12 +7812,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>설명</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7987,7 +7842,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8002,14 +7857,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">최신 게시글</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
@@ -8020,17 +7875,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">인기도</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="obsolete">표시</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8043,7 +7894,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8179,7 +8030,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8190,22 +8041,22 @@ p, li { white-space: pre-wrap; }
         <translation>채널 만들기</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>자동 다운로드 활성화</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>가입한 채널</translation>
     </message>
@@ -8225,12 +8076,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>자동 다운로드 비활성화</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8265,22 +8116,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8300,17 +8151,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8320,25 +8171,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">양식</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">제목</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">상태</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8376,9 +8212,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>채널에 가입</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">텍스트 레이블</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8392,7 +8238,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -8407,7 +8253,7 @@ p, li { white-space: pre-wrap; }
         <translation>채널 설명</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>불러오는 중</translation>
     </message>
@@ -8422,8 +8268,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">새 채널</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8434,7 +8281,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8455,7 +8302,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8517,18 +8364,18 @@ p, li { white-space: pre-wrap; }
         <translation>숨김</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>새 글</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>답글 달기</translation>
     </message>
@@ -8543,21 +8390,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">불러오는 중</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8582,55 +8425,16 @@ p, li { white-space: pre-wrap; }
         <translation>미디어 재생</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">채널에 게시하기</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">불러오는 중</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">제목</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">제목 검색</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">선택한 채널 없음</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">자동 다운로드 비활성화</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">자동 다운로드 활성화</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">피드</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">설명:</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">채널에 게시하기</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8700,7 +8504,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8736,7 +8540,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">설명</translation>
     </message>
@@ -8751,13 +8555,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">피드</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8772,7 +8576,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8787,7 +8591,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8847,12 +8651,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8927,12 +8741,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8983,17 +8798,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9108,7 +8923,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9121,7 +8936,7 @@ p, li { white-space: pre-wrap; }
         <translation>양식</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9151,7 +8966,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>답글 달기</translation>
@@ -9190,7 +9005,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9214,6 +9029,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9223,7 +9053,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9252,7 +9082,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9283,7 +9113,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9334,7 +9164,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9350,7 +9180,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -9370,8 +9200,9 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">불러오는 중</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9402,13 +9233,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>제목:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9419,7 +9250,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -9439,21 +9270,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">불러오는 중</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>숨김</translation>
     </message>
@@ -9466,63 +9293,66 @@ before you can comment</source>
         <translation>양식</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>포럼 검색</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">최신 게시글</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>제목</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>날짜</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>작성자</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>불러오는 중</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9532,12 +9362,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9577,23 +9402,23 @@ before you can comment</source>
         <translation>작성자 검색</translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>이름 없음</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9636,16 +9461,12 @@ before you can comment</source>
         <translation>레트로 쉐어 링크 복사</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>숨김</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">확장</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9675,8 +9496,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9690,10 +9511,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">없음</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9763,12 +9580,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">편집</translation>
     </message>
@@ -9829,7 +9646,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9849,7 +9666,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9901,7 +9718,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9911,7 +9728,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9926,7 +9743,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9992,12 +9809,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -10028,23 +9845,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">불러오는 중</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10055,12 +9865,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>설명</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10068,7 +9878,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>공용</translation>
     </message>
@@ -10128,7 +9938,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished">설명:</translation>
     </message>
@@ -10151,7 +9961,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10167,12 +9977,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10189,23 +9999,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10221,22 +10031,28 @@ This message is missing. You should receive it later.</source>
         <translation>이름을 입력해주십시오</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10246,12 +10062,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>정보</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10261,7 +10077,7 @@ This message is missing. You should receive it later.</source>
         <translation>최신 게시글</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10336,7 +10152,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>인기도</translation>
     </message>
@@ -10352,27 +10173,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">만들기</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>작성자</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10380,7 +10196,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>불러오는 중</translation>
     </message>
@@ -10440,7 +10256,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10497,12 +10313,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>레트로 쉐어 링크 복사</translation>
     </message>
@@ -10525,7 +10341,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10538,18 +10354,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">불러오는 중</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10559,7 +10371,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10569,7 +10381,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10589,6 +10406,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10600,7 +10425,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10648,17 +10473,13 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">불러오는 중</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11039,7 +10860,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11055,7 +10876,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11074,7 +10895,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11148,7 +10969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">양식</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11158,7 +10979,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11186,7 +11007,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11196,7 +11017,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11206,7 +11027,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11226,13 +11047,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11244,12 +11089,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11264,12 +11109,7 @@ new short format</source>
         <translation type="unfinished">레트로 쉐어 초대</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished">다른 이름으로 저장...</translation>
     </message>
@@ -11534,14 +11374,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>모두</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11551,12 +11391,12 @@ p, li { white-space: pre-wrap; }
         <translation>검색</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11566,7 +11406,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11581,27 +11421,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished">닫기</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11617,29 +11457,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11659,18 +11509,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11680,78 +11532,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>유형:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11762,17 +11614,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11787,24 +11639,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11819,7 +11671,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11829,7 +11686,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11904,7 +11761,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11934,7 +11791,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11949,7 +11806,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11997,7 +11854,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12005,7 +11862,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -12048,7 +11905,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12128,7 +11985,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12144,17 +12001,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12259,7 +12111,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12309,21 +12161,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12333,7 +12185,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12348,7 +12200,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12363,12 +12215,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12388,12 +12240,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12403,7 +12255,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12411,7 +12263,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12441,7 +12293,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12455,7 +12313,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12465,7 +12323,12 @@ These identities will soon be not supported anymore.</source>
         <translation>없음</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12476,27 +12339,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12516,7 +12379,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12526,12 +12389,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12541,12 +12410,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12556,7 +12420,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12566,10 +12430,15 @@ These identities will soon be not supported anymore.</source>
         <translation>형식</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">제거</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12595,7 +12464,7 @@ These identities will soon be not supported anymore.</source>
         <translation>추가</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">만들기</translation>
     </message>
@@ -12605,13 +12474,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12621,7 +12490,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12695,7 +12564,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>복사하기</translation>
     </message>
@@ -12705,12 +12574,12 @@ These identities will soon be not supported anymore.</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12729,26 +12598,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">보내기</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12766,27 +12647,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">상태:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12807,7 +12693,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12816,26 +12707,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12845,7 +12741,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12873,7 +12769,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12889,7 +12785,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>옵션</translation>
     </message>
@@ -12910,7 +12807,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12921,12 +12818,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12955,11 +12852,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>상태</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12970,31 +12868,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>도움말</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13009,7 +12911,12 @@ These identities will soon be not supported anymore.</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13039,7 +12946,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>정말로 레트로 쉐어를 나가시겠습니까?</translation>
     </message>
@@ -13059,7 +12966,7 @@ These identities will soon be not supported anymore.</source>
         <translation>표시</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13104,12 +13011,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13124,7 +13032,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13133,17 +13041,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13179,12 +13087,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13199,32 +13107,32 @@ These identities will soon be not supported anymore.</source>
         <translation>굵게</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>기울임</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>밑줄</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>제목:</translation>
     </message>
@@ -13235,32 +13143,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13330,7 +13238,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13370,7 +13278,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13390,18 +13298,18 @@ These identities will soon be not supported anymore.</source>
         <translation>레트로 쉐어에서 여러분과 친구가 되고 싶어합니다.</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13412,7 +13320,17 @@ Do you want to save message to draft box?</source>
         <translation>레트로 쉐어 링크 붙여넣기</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13432,7 +13350,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13442,21 +13360,21 @@ Do you want to save message to draft box?</source>
         <translation>보낸이</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13471,7 +13389,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13481,30 +13399,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>제목 없이 메시지를 보내시겠습니까?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>알 수 없음</translation>
     </message>
@@ -13619,13 +13537,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13645,7 +13563,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13666,7 +13584,7 @@ Do you want to save message ?</source>
         <translation>추가 파일 추가</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13696,18 +13614,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>닫기</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>어디에서 :</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13747,13 +13665,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13763,12 +13681,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13846,7 +13764,7 @@ Do you want to save message ?</source>
         <translation>기본값</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13856,7 +13774,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13879,7 +13797,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13887,7 +13805,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13915,7 +13833,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13925,37 +13843,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>제목:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>어디에서 :</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>어디로 :</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13995,7 +13913,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14047,7 +13965,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14057,12 +13975,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>제목 없음</translation>
     </message>
@@ -14072,17 +13990,22 @@ Do you want to save message ?</source>
         <translation>다운로드</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14091,14 +14014,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14113,12 +14046,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14140,10 +14073,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">삭제</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14222,7 +14151,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14232,24 +14161,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="vanished">삭제</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">표시</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14279,17 +14200,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14320,7 +14241,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>제목</translation>
     </message>
@@ -14330,7 +14251,7 @@ Do you want to save message ?</source>
         <translation>보낸이</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>날짜</translation>
     </message>
@@ -14340,11 +14261,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">제목별로 정렬하려면 누르십시오</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>제목 검색</translation>
     </message>
@@ -14353,6 +14270,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14379,13 +14306,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14460,7 +14387,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14474,7 +14401,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14489,18 +14416,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14535,7 +14472,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14589,7 +14536,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -14599,7 +14546,7 @@ Do you want to save message ?</source>
         <translation>항목 제거</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14634,7 +14581,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>숨김</translation>
     </message>
@@ -14775,7 +14722,7 @@ Do you want to save message ?</source>
         <translation>동료 ID</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14785,7 +14732,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14799,7 +14746,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14832,18 +14785,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14853,12 +14801,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14891,7 +14839,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14912,7 +14860,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14942,19 +14890,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">검색</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14964,12 +14912,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14979,7 +14927,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15094,7 +15042,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15104,7 +15052,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15211,7 +15159,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15226,7 +15174,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15236,12 +15184,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15470,10 +15418,6 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">피드</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15483,7 +15427,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15503,12 +15447,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15523,7 +15467,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>시험</translation>
     </message>
@@ -15534,17 +15478,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15552,7 +15498,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15691,7 +15637,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15736,12 +15687,7 @@ p, li { white-space: pre-wrap; }
         <translation>서명 포함</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">옵션</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15787,21 +15733,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>Retroshare (뒤에몫) </translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>오류 : 동료 세부 정보를 가져올 수 없습니다</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15819,7 +15765,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15888,10 +15834,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">비밀번호가 잘못된 것 같습니다</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15899,12 +15841,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15930,7 +15872,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>대화</translation>
     </message>
@@ -15951,7 +15893,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>항목 제거</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>이름:</translation>
     </message>
@@ -15991,7 +15933,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>메시지 작성</translation>
     </message>
@@ -16049,7 +15991,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>숨김</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16216,13 +16158,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">양식</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16235,14 +16170,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">답글 달기</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">요약</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16303,10 +16230,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">설명 추가</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16386,17 +16309,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16425,7 +16348,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16484,19 +16407,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16532,12 +16455,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16748,12 +16671,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16806,7 +16744,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16826,8 +16764,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">설명</translation>
     </message>
@@ -16852,13 +16790,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">답글 달기</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16886,12 +16824,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>Retroshare (뒤에몫) </translation>
     </message>
@@ -16906,12 +16844,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">그림 파일 불러오기</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16927,7 +16875,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16937,7 +16895,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16957,12 +16915,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16977,7 +16945,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16988,7 +16956,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16998,7 +16966,7 @@ p, li { white-space: pre-wrap; }
         <translation>제목</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17006,12 +16974,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17045,7 +17013,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17083,7 +17051,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">텍스트 레이블</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17099,7 +17077,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -17114,16 +17092,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">불러오는 중</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17136,18 +17115,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>설명</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
@@ -17158,12 +17137,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>답글 달기</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17173,7 +17152,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17183,17 +17162,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">숨김</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>항목을 읽음으로 설정하고 제거</translation>
     </message>
@@ -17203,7 +17182,7 @@ p, li { white-space: pre-wrap; }
         <translation>새 글</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17213,7 +17192,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -17254,34 +17233,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>불러오는 중</translation>
     </message>
 </context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">양식</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">새 글</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">다음</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">Retroshare (뒤에몫) </translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">이전</translation>
-    </message>
-</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17300,7 +17256,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17310,15 +17276,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17328,42 +17294,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17383,7 +17349,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">검색</translation>
     </message>
@@ -17413,17 +17379,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17438,12 +17404,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17453,27 +17424,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">편집</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17488,7 +17463,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">가입</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17562,6 +17537,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">선택한 채널 없음</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17651,16 +17636,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17768,7 +17753,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17784,7 +17769,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17819,12 +17804,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17868,27 +17853,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17898,12 +17883,12 @@ and use the import button to load it</source>
         <translation type="unfinished">어디에서 :</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17933,13 +17918,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17951,12 +17936,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17971,7 +17966,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17986,34 +17981,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">보낸이</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">날짜</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">그림 파일 불러오기</translation>
     </message>
 </context>
 <context>
@@ -18024,7 +18009,7 @@ and use the import button to load it</source>
         <translation type="unfinished">양식</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18043,7 +18028,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18053,7 +18038,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18080,7 +18065,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18090,7 +18075,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18110,7 +18095,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18226,7 +18211,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18234,37 +18219,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18296,7 +18286,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18304,8 +18294,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18573,12 +18563,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18609,7 +18599,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>예상치 못한 오류가 발생했습니다. &apos;RsInit::InitRetroShare unexpexted return code %1&apos; 을 보고해 주십시오.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18643,7 +18633,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18664,6 +18654,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18743,7 +18753,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18753,7 +18763,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18763,7 +18773,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18779,7 +18789,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18846,7 +18856,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18874,7 +18884,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19054,13 +19064,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">이름</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">상태</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19303,6 +19329,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19442,7 +19480,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19609,7 +19647,7 @@ p, li { white-space: pre-wrap; }
         <translation>양식</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19622,7 +19660,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19795,12 +19833,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19808,12 +19856,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20501,7 +20549,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">이름</translation>
@@ -20622,7 +20670,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -20642,7 +20690,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20698,7 +20746,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20712,11 +20760,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20730,6 +20773,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">보낸이</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20752,12 +20800,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20781,7 +20834,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20802,7 +20857,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>저장한 모든 레트로 쉐어 설정을 초기화합니다.</translation>
     </message>
@@ -20863,7 +20918,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>레트로 쉐어 언어를 설정합니다.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20884,7 +20939,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20914,7 +20969,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20932,7 +20987,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20949,12 +21004,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21015,7 +21070,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21030,7 +21085,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21130,23 +21185,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>다운로드</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>레트로 쉐어 링크 복사</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>레트로 쉐어 링크 보내기</translation>
     </message>
@@ -21156,7 +21211,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>다운로드</translation>
     </message>
@@ -21193,7 +21248,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>폴더</translation>
@@ -21204,17 +21259,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>새 레트로 쉐어 링크 만들기</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21234,7 +21289,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21242,7 +21297,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21258,22 +21313,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>항목 제거</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>지역:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21290,7 +21345,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>숨김</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21315,8 +21370,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21324,7 +21379,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>레트로 쉐어에서 여러분을 친구로 삼고 싶어합니다</translation>
     </message>
@@ -21355,7 +21410,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -21400,12 +21455,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>상태:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>메시지 작성</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21425,17 +21480,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished">알 수 없음</translation>
     </message>
@@ -21445,7 +21495,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation>숨김</translation>
     </message>
@@ -21455,7 +21515,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21465,12 +21525,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21529,12 +21589,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>지역 주소</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21555,22 +21615,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21583,21 +21643,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>이 웹사이트에서의 내 아이피 요청을 레트로 쉐어가 허용합니다:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21607,23 +21662,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21633,7 +21711,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21658,37 +21736,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21703,71 +21839,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21777,22 +21849,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21804,12 +21861,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21819,7 +21876,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21834,23 +21891,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21861,17 +21918,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21881,12 +21928,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21896,17 +21938,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21946,7 +21978,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21961,12 +21993,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22002,7 +22029,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22057,7 +22109,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22082,7 +22134,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22094,7 +22146,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22117,7 +22169,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>상태</translation>
     </message>
@@ -22177,17 +22229,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22203,18 +22266,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22249,12 +22312,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22277,22 +22340,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22327,7 +22390,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22337,12 +22400,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22422,7 +22485,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22432,12 +22495,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22456,7 +22519,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22476,17 +22539,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22496,7 +22559,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22587,7 +22650,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22595,7 +22658,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22646,11 +22709,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22660,7 +22728,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>다운로드</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>레트로 쉐어 링크를 클립보드에 복사</translation>
     </message>
@@ -22675,7 +22743,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>레트로 쉐어 링크 보내기</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22691,7 +22759,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22716,7 +22784,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22859,12 +22927,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22888,7 +22956,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>로그인</translation>
     </message>
@@ -23227,7 +23295,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23464,7 +23532,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23500,12 +23568,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished">알 수 없음</translation>
     </message>
@@ -23515,18 +23586,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23536,12 +23602,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23549,7 +23660,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23559,7 +23670,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23570,11 +23681,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23602,7 +23714,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23613,7 +23725,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23623,22 +23735,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23723,7 +23840,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23732,7 +23849,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23757,7 +23879,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23822,12 +23949,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23837,7 +23959,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23865,7 +23997,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23893,19 +24025,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>이름</translation>
@@ -24112,7 +24244,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24137,7 +24274,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24158,7 +24295,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare (뒤에몫) </translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24191,7 +24328,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24206,7 +24353,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24333,23 +24480,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>경로</translation>
     </message>
@@ -24359,7 +24501,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24369,7 +24511,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24384,7 +24526,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24394,7 +24536,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24808,12 +24950,17 @@ p, li { white-space: pre-wrap; }
         <translation>양식</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">상태:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24853,17 +25000,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24873,12 +25030,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25015,7 +25172,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25030,7 +25187,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25118,7 +25275,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25153,7 +25310,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25183,14 +25340,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">기록</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>상태</translation>
     </message>
@@ -25211,7 +25372,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25294,16 +25455,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25318,7 +25470,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25338,7 +25490,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25368,25 +25520,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="vanished">새 피드</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">친구</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25449,35 +25593,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">양식</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">제거</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">지역:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25522,11 +25673,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">없음</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>알 수 없음</translation>
@@ -25604,7 +25785,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25641,7 +25822,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_nl.ts b/retroshare-gui/src/lang/retroshare_nl.ts
index c59474c60..6d7c25195 100644
--- a/retroshare-gui/src/lang/retroshare_nl.ts
+++ b/retroshare-gui/src/lang/retroshare_nl.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Een opmerking toevoegen</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -128,12 +121,12 @@
         <translation>RetroShare: Geavanceerd Zoeken</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Zoek Criteria</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Voeg een volgend zoek criterium toe</translation>
     </message>
@@ -143,7 +136,7 @@
         <translation>Reset de zoekopdracht</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Annuleer de zoekopdracht</translation>
     </message>
@@ -163,177 +156,6 @@
         <translation>Zoeken</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Maak album</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Album Naam:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Categorie:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Beesten</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Familie</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Vrienden</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Bloemen</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Vakantie</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Landschappen</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Huisdieren</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Portretten</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Reizen</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Werk</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Willekeurig</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Onderschrift:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Waar:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotograaf</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beschrijving</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Deel Opties</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Beleid:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Kwaliteit</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Opmerkingen:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Identiteit:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Publiek</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Beperkt</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Resize Images (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Resize Images (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Stuur de originele plaatjes</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Geen opmerkingen toegestaan</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Toegevoegde opmerkingen</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Opmerkingen toegestaan</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Publiceer met de identiteit</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Sleep &amp;amp; laat los om plaatjes in te voegen. Klik op een plaatje om de gegevens eronder te bewerken.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Terug</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Foto&apos;s toevoegen</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Publiceer Album</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Verwijder Album Titel</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Vertel iets over dit album...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Waar zijn deze genomen?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Laad album miniatuur</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -342,19 +164,11 @@ p, li { white-space: pre-wrap; }⏎
         <source>Album</source>
         <translation>Album</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Album miniatuur</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Overzicht</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -370,34 +184,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>Caption</source>
         <translation>Onderschrift</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Waar:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Wanneer</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beschrijving:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Deel Opties</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Opmerkingen</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Publiceer Identiteit</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Zichtbaarheid</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -766,7 +552,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Waarschuwing: Deze service is experimenteel. Help ons door dit te testen.⏎
@@ -782,14 +568,6 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <source>Circles</source>
         <translation>Cirkels</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">GxsForums</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">GxsKanalen</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -801,10 +579,23 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation>Foto &apos;s</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -841,17 +632,13 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Avatar toevoegen</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Uw Avatar afbeelding instellen</translation>
     </message>
@@ -870,10 +657,6 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Laad Avatar</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -942,22 +725,10 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation>Opnieuw instellen</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Ontvang ranglijst</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Verzend ranglijst</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Altijd op de voorgrond</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stijl</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -973,23 +744,11 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <source>% Opaque</source>
         <translation>Ondoorzichtig</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Opslaan</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Annuleren</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Sinds</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Verberg instellingen</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1062,7 +821,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1092,12 +851,12 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1105,7 +864,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Stemmen van</translation>
     </message>
@@ -1125,7 +884,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,7 +922,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Stemmen van</translation>
     </message>
@@ -1183,7 +942,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1213,7 +972,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Verander boodschap gelezen status</translation>
     </message>
@@ -1223,7 +982,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">Nieuw</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
@@ -1231,12 +990,12 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Ik vind dit leuk!</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1256,18 +1015,18 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Uitbreiden</translation>
     </message>
@@ -1282,12 +1041,12 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">Item verwijderen</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1456,17 +1215,17 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Kanalen</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Tabbladen</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
@@ -1476,11 +1235,17 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Laad berichten op achtergrond (draad)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Downloads</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Elk kanaal in een nieuw tabblad openen</translation>
     </message>
@@ -1488,7 +1253,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1511,7 +1276,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Ik vind dit leuk!</translation>
     </message>
@@ -1536,18 +1301,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Uitbreiden</translation>
     </message>
@@ -1562,7 +1327,7 @@ into the image, so as to
         <translation type="unfinished">Item verwijderen</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
@@ -1572,17 +1337,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1590,7 +1345,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
@@ -1781,7 +1536,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Toon chat Portaal</translation>
     </message>
@@ -1793,22 +1548,6 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">U heeft %1 nieuwe berichten</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">U heeft %1 nieuw bericht</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 nieuwe berichten</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 nieuw bericht</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1830,13 +1569,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Onbekende Lobby</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Verwijder alles</translation>
     </message>
@@ -1844,13 +1584,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Count</translation>
     </message>
@@ -1860,29 +1600,7 @@ into the image, so as to
         <translation>Onderwerp</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1892,7 +1610,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1949,12 +1667,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1964,31 +1682,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Maak een nieuw chat Portaal</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Geen onderwerp ingevoerd]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Gekozen portaal gegevens</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Prive</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Publiek</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1998,42 +1716,25 @@ Double click a chat room to enter and chat.</source>
         <translation>Niet Automatisch Abonneren</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Automatisch Abonneren</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Zoek Chat lobby &apos;s</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Zoek Naam</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Geabonneerd</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Kolommen</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Nee</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2045,47 +1746,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Onderwerp:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Verbindingen:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
@@ -2100,13 +1801,24 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Toon</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation type="unfinished"></translation>
@@ -2120,7 +1832,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Item verwijderen</translation>
     </message>
@@ -2165,7 +1877,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
@@ -2180,19 +1892,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Chat instellingen</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Inschakelen Emoticons Privé Chat</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Inschakelen Emoticons Groep Chat</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Activeer eigen lettertype</translation>
     </message>
@@ -2212,7 +1912,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Activeer &quot;Schuin&quot;</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2237,11 +1937,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished">Ingesloten afbeeldingen laden</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Chat portaal</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Knipper &quot;tab&quot; ikoon</translation>
     </message>
@@ -2250,10 +1946,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Privé Chat</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2275,11 +1967,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Knipper &quot;scherm/tab&quot; ikoon</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Chat Font</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Verander de Chat Font</translation>
     </message>
@@ -2289,14 +1977,10 @@ Double click a chat room to enter and chat.</source>
         <translation>Chat Font:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Geschiedenis</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stijl</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2311,17 +1995,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Groeps chat</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Privé Chat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2385,22 +2065,28 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p align=&quot;justify&quot;&gt; op dit tabblad kunt u instellen hoeveel chatberichten Retroshare blijft opgeslagen op de schijf en hoeveel van de vorige conversatie wordt weergegeven, voor de verschillende chat-systemen. De maximale opslagperiode te ontdoen van oude berichten en voorkomt u dat de chatgeschiedenis uit te vullen met vluchtige chat (bijvoorbeeld chat lobby&apos;s en verre chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Chatlobbies</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Ingeschakeld:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2410,7 +2096,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2457,7 +2153,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Beschrijving</translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2507,11 +2203,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Maximale opslagperiode, in dagen (0 = houden alle):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Standaard zoeken</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Hoofdletter gevoelig</translation>
     </message>
@@ -2617,7 +2309,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Toon chat</translation>
     </message>
@@ -2653,7 +2345,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
@@ -2688,12 +2380,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Schuin</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2773,11 +2465,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2815,7 +2502,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>typt....</translation>
     </message>
@@ -2837,7 +2524,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Wil je echt voorgoed de geschiedenis verwijderen?</translation>
     </message>
@@ -2887,7 +2574,7 @@ after HTML conversion.</source>
         <translation>is bezig en kan mogelijk niet reageren</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Zoek hoofdlettergevoelig</translation>
     </message>
@@ -2909,7 +2596,7 @@ after HTML conversion.</source>
         <translation>Niet stoppen met kleuren na X items gevonden (meer CPU nodig)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Zoek vorige&lt;/b&gt; &lt;br/&gt;&lt;i&gt;Ctrl + Shift + G&lt;/i&gt;</translation>
     </message>
@@ -2924,16 +2611,12 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Vinden&lt;/b&gt; &lt;br/&gt;&lt;i&gt;Ctrl + F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Status)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Tekst instellen lettertype &amp; kleur</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Een bestand toevoegen</translation>
     </message>
@@ -2949,12 +2632,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Markeer deze geselecteerde tekst&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl + M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2965,12 +2648,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation> objecten gevonden.</translation>
     </message>
@@ -2990,7 +2673,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Typ een bericht hier</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3016,7 +2699,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Toon details:</translation>
     </message>
@@ -3038,7 +2721,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Persoonlijke Cirkels</translation>
     </message>
@@ -3064,7 +2747,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Vrienden</translation>
     </message>
@@ -3124,7 +2807,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Vrienden van Vrienden</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Externe Cirkels (Administrator)</translation>
     </message>
@@ -3140,7 +2823,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Cirkels</translation>
     </message>
@@ -3192,45 +2875,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: kan geen verbindings gegevens vinden.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3240,7 +2923,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Versleuteling</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation>Niet verbonden</translation>
     </message>
@@ -3322,12 +3005,17 @@ Double click on it to add his name on text writer.</source>
         <translation>Geen</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3347,7 +3035,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3364,104 +3052,16 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Wizard verbinding maken met een vriend</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Voeg een nieuwe vriend toe</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;U heeft een certificaat bestand gekregen van een vriend</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;Maak een vriend met geselecteerde vrienden van mijn vrienden</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Inclusief handtekeningen</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Kopieer uw certificaat naar het klembord</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Sla uw Certificaat op in een bestand</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Start Email programma</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Certificaat bestanden</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Gebruik opgeslagen certificaat bestanden</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Importeer een vriend certificaat...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">U moet een certificaat bestand maken en aan een vriend sturen. U kunt een reeds eerder gemaakt bestand gebruiken.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Exporteer mijn certificaat...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Sleep en plaats uw vriends certificaat in dit scherm of tik de lokatie van het bestand in onderstaande venster</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Bladeren</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Vrienden van vrienden</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Kies nu met wie je vrienden wilt worden</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Toon me:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Wordt vriend met deze verbindingen</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare ID</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Gebruik RetroShare ID om een vriend toe te voegen die al in je netwerk beschikbaar is.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Voeg je vriend&apos;s RetroShare ID toe</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Plak je vriend&apos;s RetroShare ID in het veld hieronder</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Enter de RetroShare ID van je vriend, zoiets als verbinding@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3503,27 +3103,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Nodig vrienden uit via email</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Vul het email adres van uw  vriend of vrienden in (elke gescheiden door een ;)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Uw vriend&apos;s email adres:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Enter uw vriend&apos;s email adres:</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Onderwerp:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3539,44 +3119,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Gegevens van uw aanvraag</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Verbindings details</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Email:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Knooppunt</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Woonplaats:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Voeg het certificaat handmatig in</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Voeg een vriend toe aan een groep:</translation>
     </message>
@@ -3586,7 +3154,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Verifieer vriend (Teken PGP Sleutel)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3611,16 +3179,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Voeg toe als vriend om mee verbonden te worden</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Om je vriend&apos;s verzoek te accepteren klik de Klaar knop</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Sorry, een error verscheen</translation>
     </message>
@@ -3640,32 +3214,27 @@ Double click on it to add his name on text writer.</source>
         <translation>Gegevens van uw vriend:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Sleutel deugdelijkheid:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Ondertekenaars</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Deze verbinding staat al op je vriend zijn lijst. Toevoegen stelt waarschijnlijk alleen zijn ip adres in.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3711,45 +3280,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Certificaat fout</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Kan geen verbindings details krijgen van de PGP sleutel %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Iedere verbinding die ik niet bevestigd hebt</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Vrienden van vrienden die me al vertrouwen</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Bevestigde verbindingen tonen als geweigerd</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Verbindings naam</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Ook ondertekend door</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Verbindings ID</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare uitnodiging</translation>
     </message>
@@ -3769,12 +3310,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3782,7 +3323,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3822,7 +3363,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>U heeft een aanvraag om vriend te worden</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3847,7 +3388,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3857,47 +3398,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Certificaat laden lukt niet: bestand %1 niet gevonden</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Deze verbinding %1 is niet beschikbaar in je netwerk</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Gebruik nieuw certificaat format (veiliger)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Gebruik oude (backward compatible) certificaat format</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Verwijder handtekeningen</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">RetroShare uitnodiging</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Connect vriend help</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">U kunt deze tekst kopiëren en naar een vriend sturen via mail of een andere manier</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Uw certificaat is op het klembord geplaatst, plak en stuur het naar een vriend via email of op een andere manier</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Sla op als...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3936,11 +3437,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Geen ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Gebruiken als directe bron indien mogelijk</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>IP-Adr:</translation>
     </message>
@@ -3950,7 +3447,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP Adres:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3969,41 +3466,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Alle vrienden aan elke anderen aanbevelen</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Vriend aanbevelingen</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Bericht:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Aanbevolen vrienden</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Aan</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Selecteer minstens één vriend om aan te bevelen.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Selecteer minstens één vriend als ontvanger.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Sleutel toevoegen aan keyring</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Deze sleutel is al in uw keyring</translation>
     </message>
@@ -4016,7 +3485,7 @@ even if you don&apos;t make friends.</source>
         <translation>Schakel dit selectievakje in om de sleutel toe te voegen aan uw sleutelverzameling. Dit kan handig zijn voor het verzenden van verre berichten naar deze verbinding, zelfs als u vrienden maakt.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Certificaat heeft verkeerde versienummer. Vergeet niet dat v0.6 en v0.5 netwerken niet compatibel zijn.</translation>
     </message>
@@ -4051,7 +3520,7 @@ even if you don&apos;t make friends.</source>
         <translation>IP toevoegen aan whitelist</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>Geen IP in dit certificaat</translation>
     </message>
@@ -4061,23 +3530,10 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Toegevoegd met certificaat van %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Certificaat van vriend plakken uit het klempbord</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Certificaat laden lukt niet: kan niet lezen van bestand %1</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4139,7 +3595,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>UDP setup</translation>
     </message>
@@ -4167,7 +3623,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Verbindings assistent</translation>
     </message>
@@ -4177,17 +3633,20 @@ p, li { white-space: pre-wrap; }
         <translation>Niet werkende Peer ID</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Onbekende status</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Achter Symmetric NAT</translation>
     </message>
@@ -4197,12 +3656,14 @@ p, li { white-space: pre-wrap; }
         <translation>Achter NAT &amp; geen DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Herstarten netwerk</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>Achter NAT</translation>
     </message>
@@ -4212,7 +3673,8 @@ p, li { white-space: pre-wrap; }
         <translation>Geen DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>Net status ok!</translation>
     </message>
@@ -4237,7 +3699,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zoek RS Peers</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Lookup heeft DHT nodig</translation>
     </message>
@@ -4529,7 +3991,7 @@ p, li { white-space: pre-wrap; }
         <translation>Probeer opnieuw de volledige certificaat te importeren</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4537,7 +3999,8 @@ p, li { white-space: pre-wrap; }
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>ONCONTROLEERBARE DOORSTURINGEN!</translation>
     </message>
@@ -4547,7 +4010,7 @@ p, li { white-space: pre-wrap; }
         <translation>ONCONTROLEERBARE DOORSTURING &amp; GEEN DHT</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Zoeken</translation>
     </message>
@@ -4583,12 +4046,12 @@ p, li { white-space: pre-wrap; }
         <translation>Cirkel Gegevens</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4608,7 +4071,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>IDs</translation>
     </message>
@@ -4628,18 +4091,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filter</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4654,15 +4117,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Type</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Naam:</translation>
     </message>
@@ -4702,19 +4157,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Kies een naam voor uw Cirkel</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Geen Restrictie Cirkel Geselecteerd</translation>
     </message>
@@ -4724,12 +4179,24 @@ p, li { white-space: pre-wrap; }
         <translation>Geen Cirkel Limitaties Geselecteerd</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
@@ -4739,7 +4206,7 @@ p, li { white-space: pre-wrap; }
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Zoek</translation>
@@ -4754,10 +4221,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Getekend</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Ondertekend door bekende knooppunten</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4774,10 +4237,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP identiteit</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Anoniem ID</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4800,17 +4259,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">Maak</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP geaccocieerd ID</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4829,7 +4284,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maak een groep</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished">Groeps Naam:</translation>
     </message>
@@ -4864,7 +4319,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Nieuw kanaal bericht</translation>
     </message>
@@ -4874,7 +4329,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanaal bericht</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4935,23 +4390,11 @@ p, li { white-space: pre-wrap; }⏎
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Gebruik Slepen en Neerzetten / Voeg Bestanden Toe knop om nieuwe bestanden te indexeren.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Kopieer en plak RetroShare links van je gedeelden.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Voeg bestand toe</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Voeg kanaal miniatuur toe</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Bericht</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Onderwerp</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5037,17 +4480,17 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5066,17 +4509,18 @@ p, li { white-space: pre-wrap; }⏎
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Bestand is reeds toegevoegd en in de hash opgenomen</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Voeg een onderwerp toe</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Laad miniatuur plaatje</translation>
     </message>
@@ -5091,18 +4535,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Massa gegevens genereren</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Wilt u echt %1 berichten genereren?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>U gaat nu bestanden toevoegen die niet gedeeld zijn. Weet u zeker dat u dat wilt?</translation>
     </message>
@@ -5136,7 +4574,7 @@ p, li { white-space: pre-wrap; }⏎
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Post forum bericht</translation>
     </message>
@@ -5145,10 +4583,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Onderwerp</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5169,8 +4603,8 @@ p, li { white-space: pre-wrap; }⏎
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5189,7 +4623,7 @@ p, li { white-space: pre-wrap; }
         <translation>U kunt bestanden toevoegen via Slepen en Neerzetten in dit scherm</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5219,17 +4653,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Geen Forum</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>In antwoord op</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Titel</translation>
     </message>
@@ -5282,7 +4716,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Laad images bestand</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5292,8 +4726,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Massa gegevens genereren</translation>
     </message>
@@ -5302,10 +4736,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Wilt u echt %1 berichten genereren?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Verstuur</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5320,23 +4750,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Maak een nieuw chat portaal</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Een chat portaal is een centraal en anonieme chat groep. Alle deelnemers ontvangen alle berichten. Zodra er een nieuw portaal is opgericht kunt u vrienden uitnodigen via de &quot;Vrienden&quot; knop.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Portaal naam:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Portaal onderwerp</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5371,7 +4785,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Maak</translation>
     </message>
@@ -5381,7 +4795,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>PGP-ondertekende identiteiten vereisen</translation>
     </message>
@@ -5396,11 +4810,7 @@ Do you want to discard this message?</source>
         <translation>Kies de vrienden met wie je een groeps chat wil</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Uitgenodigde vrienden</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -5421,7 +4831,7 @@ Do you want to discard this message?</source>
         <translation>Contacts:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5429,17 +4839,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Publieke informatie</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Woonplaats:</translation>
     </message>
@@ -5449,12 +4859,12 @@ Do you want to discard this message?</source>
         <translation>Locatie ID:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Software Versie:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Online sinds:</translation>
     </message>
@@ -5474,12 +4884,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5489,7 +4894,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Andere informatie</translation>
     </message>
@@ -5499,17 +4904,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Certificaat</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5519,11 +4919,7 @@ Do you want to discard this message?</source>
         <translation>Inclusief handtekeningen</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Sla sleutel op in een bestand</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exporteer identiteit</translation>
     </message>
@@ -5597,33 +4993,33 @@ en daar de importeer functie gebruiken</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP vingerafdruk:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Knooppunt informatie</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP-Id:</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Vriend knooppunten:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5662,14 +5058,6 @@ en daar de importeer functie gebruiken</translation>
         <source>Node</source>
         <translation>Knooppunt</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Maal nieuw knooppunt</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">toon statistieken scherm</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5721,7 +5109,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6389,7 +5777,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Start bestand</translation>
     </message>
@@ -6397,38 +5785,38 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>naar</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>negeer</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>dd.MM.yyyy</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6436,12 +5824,12 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Expression Widget</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Verwijder deze Expression</translation>
     </message>
@@ -6603,7 +5991,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>PLaatje</translation>
     </message>
@@ -6613,7 +6001,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6673,11 +6061,21 @@ en daar de importeer functie gebruiken</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Vrienden directories</translation>
     </message>
@@ -6799,7 +6197,7 @@ en daar de importeer functie gebruiken</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6841,7 +6239,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Toon groepen</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Groep</translation>
     </message>
@@ -6877,7 +6275,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Voeg toe aan groep</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Zoeken</translation>
@@ -6893,7 +6291,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Sorteer per datum</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7104,7 +6502,7 @@ at least one peer was not added to a group</source>
     <message>
         <location line="+5"/>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Naar</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -7130,7 +6528,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Bevestig vriend verzoek</translation>
     </message>
@@ -7147,10 +6545,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Zoeken:</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7172,7 +6566,7 @@ at least one peer was not added to a group</source>
         <translation>Zoek vrienden</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Selecteer alles</translation>
     </message>
@@ -7183,16 +6577,132 @@ at least one peer was not added to a group</source>
         <translation>Selecteer geen</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Naam</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Maak een vriend</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Bewerk berichten status</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Uitzenden</translation>
     </message>
@@ -7275,33 +6785,38 @@ at least one peer was not added to a group</source>
         <translation>Reset lettertype naar standaard</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Sleutelbos</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retroshare groepschat: berichten worden verstuurd naar alle verbonden vrienden.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Netwerk grafiek</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Stel hier uw statusbericht in.</translation>
     </message>
@@ -7319,7 +6834,17 @@ at least one peer was not added to a group</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Alle velden moet minimaal 3 karakters bevatten</translation>
     </message>
@@ -7329,17 +6854,12 @@ at least one peer was not added to a group</source>
         <translation>Wachtwoorden komen niet overeen</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -7360,38 +6880,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7411,12 +6931,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7426,38 +6946,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7501,13 +7026,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7517,7 +7042,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7552,7 +7077,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7562,12 +7087,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7577,12 +7097,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7808,36 +7323,13 @@ and use the import button to load it</source>
         <translation>We gaan starten</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Nodig vrienden uit</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is niets zonder uw vrienden. Klik op de knop om het proces te starten.&lt;/span&gt;&lt;/p&gt;⏎
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email een uitnodiging met uw &amp;quot;ID Certificaat&amp;quot; aan uw vrienden.&lt;/span&gt;&lt;/p&gt;⏎
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Wees zeker dat u een uitnodiging terugkrijgt... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;U kunt alleen verbinding maken met een vriend als u beide elkaar heeft toegevoegd.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Nodig jouw vrienden uit voor RetroShare</translation>
     </message>
@@ -7847,89 +7339,103 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Voeg vrienden toe</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Maak verbinding met vrienden</translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+76"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Geavanceerd: Open een poort in je Firewall</translation>
+    </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Maak verbinding met vrienden</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Geavanceerd: Open een poort in je Firewall</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Meer Help en Ondersteuning</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Open RetroShare Website</translation>
     </message>
@@ -7954,7 +7460,7 @@ p, li { white-space: pre-wrap; }
         <translation>Email terugkoppeling</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare uitnodiging</translation>
     </message>
@@ -8004,12 +7510,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare terugkoppeling</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>RetroShare ondersteuning</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8133,7 +7639,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Toon groeps chat</translation>
     </message>
@@ -8141,7 +7647,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8311,7 +7817,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
@@ -8324,12 +7830,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8354,19 +7860,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Sorteer op naam</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Sorteer op populariteit</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Sorteer op laatste post</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8381,14 +7875,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Het laatste bericht</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
@@ -8399,17 +7893,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Populariteit</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Toon</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8422,7 +7912,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>en</translation>
     </message>
@@ -8558,7 +8048,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanalen</translation>
@@ -8569,22 +8059,22 @@ p, li { white-space: pre-wrap; }
         <translation>Maak een nieuw kanaal</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Activeer automatisch downloaden</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Mijn Kanalen</translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Geabonneerde kanalen</translation>
     </message>
@@ -8604,12 +8094,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Automatisch downloaden uitschakelen</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8644,22 +8134,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Bespelen</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Open map</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -8679,17 +8169,17 @@ p, li { white-space: pre-wrap; }
         <translation>Controleren</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Weet u zeker dat u wilt annuleren en daarna het bestand te verwijderen?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Kan de map niet openen</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Speel bestand</translation>
     </message>
@@ -8699,37 +8189,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Bestand %1 bestaat niet op deze locatie</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulier</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Bestandsnaam</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Grootte</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Titel</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Gepubliceerd</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Status</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Maak een nieuw kanaal</translation>
     </message>
@@ -8767,9 +8230,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Registreer bij dit kanaal</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Tekst label</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8783,7 +8256,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -8798,7 +8271,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanaal beschrijving</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Laden</translation>
     </message>
@@ -8813,8 +8286,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Nieuw kanaal</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8825,7 +8299,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8846,7 +8320,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Bespelen</translation>
     </message>
@@ -8902,28 +8376,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Bestanden</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Waarschuwing! U heeft minder dan %1 uur en %2 minuten voordat dit bestand verwijderd is. Overweeg om het op te slaan.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Opmerking</translation>
     </message>
@@ -8938,21 +8408,17 @@ p, li { white-space: pre-wrap; }
         <translation>Ik vindt dit niet leuk</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8977,87 +8443,16 @@ p, li { white-space: pre-wrap; }
         <translation>Speel media</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Post op dit kanaal</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Zoek kanalen</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Titel</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Zoek Titel</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Bericht</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Zoek bericht</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Bestandsnaam</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Zoek bestandsnaam</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Geen kanaal geselecteerd</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Automatisch downloaden uitschakelen</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Activeer automatisch downloaden</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Toon feeds</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Bestanden weergeven</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Feeds</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Bestanden</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beschrijving:</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Post op dit kanaal</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9127,7 +8522,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9163,7 +8558,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Opmerkingen</translation>
     </message>
@@ -9178,13 +8573,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Feeds</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9199,7 +8594,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9214,7 +8609,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9274,12 +8669,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9354,12 +8759,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Geabonneerd</translation>
     </message>
@@ -9410,17 +8816,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9535,7 +8941,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Opmerkingen container</translation>
     </message>
@@ -9548,7 +8954,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9578,7 +8984,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ververs</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Opmerkingen</translation>
@@ -9617,7 +9023,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Antwoord op een opmerking</translation>
     </message>
@@ -9641,6 +9047,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Stem omlaag</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9650,7 +9071,7 @@ p, li { white-space: pre-wrap; }
         <translation>Geef een opmerking</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9679,26 +9100,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Opmerking&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Getekend door</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9727,7 +9132,7 @@ before you can comment</source>
 voor je een opmerking kan doen</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9769,14 +9174,6 @@ voor je een opmerking kan doen</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Toevoegen van Forum beheerders</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Selecteer Forum beheerders</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9786,7 +9183,7 @@ voor je een opmerking kan doen</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Registreer bij dit forum</translation>
     </message>
@@ -9802,7 +9199,7 @@ voor je een opmerking kan doen</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -9822,8 +9219,9 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9854,13 +9252,13 @@ voor je een opmerking kan doen</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Onderwerp:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Uitschrijven bij dit forum</translation>
     </message>
@@ -9871,7 +9269,7 @@ voor je een opmerking kan doen</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -9891,21 +9289,17 @@ voor je een opmerking kan doen</translation>
         <translation>In antwoord op: </translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Forum Feed</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
@@ -9918,63 +9312,66 @@ voor je een opmerking kan doen</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Start een nieuw draadje in het geselecteerde forum</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Zoek forums</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Het laatste bericht</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished">Nieuw draadje</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Threaded View</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Flat View</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Laden</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9984,12 +9381,7 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Beantwoord bericht</translation>
     </message>
@@ -10013,10 +9405,6 @@ voor je een opmerking kan doen</translation>
         <source>Download all files</source>
         <translation>Download alle bestanden</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Volgende ongelezen</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10033,31 +9421,23 @@ voor je een opmerking kan doen</translation>
         <translation>Zoek Auteur</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Inhoud</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Zoek Inhoud</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Geen naam</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Antwoord</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10100,16 +9480,12 @@ voor je een opmerking kan doen</translation>
         <translation>Kopieer RetroShare Link</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Uitbreiden</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10139,8 +9515,8 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10154,22 +9530,6 @@ voor je een opmerking kan doen</translation>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anoniem</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">Getekend</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">Geen</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Bericht ontbreekt ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10239,12 +9599,12 @@ voor je een opmerking kan doen</translation>
         <translation>Origineel bericht</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">Bewerk</translation>
     </message>
@@ -10305,7 +9665,7 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10325,7 +9685,7 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10377,7 +9737,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10387,7 +9747,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10402,7 +9762,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10468,12 +9828,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forums</translation>
@@ -10504,35 +9864,16 @@ This message is missing. You should receive it later.</source>
         <translation>Andere forums</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Wachten</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Ontvangen</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Ikoon toevoegen</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Sleutel ontvangers kunnen voor een beperkte groep publiceren en kunnen kijken en publiceren op Privé actige Kanalen.</translation>
     </message>
@@ -10541,22 +9882,14 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Deel Publieke Sleutel</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">Controleer welke verbinding je wilt delen met een openbare Privé Sleutel</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Deel sleutel met</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Berichten Distributie</translation>
     </message>
@@ -10564,7 +9897,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Publiek</translation>
     </message>
@@ -10583,14 +9916,6 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nieuw draadje</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Benodigd</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Versleutelde berichten</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10632,7 +9957,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished">Opmerkingen:</translation>
     </message>
@@ -10655,7 +9980,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10671,12 +9996,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10693,23 +10018,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10725,30 +10050,28 @@ This message is missing. You should receive it later.</source>
         <translation>Voeg een naam toe</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Laad groep logo</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Groep wijzigingen verzenden</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Mislukt te bereiden groep metagegevens - Lees</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Zal worden gebruikt voor het verzenden van feedback</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Eigenaar:</translation>
     </message>
@@ -10758,12 +10081,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10773,7 +10096,7 @@ This message is missing. You should receive it later.</source>
         <translation>Het laatste bericht</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10848,7 +10171,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Populariteit</translation>
     </message>
@@ -10864,27 +10192,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Maak</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Auteur</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10892,7 +10215,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Laden</translation>
     </message>
@@ -10952,7 +10275,7 @@ This message is missing. You should receive it later.</source>
         <translation>Bewerk Details</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11009,12 +10332,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopieer RetroShare Link</translation>
     </message>
@@ -11037,7 +10360,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Geen handtekening</translation>
     </message>
@@ -11050,40 +10373,24 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Niet gevonden</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Geen handtekening</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Verificatie</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>onbekende sleutel</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">anoniem</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11093,7 +10400,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11113,6 +10425,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11124,7 +10444,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11172,17 +10492,13 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11323,7 +10639,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+31"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Onbekenden verbinding</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -11563,7 +10879,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11579,7 +10895,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
@@ -11598,7 +10914,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11676,7 +10992,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11686,7 +11002,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11714,7 +11030,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11724,7 +11040,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Kopieer uw certificaat naar het klembord</translation>
     </message>
@@ -11734,7 +11050,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Sla uw Certificaat op in een bestand</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11754,13 +11070,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11772,12 +11112,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11792,12 +11132,7 @@ new short format</source>
         <translation type="unfinished">RetroShare uitnodiging</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished">Sla op als...</translation>
     </message>
@@ -12062,14 +11397,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Reputatie</translation>
     </message>
@@ -12079,12 +11414,12 @@ p, li { white-space: pre-wrap; }
         <translation>Zoek</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>Anoniem Id</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Maak een nieuwe identiteit</translation>
     </message>
@@ -12094,7 +11429,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12109,27 +11444,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished">Sluiten</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12145,29 +11480,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Cirkels</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12187,18 +11532,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Persoonlijke Cirkels</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished">Identiteit aanpassen</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Chat met deze verbinding</translation>
     </message>
@@ -12208,78 +11555,78 @@ p, li { white-space: pre-wrap; }
         <translation>Start een chat met deze verbinding</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>Eigenaar knooppunt-ID:</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Identiteitsnaam:</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Verstuur bericht</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Identiteit ID:</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Knooppuntnaam van de eigenaar:</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12290,17 +11637,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anoniem</translation>
     </message>
@@ -12315,24 +11662,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Deze identiteit is eigendom van u</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12347,7 +11694,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12357,7 +11709,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12432,7 +11784,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12462,7 +11814,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">onbekend</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12477,7 +11829,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished">Bewerk Cirkel</translation>
     </message>
@@ -12525,7 +11877,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12533,7 +11885,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -12576,7 +11928,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Anonieme identiteit</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12656,7 +12008,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12672,17 +12024,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12787,7 +12134,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12837,21 +12184,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Mensen</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12861,7 +12208,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12876,7 +12223,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12891,12 +12238,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12916,12 +12263,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12931,7 +12278,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12939,7 +12286,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Gebruikersnaam</translation>
     </message>
@@ -12969,7 +12316,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudoniem</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12979,12 +12326,19 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Nieuwe identiteit</translation>
     </message>
@@ -12998,7 +12352,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13008,7 +12362,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Identiteit aanpassen</translation>
@@ -13019,27 +12378,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13059,7 +12418,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13069,11 +12428,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Fout bij ophalen sleutel!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>SleutelID is ongeldig</translation>
     </message>
@@ -13088,7 +12443,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Onbekende echte naam</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Maak een nieuwe identiteit</translation>
     </message>
@@ -13098,10 +12453,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Verwijderen</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13127,7 +12487,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Maak</translation>
     </message>
@@ -13137,13 +12497,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13153,7 +12513,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13227,7 +12587,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Kopieer</translation>
     </message>
@@ -13237,12 +12597,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Merk alles</translation>
     </message>
@@ -13261,26 +12621,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Citaat</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Verstuur</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13298,27 +12670,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Poort:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13339,7 +12716,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13348,26 +12730,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Open bestand</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Open map</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Controleren...</translation>
     </message>
@@ -13377,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Controleer bestanden</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13405,7 +12792,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Vriend toevoegen</translation>
     </message>
@@ -13421,7 +12808,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
@@ -13442,7 +12830,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Stoppen</translation>
     </message>
@@ -13453,12 +12841,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Snel start Wizard</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 is een beveiligd gedecentraliseerde communicatie platform</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Niet afgemaakt</translation>
     </message>
@@ -13486,11 +12874,12 @@ Maak meer ruimte vrij en klik Ok.</translation>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Notify</translation>
     </message>
@@ -13501,31 +12890,35 @@ Maak meer ruimte vrij en klik Ok.</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Open berichten</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Grafische bandbreedte</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Applicaties</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Minimalisser</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Maximalisseer</translation>
     </message>
@@ -13540,7 +12933,12 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 nieuw bericht</translation>
     </message>
@@ -13570,7 +12968,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>%1 vrienden verbonden</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Wil je RetroShare stoppen?</translation>
     </message>
@@ -13590,7 +12988,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Toon</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Wees er zeker van dat deze link je niet naar een verdachte website stuurt</translation>
     </message>
@@ -13635,12 +13033,13 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Service toestemming matrix</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13655,7 +13054,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13664,17 +13063,17 @@ Maak meer ruimte vrij en klik Ok.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Opstellen</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Paragraph</translation>
     </message>
@@ -13710,12 +13109,12 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Kop 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Letter grootte</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Verklein letter grootte</translation>
     </message>
@@ -13730,32 +13129,32 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Vet</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Schuin</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Uitlijning</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Voeg een plaatje toe</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Zet lettertype om in code stijl</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Onderlijnd</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Onderwerp:</translation>
     </message>
@@ -13766,32 +13165,32 @@ Maak meer ruimte vrij en klik Ok.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Labels</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Aanbevolen bestanden</translation>
     </message>
@@ -13861,7 +13260,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Voeg een citaat blok toe</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Verstuur naar:</translation>
     </message>
@@ -13901,7 +13300,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hallo,&lt;br&gt;ik wil een goede vriend van mij aanraden; als je mij vertrouwd kun je hem ook vertrouwen. &lt;br&gt;</translation>
     </message>
@@ -13921,18 +13320,18 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>wil vrienden met je zijn op RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hi %1,&lt;br&gt;&lt;br&gt;%2 wil vrienden met je zijn op RetroShare&lt;br&gt;&lt;br&gt;Reageer nu:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Bedankt,&lt;br&gt;Het RetroShare Team</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Bewaar bericht</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Bericht is niet verzonden.⏎
@@ -13944,7 +13343,17 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>PLak RetroShare Link</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Voeg toe aan &quot;Aan&quot;</translation>
     </message>
@@ -13964,7 +13373,7 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Voeg toe als &quot;Aanbevolen&quot;</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Origineel bericht</translation>
     </message>
@@ -13974,21 +13383,21 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Van</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Naar</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Zenden</translation>
     </message>
@@ -14003,7 +13412,7 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Op %1, %2 schreef:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Antw:</translation>
     </message>
@@ -14013,30 +13422,30 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Doorst:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Wil je dit bericht versturen zonder onderwerp?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Voeg minstens één ontvanger toe.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
@@ -14151,13 +13560,13 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation type="unfinished">Gegevens</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Open bestand...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML- bestand (*.htm *.html );;Alle bestanden (*)</translation>
     </message>
@@ -14177,7 +13586,7 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Export PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Bericht is niet verzonden.⏎
@@ -14199,7 +13608,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Voeg extra bestand toe</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14229,18 +13638,18 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Van:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14280,13 +13689,13 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14296,12 +13705,12 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14379,7 +13788,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Standaard</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Een nieuwe tab</translation>
     </message>
@@ -14389,7 +13798,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Een nieuw scherm</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Bewerk Label</translation>
     </message>
@@ -14412,7 +13821,7 @@ Wil je het bericht bewaren?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Ond:</translation>
     </message>
@@ -14420,7 +13829,7 @@ Wil je het bericht bewaren?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Bericht</translation>
     </message>
@@ -14448,7 +13857,7 @@ Wil je het bericht bewaren?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Aanbevolen bestanden</translation>
     </message>
@@ -14458,37 +13867,37 @@ Wil je het bericht bewaren?</translation>
         <translation>Download alle Aanbevolen bestanden</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Onderwerp:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Van:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Aan:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Labels:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Antwoord</translation>
     </message>
@@ -14528,7 +13937,7 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14580,7 +13989,7 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Bevestig %1 als vriend</translation>
     </message>
@@ -14590,12 +13999,12 @@ Wil je het bericht bewaren?</translation>
         <translation>Voeg %1 als vriend toe</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Geen onderwerp</translation>
     </message>
@@ -14605,17 +14014,22 @@ Wil je het bericht bewaren?</translation>
         <translation>Download</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14624,14 +14038,24 @@ Wil je het bericht bewaren?</translation>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Download alles</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Print Document</translation>
     </message>
@@ -14646,12 +14070,12 @@ Wil je het bericht bewaren?</translation>
         <translation>HTML- bestand (*.htm *.html );;Alle bestanden (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation> Afbeeldingen altijd laden voor dit bericht</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Het venster bijlage verbergen</translation>
     </message>
@@ -14673,42 +14097,6 @@ Wil je het bericht bewaren?</translation>
         <source>Compose</source>
         <translation>Opstellen</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Antwoord op geselecteerde bericht</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Antwoord</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Antwoord op alle geselecteerde berichten</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Beantwoord alles</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Stuur geselecteerd bericht door</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Doorsturen</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Verwijder geselecteerde bericht</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Verwijderen</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Print geselecteerd bericht</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14787,7 +14175,7 @@ Wil je het bericht bewaren?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Nieuw bericht</translation>
     </message>
@@ -14797,60 +14185,16 @@ Wil je het bericht bewaren?</translation>
         <translation>Opstellen</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Antwoord op geselecteerde bericht</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Antwoord</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Antwoord op alle geselecteerde berichten</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Beantwoord alles</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Stuur geselecteerd bericht door</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Doorsturen</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Verwijder geselecteerde bericht</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Verwijderen</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Print geselecteerd bericht</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Print</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Toon</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Labels</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Inbox</translation>
@@ -14880,21 +14224,17 @@ Wil je het bericht bewaren?</translation>
         <translation>Asbak</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Totaal inbox:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Mappen</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Snelle blik</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Print...</translation>
@@ -14904,26 +14244,6 @@ Wil je het bericht bewaren?</translation>
         <source>Print Preview</source>
         <translation>Print Voorbeeld</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Alleen knoppen tekst</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Knoppen tekst naast ikoon</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Knoppen met tekst</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Knoppen tekst onder ikoon</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">PLaats Tekst onder ikoon</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14945,7 +14265,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Stuur bericht door</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Onderwerp</translation>
     </message>
@@ -14955,7 +14275,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Van</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -14965,39 +14285,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Inhoud</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Klik om op bijlages te sorteren</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Klik om op &quot;Onderwerp&quot; te sorteren</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Klik om op &quot;Gelezen&quot; te sorteren</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Klik om op &quot;Afzender&quot; te sorteren</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Klik om op &quot;Datum&quot; te sorteren</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Klik om op &quot;Labels&quot; te sorteren</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Klik om op &quot;Sterren&quot; te sorteren</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Stuur geselecteerd bericht door</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Zoek Onderwerp</translation>
     </message>
@@ -15006,6 +14294,11 @@ Wil je het bericht bewaren?</translation>
         <source>Search From</source>
         <translation>Zoek van</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15032,14 +14325,14 @@ Wil je het bericht bewaren?</translation>
         <translation>Zoek Bijlagen</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Starred</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15113,7 +14406,7 @@ Wil je het bericht bewaren?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15127,7 +14420,7 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15142,34 +14435,33 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Concepten</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Geen &quot;Sterren&quot; berichten aanwezig. Sterren geven je bericht een speciale status zodat je de berichten makkelijker kan vinden. Om een bericht een ster te geven klik je op een lichte grijze ster naast een bericht.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Geen systeem berichten beschikbaar</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Naar</translation>
+        <translation>Naar</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Klik om te sorteren op</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15177,22 +14469,6 @@ Wil je het bericht bewaren?</translation>
         <source>Total:</source>
         <translation>Totaal:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Berichten</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Klik om te sorteren op tekening</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Dit bericht heeft een valide handtekening</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Dit bericht heeft een ongeldige handtekening</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15220,7 +14496,17 @@ Wil je het bericht bewaren?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15274,7 +14560,7 @@ Wil je het bericht bewaren?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -15284,7 +14570,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Item verwijderen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished">van</translation>
     </message>
@@ -15319,7 +14605,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Bericht in behandeling</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
@@ -15460,7 +14746,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Verbindings ID</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Verwijder ongebruikte sleutels...</translation>
     </message>
@@ -15470,7 +14756,7 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Schoon sleutelring</translation>
     </message>
@@ -15488,7 +14774,13 @@ Opmerkingen: Je oude sleutelbos zal gebackupped worden.
 Deze operatie kan mislukken als er meerdere Retroshare instanties draaien op dezelfde machine.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Sleutelring info</translation>
@@ -15524,18 +14816,13 @@ Voor de veiligheid is je sleutelbos gebackupped.
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Datainconsistentie in de sleutelbos. Dit is hoogstwaarschijnlijk een bug. Neem contact op met de ontwikkelaars.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15545,25 +14832,18 @@ Voor de veiligheid is je sleutelbos gebackupped.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Netwerk</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -15590,7 +14870,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15611,7 +14891,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Groepen</translation>
     </message>
@@ -15641,19 +14921,19 @@ Reported error:</source>
         <translation type="unfinished">importeer vriendenlijst, inclusief groepen</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15663,12 +14943,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15678,7 +14958,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Groep</translation>
     </message>
@@ -15793,7 +15073,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15803,7 +15083,7 @@ Reported error:</source>
         <translation type="unfinished">Wil je deze vriend verwijderen=</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Klaar!</translation>
@@ -15910,7 +15190,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15925,11 +15205,7 @@ at least one peer was not added to a group</source>
         <translation>Verwijder alles</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Dit is een test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15939,12 +15215,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15999,10 +15275,6 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Veiligheid</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16024,10 +15296,6 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Bericht</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Verbindings poging</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16181,10 +15449,6 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation>Alle Toasters tijdelijk uitschakelen</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Feed</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -16194,7 +15458,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16214,12 +15478,12 @@ at least one peer was not added to a group</source>
         <translation>Foutief wachtwoord!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Ongeregistreerde plugin/executable</translation>
     </message>
@@ -16234,19 +15498,7 @@ at least one peer was not added to a group</source>
         <translation>Controleer uw systeem klok</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Onderzoek van gedeelde bestanden...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Indexeren van bestanden</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Bestands index opslaan...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -16257,17 +15509,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Onbekende titel</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Versleutelde berichten</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16275,7 +15529,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Vriend online</translation>
     </message>
@@ -16327,10 +15581,6 @@ Laag verkeer: 10% standaard verkeerd en TODO: pauseerd alle bestands overdrachte
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Dialoog</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -16421,7 +15671,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16430,10 +15685,6 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Onderteken PGP Sleutel</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16470,19 +15721,14 @@ p, li { white-space: pre-wrap; }
         <translation>Inclusief handtekeningen</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Opties</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use as direct source, when available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gebruiken als directe bron, indien beschikbaar</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -16521,21 +15767,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: kan geen verbindings gegevens vinden.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>De ingevoerde sleutel algoritme wordt niet ondersteund door RetroShare⏎
@@ -16554,7 +15800,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16623,10 +15869,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Misschien is uw wachtwoord fout</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -16634,12 +15876,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16665,7 +15907,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
@@ -16686,7 +15928,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Item verwijderen</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
@@ -16726,7 +15968,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Schrijf een bericht</translation>
     </message>
@@ -16740,10 +15982,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Vriend verbonden</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Verbindings poging</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16782,17 +16020,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished">Onbekend</translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Onbekende Verbinding</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Verstuur bericht</translation>
     </message>
@@ -16959,13 +16193,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulier</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16973,23 +16200,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Foto</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Opmerkingen</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Overzicht</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17050,14 +16265,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Een opmerking toevoegen</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Schrijf een opmerking</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17128,10 +16335,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>Create Album</source>
         <translation>Maak album</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Bekijk Album</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17153,17 +16356,17 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Slide Show</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Mijn Albums</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Geabonneerde Albums</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Gedeelde Albums</translation>
     </message>
@@ -17193,7 +16396,7 @@ voordat je het kunt bewerken!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Album Naam</translation>
     </message>
@@ -17252,19 +16455,19 @@ voordat je het kunt bewerken!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17300,12 +16503,12 @@ voordat je het kunt bewerken!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Toon meer gegevens van deze plugin</translation>
     </message>
@@ -17451,41 +16654,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>Plugin look-up directories</source>
         <translation>Plugin look-up directories</translation>
     </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Geen API nummer gevonden. Lees de plugin ontwerp handleiding.</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Geen SVN nummer gevonden. Lees de plugin ontwerp handleiding.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Laad error.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Er mist een symbool. Verkeerde versie?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Geen plugin object</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Plugin is geladen</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Onbekende status</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Controleer dit voor plugin ontwikkeling. Zij worden niet gecontroleerd voor de index. Echter, gewoonlijk zal het controleren van de index je beschermen tegen verdacht gebruik van de plugins</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -17555,12 +16723,27 @@ malicious behavior of crafted plugins.</source>
         <translation>Zet scherm boven</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -17594,14 +16777,6 @@ malicious behavior of crafted plugins.</source>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Het sluiten van dit venster zal het gesprek beëindigen en de chat-tunnel verwijderen.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Verwijder de tunnel?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -17621,7 +16796,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Nieuw</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Stemmen van</translation>
     </message>
@@ -17641,8 +16816,8 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Opmerkingen</translation>
     </message>
@@ -17667,13 +16842,13 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17701,20 +16876,12 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Ondertekend door:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Notities</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -17729,12 +16896,22 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Laad images bestand</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -17750,7 +16927,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17760,23 +16947,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Bevestig Bericht</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">U verzendt een link. De sleutel tot een succesvolle indiening is interessante inhoud en een beschrijvende titel.</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Bevestig</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Een nieuw bericht verzenden</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Voeg een titel toe</translation>
     </message>
@@ -17796,12 +16967,22 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17816,7 +16997,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17827,7 +17008,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">PLaatje</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17837,7 +17018,7 @@ malicious behavior of crafted plugins.</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Koppeling</translation>
     </message>
@@ -17845,36 +17026,12 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Geposte Links</translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Thema aanmaken</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Mijn Onderwerpen</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Geabonneerde Onderwerpen</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Populaire Onderwerpen</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Andere Onderwerpen</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17908,31 +17065,7 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Geplaatst Onderwerp</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Admins onderwerp toevoegen</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Selcteer Admins onderwerp</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Maak een nieuw onderwerp</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Onderwerp bewerken</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Bijwerken van onderwerp</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17970,7 +17103,17 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Tekst label</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>Abonneren op onderwerp</translation>
     </message>
@@ -17986,7 +17129,7 @@ malicious behavior of crafted plugins.</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -18001,24 +17144,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">Geplaatste beschrijving</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Laden</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">Nieuw geplaatst</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18031,22 +17167,18 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Site</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Opmerkingen</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
@@ -18057,12 +17189,12 @@ malicious behavior of crafted plugins.</source>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Opmerking</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18072,7 +17204,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18082,21 +17214,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Stemmen van</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Wegstemmen</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Markeer als gelezen en verplaats item</translation>
     </message>
@@ -18106,7 +17234,7 @@ malicious behavior of crafted plugins.</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18116,7 +17244,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
@@ -18157,73 +17285,10 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Laden</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Door</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulier</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Hot</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nieuw</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Boven</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Vandaag</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Gisteren</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Deze Week</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Deze Maand</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Dit Jaar</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Een nieuw bericht verzenden</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Volgend</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Maak of kies een teken-identiteit voor het stemmen</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Vorige</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18243,7 +17308,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18253,15 +17328,15 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">onbekend</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18271,42 +17346,42 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18326,7 +17401,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Hot</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18356,17 +17431,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18381,12 +17456,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18396,27 +17476,31 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Bewerk</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18431,7 +17515,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Registreren</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18505,6 +17589,16 @@ malicious behavior of crafted plugins.</source>
         <source>No Channel Selected</source>
         <translation type="unfinished">Geen kanaal geselecteerd</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -18513,10 +17607,6 @@ malicious behavior of crafted plugins.</source>
         <source>Tabs</source>
         <translation>Tabblad</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Elk onderwerp openen in een nieuw tabblad</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -18530,10 +17620,6 @@ malicious behavior of crafted plugins.</source>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Gepost</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -18602,16 +17688,16 @@ malicious behavior of crafted plugins.</source>
         <translation>Profiel Beheerder</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -18723,7 +17809,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Bewerk berichten status</translation>
@@ -18739,7 +17825,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Profiel Beheerder</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Publieke informatie</translation>
     </message>
@@ -18774,12 +17860,12 @@ en daar de importeer functie gebruiken</translation>
         <translation>Online sinds:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Andere informatie</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Mijn adres</translation>
     </message>
@@ -18823,51 +17909,27 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Bericht van:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Account 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Account 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Account 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Voeg aan Pulse toe</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">filter</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">URL toevoeger</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Toon als</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18877,12 +17939,12 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished">Van:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18912,13 +17974,13 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18930,12 +17992,22 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18944,17 +18016,13 @@ en daar de importeer functie gebruiken</translation>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Post Pulse to Wire</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18969,34 +18037,24 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Van</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Datum</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Laad images bestand</translation>
     </message>
 </context>
 <context>
@@ -19007,7 +18065,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished">Formulier</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19026,7 +18084,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19036,7 +18094,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19063,7 +18121,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19073,7 +18131,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19093,7 +18151,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19209,7 +18267,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19217,37 +18275,42 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19279,7 +18342,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19287,8 +18350,8 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Bevestiging</translation>
     </message>
@@ -19559,12 +18622,12 @@ Karakters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; worden vervangen
         <translation>Verbindings details</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Bestands aanvraag gestopt</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Deze versie van RetroShare maakt gebruik van OpenPGP-SDK. Als bijeffect gebruikt het niet de gedeelde PGP sleutelring maar heeft zijn eigen sleutelring die gebruikt wordt door alle RetroShare gevallen.&lt;br&gt;&lt;br&gt;</translation>
     </message>
@@ -19595,7 +18658,7 @@ Karakters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; worden vervangen
         <translation>Een onverwachte error verscheen. Stuur een report  &apos;RsInit::InitRetroShare onverwachte return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19629,7 +18692,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Meerdere gevallen</translation>
@@ -19652,6 +18715,26 @@ Lock file:⏎
 Lock file:⏎
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -19732,7 +18815,7 @@ De error is: %2</translation>
         <translation>Gegevens doorsturen</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19742,7 +18825,7 @@ De error is: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19752,7 +18835,7 @@ De error is: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19768,7 +18851,7 @@ De error is: %2</translation>
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19835,7 +18918,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19863,7 +18946,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20043,13 +19126,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Naam</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Knooppunt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20292,6 +19391,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -20454,7 +19565,7 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Netwerk breed</translation>
     </message>
@@ -20634,7 +19745,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Het laden van ingesloten afbeeldingen is geblokkeerd.</translation>
     </message>
@@ -20647,7 +19758,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20820,12 +19931,22 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20833,12 +19954,12 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21530,7 +20651,7 @@ Als u denkt dat het is juist dat, de bijbehorende regel uit het bestand verwijde
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Naam</translation>
@@ -21651,7 +20772,7 @@ Als u denkt dat het is juist dat, de bijbehorende regel uit het bestand verwijde
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
@@ -21671,7 +20792,7 @@ Als u denkt dat het is juist dat, de bijbehorende regel uit het bestand verwijde
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21727,7 +20848,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21741,11 +20862,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Bericht ontbreekt ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -21759,6 +20875,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Van</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">Naar</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -21781,13 +20902,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Klik om op &quot;Gelezen&quot; te sorteren</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Klik om op &quot;Afzender&quot; te sorteren</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21810,7 +20936,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21831,7 +20959,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Resets ALLE opgslagen RetroShare instellingen</translation>
     </message>
@@ -21892,7 +21020,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Stel RetroShare&apos;s taal in.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Het is niet mogelijk om het log bestand &apos;%1&apos;: %2 te openen</translation>
     </message>
@@ -21913,7 +21041,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Kan geen gegevensmap maken: %1</translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21943,7 +21071,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21961,7 +21089,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21978,12 +21106,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Plaats een sleutelwoord hier (minstens 3 karakters)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Start zoeken</translation>
     </message>
@@ -22045,7 +21173,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Leeg</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Sleutelwoorden</translation>
     </message>
@@ -22060,7 +21188,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Zoek ID</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Bestandsnaam</translation>
     </message>
@@ -22160,23 +21288,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Download geselecteerd</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Bestandsnaam</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopieer RetroShare Link</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Stuur RetroShare link</translation>
     </message>
@@ -22186,7 +21314,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Download</translation>
     </message>
@@ -22223,7 +21351,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Verwijder alles</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Map</translation>
@@ -22234,17 +21362,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nieuwe RetroShare link(s)</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Open map</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Collectie maken...</translation>
     </message>
@@ -22264,7 +21392,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Download van collectief bestand...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Collectie</translation>
     </message>
@@ -22272,7 +21400,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Verbindings details</translation>
     </message>
@@ -22288,22 +21416,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Item verwijderen</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Verbindings ID:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Woonplaats:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22320,7 +21448,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22345,8 +21473,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22354,7 +21482,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>wil vrienden zijn met je op RetroShare</translation>
     </message>
@@ -22385,7 +21513,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -22430,12 +21558,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Schrijf een bericht</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Verbindings poging</translation>
     </message>
@@ -22455,17 +21583,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Onbekende (uitgaande) verbindings poging</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Onbekend veiligheids probleem</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished">Onbekend</translation>
     </message>
@@ -22475,11 +21608,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Onbekenden verbinding</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
@@ -22489,7 +21618,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Wil je deze vriend verwijderen=</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Certificaat heeft verkeerde handtekening! Deze verbinding is niet wie hij beweert te zijn.</translation>
     </message>
@@ -22499,12 +21628,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ontbrekende/Beschadigd certificaat. Niet een echte Retroshare gebruiker.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>Certificaat heeft een interne fout veroorzaakt.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22563,12 +21692,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Lokaal adres</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22589,22 +21718,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Poort:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Lokaal Netwerk</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Extern ip adres vinder</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Bekende / Eerdere IP&apos;s:</translation>
     </message>
@@ -22620,21 +21749,16 @@ kun je makkelijker verbonden worden met je vrienden. Het helpt⏎
 je ook als ja achter een Firewall of VPN zit.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Sta RetroShare toe om mijn ip-adres te vragen aan de volgende websites:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Aanvaardbare poorten variëren van 10 tot 65535. Normaal zijn poorten onder 1024 gereserveerd door uw systeem.</translation>
     </message>
@@ -22644,23 +21768,46 @@ je ook als ja achter een Firewall of VPN zit.</translation>
         <translation>Aanvaardbare poorten variëren van 10 tot 65535. Normaal zijn poorten onder 1024 gereserveerd door uw systeem.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>UI adres</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Discovery ingeschakeld (aanbevolen)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Ontdekking uit</translation>
     </message>
@@ -22670,7 +21817,7 @@ je ook als ja achter een Firewall of VPN zit.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22695,37 +21842,95 @@ je ook als ja achter een Firewall of VPN zit.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>Proxy lijkt te werken.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22740,71 +21945,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">onbekend</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22814,22 +21955,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22841,12 +21967,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22856,7 +21982,7 @@ Also check your ports!</source>
         <translation>Leeg</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22871,23 +21997,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22898,17 +22024,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22918,12 +22034,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22933,17 +22044,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22983,7 +22084,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
@@ -22998,12 +22099,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stop</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">Binnenkomend</translation>
     </message>
@@ -23039,7 +22135,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23094,7 +22215,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Totaal:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23119,7 +22240,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23131,7 +22252,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23154,7 +22275,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -23214,17 +22335,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23240,18 +22372,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23286,12 +22418,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23314,22 +22446,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23364,7 +22496,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23374,12 +22506,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23459,7 +22591,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Controleer welke verbinding je wilt delen met een openbare Privé Sleutel</translation>
     </message>
@@ -23469,12 +22601,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Delen voor vriend</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Deel</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>U kunt uw vrienden laten weten over uw kanaal door met hen te delen. 
@@ -23494,7 +22626,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Gedeelde mappen manager</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23514,17 +22646,17 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation type="unfinished">Zichtbaarheid</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Voeg een gedeelde directory toe</translation>
     </message>
@@ -23534,7 +22666,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Toepassen en sluiten</translation>
     </message>
@@ -23625,7 +22757,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>directory niet gevonden of directory naam niet geaccepteerd</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Dit is een lijst van gedeelde mappen. U kunt toevoegen en verwijderen van mappen met behulp van de knoppen aan de onderkant. Wanneer u een nieuwe map, aanvankelijk alle bestanden in die map worden gedeeld. U kunt delen vlaggen voor elke gedeelde map afzonderlijk instellen.</translation>
     </message>
@@ -23633,7 +22765,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Bestanden</translation>
     </message>
@@ -23684,11 +22816,16 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>controleer bestanden</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Download geselecteerd</translation>
     </message>
@@ -23698,7 +22835,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Kopieer Retroshare link naar het klembord</translation>
     </message>
@@ -23713,7 +22850,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Stuur RetroShare links</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23729,7 +22866,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Aanbeveling(en)</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Collectie maken...</translation>
     </message>
@@ -23754,7 +22891,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Download van collectief bestand...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23897,12 +23034,12 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Laad configuratie</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Maak interface</translation>
     </message>
@@ -23926,7 +23063,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Onthoudt wachtwoord</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Log In</translation>
     </message>
@@ -24267,7 +23404,7 @@ This choice can be reverted in settings.</source>
         <translation>Berichten status</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Bericht:</translation>
     </message>
@@ -24512,7 +23649,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Verwijder alle labels</translation>
     </message>
@@ -24548,12 +23685,15 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished">Onbekend</translation>
     </message>
@@ -24563,18 +23703,13 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24584,12 +23719,57 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Niet verbonden</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24597,7 +23777,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24607,7 +23787,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24618,11 +23798,12 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24650,7 +23831,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Overdrachts opties</translation>
@@ -24661,7 +23842,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Maximum gelijktijdige downloads:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24671,22 +23852,27 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Deel automatisch uw opslag directory (Aanbevolen)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24771,7 +23957,7 @@ p, li { white-space: pre-wrap; }⏎
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24780,7 +23966,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24805,7 +23996,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -24870,12 +24066,7 @@ p, li { white-space: pre-wrap; }
         <translation>Max. tunnel aanvraag. doorgestuurd per seconde:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24885,7 +24076,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Waarschuwing</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24913,7 +24114,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Download klaar</translation>
     </message>
@@ -24937,39 +24138,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Je hebt %1 complete downloads</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Je hebt %1 complete download</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 complete downloads</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 complete download</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Uploads</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Naam</translation>
@@ -25176,7 +24361,12 @@ p, li { white-space: pre-wrap; }
         <translation>Specificeer...</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation>Verplaats in Rij...</translation>
     </message>
@@ -25201,7 +24391,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kies directory</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25222,7 +24412,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -25255,7 +24445,17 @@ p, li { white-space: pre-wrap; }
         <translation>Bestand %1 is niet kompleet. Als het een media bestand is probeer deze te openen.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Waarschuwing</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Verander bestandsnaam</translation>
     </message>
@@ -25270,7 +24470,7 @@ p, li { white-space: pre-wrap; }
         <translation>Vul een nieuwe -en geldige- bestandsnaam in</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
@@ -25397,23 +24597,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Kolommen</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Bestandsoverdrachten</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Pad</translation>
     </message>
@@ -25423,7 +24618,7 @@ p, li { white-space: pre-wrap; }
         <translation>Pad kolom weergeven</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>Kan geen gegevens verwijderen voorvertoningsbestand</translation>
     </message>
@@ -25433,7 +24628,7 @@ p, li { white-space: pre-wrap; }
         <translation>Probeer het opnieuw?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Collectie maken..</translation>
     </message>
@@ -25448,7 +24643,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bekijk collectie..</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation>Collectie</translation>
     </message>
@@ -25458,7 +24653,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Anonieme tunnel 0x</translation>
     </message>
@@ -25587,7 +24782,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-190"/>
         <location line="+19"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Onbekenden verbinding</translation>
     </message>
 </context>
 <context>
@@ -25872,12 +25067,17 @@ p, li { white-space: pre-wrap; }
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25917,17 +25117,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25937,12 +25147,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26079,11 +25289,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki pagina&apos;s</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Nieuwe Groep</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Pagina Naam</translation>
     </message>
@@ -26098,7 +25304,7 @@ p, li { white-space: pre-wrap; }
         <translation>Orig Id</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26186,7 +25392,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Pagina Bewerkte Geschiedenis</translation>
     </message>
@@ -26221,7 +25427,7 @@ p, li { white-space: pre-wrap; }
         <translation>PaginaID</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -26251,14 +25457,18 @@ p, li { white-space: pre-wrap; }
         <translation>Labels</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Geschiedenis</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Toon Bewerkte Geschiedenis</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -26279,7 +25489,7 @@ p, li { white-space: pre-wrap; }
         <translation>Omkeren</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Bevestig</translation>
     </message>
@@ -26351,10 +25561,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">TimeRange</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -26366,16 +25572,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Ververs</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26390,7 +25587,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Anderen</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26410,7 +25607,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26440,85 +25637,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Verleden Maand</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Verleden Week</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Vandaag</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nieuw</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">van</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">totdat</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Zoek/Filter</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Netwerk breed</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Beheer Accounts</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Toon:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Uzelf</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Vrienden</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Volgend</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Custom</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Account 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Account 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Account 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">CheckBox</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Post Pulse to Wire</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -26581,35 +25710,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulier</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Verwijderen</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Woonplaats:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -26654,11 +25790,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Volgend</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Onbekend</translation>
@@ -26736,7 +25902,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2d</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26773,7 +25939,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_pl.ts b/retroshare-gui/src/lang/retroshare_pl.ts
index ef7478036..46abcec56 100644
--- a/retroshare-gui/src/lang/retroshare_pl.ts
+++ b/retroshare-gui/src/lang/retroshare_pl.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Dodaj komentarz</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: Wyszukiwanie zaawansowane</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Kryteria wyszukiwania</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Dodaj następne kryterium wyszukiwania.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Resetuj kryteria wyszukiwania.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Anuluj wyszukiwanie.</translation>
     </message>
@@ -164,109 +157,6 @@
         <translation>Szukaj</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Utwórz album</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Nazwa albumu:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Kategoria:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Zwierzęta</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Rodzina</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Przyjaciele</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Kwiaty</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Wakacje</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Zwierzęta</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Podróż</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Praca</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Losowe</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Gdzie:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotograf:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Opis</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Jakość:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Komentarze:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Publiczne</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Komentowanie zabronione</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Komentarze dozwolone</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Jakiekolwiek komentarze dozwolone</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Wstecz</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Dodaj zdjęcia</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Publikuj album</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Powiedz coś o tym albumie...</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -280,10 +170,6 @@
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Podsumowanie</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -299,26 +185,6 @@
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Gdzie:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Kiedy</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Opis</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Komentarze</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Widoczność</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -683,7 +549,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -709,10 +575,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -755,7 +634,7 @@ p, li { white-space: pre-wrap; }
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -842,22 +721,10 @@ p, li { white-space: pre-wrap; }
         <translation>Zresetuj</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Prędkość pobierania</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Prędkość wysyłania</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Zawsze na wierzchu</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Styl</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -873,23 +740,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% nieprzezroczysty</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Zapisz</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Anuluj</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Od:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Ukryj ustawienia</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -962,7 +817,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -992,12 +847,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1005,7 +860,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1025,7 +880,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1063,7 +918,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1083,7 +938,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1113,7 +968,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Przełącz status przeczytanej wiadomości</translation>
     </message>
@@ -1123,7 +978,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nowy</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1131,12 +986,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1156,18 +1011,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Awatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Rozwiń</translation>
     </message>
@@ -1182,12 +1037,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Usuń element</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1356,17 +1211,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Kanały</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
@@ -1376,7 +1231,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Pobierania</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1384,7 +1249,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1407,7 +1272,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1432,18 +1297,18 @@ into the image, so as to
         <translation type="unfinished">Awatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Rozwiń</translation>
     </message>
@@ -1458,7 +1323,7 @@ into the image, so as to
         <translation type="unfinished">Usuń element</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1468,17 +1333,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Ukryj</translation>
     </message>
@@ -1486,7 +1341,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1677,7 +1532,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Pokaż lobby rozmów</translation>
     </message>
@@ -1689,22 +1544,6 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Masz %1 nowych wiadomości</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Masz %1 nową wiadomość</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 nowych wiadomości</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 nowa wiadomość</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1726,13 +1565,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1740,13 +1580,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Liczba</translation>
     </message>
@@ -1756,29 +1596,7 @@ into the image, so as to
         <translation>Temat</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1788,7 +1606,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1845,12 +1663,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1860,31 +1678,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Stwórz lobby rozmów</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Nie podano tematu]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Informacje o zaznaczonym lobby</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Prywatny</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Publiczne</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1894,42 +1712,25 @@ Double click a chat room to enter and chat.</source>
         <translation>Wyłącz autosubskrypcję</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Dodaj autosubskrypcję</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Wyszukaj lobby rozmów</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Subskrybowane</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Kolumny</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Tak</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Nie</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1941,47 +1742,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1996,13 +1797,24 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Pokaż</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation type="unfinished"></translation>
@@ -2016,7 +1828,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Usuń element</translation>
     </message>
@@ -2061,7 +1873,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
@@ -2076,15 +1888,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Ustawienia rozmów</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Włącz emotikony w rozmowach grupowych</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2104,7 +1908,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2129,7 +1933,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2138,10 +1942,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Chat Prywatny</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2163,11 +1963,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Czcionka w rozmowach</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Zmień czcionkę</translation>
     </message>
@@ -2177,14 +1973,10 @@ Double click a chat room to enter and chat.</source>
         <translation>Czcionka w rozmowach:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Historia</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Styl</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2199,17 +1991,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Chat grupowy</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Chat prywatny</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2279,12 +2067,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">Szukaj</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2294,7 +2092,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2391,7 +2199,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Rozróżnianie wielkości liter</translation>
     </message>
@@ -2497,7 +2305,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Pokaż Chat</translation>
     </message>
@@ -2533,7 +2341,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -2568,12 +2376,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Pochylenie</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2653,11 +2461,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2695,7 +2498,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>pisze...</translation>
     </message>
@@ -2717,7 +2520,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Czy naprawdę chcesz fizycznie usunąć historię?</translation>
     </message>
@@ -2767,7 +2570,7 @@ after HTML conversion.</source>
         <translation>jest Zajęty i może nie odpowiedzieć</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2789,7 +2592,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2804,12 +2607,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2825,12 +2628,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2841,12 +2644,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2866,7 +2669,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2892,7 +2695,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Pokazywanie szczegółów:</translation>
     </message>
@@ -2914,7 +2717,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Kręgi Osobiste</translation>
     </message>
@@ -2940,7 +2743,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Przyjaciele</translation>
     </message>
@@ -3000,7 +2803,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3016,7 +2819,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Kręgi</translation>
     </message>
@@ -3068,45 +2871,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3116,7 +2919,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3198,12 +3001,17 @@ Double click on it to add his name on text writer.</source>
         <translation>brak</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3223,7 +3031,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3240,23 +3048,11 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Załącz podpisy</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Wyeksportuj swój certyfikat...</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Przeglądaj</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
@@ -3303,19 +3099,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Zaproś Przyjaciół przez Email</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Wpisz adres email twoich przyjaciół (oddziel każdy średnikiem)</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Temat:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3331,36 +3115,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Email:</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Miejsce:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Dodaj przyjaciela do grupy:</translation>
     </message>
@@ -3370,7 +3150,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Uwierzytelnij znajomego (Podpisz Klucz PGP)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3395,12 +3175,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3420,32 +3210,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3491,17 +3276,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Ładowanie certyfikatu nie powiodło się</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Zaproszenie RetroShare</translation>
     </message>
@@ -3521,12 +3306,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3534,7 +3319,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3574,7 +3359,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3599,7 +3384,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3609,19 +3394,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Usuń podpisy</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Możesz skopiować ten tekst i wysłać go do swojego przyjaciele poprzez email, czy też w inny sposób</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Zapisz jako...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3660,7 +3433,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3670,7 +3443,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3689,21 +3462,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Wiadomość:</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Do</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3716,7 +3481,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3751,7 +3516,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3761,12 +3526,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3831,7 +3591,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3859,7 +3619,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3869,17 +3629,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3889,12 +3652,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3904,7 +3669,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3929,7 +3695,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4221,7 +3987,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4229,7 +3995,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4239,7 +4006,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4275,12 +4042,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4300,7 +4067,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4320,18 +4087,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished">Ksywa</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4346,15 +4113,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Typ</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Nazwa:</translation>
     </message>
@@ -4394,19 +4153,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4416,12 +4175,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
@@ -4431,7 +4202,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Szukaj</translation>
@@ -4484,13 +4255,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">Utwórz</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4509,7 +4280,7 @@ p, li { white-space: pre-wrap; }
         <translation>Utwórz Grupę</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished">Nazwa grupy:</translation>
     </message>
@@ -4544,7 +4315,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4554,7 +4325,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiadomość</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4614,14 +4385,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Channel Thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Wiadomość</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Temat:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4707,17 +4470,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4742,7 +4505,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4757,18 +4525,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4802,7 +4564,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4811,10 +4573,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Temat</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4835,8 +4593,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4855,7 +4613,7 @@ p, li { white-space: pre-wrap; }
         <translation>Możesz dołączyć pliki poprzez &quot;przeciągnij i upuść&quot; w tym oknie</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,17 +4643,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>W Odpowiedzi do</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Tytuł</translation>
     </message>
@@ -4948,7 +4706,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Wczytaj obraz</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4958,8 +4716,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4968,10 +4726,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Wyślij</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4986,7 +4740,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5021,7 +4775,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Utwórz</translation>
     </message>
@@ -5031,7 +4785,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5046,7 +4800,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -5067,7 +4821,7 @@ Do you want to discard this message?</source>
         <translation>Kontakty:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5075,17 +4829,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Informacje Publiczne</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Miejsce:</translation>
     </message>
@@ -5095,12 +4849,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Online od:</translation>
     </message>
@@ -5120,12 +4874,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5135,7 +4884,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Inne Informacje</translation>
     </message>
@@ -5145,17 +4894,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Certyfikat</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5165,11 +4909,7 @@ Do you want to discard this message?</source>
         <translation>Załącz podpisy</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Zapisz Klucz do pliku</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Eksportuj Tożsamość</translation>
     </message>
@@ -5239,33 +4979,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5355,7 +5095,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6023,7 +5763,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6031,38 +5771,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>dd.MM.rrrr</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation> MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation> GB</translation>
     </message>
@@ -6070,12 +5810,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6237,7 +5977,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Obraz</translation>
     </message>
@@ -6247,7 +5987,7 @@ and use the import button to load it</source>
         <translation>Wideo</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6307,11 +6047,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Katalogi Przyjaciół</translation>
     </message>
@@ -6433,7 +6183,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6475,7 +6225,7 @@ and use the import button to load it</source>
         <translation>Pokaż Grupy</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
@@ -6511,7 +6261,7 @@ and use the import button to load it</source>
         <translation>Dodaj do grupy</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished">Szukaj</translation>
@@ -6527,7 +6277,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6764,7 +6514,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6802,7 +6552,7 @@ at least one peer was not added to a group</source>
         <translation>Szukaj Przyjaciół</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished">Zaznacz wszystkie</translation>
     </message>
@@ -6813,16 +6563,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6905,33 +6771,38 @@ at least one peer was not added to a group</source>
         <translation>Zresetuj czcionkę do domyślnej</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6949,7 +6820,17 @@ at least one peer was not added to a group</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6959,17 +6840,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6990,38 +6866,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7041,12 +6917,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7056,38 +6932,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7131,13 +7012,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7147,7 +7028,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7182,7 +7063,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7192,12 +7073,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7207,12 +7083,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7438,27 +7309,13 @@ and use the import button to load it</source>
         <translation>Pierwsze kroki</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Zaproś Przyjaciół</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7468,89 +7325,103 @@ p, li { white-space: pre-wrap; }
         <translation>Dodaj Przyjaciół</translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Zaawansowane: Otwórz Port Firewalla</translation>
+    </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Zaawansowane: Otwórz Port Firewalla</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Dalsza Pomoc i Wsparcie</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Otwórz stronę RS</translation>
     </message>
@@ -7575,7 +7446,7 @@ p, li { white-space: pre-wrap; }
         <translation>Opinia Email</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>Zaproszenie RetroShare</translation>
     </message>
@@ -7625,12 +7496,12 @@ p, li { white-space: pre-wrap; }
         <translation>Opinia o RetroShare</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>Wsparcie RetroShare</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7754,7 +7625,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Pokaż Chat Grupy</translation>
     </message>
@@ -7762,7 +7633,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7932,7 +7803,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Tytuł</translation>
     </message>
@@ -7945,12 +7816,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7975,19 +7846,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Sortuj według Nazwy</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Sortuj według Popularności</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Sortuj według Ostatniego Postu</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8002,14 +7861,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Ostatni Post</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -8020,17 +7879,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularność</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Wyświetl</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8043,7 +7898,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>i</translation>
     </message>
@@ -8179,7 +8034,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanały</translation>
@@ -8190,22 +8045,22 @@ p, li { white-space: pre-wrap; }
         <translation>Stwórz kanał</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Włącz auto-pobieranie</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Moje Kanały</translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Subskrybowane kanały</translation>
     </message>
@@ -8225,12 +8080,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Wyłącz auto-pobieranie</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8265,22 +8120,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Odtwórz</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
@@ -8300,17 +8155,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8320,29 +8175,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formularz</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Rozmiar</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Tytuł</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Stan</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8380,9 +8216,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Zapisz się na kanał</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8396,7 +8242,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -8411,7 +8257,7 @@ p, li { white-space: pre-wrap; }
         <translation>Opis kanału</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Wczytywanie</translation>
     </message>
@@ -8426,8 +8272,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Nowy kanał</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8438,7 +8285,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8459,7 +8306,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Odtwórz</translation>
     </message>
@@ -8515,28 +8362,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Pliki</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Uwaga! Masz mniej niż %1 godzin i %2 minut zanim ten plik zostanie skasowany. Rozważ jego zapisanie.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Skomentuj</translation>
     </message>
@@ -8551,21 +8394,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Wczytywanie</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8590,59 +8429,16 @@ p, li { white-space: pre-wrap; }
         <translation>Odtwórz multimedia</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Napisz post na kanale</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Wczytywanie</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Tytuł</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Szukaj Tytuł</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Wiadomość</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Nie wybrano kanału</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Wyłącz auto-pobieranie</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Włącz auto-pobieranie</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Pliki</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Opis</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Napisz post na kanale</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8712,7 +8508,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8748,7 +8544,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Komentarze</translation>
     </message>
@@ -8763,13 +8559,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8784,7 +8580,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8799,7 +8595,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8859,12 +8655,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8939,12 +8745,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Subskrybowane</translation>
     </message>
@@ -8995,17 +8802,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9120,7 +8927,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9133,7 +8940,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9163,7 +8970,7 @@ p, li { white-space: pre-wrap; }
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Komentarz</translation>
@@ -9202,7 +9009,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Odpowiedz na Komentarz</translation>
     </message>
@@ -9226,6 +9033,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Głosuj przeciw</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9235,7 +9057,7 @@ p, li { white-space: pre-wrap; }
         <translation>Skomentuj</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9264,21 +9086,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Komentarz&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9306,7 +9117,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9357,7 +9168,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Zasubskrybuj Forum</translation>
     </message>
@@ -9373,7 +9184,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -9393,8 +9204,9 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Wczytywanie</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9425,13 +9237,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Temat:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9442,7 +9254,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -9462,21 +9274,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Wczytywanie</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
@@ -9489,63 +9297,66 @@ before you can comment</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Rozpocznij nowy Wątek dla Wybranego Forum</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Przeszukaj fora</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Ostatni Post</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished">Nowy Wątek</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Widok Wątku</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Widok Płaski</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Tytuł</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Wczytywanie</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9555,12 +9366,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Odpowiedz Wiadomością</translation>
     </message>
@@ -9584,10 +9390,6 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Pobierz wszystkie pliki</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Następne nieprzeczytane</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9604,31 +9406,23 @@ before you can comment</source>
         <translation>Szukaj Autora</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Zawartość</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Szukaj Zawartości</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Bez nazwy</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Odpowiedz</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9671,16 +9465,12 @@ before you can comment</source>
         <translation>Skopiuj Link RetroShare</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Rozwiń</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9710,8 +9500,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9725,22 +9515,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anonimowy</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">podpisane</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">brak</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Brakująca Wiadomość ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9810,12 +9584,12 @@ before you can comment</source>
         <translation>Oryginalna Wiadomość</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">Edytuj</translation>
     </message>
@@ -9876,7 +9650,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9896,7 +9670,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9948,7 +9722,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9958,7 +9732,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9973,7 +9747,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10039,12 +9813,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Fora</translation>
@@ -10075,31 +9849,16 @@ This message is missing. You should receive it later.</source>
         <translation>Inne Fora</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Oczekiwanie</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Wczytywanie</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Dodaj Ikonę</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10110,12 +9869,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Dystrybucja Wiadomości</translation>
     </message>
@@ -10123,7 +9882,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Publiczne</translation>
     </message>
@@ -10142,14 +9901,6 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nowy Wątek</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Wymagane</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Zaszyfrowane Wiadomości</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10191,7 +9942,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished">Komentarze:</translation>
     </message>
@@ -10214,7 +9965,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10230,12 +9981,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10252,23 +10003,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10284,22 +10035,28 @@ This message is missing. You should receive it later.</source>
         <translation>Proszę, dodaj Nazwę</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Załaduj Logo Grupy</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10309,12 +10066,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10324,7 +10081,7 @@ This message is missing. You should receive it later.</source>
         <translation>Ostatni Post</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10399,7 +10156,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Popularność</translation>
     </message>
@@ -10415,27 +10177,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Utwórz</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Autor</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10443,7 +10200,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Wczytywanie</translation>
     </message>
@@ -10503,7 +10260,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10560,12 +10317,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Skopiuj Link RetroShare</translation>
     </message>
@@ -10588,7 +10345,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10601,18 +10358,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Wczytywanie</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10622,7 +10375,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10632,7 +10385,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10652,6 +10410,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10663,7 +10429,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10711,17 +10477,13 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Wczytywanie</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11102,7 +10864,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11118,7 +10880,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Autorzy</translation>
     </message>
@@ -11137,7 +10899,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11215,7 +10977,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formularz</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11225,7 +10987,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11253,7 +11015,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11263,7 +11025,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11273,7 +11035,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11293,13 +11055,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11311,12 +11097,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11331,12 +11117,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished">Zapisz jako...</translation>
     </message>
@@ -11601,14 +11382,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Wszyscy</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Reputacja</translation>
     </message>
@@ -11618,12 +11399,12 @@ p, li { white-space: pre-wrap; }
         <translation>Szukaj</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Stwórz nową Tożsamość</translation>
     </message>
@@ -11633,7 +11414,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11648,27 +11429,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished">Zamknij</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11684,29 +11465,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Kręgi</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11726,18 +11517,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Kręgi Osobiste</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11747,78 +11540,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11829,17 +11622,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anonim</translation>
     </message>
@@ -11854,24 +11647,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11886,7 +11679,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11896,7 +11694,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11971,7 +11769,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12001,7 +11799,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">nieznane</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12016,7 +11814,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12064,7 +11862,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12072,7 +11870,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -12115,7 +11913,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12195,7 +11993,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12211,17 +12009,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12326,7 +12119,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12376,21 +12169,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12400,7 +12193,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12415,7 +12208,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12430,12 +12223,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12455,12 +12248,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12470,7 +12263,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12478,7 +12271,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Ksywa</translation>
     </message>
@@ -12508,7 +12301,13 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudonim</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12522,7 +12321,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12532,7 +12331,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12543,27 +12347,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12583,7 +12387,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12593,12 +12397,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12608,12 +12418,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12623,7 +12428,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12633,10 +12438,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Usuń</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12662,7 +12472,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Dodaj</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Utwórz</translation>
     </message>
@@ -12672,13 +12482,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12688,7 +12498,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12762,7 +12572,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Skopiuj</translation>
     </message>
@@ -12772,12 +12582,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Zaznacz wszystkie</translation>
     </message>
@@ -12796,26 +12606,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Cytat</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Wyślij</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12833,27 +12655,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12874,7 +12701,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12883,26 +12715,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Otwórz Plik</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Otwórz folder</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Sprawdzanie...</translation>
     </message>
@@ -12912,7 +12749,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12940,7 +12777,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Dodaj Przyjaciela</translation>
     </message>
@@ -12956,7 +12793,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
@@ -12977,7 +12815,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Zamknij</translation>
     </message>
@@ -12988,12 +12826,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Kreator szybkiego startu</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 bezpieczna, zdecentralizowana platforma komunikacji</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Niedokończone</translation>
     </message>
@@ -13018,11 +12856,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Stan</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Powiadom</translation>
     </message>
@@ -13033,31 +12872,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Aplikacje</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Minimalizuj</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Maksymalizuj</translation>
     </message>
@@ -13072,7 +12915,12 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 nowa wiadomość</translation>
     </message>
@@ -13102,7 +12950,7 @@ These identities will soon be not supported anymore.</source>
         <translation>%1 przyjaciół połączonych</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Czy naprawczę chcesz wyjść z RetroShare ?</translation>
     </message>
@@ -13122,7 +12970,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pokaż</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13167,12 +13015,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13187,7 +13036,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13196,17 +13045,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Paragraf</translation>
     </message>
@@ -13242,12 +13091,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Zwiększ rozmiar czcionki</translation>
     </message>
@@ -13262,32 +13111,32 @@ These identities will soon be not supported anymore.</source>
         <translation>Pogrubienie</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Pochylenie</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Wyrównanie</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Dodaj Obraz</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Podkreślenie</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Temat:</translation>
     </message>
@@ -13298,32 +13147,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Polecane pliki</translation>
     </message>
@@ -13393,7 +13242,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Wyślij do:</translation>
     </message>
@@ -13433,7 +13282,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13453,18 +13302,18 @@ These identities will soon be not supported anymore.</source>
         <translation>chce być twoim przyjacielem na RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Zapisz wiadomość</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Wiadomość nie została wysłana.
@@ -13476,7 +13325,17 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Wklej Link RetroShare</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Dodaj do &quot;Do&quot;</translation>
     </message>
@@ -13496,7 +13355,7 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Dodaj jako Polecane</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Oryginalna Wiadomość</translation>
     </message>
@@ -13506,21 +13365,21 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Od</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Do</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Wysłane</translation>
     </message>
@@ -13535,7 +13394,7 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13545,30 +13404,30 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Fwd:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Czy chcesz wysłać tą wiadomość bez tematu ?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Proszę dodaj przynajmniej jednego odbiorcę.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Nieznane</translation>
     </message>
@@ -13683,13 +13542,13 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation type="unfinished">Szczegóły</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Otwórz Plik...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Pliki HTML (*.htm *.html);;Wszystkie pliki (*)</translation>
     </message>
@@ -13709,7 +13568,7 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Eksport PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Wiadomość nie została wysłana.
@@ -13731,7 +13590,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Dodaj dodatkowy plik</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13761,18 +13620,18 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Od klatki:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13812,13 +13671,13 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13828,12 +13687,12 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13911,7 +13770,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Domyślne</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Nowa karta</translation>
     </message>
@@ -13921,7 +13780,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Nowe okno</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Edytuj Tag</translation>
     </message>
@@ -13944,7 +13803,7 @@ Czy chcesz zapisać wiadomość ?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13952,7 +13811,7 @@ Czy chcesz zapisać wiadomość ?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Wiadomość</translation>
     </message>
@@ -13980,7 +13839,7 @@ Czy chcesz zapisać wiadomość ?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Rekomendowane Pliki</translation>
     </message>
@@ -13990,37 +13849,37 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Pobierz wszystkie Polecane Pliki</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Temat:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Od klatki:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Do klatki:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Tagi:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Odpowiedz</translation>
     </message>
@@ -14060,7 +13919,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14112,7 +13971,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Zatwierdź %1 jako przyjaciela</translation>
     </message>
@@ -14122,12 +13981,12 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Dodaj %1 jako przyjaciela</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Brak tematu</translation>
     </message>
@@ -14137,17 +13996,22 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14156,14 +14020,24 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Pobierz wszystkie</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Drukuj Dokument</translation>
     </message>
@@ -14178,12 +14052,12 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Pliki HTML (*.htm *.html);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14205,34 +14079,6 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Odpowiedz na wybraną wiadomość</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Odpowiedz</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Odpowiedz na wszystkie wybrane wiadomości</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Prześlij dalej wybraną wiadomość</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Usuń wybraną wiadomość</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Usuń</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Drukuj wybraną wiadomość</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14311,7 +14157,7 @@ Czy chcesz zapisać wiadomość ?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Nowa Wiadmość</translation>
     </message>
@@ -14321,52 +14167,16 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Odpowiedz na wybraną wiadomość</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Odpowiedz</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Odpowiedz na wszystkie wybrane wiadomości</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Prześlij dalej wybraną wiadomość</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Usuń wybraną wiadomość</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Usuń</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Drukuj wybraną wiadomość</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Drukuj</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Wyświetl</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Przychodzące</translation>
@@ -14396,21 +14206,17 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Kosz</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Foldery</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Szybki podgląd</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Drukuj...</translation>
@@ -14420,26 +14226,6 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>Print Preview</source>
         <translation>Podgląd Wydruku</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Tylko ikony przycisków</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Tekst obok przycisków ikon</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Przyciski z tekstem</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Tekst przycisków pod ikonami</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Ustaw tekst pod ikoną</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14461,7 +14247,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Tytuł</translation>
     </message>
@@ -14471,7 +14257,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Od</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
@@ -14481,7 +14267,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Zawartość</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14490,6 +14276,11 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14516,17 +14307,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Szukaj Załączników</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+324"/>
         <source>System</source>
         <translation type="unfinished">System</translation>
     </message>
@@ -14596,12 +14377,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Show author in People</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+63"/>
         <source>Empty trash</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14611,7 +14387,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14626,22 +14402,48 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Do</translation>
+        <translation>Do</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="+69"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+256"/>
+        <source>Show in People</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+586"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14649,10 +14451,6 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>Total:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Wiadomości</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14680,7 +14478,17 @@ Czy chcesz zapisać wiadomość ?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14734,7 +14542,7 @@ Czy chcesz zapisać wiadomość ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -14744,7 +14552,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Usuń element</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished">od</translation>
     </message>
@@ -14779,7 +14587,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
@@ -14920,7 +14728,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Usuń nieużywane klucze...</translation>
     </message>
@@ -14930,7 +14738,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14944,7 +14752,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14977,18 +14791,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14998,12 +14807,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -15036,7 +14845,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15057,7 +14866,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Grupy</translation>
     </message>
@@ -15087,19 +14896,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Szukaj</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15109,12 +14918,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15124,7 +14933,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Grupa</translation>
     </message>
@@ -15239,7 +15048,7 @@ Reported error:</source>
         <translation type="unfinished">Zwiń wszystkie</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15249,7 +15058,7 @@ Reported error:</source>
         <translation type="unfinished">Czy chcesz usunąć tego Przyjaciela?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15356,7 +15165,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15371,11 +15180,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">To jest test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15385,12 +15190,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15445,10 +15250,6 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Blogi</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Bezpieczeństwo</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15526,7 +15327,7 @@ at least one peer was not added to a group</source>
     <message>
         <location line="+7"/>
         <source>Private Chat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Prywatny Chat</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -15632,7 +15433,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15652,12 +15453,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15672,7 +15473,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15683,17 +15484,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15701,7 +15504,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15840,7 +15643,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15849,10 +15657,6 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Podpisz klucz PGP</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15889,12 +15693,7 @@ p, li { white-space: pre-wrap; }
         <translation>Załącz podpisy</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Opcje</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15940,21 +15739,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15972,7 +15771,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16041,10 +15840,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Być może hasło jest błędne</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -16052,12 +15847,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16083,7 +15878,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
@@ -16104,7 +15899,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Usuń element</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
@@ -16144,7 +15939,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Napisz wiadomość</translation>
     </message>
@@ -16202,7 +15997,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16369,13 +16164,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formularz</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16383,23 +16171,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Zdjęcie</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Komentarz</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Podsumowanie</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16460,14 +16236,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Dodaj Komentarz</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Napisz komentarz...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16534,10 +16302,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Utwórz Album</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Pokaż Album</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16559,17 +16323,17 @@ p, li { white-space: pre-wrap; }
         <translation>Pokaz Slajdów</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Moje Albumy</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Subskrybowane Albumy</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16598,7 +16362,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16657,19 +16421,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16705,12 +16469,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Pokaż więcej szczegółów o tej wtyczce</translation>
     </message>
@@ -16925,12 +16689,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16983,7 +16762,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nowy</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17003,8 +16782,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Komentarze</translation>
     </message>
@@ -17029,13 +16808,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17063,16 +16842,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Notes</source>
-        <translation type="vanished">Notki</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -17087,12 +16862,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Wczytaj obraz</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -17108,7 +16893,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17118,7 +16913,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17138,12 +16933,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17158,7 +16963,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17169,7 +16974,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Obraz</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17179,7 +16984,7 @@ p, li { white-space: pre-wrap; }
         <translation>Tytuł</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17187,28 +16992,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>My Topics</source>
-        <translation type="vanished">Moje Tematy</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Subskrybowane Tematy</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Popularne Tematy</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Inne Tematy</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17242,7 +17031,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17280,7 +17069,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17296,7 +17095,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -17311,16 +17110,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Wczytywanie</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17333,22 +17133,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Strona</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation type="unfinished">Komentarze</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17359,12 +17155,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Skomentuj</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17374,7 +17170,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17384,21 +17180,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17408,7 +17200,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nowy</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17418,7 +17210,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17459,42 +17251,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Wczytywanie</translation>
     </message>
 </context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formularz</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nowy</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Dzisiaj</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Wczoraj</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Następne</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Poprzednie</translation>
-    </message>
-</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17513,7 +17274,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17523,15 +17294,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">nieznane</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17541,42 +17312,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17596,7 +17367,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">Szukaj</translation>
     </message>
@@ -17626,17 +17397,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17651,12 +17422,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17666,27 +17442,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Edytuj</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17701,7 +17481,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Zapisz się</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17775,6 +17555,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Nie wybrano kanału</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17864,16 +17654,16 @@ p, li { white-space: pre-wrap; }
         <translation>Menedżer profili</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17981,7 +17771,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17997,7 +17787,7 @@ and use the import button to load it</source>
         <translation>Menedżer profili</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Informacje Publiczne</translation>
     </message>
@@ -18032,12 +17822,12 @@ and use the import button to load it</source>
         <translation>Online od:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Inne Informacje</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Mój Adres</translation>
     </message>
@@ -18081,43 +17871,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Account 1</source>
-        <translation type="vanished">Konto 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Konto 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Konto 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">filtr</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Wyświetl Jako</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18127,12 +17901,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Od klatki:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18162,13 +17936,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18180,12 +17954,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18200,7 +17984,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18215,34 +17999,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Od</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Data</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Wczytaj obraz</translation>
     </message>
 </context>
 <context>
@@ -18253,7 +18027,7 @@ and use the import button to load it</source>
         <translation type="unfinished">Formularz</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18272,7 +18046,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18282,7 +18056,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18309,7 +18083,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18319,7 +18093,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18339,7 +18113,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18455,7 +18229,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18463,37 +18237,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18525,7 +18304,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18533,8 +18312,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18803,12 +18582,12 @@ Symbole &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; zostaną zastąpio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18839,7 +18618,7 @@ Symbole &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; zostaną zastąpio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18873,7 +18652,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18892,6 +18671,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18971,7 +18770,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18981,7 +18780,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18991,7 +18790,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19007,7 +18806,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19074,7 +18873,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19102,7 +18901,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19283,12 +19082,28 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Status</source>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19531,6 +19346,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19675,7 +19502,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19842,7 +19669,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19855,7 +19682,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20028,12 +19855,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20041,12 +19878,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20736,7 +20573,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20857,7 +20694,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20877,7 +20714,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20933,7 +20770,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20947,11 +20784,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Brakująca Wiadomość ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20965,6 +20797,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Od</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">Do</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20987,12 +20824,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -21016,7 +20858,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21037,7 +20881,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21098,7 +20942,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21119,7 +20963,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21149,7 +20993,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21167,7 +21011,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21184,12 +21028,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21250,7 +21094,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21265,7 +21109,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21365,23 +21209,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Nazwa pliku</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Pobierz</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Skopiuj link RetroShare</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21391,7 +21235,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Pobierz</translation>
     </message>
@@ -21428,7 +21272,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Folder</translation>
@@ -21439,17 +21283,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Otwórz folder</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21469,7 +21313,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21477,7 +21321,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21493,22 +21337,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Usuń element</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Miejsce:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21525,7 +21369,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21550,8 +21394,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21559,7 +21403,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>chce być przyjacielem z tobą na RetroShare</translation>
     </message>
@@ -21590,7 +21434,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -21635,12 +21479,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Napisz wiadomość</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21660,17 +21504,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished">Nieznane</translation>
     </message>
@@ -21680,7 +21519,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
@@ -21690,7 +21539,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Czy chcesz usunąć tego Przyjaciela?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21700,12 +21549,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21764,12 +21613,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Adres Lokalny</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21790,22 +21639,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21818,21 +21667,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21842,23 +21686,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21868,7 +21735,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21893,37 +21760,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21938,71 +21863,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">nieznane</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22012,22 +21873,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22039,12 +21885,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22054,7 +21900,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22069,23 +21915,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22096,17 +21942,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22116,12 +21952,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22131,17 +21962,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22181,7 +22002,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
@@ -22196,12 +22017,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stop</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">Przychodzące</translation>
     </message>
@@ -22237,7 +22053,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22292,7 +22133,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22317,7 +22158,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22329,7 +22170,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22352,7 +22193,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Stan</translation>
     </message>
@@ -22412,17 +22253,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22438,18 +22290,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22484,12 +22336,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22512,22 +22364,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22562,7 +22414,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22572,12 +22424,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22657,7 +22509,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22667,12 +22519,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Podziel się z przyjacielem</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22691,7 +22543,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22711,17 +22563,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished">Widoczność</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22731,7 +22583,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Zastosuj i zamknij</translation>
     </message>
@@ -22822,7 +22674,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22830,7 +22682,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Pliki</translation>
     </message>
@@ -22881,11 +22733,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22895,7 +22752,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22910,7 +22767,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22926,7 +22783,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22951,7 +22808,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23094,12 +22951,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23123,7 +22980,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23462,7 +23319,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Wiadomość:</translation>
     </message>
@@ -23703,7 +23560,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Usuń wszystkie tagi</translation>
     </message>
@@ -23739,12 +23596,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished">Nieznane</translation>
     </message>
@@ -23754,18 +23614,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23775,12 +23630,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Błąd</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23788,7 +23688,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23798,7 +23698,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23809,11 +23709,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23841,7 +23742,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Opcje transferu</translation>
@@ -23852,7 +23753,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maksymalna ilość jednoczesnych pobierań:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23862,22 +23763,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23962,7 +23868,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23971,7 +23877,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23996,7 +23907,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24061,12 +23977,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24076,7 +23987,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Ostrzeżenie</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24104,7 +24025,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Pobieranie zakończone</translation>
     </message>
@@ -24128,39 +24049,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Masz %1 zakończonych pobierań</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Masz %1 zakończone pobieranie</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 zakończonych pobierań</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 zakończone pobieranie</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Pobierania</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nazwa</translation>
@@ -24367,7 +24272,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24392,7 +24302,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24413,7 +24323,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24446,7 +24356,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Ostrzeżenie</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24461,7 +24381,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Rozwiń wszystkie</translation>
@@ -24588,23 +24508,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Kolumny</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Transfery plików</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Ścieżka</translation>
     </message>
@@ -24614,7 +24529,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24624,7 +24539,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24639,7 +24554,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24649,7 +24564,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25063,12 +24978,17 @@ p, li { white-space: pre-wrap; }
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25108,17 +25028,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25128,12 +25058,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25270,11 +25200,7 @@ p, li { white-space: pre-wrap; }
         <translation>Strony Wiki</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Nowa Grupa</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25289,7 +25215,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25377,7 +25303,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Historia Edycji Strony</translation>
     </message>
@@ -25412,7 +25338,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25442,14 +25368,18 @@ p, li { white-space: pre-wrap; }
         <translation>Tagi</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Historia</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Pokaż Historię Edycji</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -25470,7 +25400,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25553,16 +25483,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Odśwież</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25577,7 +25498,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Inni</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25597,7 +25518,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25627,57 +25548,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Ostatni miesiąc</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Ostatni tydzień</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Dziś</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nowy</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">od</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Zarządzaj Kontami</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Przyjaciele</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Następujące</translation>
     </message>
     <message>
-        <source>Account 1</source>
-        <translation type="vanished">Konto 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Konto 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Konto 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25740,35 +25621,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formularz</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Usuń</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Miejsce:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25813,11 +25701,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Następujące</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Nieznane</translation>
@@ -25895,7 +25813,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25932,7 +25850,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_pt.ts b/retroshare-gui/src/lang/retroshare_pt.ts
index 4835855cf..a760d3920 100644
--- a/retroshare-gui/src/lang/retroshare_pt.ts
+++ b/retroshare-gui/src/lang/retroshare_pt.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,10 +566,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -612,7 +625,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -699,7 +712,7 @@ p, li { white-space: pre-wrap; }
         <translation>Repor</translation>
     </message>
     <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -795,7 +808,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -825,12 +838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,7 +851,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -858,7 +871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -896,7 +909,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -916,7 +929,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -946,7 +959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -956,7 +969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -964,12 +977,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -989,18 +1002,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1015,12 +1028,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1189,17 +1202,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1209,7 +1222,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1217,7 +1240,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1263,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1265,18 +1288,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1291,7 +1314,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1301,17 +1324,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1319,7 +1332,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1510,7 +1523,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1543,13 +1556,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1557,13 +1571,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1573,29 +1587,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1605,7 +1597,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1662,12 +1654,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1677,23 +1669,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-240"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-564"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1703,27 +1714,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1738,47 +1744,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1793,7 +1799,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Mostrar</translation>
@@ -1813,7 +1819,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1858,7 +1864,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1873,7 +1879,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1893,7 +1899,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1918,7 +1924,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1948,7 +1954,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1958,7 +1964,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1982,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2052,12 +2058,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2067,7 +2083,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2164,7 +2190,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Sensível capitalização</translation>
     </message>
@@ -2270,7 +2296,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2306,7 +2332,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2341,12 +2367,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2426,11 +2452,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2468,7 +2489,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2490,7 +2511,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2540,7 +2561,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2562,7 +2583,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2577,12 +2598,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2598,12 +2619,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2614,12 +2635,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2639,7 +2660,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2665,7 +2686,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2687,7 +2708,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2713,7 +2734,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2773,7 +2794,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2789,7 +2810,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2841,45 +2862,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2889,7 +2910,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2971,12 +2992,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2996,7 +3022,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3064,7 +3090,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3080,12 +3106,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -3095,17 +3121,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3115,7 +3141,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3140,12 +3166,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3165,32 +3201,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3236,17 +3267,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3266,12 +3297,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3279,7 +3310,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3319,7 +3350,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3344,7 +3375,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3354,7 +3385,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3393,7 +3424,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3403,7 +3434,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3428,7 +3459,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3441,7 +3472,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3476,7 +3507,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3486,12 +3517,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3556,7 +3582,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3584,7 +3610,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3594,17 +3620,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3614,12 +3643,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3629,7 +3660,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3654,7 +3686,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3946,7 +3978,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3954,7 +3986,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3964,7 +3997,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4000,12 +4033,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4025,7 +4058,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4045,18 +4078,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4071,7 +4104,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
@@ -4111,19 +4144,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4133,12 +4166,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
@@ -4148,7 +4193,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4201,13 +4246,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4226,7 +4271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4261,7 +4306,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,7 +4316,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4416,17 +4461,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4451,7 +4496,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4466,18 +4516,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4511,7 +4555,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4521,7 +4565,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+31"/>
+        <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;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4536,16 +4589,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+114"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4560,7 +4604,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4590,17 +4634,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4653,7 +4697,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4663,8 +4707,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4687,7 +4731,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4722,7 +4766,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4732,7 +4776,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4747,7 +4791,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4768,7 +4812,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4776,17 +4820,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4796,12 +4840,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4821,12 +4865,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4836,7 +4875,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4846,17 +4885,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4866,7 +4900,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4936,33 +4970,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5052,7 +5086,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5720,7 +5754,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5728,38 +5762,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5767,12 +5801,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5934,7 +5968,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5944,7 +5978,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6004,11 +6038,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6130,7 +6174,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6172,7 +6216,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6208,7 +6252,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6224,7 +6268,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6461,7 +6505,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6499,7 +6543,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6510,16 +6554,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6602,33 +6762,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6646,7 +6811,17 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6656,17 +6831,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6687,38 +6857,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6738,12 +6908,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6753,38 +6923,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6828,13 +7003,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6844,7 +7019,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6879,7 +7054,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6889,12 +7064,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6904,12 +7074,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7135,27 +7300,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7165,39 +7316,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7205,49 +7374,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7272,7 +7437,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7322,12 +7487,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7451,7 +7616,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7459,7 +7624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7629,7 +7794,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7642,12 +7807,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7672,7 +7837,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7687,14 +7852,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7705,13 +7870,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7724,7 +7889,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7860,7 +8025,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -7871,22 +8036,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7906,12 +8071,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7946,22 +8111,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7981,17 +8146,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8004,7 +8169,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8042,8 +8207,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8058,7 +8233,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8073,7 +8248,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8087,6 +8262,11 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8096,7 +8276,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8117,7 +8297,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8179,18 +8359,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8205,17 +8385,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8243,13 +8423,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8319,7 +8499,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8355,7 +8535,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8370,13 +8550,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8391,7 +8571,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8406,7 +8586,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8466,12 +8646,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8546,12 +8736,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8602,17 +8793,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8727,7 +8918,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8740,7 +8931,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8770,7 +8961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -8809,7 +9000,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8833,6 +9024,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -8842,7 +9048,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -8871,7 +9077,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8902,7 +9108,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8953,7 +9159,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8969,7 +9175,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8988,6 +9194,11 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9017,13 +9228,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9034,7 +9245,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9054,17 +9265,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9077,59 +9288,66 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9139,12 +9357,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9184,23 +9397,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9243,12 +9456,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9278,8 +9491,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9362,12 +9575,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9428,7 +9641,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9448,7 +9661,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9500,7 +9713,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9510,7 +9723,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9525,7 +9738,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9591,12 +9804,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9631,12 +9844,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9647,12 +9860,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9660,7 +9873,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9720,7 +9933,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9743,7 +9956,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9759,12 +9972,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9781,23 +9994,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9813,22 +10026,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9838,12 +10057,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9853,7 +10072,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9928,7 +10147,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9944,27 +10168,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,7 +10191,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10032,7 +10251,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10089,12 +10308,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10117,7 +10336,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10130,14 +10349,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,7 +10366,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10157,7 +10376,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10177,6 +10401,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10188,7 +10420,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10236,7 +10468,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10623,7 +10855,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10639,7 +10871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10658,7 +10890,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10732,7 +10964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10742,7 +10974,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10770,7 +11002,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10780,7 +11012,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10790,7 +11022,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10810,13 +11042,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10828,12 +11084,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10848,12 +11104,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11118,14 +11369,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11135,12 +11386,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11150,7 +11401,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11165,27 +11416,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11201,29 +11452,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11243,18 +11504,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11264,78 +11527,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11346,17 +11609,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11371,24 +11634,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11403,7 +11666,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11413,7 +11681,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11488,7 +11756,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11518,7 +11786,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11533,7 +11801,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11581,7 +11849,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11589,7 +11857,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11632,7 +11900,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11712,7 +11980,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11728,17 +11996,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11843,7 +12106,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11893,21 +12156,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11917,7 +12180,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11932,7 +12195,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11947,12 +12210,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11972,12 +12235,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11987,7 +12250,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11995,7 +12258,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12025,7 +12288,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12039,7 +12308,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12049,7 +12318,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12060,27 +12334,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12100,7 +12374,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12110,12 +12384,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12125,12 +12405,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12140,7 +12415,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12150,10 +12425,15 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12179,7 +12459,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Adicionar</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12189,13 +12469,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12205,7 +12485,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12279,7 +12559,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -12289,12 +12569,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12317,18 +12597,34 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12346,27 +12642,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12387,7 +12688,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12396,26 +12702,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,7 +12736,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12453,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,7 +12780,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
@@ -12490,7 +12802,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12501,12 +12813,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12531,11 +12843,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12546,31 +12859,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12585,7 +12902,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12615,7 +12937,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12635,7 +12957,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12680,12 +13002,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12700,7 +13023,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12709,17 +13032,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12755,12 +13078,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12775,32 +13098,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12811,32 +13134,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12906,7 +13229,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12946,7 +13269,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12966,18 +13289,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -12988,7 +13311,17 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13008,7 +13341,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13018,21 +13351,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13047,7 +13380,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13057,30 +13390,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13195,13 +13528,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13221,7 +13554,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13242,7 +13575,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13272,18 +13605,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13323,13 +13656,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13339,12 +13672,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13422,7 +13755,7 @@ Do you want to save message ?</source>
         <translation>Omissão</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13432,7 +13765,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13455,7 +13788,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13463,7 +13796,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13491,7 +13824,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13501,37 +13834,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Para:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13571,7 +13904,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13623,7 +13956,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13633,12 +13966,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13648,17 +13981,22 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13667,14 +14005,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13689,12 +14037,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13716,10 +14064,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Apagar</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -13798,7 +14142,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13808,20 +14152,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="vanished">Apagar</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -13851,17 +14191,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -13892,7 +14232,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13902,7 +14242,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13912,7 +14252,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13921,6 +14261,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -13947,13 +14297,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14028,7 +14378,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14042,7 +14392,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14057,18 +14407,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14103,7 +14463,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14157,7 +14527,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14167,7 +14537,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14202,7 +14572,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14343,7 +14713,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14353,7 +14723,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14367,7 +14737,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14400,18 +14776,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14421,12 +14792,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14459,7 +14830,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14480,7 +14851,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14510,19 +14881,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14532,12 +14903,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14547,7 +14918,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14662,7 +15033,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14672,7 +15043,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -14779,7 +15150,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14794,7 +15165,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14804,12 +15175,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15047,7 +15418,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15067,12 +15438,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15087,7 +15458,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15098,17 +15469,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15116,7 +15489,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15255,7 +15628,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15300,12 +15678,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Opções</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15351,21 +15724,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15383,7 +15756,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15459,12 +15832,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15490,7 +15863,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15511,7 +15884,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -15551,7 +15924,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15609,7 +15982,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15927,17 +16300,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15966,7 +16339,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16025,19 +16398,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16073,12 +16446,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16289,12 +16662,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16347,7 +16735,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16367,8 +16755,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16393,13 +16781,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16427,12 +16815,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16447,12 +16835,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16468,7 +16866,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16478,7 +16886,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16498,12 +16906,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16518,7 +16936,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16529,7 +16947,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16539,7 +16957,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16547,12 +16965,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -16586,7 +17004,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16624,7 +17042,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16640,7 +17068,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16655,12 +17083,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16673,18 +17106,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16695,12 +17128,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16710,7 +17143,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16720,17 +17153,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16740,7 +17173,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16750,7 +17183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16791,7 +17224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16814,7 +17247,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16824,15 +17267,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16842,42 +17285,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16897,7 +17340,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16927,17 +17370,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16952,12 +17395,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16967,27 +17415,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17002,7 +17454,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17076,6 +17528,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17165,16 +17627,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17282,7 +17744,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17298,7 +17760,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17333,12 +17795,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17382,27 +17844,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17412,12 +17874,12 @@ and use the import button to load it</source>
         <translation type="unfinished">De:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17447,13 +17909,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17465,12 +17927,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17485,7 +17957,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17500,20 +17972,25 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PulseMessage</name>
@@ -17523,7 +18000,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -17542,7 +18019,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17552,7 +18029,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17579,7 +18056,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17589,7 +18066,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17609,7 +18086,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17725,7 +18202,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17733,37 +18210,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17795,7 +18277,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17803,8 +18285,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18072,12 +18554,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18108,7 +18590,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18142,7 +18624,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18161,6 +18643,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18240,7 +18742,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18250,7 +18752,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18260,7 +18762,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18276,7 +18778,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18343,7 +18845,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18371,7 +18873,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18552,12 +19054,28 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Status</source>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18800,6 +19318,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -18939,7 +19469,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19106,7 +19636,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19119,7 +19649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19292,12 +19822,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19305,12 +19845,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19998,7 +20538,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20119,7 +20659,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20139,7 +20679,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20195,7 +20735,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20209,11 +20749,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20227,6 +20762,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20249,12 +20789,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20278,7 +20823,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20299,7 +20846,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20360,7 +20907,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20381,7 +20928,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20411,7 +20958,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20429,7 +20976,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20446,12 +20993,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20512,7 +21059,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20527,7 +21074,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20627,23 +21174,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20653,7 +21200,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20690,7 +21237,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -20701,17 +21248,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20731,7 +21278,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20739,7 +21286,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20755,22 +21302,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20787,7 +21334,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20812,8 +21359,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20821,7 +21368,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20852,7 +21399,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20897,12 +21444,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20922,17 +21469,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20942,7 +21484,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20952,7 +21504,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20962,12 +21514,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21026,12 +21578,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21052,22 +21604,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21080,21 +21632,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21104,23 +21651,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21130,7 +21700,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21155,37 +21725,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,71 +21828,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21274,22 +21838,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21301,12 +21850,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21316,7 +21865,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21331,23 +21880,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21358,17 +21907,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21378,12 +21917,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21393,17 +21927,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21443,7 +21967,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21458,12 +21982,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21499,7 +22018,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21554,7 +22098,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21579,7 +22123,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -21591,7 +22135,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21614,7 +22158,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21674,17 +22218,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21700,18 +22255,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21746,12 +22301,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21774,22 +22329,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21824,7 +22379,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21834,12 +22389,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21919,7 +22474,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21929,12 +22484,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -21953,7 +22508,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21973,17 +22528,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21993,7 +22548,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22084,7 +22639,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22092,7 +22647,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22143,11 +22698,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22157,7 +22717,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22172,7 +22732,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22188,7 +22748,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22213,7 +22773,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22356,12 +22916,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22385,7 +22945,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22724,7 +23284,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22961,7 +23521,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22997,12 +23557,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23012,18 +23575,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23033,12 +23591,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23046,7 +23649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23056,7 +23659,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23067,11 +23670,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23099,7 +23703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23110,7 +23714,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23120,22 +23724,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23220,7 +23829,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23229,7 +23838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23254,7 +23868,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23319,12 +23938,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23334,7 +23948,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23362,7 +23986,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23390,19 +24014,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -23609,7 +24233,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23634,7 +24263,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23655,7 +24284,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -23688,7 +24317,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23703,7 +24342,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -23830,23 +24469,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Caminho</translation>
     </message>
@@ -23856,7 +24490,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23866,7 +24500,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23881,7 +24515,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23891,7 +24525,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24305,12 +24939,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24350,17 +24989,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24370,12 +25019,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24512,7 +25161,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24527,7 +25176,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24615,7 +25264,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24650,7 +25299,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24680,14 +25329,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24708,7 +25361,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24791,12 +25444,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24811,7 +25459,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24831,7 +25479,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24861,7 +25509,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24871,7 +25519,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -24934,35 +25582,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25007,11 +25662,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25089,7 +25774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25126,7 +25811,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_ru.ts b/retroshare-gui/src/lang/retroshare_ru.ts
index cfe0de745..30239b1a6 100644
--- a/retroshare-gui/src/lang/retroshare_ru.ts
+++ b/retroshare-gui/src/lang/retroshare_ru.ts
@@ -84,13 +84,6 @@
         <translation>Только скрытый узел сети</translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Добавить комментарий</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: расширенный поиск</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Критерии поиска</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Добавить дополнительный критерий поиска.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Сбросить критерии поиска.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Отменяет поиск.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Поиск </translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Создать альбом</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Название альбома</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Категория:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Дикие животные</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Семья</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Узлы сети</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Цветы</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Праздник</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Пейзажи</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Домашние животные</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Портреты</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Путешествия</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Работа</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Случайно</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Заголовок:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Где:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Фотограф:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Описание:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Настройки общего доступа</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Политика:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Качество:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Комментарии:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Личность:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Публичный</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Ограниченный</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Изменение размера изображений (&lt; 1 МБ)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Изменение размера изображений (&lt; 10 МБ)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Отправить исходные изображения</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Комментарии запрещены</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Авторизованные комментарии</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Любые комментарии разрешены</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Опубликовать под псевдонимом</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Перетащите картинку для вставки. Нажмите на картинку для редактирования подробностей.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Назад</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Добавить фото</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Опубликовать альбом</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Удалить название альбома</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Сделать отклик об альбоме...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Источник контента</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Загрузить миниатюру альбома</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Альбом</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Миниатюра альбома</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Резюме</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Надпись</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Где:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Когда</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Описание:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Настройки общего доступа</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Комментарии</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Опубликовать личность</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Видимость</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Предупреждение: это экспериментальные сервисы. Пожалуйста, помогите нам протестировать их.
@@ -783,14 +569,6 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>Круги</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">Форумы Gxs</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">Каналы Gxs</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ p, li { white-space: pre-wrap; }
         <translation>Фотографии</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">Сохранить изображение</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p кБ</translation>
     </message>
@@ -842,17 +633,13 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Добавить аватар</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Удалить эту позицию</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Установить ваш аватар</translation>
     </message>
@@ -871,10 +658,6 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Загрузить аватар</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ p, li { white-space: pre-wrap; }
         <translation>Сброс</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Скорость приёма</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Скорость отдачи</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Поверх всех окон</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Стиль</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% непрозрачности</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Сохранить</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Отмена</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>С:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Скрыть настройки</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,7 +822,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Комментарий</translation>
     </message>
@@ -1093,12 +852,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Автор этого сообщения (личность %1) заблокирован.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Голосовать &quot;за&quot;</translation>
     </message>
@@ -1126,7 +885,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Голосовать &quot;за&quot;</translation>
     </message>
@@ -1184,7 +943,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Предоставить общий доступ</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Изменить статус прочитанного сообщения</translation>
     </message>
@@ -1224,7 +983,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Новый</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
@@ -1232,12 +991,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Мне нравится</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Аватар</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1283,12 +1042,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Удалить объект</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,17 +1216,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Каналы</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Общее</translation>
     </message>
@@ -1477,11 +1236,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Загрузить сообщения в фоне (потоком)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Обмен файлами</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Открывать каждый канал в новой вкладке</translation>
     </message>
@@ -1489,7 +1254,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Мне нравится</translation>
     </message>
@@ -1537,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">Аватар</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1563,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished">Удалить объект</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
@@ -1573,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Комментарий</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished">Комментарии </translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1591,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
@@ -1783,7 +1538,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Показать чат-комнату</translation>
     </message>
@@ -1795,22 +1550,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>Чаты</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">У вас %1 новых сообщений</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">У вас %1 новых сообщений</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 новых сообщений</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 новое сообщение</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1832,13 +1571,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Неизвестная чат-комната</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Удалить всё</translation>
     </message>
@@ -1846,13 +1586,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Всего</translation>
     </message>
@@ -1862,33 +1602,7 @@ into the image, so as to
         <translation>Тема</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>Подписанные приватные чат-комнаты</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>Подписанные публичные чат-комнаты</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Приватные чат-комнаты</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Публичные чат-комнаты</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;Чат-комнаты&lt;/h1&gt; &lt;p&gt;Чат-комнаты это распределенная система чатов для общения, которые функционируют по довольно схожим с IRC принципам. Чаты позволяют анонимно общаться с множеством людей без необходимости добавлять их в список своих контактов.&lt;/p&gt;                    	                      &lt;p&gt;Чат-комнаты могут быть публичным (участники из списка ваших контактов видят их) или приватным (участники из списка ваших контактов не видят их до тех пор, пока они не получат ваше приглашение присоединиться к чату. &lt; img src=&quot;:/images/add_24x24.png «width=%2/ &gt;). 	                      В случае, когда в приватную чат-комнату были приглашены вы, она становится вам видима. Но это только в том случае, когда один или несколько ваших доверенных узлов используют её. &lt;/p&gt;                                                                                               	                      &lt;p&gt;Список слева показывает чат-комнаты, в которых находится один или несколько участников из вашего окружения. Вы можете &lt;ul&gt;&lt;li&gt;щёлкнуть правой кнопкой мыши для создания новой чат-комнаты&lt;/li&gt;, &lt;li&gt;дважды щёлкнуть по существующей чат-комнате, чтобы войти в неё, общаться и показать её своим друзьям.&lt;/li&gt;&lt;/ul&gt; Примечание: Для правильной работы чат-комнат, время вашего компьютера должно быть установлено точно.  Поэтому проверьте ваши системные часы!	                      &lt;/p&gt;                                      	                      </translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Создать чат-комнату</translation>
     </message>
@@ -1898,7 +1612,7 @@ into the image, so as to
         <translation>Покинуть эту чат-комнату</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Создать неанонимную личность и войти в чат-комнату</translation>
     </message>
@@ -1957,12 +1671,12 @@ Double click a chat room to enter and chat.</source>
 Двойной щелчок мыши для входа в комнату и общения.</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 приглашает вас в чат-комнату %2</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Выберите неанонимную личность для этой чат-комнаты:</translation>
     </message>
@@ -1972,31 +1686,31 @@ Double click a chat room to enter and chat.</source>
         <translation>Выберите личность, от имени которой вы будете общаться чат-комнате:</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Создать чат-комнату</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[тема не указана]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Информация о выбранной чат-комнате</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>приватная</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>публичная</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>Допустимы анонимные участники</translation>
     </message>
@@ -2006,42 +1720,25 @@ Double click a chat room to enter and chat.</source>
         <translation>Удалить автоподписку</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Установить автоподписку</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Поиск чатов</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Поиск по имени</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Подписка</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Столбцы</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Да</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Нет</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2053,47 +1750,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Название чат-комнаты: </translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>Идентификатор чат-комнаты: </translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Безопасность:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Участников:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
@@ -2108,13 +1805,24 @@ Double click a chat room to enter and chat.</source>
         <translation>Анонимные участники не допускаются</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>столбец</translation>
@@ -2128,7 +1836,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Удалить объект</translation>
     </message>
@@ -2173,46 +1881,22 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Главное</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Удалённый чат</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Все</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Контакты</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Никто</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Разрешить удалённый шифрованный чат от</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Настройки чата</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Разрешить смайлики в приватном чате</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Разрешить смайлики в групповом чате</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Разрешить пользовательские шрифты</translation>
     </message>
@@ -2221,10 +1905,6 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>Разрешить нестандартный размер шрифта</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">Минимальный размер шрифта</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2236,7 +1916,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2261,11 +1941,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Загружать внедрённые изображения</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Чат-комната</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Мерцание иконки вкладки</translation>
     </message>
@@ -2274,10 +1950,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation>Не отсылать уведомления о наборе текста</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Приватный чат</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2299,11 +1971,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Мерцание иконки окна/вкладки</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Шрифт чата</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Изменить шрифт чата</translation>
     </message>
@@ -2313,14 +1981,10 @@ Double click a chat room to enter and chat.</source>
         <translation>Шрифт чата:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>История</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Стиль</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2335,17 +1999,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation>Вариант:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Групповой чат</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Приватный чат</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation>Выберите свой шрифт по умолчанию для чата.</translation>
     </message>
@@ -2409,22 +2069,28 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;В этой вкладке вы можете задать, какое количество сообщений чата RetroShare будет хранить на диске, а также объём отображения состоявшихся бесед для различных систем чатов. Максимальный период хранения позволяет очищать историю чатов и предотвращает её заполнение временными чатами (например, обычные чаты или удалённые чаты).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Комнаты чата</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Включено:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2434,7 +2100,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Чат-комнаты</translation>
@@ -2531,11 +2207,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Максимальный срок хранения, в днях (0 - бесконечно):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Параметры поиска по умолчанию</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Учитывать регистр</translation>
     </message>
@@ -2574,10 +2246,6 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation>Порог автоматического поиска</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Личность по умолчанию для чат-комнат:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2645,7 +2313,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Показать чат</translation>
     </message>
@@ -2681,7 +2349,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -2716,12 +2384,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>Вставить смайлик</translation>
     </message>
@@ -2730,10 +2398,6 @@ Double click a chat room to enter and chat.</source>
         <source>Attach a Picture</source>
         <translation>Прикрепить картинку</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton: деактивирована {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2805,11 +2469,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation>Вставить горизонтальную черту</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Сохранить изображение</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2847,7 +2506,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>печатает...</translation>
     </message>
@@ -2871,7 +2530,7 @@ after HTML conversion.</source>
         <translation>Выберите шрифт.</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Вы действительно хотите удалить с диска историю сообщений?</translation>
     </message>
@@ -2921,7 +2580,7 @@ after HTML conversion.</source>
         <translation>сейчас занят и не может вам ответить</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>Найти с учётом регистра</translation>
     </message>
@@ -2943,7 +2602,7 @@ after HTML conversion.</source>
         <translation>Продолжить выделять цветом после X найденных вхождений (требуется больше ресурсов процессора)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Найти предыдущее &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2958,16 +2617,12 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Найти&lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Состояние)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Указать тип шрифта и цвет текста</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Прикрепить файл</translation>
     </message>
@@ -2983,12 +2638,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Отметить этот выделенный текст&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl + M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation>Идентификатор личности: </translation>
     </message>
@@ -2999,12 +2654,12 @@ Double click on it to add his name on text writer.</source>
         <translation>Двойной щелчок, чтобы добавить имя в текстовый редактор.</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation> Не подписано</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation> удовлетворяют условию.</translation>
     </message>
@@ -3024,7 +2679,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Печатайте ваши сообщения здесь</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Продолжить выделять цветом после</translation>
     </message>
@@ -3050,7 +2705,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Подробности: </translation>
     </message>
@@ -3072,7 +2727,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Личные круги</translation>
     </message>
@@ -3098,7 +2753,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Узлы сети</translation>
     </message>
@@ -3158,7 +2813,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Ближнее окружение</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Внешние круги (администратор) </translation>
     </message>
@@ -3174,7 +2829,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Круги</translation>
     </message>
@@ -3226,43 +2881,48 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Ошибка: не могу получить совокупность деталей.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3274,7 +2934,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Шифрование</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>не соединён</translation>
     </message>
@@ -3356,25 +3016,17 @@ Double click on it to add his name on text writer.</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Этот сертификат содержит:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;&lt;b&gt;идентификатор узла&lt;/b&gt; и &lt;b&gt;имя&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">&lt;b&gt;onion-адрес&lt;/b&gt; и &lt;b&gt;порт&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">&lt;b&gt;IP-адрес&lt;/b&gt; и &lt;b&gt;порт&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы можете использовать этот сертификат, чтобы пополнить список ваших контактов. Отправьте его потенциальному участнику по электронной почте или передайте лично в руки.&lt;/p&gt;</translation>
     </message>
@@ -3389,7 +3041,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Это метод шифрования, используемый &lt;span style=&quot;font-weight:600;&quot;&gt; OpenSSL&lt;/span&gt;. Подключение к доверенному узлу&lt;/p&gt; &lt;p&gt;всегда шифруется стойким алгоритмом и если DHE присутствует, дальнейшее соединение использует метод&lt;/p&gt; &lt;p&gt;«совершенной секретности с упреждением».&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation> с </translation>
     </message>
@@ -3406,118 +3058,16 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Помощник подключения к удалённому узлу</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Добавить новый узел</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Вы получаете сертификат доверенного узла</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;Добавить в личное окружение контакты моих доверенных узлов</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Email 
- (Your friend will receive an email with instructions how to download RetroShare)</source>
-        <translation type="vanished">&amp;Отправить приглашение по электронной почте
-(ваш контакт получит письмо с инструкциями, откуда скачать RetroShare)</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Вставить подписи</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Скопировать ваш сертификат в буфер обмена</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Сохранить ваш сертификат в файл</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Запустить почтовый клиент</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Открыть сертификат вашего контакта из файла</translation>
     </message>
-    <message>
-        <source>Open certificate</source>
-        <translation type="vanished">Открыть сертификат</translation>
-    </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">Пожалуйста, вставьте сертификат другого участника сети в поле внизу</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Файлы сертификатов</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Использовать PGP-сертификаты, сохранённые в файлах.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Импортировать сертификат доверенного узла</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Вам следует создать файл с вашим сертификатом и передать его потенциальному участнику сети. Также вы можете использовать файл созданный заранее.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Экспортировать мой сертификат</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Перетащите файл с сертификатом другого участника сети в это окно или укажите путь к нему в поле ниже</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Обзор</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Ближнее окружение</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Выберите с кем вы хотите обменяться сертификатами.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Показать мне:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Обменяться сертификатами с этими участниками</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>Идентификатор RetroShare</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Использовать идентификатор RetroShare для обмена сертификатами с существующим узлом сети.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Добавить RetroShare ID других участников...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Вставить RetroShare ID других участников в поле ниже</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Введите RetroShare ID участника сети. Например, Peer@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3559,27 +3109,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Электронная почта</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Пригласить потенциального участника сети по электронной почте</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Введите адреса электронных почт потенциальных участников сети (адреса разделять запятыми)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Адреса электронной почты:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Введите адреса электронных почт потенциальных участников сети</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Тема:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3595,77 +3125,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Подробности запроса</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Сведения об участнике</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Эл. почта</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Узел сети:</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">Обратите внимание на тот факт, что вы можете добавлять в ваше окружение столько контактов, сколько пожелаете. Но их количество более 40, вероятно, приведёт к заметной загрузке CPU, памяти и пропускной способности вашего интернет-канала.</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">Этот мастер поможет вам соединиться с другими участниками сети RetroShare (тёмной сети).&lt;br&gt;Для этого доступны следующие способы:</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Ввести сертификат вручную</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">Ввести личность RetroShare вручную</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">&amp;Отправить приглашение через провайдеров веб-почты.</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Рекомендовать друг другу несколько контактов из окружения</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">Сертификат RetroShare </translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">Пожалуйста, вставьте сертификат другого участника сети в поле внизу</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Вставить сертификат</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Сюда следует вводить сертификаты потенциальных контактов. ВНИМАНИЕ: сертификаты — это не просто пбличные PGP-ключи, это более сложная структура данных. Не вставляйте сюда PGP-ключи своих потенциальных контактов (ни полностью, ни частично) – это не сработает. Сертификат должен вводиться полностью!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Добавить этот узел в группу:</translation>
     </message>
@@ -3675,7 +3160,7 @@ resources.</source>
         <translation>Аутентификация доверенного узла (подписать его PGP-ключ)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3700,16 +3185,22 @@ resources.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Добавить сертификат участника для последующего соединения с ним</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Чтобы принять запрос на предложение обменяться сертификатами, нажмите кнопку «Завершить».</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>К сожалению, появились некоторые ошибки</translation>
     </message>
@@ -3729,32 +3220,27 @@ resources.</source>
         <translation>Подробная информация об узле:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Уровень доверия к ключу:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Подписавшие</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Подписание публичного ключа участника сети – это способ обозначить своё доверие тому или иному участнику. Сигнатуры, которые вы видите ниже, подтверждают, что ключи в списке заверены и признаются как подлинные.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Этот участник уже находится в вашем доверенном окружении. Добавление сертификата снова лишь установит актуальный IP-адрес этого узла.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3800,49 +3286,17 @@ resources.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Ошибка загрузки сертификата</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Не удаётся получить подробности PGP-ключа участника %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Любой участник, ключ которого не подписан мною</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Участники из окружения, которые подписали мой сертификат</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Подписанные участники показывать как отвергнутые</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Имя участника</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Также подписано</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Идентификатор участника</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">Сертификат в порядке</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Недействительный сертификат RetroShare!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>Приглашение в RetroShare</translation>
     </message>
@@ -3862,12 +3316,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Это же ваш собственный сертификат! Вы не хотели бы соединиться с самим собой, не так ли?</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3875,7 +3329,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation>Этот ключ уже находится в вашем доверенном списке</translation>
     </message>
@@ -3915,7 +3369,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>У вас имеется запрос на соединение от</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3940,7 +3394,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3950,47 +3404,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Ошибка загрузки сертификата: %1 не найден</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">Этот участник %1 не доступен в вашей сети</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Использовать новый формат сертификата (безопаснее)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Использовать старый формат сертификата (совместим со старыми версиями)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Удаление подписи</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">Приглашение в RetroShare</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Помощь по установлению соединения</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Вы можете скопировать этот текст и отправить его контрагенту по электронной почте или любым другим способом</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Ваш сертификат скопирован в буфер обмена. Отправьте контрагенту письмо с этим сертификатом по электронной почте или же воспользуйтесь любым другим доступным способом.</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Сохранить как...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4029,11 +3443,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Никого ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Использовать как прямой источник, при возможности</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>IP-адрес:</translation>
     </message>
@@ -4043,7 +3453,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP-адрес:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Показать дополнительные настройки</translation>
     </message>
@@ -4052,10 +3462,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Механизм подписания ключей может оказаться полезным другим участникам сети, которые, добавляя чужой сертификат в своё окружение, имеют возможность посмотреть, кто подписал ключ в сертификате. Следует отметить, что подписание чужих ключей не является обязательным и не может быть впоследствии отменено. Поэтому подходите к вопросу подписания, взвесив все «за» и «против».&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare периодически проверяет папки ваших контактов, доступные вам к просмотру, на предмет наличия там интересующего вас файла. Если файл находится, в целях скачивания с контактом устанавливается прямое соединение – не через систему анонимных туннелей. В этом случае узел-источник из вашего окружения достоверно знает, что файл качаете именно вы – пользователь с конкретным сертификатом.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Чтобы исключить такого рода небезопасное поведение вашего клиент-сервера, снимите здесь галочку. Отметим, что прямое соединение всё равно установится, если вы напрямую выберете в открытой к просмотру папке файл для скачивания. Включение/отключение возможности прямого соединения при файлообмене применяется ко всем местоположениям одного узла.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4066,45 +3472,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Участники тёмной сети, для которых активирована эта опция, не смогут установить с вами соединение, если их IP-адрес не внесён в белый список. Подобный подход защищает вас от атаки типа «перенаправление трафика». Когда опция включена, блокируемые участники будут получать сообщения через &quot;уведомления системы безопасности&quot;. Здесь вы имеете возможность занести определённые IP-адреса в белый/чёрный список. Применяется ко всем местоположениям, привязанным к конкретному сертификату.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Рекомендовать друг друга множеству участников сети</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Рекомендации одних участников сети другим участникам</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">Нижеследующий текст – это ваш сертификат RetroShare. Для установления соединения вам следует передать его действующему участнику тёмной сети.</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Сообщение:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Рекомендовать участников</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Кому</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Выберите по меньшей мере одного участника для того, чтобы порекомендовать его</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Выберите по меньшей мере одного участника на роль получателя рекомендации</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Добавить ключ в связку ключей</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Это ключ уже в вашей связке</translation>
     </message>
@@ -4120,7 +3494,7 @@ even if you don&apos;t make friends.</source>
 даже если вы не являетесь доверенными.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Сертификат имеет неправильный номер версии. Помните, что  сети v0.6 и v0.5 несовместимы.</translation>
     </message>
@@ -4155,7 +3529,7 @@ even if you don&apos;t make friends.</source>
         <translation>Добавить IP в белый список </translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>В этом сертификате отсутствует IP-адрес!</translation>
     </message>
@@ -4165,27 +3539,10 @@ even if you don&apos;t make friends.</source>
         <translation>Этот сертификат не содержит в себе IP-адреса. В данном случае для установления соединения с узлом ваш клиент задействует сервис обнаружения и распределённую таблицу хешей DHT. Поскольку вам требуется разрешение белого списка, подключение к участнику вызовет предупреждение системы безопасности во вкладке новостей. Оттуда вы можете добавить его IP-адрес в белый список.</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Добавлено с сертификатом от %1</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Вставить сертификат участника из буфера обмена</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Ошибка загрузки сертификата: не удаётся прочитать файл %1 </translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Ошибка загрузки сертификата: что-то не так с %1 </translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4247,7 +3604,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>Установление UDP</translation>
     </message>
@@ -4283,7 +3640,7 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;то можете закрыть его.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Помощник соединения</translation>
     </message>
@@ -4293,17 +3650,20 @@ p, li { white-space: pre-wrap; }
         <translation>Неверный идентификатор участника</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Неизвестное состояние</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Не в сети</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>За симметричным NAT</translation>
     </message>
@@ -4313,12 +3673,14 @@ p, li { white-space: pre-wrap; }
         <translation>Плохая сеть: непрозрачный NAT, не работает DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Перезапуск сети</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>За маршрутизатором</translation>
     </message>
@@ -4328,7 +3690,8 @@ p, li { white-space: pre-wrap; }
         <translation>DHT не работает</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>СОСТОЯНИЕ СЕТИ ХОРОШЕЕ!</translation>
     </message>
@@ -4353,7 +3716,7 @@ p, li { white-space: pre-wrap; }
         <translation>Поиск участников тёмной сети</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Поиск узла требует DHT</translation>
     </message>
@@ -4645,7 +4008,7 @@ p, li { white-space: pre-wrap; }
         <translation>Пожалуйста, повторите попытку импорта полного сертификата.</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4653,7 +4016,8 @@ p, li { white-space: pre-wrap; }
         <translation>Нет данных</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>НЕПРОВЕРЕННАЯ ПЕРЕСЫЛКА!</translation>
     </message>
@@ -4663,7 +4027,7 @@ p, li { white-space: pre-wrap; }
         <translation>Неподдающееся проверке перенаправление! DHT не работает</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Поиск</translation>
     </message>
@@ -4699,12 +4063,12 @@ p, li { white-space: pre-wrap; }
         <translation>Подробности о круге</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Имя круга, контакты автора и список приглашённых будут видны всем приглашённым участникам. Если круг не является приватным, он также будет виден соседним узлам, на которых размещаются приглашённые члены.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4724,7 +4088,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>Идентификаторы</translation>
     </message>
@@ -4744,18 +4108,18 @@ p, li { white-space: pre-wrap; }
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Псевдоним</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Приглашённые пользователи</translation>
     </message>
@@ -4770,15 +4134,7 @@ p, li { white-space: pre-wrap; }
         <translation>Известные пользователи</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">Идентификатор</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Тип</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -4818,23 +4174,19 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Информация о круге может быть доступна участникам другого круга. В данном случае участникам этого круга будут доступны все арибуты первого круга (список участников, авторство и т. п.), а также привязанный к нему контент.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Видим только членам круга:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Пожалуйста, установите название вашего круга</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Не выбрано ограничение круга</translation>
     </message>
@@ -4844,12 +4196,24 @@ p, li { white-space: pre-wrap; }
         <translation>Не выбраны ограничения круга</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
@@ -4859,7 +4223,7 @@ p, li { white-space: pre-wrap; }
         <translation>Удалить </translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Поиск</translation>
@@ -4874,10 +4238,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Подписано</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Подписано известными узлами</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4894,10 +4254,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP-личность</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Анонимный идентификатор</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4920,17 +4276,13 @@ p, li { white-space: pre-wrap; }
         <translation>Создать новый круг</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">Идентификатор, привязанный к PGP-ключу</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Добавить члена</translation>
     </message>
@@ -4949,7 +4301,7 @@ p, li { white-space: pre-wrap; }
         <translation>Создать группу</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Имя группы:</translation>
     </message>
@@ -4984,7 +4336,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Новое сообщение канала</translation>
     </message>
@@ -4994,7 +4346,7 @@ p, li { white-space: pre-wrap; }
         <translation>Сообщение канала</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5055,23 +4407,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Используйте кнопку &quot;Перетащить и Отпустить / Добавить файлы&quot;, чтобы хешировать новые файлы.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Копируйте / вставьте ссылки RetroShare ваших файлов&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Добавить файл во вложение</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Добавить изображение-миниатюру для канала</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Сообщение</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Тема:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5157,17 +4497,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5186,17 +4526,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Файл уже добавлен и хеширован</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Добавьте тему сообщения</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Загрузить изображение-миниатюру</translation>
     </message>
@@ -5211,18 +4552,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Создание массовой информации</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Вы действительно хотите создать %1 сообщений?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Вы хотите добавить файлы которые не ещё не общедоступны. Продолжить в любом случае?</translation>
     </message>
@@ -5256,7 +4591,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Создать сообщение на форуме</translation>
     </message>
@@ -5265,10 +4600,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Форум</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Тема</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5289,8 +4620,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5309,7 +4640,7 @@ p, li { white-space: pre-wrap; }
         <translation>Вы можете добавить файлы перетаскиванием</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5339,17 +4670,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Нет форума</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>В ответ на</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Название</translation>
     </message>
@@ -5403,7 +4734,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Загрузить файл изображения</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>Нет совместимого идентификатора для этого форума</translation>
     </message>
@@ -5413,8 +4744,8 @@ Do you want to discard this message?</source>
         <translation>Ни один из ваших идентификаторов не имеет прав для отправки сообщений в этот форум. Возможно, доступ к форуму ограничен кругом, в котором вы не состоите, или форум требует наличие подписанного идентификатора.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Создание массовой информации</translation>
     </message>
@@ -5423,10 +4754,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Вы действительно хотите создать %1 сообщений?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Отправить</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5441,23 +4768,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Создать чат-комнату</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Комната чата – децентрализованная и анонимная чат-группа. Все участники публично отправляют и принимают сообщения друг друга. После создания комнаты чата вы можете пригласить туда других участников из своего окружения, воспользовавшись кнопкой вверху справа с подсказкой «Пригласить участников в эту чат-комнату»</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Имя комнаты:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Тема:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5492,7 +4803,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Создать</translation>
     </message>
@@ -5502,11 +4813,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если вы отметите это, только подписанные участники смогут общаться в этой комнате. Это ограничение предотвращает спам от имени анонимных участников и делает возможным или, по меньшей мере, определить узел спаммера.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>требовать PGP-подписи личностей</translation>
     </message>
@@ -5521,11 +4828,7 @@ Do you want to discard this message?</source>
         <translation>Отметьте участников, с которыми вы желаете организовать чат</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Приглашённые участники</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Создать чат-комнату</translation>
@@ -5546,7 +4849,7 @@ Do you want to discard this message?</source>
         <translation>Контакты:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Личность для использования:</translation>
     </message>
@@ -5554,17 +4857,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Публичная информация</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Местоположение:</translation>
     </message>
@@ -5574,12 +4877,12 @@ Do you want to discard this message?</source>
         <translation>Идентификатор местоположения:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Версия программы:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Подключён с:</translation>
     </message>
@@ -5599,12 +4902,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5614,7 +4912,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Прочее</translation>
     </message>
@@ -5624,17 +4922,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished">Профиль</translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Сертификат</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5644,11 +4937,7 @@ Do you want to discard this message?</source>
         <translation>Вставить подписи</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Сохранить ключ в файл</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Экспорт личности</translation>
     </message>
@@ -5722,33 +5011,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP-отпечаток:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Сведения об узле сети</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP-идентификатор:</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Доверенные узлы:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5787,14 +5076,6 @@ and use the import button to load it</source>
         <source>Node</source>
         <translation>Узел сети</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Создание нового узла...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">Показать окно статистики</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5811,10 +5092,6 @@ and use the import button to load it</source>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;RetroShare использует DHT-сеть BitTorrent в качестве вспомогательной службы для установления соединений. В DHT не  хранится ваш IP-адрес. 				                        DHT используется участниками из вашего окружения для установления соединения через стандартные DHT-запросы. 												Индикатор статуса DHT станет зелёным сразу же, как только RetroShare получит DHT-ответ от одного из ваших контактов.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5850,7 +5127,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>Б</translation>
     </message>
@@ -6518,7 +5795,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Начальный файл</translation>
     </message>
@@ -6526,38 +5803,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>кому</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>без учёта регистра</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>dd.MM.yyyy</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>КБ</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>МБ</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>ГБ</translation>
     </message>
@@ -6565,12 +5842,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Визуализация выражения</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Удалить это выражение</translation>
     </message>
@@ -6732,7 +6009,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Изображение</translation>
     </message>
@@ -6742,7 +6019,7 @@ and use the import button to load it</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
@@ -6802,11 +6079,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation>C </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Папки доверенных участников</translation>
     </message>
@@ -6928,7 +6215,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation>Идентификатор</translation>
     </message>
@@ -6963,10 +6250,6 @@ and use the import button to load it</source>
         <source>Show State</source>
         <translation>Показать состояние</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">Доверенные узлы</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6974,7 +6257,7 @@ and use the import button to load it</source>
         <translation>Показать группы</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Группа</translation>
     </message>
@@ -7010,7 +6293,7 @@ and use the import button to load it</source>
         <translation>добавить в группу</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Поиск</translation>
@@ -7026,7 +6309,7 @@ and use the import button to load it</source>
         <translation>Сортировать по состоянию</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Сведения об узле</translation>
     </message>
@@ -7270,7 +6553,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Подтвердить запрос на установление контакта</translation>
     </message>
@@ -7287,10 +6570,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Поиск:</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7312,7 +6591,7 @@ at least one peer was not added to a group</source>
         <translation>Поиск контактов</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Отметить все</translation>
     </message>
@@ -7323,16 +6602,134 @@ at least one peer was not added to a group</source>
         <translation>Снять отметки</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Имя</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished">Адрес</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Статус</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Добавить узел в окружение</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished">Прокси не включён или неисправен.
+Все ли службы запущены и работают?
+Также проверьте порты.</translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Изменить ваш статус</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Широковещательный чат</translation>
     </message>
@@ -7415,33 +6812,38 @@ at least one peer was not added to a group</source>
         <translation>Сбросить настройки шрифта</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Массив ключей</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt; Сеть&lt;/h1&gt; &lt;p&gt;Вкладка «Сеть» показывает ваше доверенное окружение в сети RetroShare, а именно: те узлы RetroShare, с которыми вы соединены или можете соединиться, когда участник появится в сети.     &lt;/p&gt; &lt;p&gt;Можно группировать узлы, чтобы позднее детально разграничить уровень доступа к информации, например, разрешить только определённым узлам видеть определённые файлы или структуру ваших папок.&lt;/p&gt;     &lt;p&gt;Справа, вы найдете 3 полезные вкладки: &lt;ul&gt;&lt;li&gt;Широковещательный чат отправляет сообщения сразу всем подключенным узлам &lt;/li&gt; &lt;li&gt;Граф локальной сети отображает в удобной форме окружающие вас узлы, основываясь на информации, полученной от специального сервиса обнаружения&lt;/li&gt; &lt;li&gt;Массив ключей содержит идентификаторы пользователей, собранных вашим клиентом от других участников сети&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;                                                                                                        </translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Широковещательный чат RetroShare: сообщения будут рассылаться всем подключённым узлам.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Визуализация сети</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Установить сообщение о своём статусе</translation>
     </message>
@@ -7459,7 +6861,17 @@ at least one peer was not added to a group</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Все поля должны обязательно быть заполнены текстом, состоящим из не менее 3 символов</translation>
     </message>
@@ -7469,17 +6881,12 @@ at least one peer was not added to a group</source>
         <translation>Пароли не совпадают</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation>Использовать BOB</translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Данный пароль предназначен для PGP</translation>
@@ -7500,50 +6907,38 @@ at least one peer was not added to a group</source>
         <translation>Не удалось создать ваш новый сертификат. Может быть, введён неправильный пароль PGP!</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="vanished">Параметры</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation>Длина ключа PGP</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Введите здесь надёжный пароль. Пароль не должен быть короче восьми символов и содержать тривиальных комбинаций букв и цифр. Это очень важно, так как этот пароль защищает ваш приватный ключ!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Прежде, чем продолжить, подвигайте мышью, чтобы собрать необходимые случайные данные. Индикатор прогресса должен дойти как минимум до 20%, но желательно достигнуть 100%&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Регулярный узел</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">Скрытый Tor- / i2p-узел</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Название вашего узла определяет имя экземпляра клиент-сервера RetroShare, &lt;/p&gt;&lt;p&gt;который будет запущен на этом компьютере&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Use existing profile</source>
-        <translation type="vanished">Использовать существующий профиль</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Название узла</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7563,12 +6958,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Имя профиля идентифицирует вас в рамках вашего сетевого окружения.&lt;/p&gt;&lt;p&gt;Оно используется участниками сети, чтобы отличить вас от других участников и установить с вами соединение.&lt;/p&gt;&lt;p&gt;В рамках одного профиля вы имеете возможность&lt;/p&gt;&lt;p&gt;создать на различных машинах множество узлов с разными названиями.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Экспортировать профиль</translation>
     </message>
@@ -7578,42 +6973,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Здесь следует указать onion-адрес наподобие: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;, или же i2p-адрес в форме: [52 символа].b32.i2p &lt;/p&gt;&lt;p&gt;Для того, чтобы получить такие адреса, вам необходимо сконфигурировать скрытые или Tor-, или i2p-сервисы/серверы. В случае, если у вас нет ни того, ни другого, вы можете пропустить этот шаг и вернуться к настройкам позднее через конфигурационную панель RetroShare:  Настройки → Сеть → Настройка скрытых сервисов.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Личности-идентификаторы используются при общении в чатах, а также когда вы оставляете комментарии к сообщениям в форумах или каналах. &lt;/p&gt;&lt;p&gt;Кроме того, они необходимы для адресации участников при пересылке сообщений через встроенный почтовый сервис RetroShare.&lt;/p&gt;&lt;p&gt;У вас есть возможность создать анонимную или подписанную личность прямо сейчас. Но сделать это можно и позднее, воспользовавшись вкладкой «Участники».&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>Начнём!</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Дополнительные параметры</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>Скрытый адрес</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Ваш профиль связан с парой ключей PGP. В настоящее время RetroShare игнорирует DSA-ключи.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Это ваш порт подключения&lt;/p&gt; &lt;p&gt;Любое значение от 1024 до 65535&lt;/p&gt; &lt;p&gt;допустимо. Вы можете изменить его позже.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7661,13 +7057,13 @@ and use the import button to load it</source>
         <translation>Ваш профиль не был сохранён. Произошла ошибка.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Импортировать профиль</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Создать новый профиль и узел RetroShare</translation>
     </message>
@@ -7677,7 +7073,7 @@ and use the import button to load it</source>
         <translation>Создать новый узел RetroShare</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation>Адрес Tor/I2P</translation>
     </message>
@@ -7712,7 +7108,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7722,12 +7118,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Создание узла отключено до тех пор, пока не будут правильно заданы все поля.&lt;/p&gt;</translation>
     </message>
@@ -7737,12 +7128,7 @@ and use the import button to load it</source>
         <translation>&lt;p&gt;Создание узла отключено, пока не будет собрано достаточное количество случайных чисел. Пожалуйста, перемещайте мышь по кругу, пока не будет достигнуто по крайней мере 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation>Адрес экземпляра I2P с включённым BOB</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation>Адрес экземпляра I2P</translation>
     </message>
@@ -7968,36 +7354,13 @@ and use the import button to load it</source>
         <translation>Быстрый старт</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Пригласить участников</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare – это анонимная приватная f2f-сеть, поэтому вам необходимо соединиться как минимум с одним действующим участником сети. Нажмите на кнопку, чтобы добавить участника себе в окружение.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Отправьте приглашение с вашим сертификатом по электронной почте.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Аналогично получите приглашения от других участников сети. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Помните: соединение в тёмной сети RetroShare предполагает взаимный обмен сертификатами; только в этом случае вы сможете соединиться с контрагентом.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Добавить ваших друзей и близких в RetroShare</translation>
     </message>
@@ -8007,136 +7370,103 @@ p, li { white-space: pre-wrap; }
         <translation>Добавить узлы в окружение</translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Запустите RetroShare в то же время, что и ваш доверенный узел, и RetroShare в автоматическом режиме соединит вас!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Вашему клиенту необходимо найти сеть RetroShare до того, как станут возможными соединения между узлами.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Обычно это занимает 2-30 минут после первого запуска RetroShare. Не забудьте включить UPnP в вашем модеме или роутере!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Если индикатор DHT (см. кружок на панели состояния внизу) стал зелёным, то соединения с узлами сети возможны.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Если у вас работает UPnP или вручную настроен открытый порт, индикатор NAT (также см. на панель состояния) переключается из жёлтого состояния в зелёное.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Если он остаётся в красном состоянии, тогда это говорит о непрозрачном межсетевом экране, сквозь который RetroShare будет пытаться «пробиться».&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Посмотрите в раздел «Помощь», чтобы получить более полную информацию о соединениях.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Соединиться с доверенными узлами</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Вы можете существенно улучшить производительность и соединяемость Retroshare, открыв в вашем модеме или роутере внешний порт. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Это ускорит соединения с другими узлами, так как позволит другим участникам, у которых нет открытого порта, легко подключаться к вам. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Простейший способ это сделать – активировать UPnP в вашем модеме или роутере.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Так как модемов и роутеров множество и настраиваются они по-разному, мы рекомендуем вам поискать в Интернете информацию по запросу следующего вида: «открыть порт в модеме &lt;модель_модема&gt;.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Если всё же вам не удалось открыть порт, не беспокойтесь, Retroshare всё равно будет работать: в сети множество пользователей с открытыми портами.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Дополнительная настройка: открыть порт межсетевого экрана</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Имеются трудности в освоении RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Почитайте FAQ в Вики. Материал слегка устарел, но он всё же содержит основную информацию.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Почитайте форумы в Интернете. Задайте там актуальные для вас вопросы или укажите нерешённые проблемы.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Если вы уже подключены к сети, почитайте внутренные форумы RetroShare.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	– подчеркнём: они доступны только в том случае, если у вас имеется хотя бы один соединённый с вами узел.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) Если у вас ничего не получается, зайдите на сайт https://adorabilis.wordpress.com или в группу Вконтакте https://vk.com/retroshare и оставьте комментарий с вопросом в одной из тем. Вам обязательно ответят.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Соединиться с доверенными узлами</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Когда контрагенты отправят вам свои приглашения, чтобы их добавить, откройте окно &quot;Добавить узлы в окружение&quot;.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Вставьте &amp;quot;сертификаты&amp;quot; в окне и добавьте их как доверенные узлы.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Дополнительная настройка: открыть порт межсетевого экрана</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Дополнительная помощь и поддержка</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>Открыть официальный сайт RetroShare</translation>
     </message>
@@ -8161,7 +7491,7 @@ p, li { white-space: pre-wrap; }
         <translation>Написать отзыв</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>Приглашение из RetroShare</translation>
     </message>
@@ -8211,12 +7541,12 @@ p, li { white-space: pre-wrap; }
         <translation>Отзывы о RetroShare</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>Команда поддержки RetroShare</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>В ней много особенностей, включая встроенный чат, систему передачи сообщений,</translation>
     </message>
@@ -8340,7 +7670,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Показать групповой чат</translation>
     </message>
@@ -8348,7 +7678,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[неизвестно]</translation>
     </message>
@@ -8514,19 +7844,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Вы имеете возможность поделиться с доверенным окружением информацией о созданном вами форуме. Выберите контакты, которым вы хотели бы дать информацию о созданном форуме.</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">Разрешения администратора общей темы</translation>
-    </message>
-    <message>
-        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
-        <translation type="vanished">Вы можете разрешить вашим контактам изменять тему. Для этого выберите тот или иной контакт в списке ниже. Примечание: невозможно отобрать права администратора в сервисе публикаций.</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Название</translation>
     </message>
@@ -8539,12 +7861,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8569,35 +7891,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">Сортировать по убыванию</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">Сортировать по возрастанию</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Сортировать по имени</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Сортировать по популярности</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Сортировать по последнему сообщению</translation>
-    </message>
-    <message>
-        <source>Sort by Number of Posts</source>
-        <translation type="vanished">Сортировать по количеству сообщений</translation>
-    </message>
-    <message>
-        <source>Sort by Unread</source>
-        <translation type="vanished">Сортировать по количеству непрочтённых сообщений</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Вы администратор (изменяйте название и описание используя меню &quot;Редактировать&quot;)</translation>
     </message>
@@ -8612,14 +7906,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Идентификатор</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Последнее непрочтённое</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
@@ -8630,17 +7924,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Популярность</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Показать</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8653,7 +7943,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>и</translation>
     </message>
@@ -8789,7 +8079,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Каналы</translation>
@@ -8800,26 +8090,22 @@ p, li { white-space: pre-wrap; }
         <translation>Создать канал</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Включить автоматическое скачивание</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Мои каналы</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Каналы&lt;/h1&gt; &lt;p&gt;Каналы дают возможность публиковать контент (например, кино или музыку), который подлежит раздаче пользователям сети.&lt;/p&gt; &lt;p&gt;В списке каналов содержатся те каналы, на которые подписано ваше доверенное окружение, равно как и ваш узел автоматически отсылает окружению информацию о каналах, на которые подписаны вы. Такой механизм позволяет распространять по сети информацию о хороших каналах и блокировать неудачные.&lt;/p&gt; &lt;p&gt;Оставлять сообщения в канале может только его создатель. Остальные участники могут лишь читать его содержимое и только в том случае, если канал не является приватным. Тем не менее, вы можете ⇥ дать права на чтение или модификацию канала пользователям из доверенного окружения.&lt;/p&gt;⇥ &lt;p&gt;Канал может быть анонимным или псевдонимным, если за ним закреплён определённый идентификатор пользователя. ⇥ Включите режим «Разрешить комментарии», если Вы хотите дать пользователям возможность комментировать сообщения.&lt;/p&gt; &lt;p&gt;Сообщения канала удаляются через %1 месяца.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Подписка на каналы</translation>
     </message>
@@ -8839,12 +8125,12 @@ p, li { white-space: pre-wrap; }
         <translation>Выберите папку загрузки для канала</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Отменить автоматическое скачивание</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>Выберите папку загрузки</translation>
     </message>
@@ -8879,22 +8165,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Воспроизвести</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Открыть папку</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -8914,17 +8200,17 @@ p, li { white-space: pre-wrap; }
         <translation>Проверка</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Вы уверены, что хотите отменить операцию и удалить файл?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Не удалось открыть папку</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Проиграть файл</translation>
     </message>
@@ -8934,37 +8220,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Файл %1 не существует в указанном месте.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Форма</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Имя файла</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Размер</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Название</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Опубликовано</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Статус</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Создать новый канал</translation>
     </message>
@@ -9002,9 +8261,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Подписаться на канал</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Текстовая метка</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9018,7 +8287,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Раскрыть</translation>
     </message>
@@ -9033,7 +8302,7 @@ p, li { white-space: pre-wrap; }
         <translation>Описание канала</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Загрузка</translation>
     </message>
@@ -9048,8 +8317,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Новый канал</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Никогда</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -9060,7 +8330,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Новый комментарий:</translation>
     </message>
@@ -9081,7 +8351,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
@@ -9137,28 +8407,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>файлов</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Внимание! У вас есть менее %1 часов и %2 минут, прежде чем файл будет удалён. Рассмотрите возможность его сохранения.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Скрыть</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
     </message>
@@ -9173,21 +8439,17 @@ p, li { white-space: pre-wrap; }
         <translation>Мне не понравилось</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Загрузка</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation>Комментарии </translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9212,139 +8474,16 @@ p, li { white-space: pre-wrap; }
         <translation>Проиграть медиафайл</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Создать сообщение в канале</translation>
-    </message>
-    <message>
-        <source>Add new post</source>
-        <translation type="vanished">Добавить новое сообщение</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Загрузка</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Поиск каналов</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Название</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Поиск по названию</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Почтовая служба</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Поиск сообщения</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Имя файла</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Поиск файла по имени</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Не выбраны каналы</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Никогда</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Публичный</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle &quot;</source>
-        <translation type="vanished">Только для членов круга &quot; </translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle </source>
-        <translation type="vanished">Только для членов круга</translation>
-    </message>
-    <message>
-        <source>Your eyes only</source>
-        <translation type="vanished">Только для вас</translation>
-    </message>
-    <message>
-        <source>You and your friend nodes</source>
-        <translation type="vanished">Вы и ваше окружение</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Отменить автоматическое скачивание</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Включить автоматическое скачивание</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Отобразить сообщения</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Показать файлы</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Администратор:</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Последнее сообщение:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">неизвестно</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Распространение:</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Каналы</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">файлов</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Подписчики</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Описание:</translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">Сообщений (соседние узлы):</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Создать сообщение в канале</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished">Добавить новое сообщение</translation>
     </message>
@@ -9414,7 +8553,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9450,7 +8589,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Комментарии</translation>
     </message>
@@ -9465,13 +8604,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Каналы</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9486,7 +8625,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9501,7 +8640,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9561,12 +8700,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9623,12 +8772,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ограничено для членов круга &quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ограничено для членов круга </translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9641,12 +8790,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Вы и ваше окружение</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9697,17 +8847,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9727,27 +8877,11 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Удалить объект</translation>
     </message>
-    <message>
-        <source>for identity </source>
-        <translation type="vanished">для личности </translation>
-    </message>
-    <message>
-        <source>You received a membership request for circle:</source>
-        <translation type="vanished">Вы получили запрос на членство в круге:</translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Удовлетворить запрос на членство</translation>
     </message>
-    <message>
-        <source>Revoke membership request</source>
-        <translation type="vanished">Отказать в запросе на членство</translation>
-    </message>
-    <message>
-        <source>You received an invitation for circle:</source>
-        <translation type="vanished">Вы получили приглашение в круг:</translation>
-    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -9838,7 +8972,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Контейнер комментариев</translation>
     </message>
@@ -9851,7 +8985,7 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9881,7 +9015,7 @@ p, li { white-space: pre-wrap; }
         <translation>Обновить</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
@@ -9920,7 +9054,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Ответ на комментарий</translation>
     </message>
@@ -9944,6 +9078,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Голосовать против</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9953,7 +9102,7 @@ p, li { white-space: pre-wrap; }
         <translation>Сделать комментарий</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9982,26 +9131,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Комментарий&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Подписано</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -10030,7 +9163,7 @@ before you can comment</source>
 чем вы сможете комментировать</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10072,14 +9205,6 @@ before you can comment</source>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Добавить администраторов форума</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Выбрать администраторов форума</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -10089,7 +9214,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Подписаться на форум</translation>
     </message>
@@ -10105,7 +9230,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Раскрыть</translation>
     </message>
@@ -10125,8 +9250,9 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Загрузка</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10157,13 +9283,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Отписаться от форума</translation>
     </message>
@@ -10174,7 +9300,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Раскрыть</translation>
     </message>
@@ -10194,21 +9320,17 @@ before you can comment</source>
         <translation>В ответ на:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Загрузка</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Послать в форум</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Скрыть</translation>
     </message>
@@ -10221,63 +9343,66 @@ before you can comment</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Начать новую тему в выбранном форуме</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Поиск по форумам</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Последнее сообщение</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation>Новая тема</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Древовидный вид</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Плоский вид</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Сохранить изображение</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Загрузка</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10287,12 +9412,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Ответить на сообщение</translation>
     </message>
@@ -10316,10 +9436,6 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Скачать все файлы</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Следующее непрочитанное</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10336,35 +9452,23 @@ before you can comment</source>
         <translation>Поиск Автора</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Содержимое</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Поиск контента</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Подписка на форум означает, что ваш клиент будет собирать среди доверенного окружения все имеющиеся сообщения, а также, в свою очередь, делать форумный котент видимым для других участников из вашего окружения.&lt;/p&gt; &lt;p&gt;Впоследствии, при желании, вы сможете отписаться от форума, воспользовавшись контекстным меню.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Без названия</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Ответ</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10407,20 +9511,12 @@ before you can comment</source>
         <translation>Скопировать ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Скрыть</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Раскрыть</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Заблокировано]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[неизвестно]</translation>
     </message>
@@ -10450,8 +9546,8 @@ before you can comment</source>
         <translation>Только для вас</translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation>Распространение</translation>
     </message>
@@ -10465,26 +9561,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation>Анти-спам</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Отредактированное сообщение ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Аноним</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">подписано</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">нет</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Пропущенное сообщение ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10554,16 +9630,12 @@ before you can comment</source>
         <translation>Оригинал сообщения</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation>Новая тема</translation>
     </message>
     <message>
-        <source>Read status</source>
-        <translation type="vanished">Указывать состояние прочитано / не прочитано</translation>
-    </message>
-    <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
@@ -10624,7 +9696,7 @@ before you can comment</source>
         <translation>Репутация автора</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10644,7 +9716,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Сообщения анонимных авторов, а также авторов с неизвестными ключами, будут перенаправляться, если их репутация положительна</translation>
     </message>
@@ -10696,7 +9768,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10706,7 +9778,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10721,28 +9793,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information for this identity is currently missing.</source>
-        <translation type="vanished">В настоящее время информация об этой личности отсутствует</translation>
-    </message>
-    <message>
-        <source>You have banned this ID. The message will not be
-displayed nor forwarded to your friends.</source>
-        <translation type="vanished">Вы заблокировали этого участника. Его сообщения
-не будут отображаться и не будут транслироваться вашему окружению.</translation>
-    </message>
-    <message>
-        <source>You have not set an opinion for this person,
- and your friends do not vote positively: Spam regulation 
-prevents the message to be forwarded to your friends.</source>
-        <translation type="vanished">Вы не указали своё мнение об этом участнике,
-но некоторые узлы из вашего окружения установили для него отрицательную репутацию. Поэтому система предотвращения спама в вашем клиент-сервере не будет транслировать сообщения этого участника другим узлам из вашего окружения.</translation>
-    </message>
-    <message>
-        <source>Message will be forwarded to your friends.</source>
-        <translation type="vanished">Сообщения не будут перенаправляться вашему окружению.</translation>
-    </message>
-    <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation>(Последнее) </translation>
     </message>
@@ -10751,10 +9802,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>(Old) </source>
         <translation>(Старое) </translation>
     </message>
-    <message>
-        <source>You cant act on the author to a non-existant Message</source>
-        <translation type="vanished">Вы не можете влиять на автора несуществующего сообщения.</translation>
-    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -10812,12 +9859,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Форумы&lt;/h1&gt; ⇥⇥⇥&lt;p&gt;Форумы в RetroShare выглядят схоже и преследуют те же цели, что и интернет-форумы. Ключевым отличием является их децентрализованность.&lt;/p&gt; ⇥⇥⇥&lt;p&gt;В списке доступных форумов значатся форумы, на которые подписано ваше доверенное окружение. В свою очередь, вы отдаёте окружению информацию о том,⇥⇥⇥на какие форумы подписаны вы. Такой механизм распространения продвигает по сети хорошие форумы и блокирует неудачные.&lt;/p&gt; &lt;р&gt; Сообщения форумов хранятся в течение %1 дней и синхронизируются с другими узлами в течение %2 дней. &lt;/p&gt; &lt;р&gt; У вас есть возможность изменить эти значения.&lt;/p&gt;</translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Форумы</translation>
@@ -10848,35 +9895,16 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Другие форумы</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">ожидание</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Получение</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Загрузка</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Добавить значок</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Получатели ключа могут публиковать сообщения в группы с ограниченным доступом, просматривать и публиковать сообщения в приватных каналах</translation>
     </message>
@@ -10885,22 +9913,14 @@ prevents the message to be forwarded to your friends.</source>
         <source>Share Publish Key</source>
         <translation>Поделиться публичным ключом</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">проверить участников, с которыми вы хотите поделиться приватным ключом</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Поделиться ключом с</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Распространение сообщений</translation>
     </message>
@@ -10908,7 +9928,7 @@ prevents the message to be forwarded to your friends.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Публичные</translation>
     </message>
@@ -10927,14 +9947,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>New Thread</source>
         <translation>Новая тема</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Требуется</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Шифрованное сообщение</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10976,7 +9988,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Защита от спама</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Комментарии:</translation>
     </message>
@@ -10999,7 +10011,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Анти-спам:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11015,12 +10027,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation>Ограничено кругом:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation>Ограничено вашими доверенными узлами</translation>
     </message>
@@ -11037,23 +10049,23 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>Отслеживание сообщений</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>Необходима PGP-подпись</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation>Только для доверенных участников в группе</translation>
     </message>
@@ -11069,30 +10081,28 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Добавьте имя</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>Необходима PGP-подпись от известного идентификатора</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Загрузить логотип группы</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Отправить изменения группы</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Не удалось подготовить метаданные группы - пожалуйста, проверьте</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Будет использовано для обратной связи</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Владелец:</translation>
     </message>
@@ -11102,12 +10112,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Укажите здесь осмысленное описание</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Сведения</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>Идентификатор</translation>
     </message>
@@ -11117,7 +10127,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Последнее сообщение</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Сообщения будут распространяться далеко за пределы вашего доверенного окружения до тех пор, пока кто-нибудь подписан на созданный вами канал/форум/публикацию.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -11192,7 +10202,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Запретить неподписанные и неизвестные идентификаторы</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Популярность</translation>
     </message>
@@ -11208,27 +10223,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Создать</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Автор</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>Идентификатор Gxs</translation>
     </message>
@@ -11236,7 +10246,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Загрузка</translation>
     </message>
@@ -11296,7 +10306,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Редактировать подробности</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation>Синхронизировать контент в течение...</translation>
     </message>
@@ -11353,16 +10363,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share publish permissions</source>
-        <translation type="vanished">Поделиться правами на запись</translation>
-    </message>
-    <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Скопировать ссылку RetroShare</translation>
     </message>
@@ -11385,7 +10391,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Без подписи</translation>
     </message>
@@ -11398,40 +10404,24 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Загрузка</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Не найден</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Без подписи</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Заблокировано]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Аутентификация</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>неизвестный ключ</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">анонимный</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11441,7 +10431,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Имя&amp;nbsp;личности </translation>
     </message>
@@ -11455,16 +10450,20 @@ prevents the message to be forwarded to your friends.</source>
         <source>Node</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">Подписано</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[неизвестный]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11476,7 +10475,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11524,17 +10523,13 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Загрузка</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11651,10 +10646,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>Group ID / Author</source>
         <translation>Идентификатор группы / автор</translation>
     </message>
-    <message>
-        <source>Number of messages / Publish TS</source>
-        <translation type="vanished">Количество сообщений / Время публикации</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -11670,10 +10661,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>Popularity</source>
         <translation>Популярность</translation>
     </message>
-    <message>
-        <source>Details</source>
-        <translation type="vanished">Подробности</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -11706,41 +10693,6 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Нет</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">Авторизованные туннели:</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">Идентификатор туннеля: %1</translation>
-    </message>
-    <message>
-        <source>from: %1</source>
-        <translation type="vanished">от: %1</translation>
-    </message>
-    <message>
-        <source>to: %1</source>
-        <translation type="vanished">к: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">статус: %1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">всего отправлено: %1 байт</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">всего получено: %1 байт</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Неизвестный участник</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11953,48 +10905,12 @@ prevents the message to be forwarded to your friends.</source>
         <source>About</source>
         <translation>О программе</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;RetroShare – это кроссплатформенное приложение на основе открытого ПО, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;персональная защищённая децентрализованная коммуникационная система.⇥&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Она позволяет осуществлять безопасный файлообмен совместно с доверенными участниками,  &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;использует сеть доверия для установления подлинности участников и OpenSSL для шифрования всей передаваемой информации. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;RetroShare предоставляет сервисы файлообмена, чатов, электронной почты и каналов&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Следующие полезные ссылки дают больше сведений:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Вебсайт Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;Вики-страница Retroshare&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;Форум RetroShare&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;Страница проекта Retroshare&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Блог команды RetroShare&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Twitter разработчиков RetroShare&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+37"/>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -12010,7 +10926,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Авторы</translation>
     </message>
@@ -12029,7 +10945,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -12042,36 +10958,6 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Перевод интерфейса RetroShare:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Переводчики веб-сайта RetroShare:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Шведский язык: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Немецкий язык: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Польский язык: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -12137,12 +11023,12 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+158"/>
+        <location line="+165"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12157,7 +11043,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12166,32 +11052,12 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Did you receive a certificate from a friend?</source>
-        <translation type="vanished">У вас уже есть сертификат другого участника тёмной сети?</translation>
-    </message>
-    <message>
-        <source>Add friends certificate</source>
-        <translation type="vanished">Добавить сертификат</translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">Добавить файл сертификата</translation>
-    </message>
-    <message>
-        <source>Share your RetroShare Key</source>
-        <translation type="vanished">Предоставить мой сертификат</translation>
-    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
-        <translation type="vanished">Текст, который вы видите ниже, есть ваш сертификат. Отправьте его тому, с кем вы желаете соединиться</translation>
-    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -12202,20 +11068,12 @@ private and secure decentralized communication platform.
 </translation>
     </message>
     <message>
-        <source>Launch startup wizard</source>
-        <translation type="vanished">Мастер запуска</translation>
-    </message>
-    <message>
-        <source>Do you need help with RetroShare?</source>
-        <translation type="vanished">Вам нужна помощь по RetroShare?</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+134"/>
         <source>Open Web Help</source>
         <translation>Открыть помощь в веб</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Скопировать сертификат в буфер обмена</translation>
     </message>
@@ -12225,7 +11083,7 @@ private and secure decentralized communication platform.
         <translation>Сохранить сертификат в файл</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>Послать по электронной почте</translation>
     </message>
@@ -12245,13 +11103,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12263,17 +11145,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+57"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12282,19 +11159,11 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Добро пожаловать в Retroshare!&lt;/h1&gt;   &lt;p&gt;Вам нужно &lt;b&gt;добавить доверенные узлы&lt;/b&gt;! После добавления доверенных узлов или присоединения к существующей сети,	  вы сможете обмениваться файлами, общаться в чате, на форумах и т. д. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;Для этого скопируйте свой сертификат с этой страницы и отправьте его своим контактам, а также добавьте их сертификаты.&lt;/p&gt;    &lt;p&gt;Другой вариант — найти в интернете &quot;чат-серверы Retroshare&quot; (независимо от администрирования). Эти серверы позволяют обмениваться сертификатами с выделенным узлом Retroshare, через который вы сможете анонимно встречаться с другими людьми.&lt;/p&gt; </translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Пригласить в RetroShare</translation>
     </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Ваш сертификат скопирован в буфер обмена. Отправьте контрагенту письмо с этим сертификатом по электронной почте или же воспользуйтесь любым другим доступным способом.</translation>
-    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -12566,14 +11435,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Все участники</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Репутация</translation>
     </message>
@@ -12583,12 +11452,12 @@ p, li { white-space: pre-wrap; }
         <translation>Поиск</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>Анонимный идентификатор</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Создать новую личность</translation>
     </message>
@@ -12598,7 +11467,7 @@ p, li { white-space: pre-wrap; }
         <translation>Создать новый круг</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>Действия над участниками</translation>
     </message>
@@ -12613,27 +11482,27 @@ p, li { white-space: pre-wrap; }
         <translation>Участник</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation>Блокировка:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Автоматически блокировать все личности, созданные этим узлом</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation>Рейтинг согласно мнению участников из окружения:</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Положительное мнение</translation>
     </message>
@@ -12649,29 +11518,39 @@ p, li { white-space: pre-wrap; }
         <translation>Отрицательное мнение</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation>Статистика использования</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Круги</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Имя круга</translation>
     </message>
@@ -12691,18 +11570,20 @@ p, li { white-space: pre-wrap; }
         <translation>Личные круги</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Редактировать личность</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Удалить личность</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Чат с этим участником</translation>
     </message>
@@ -12712,98 +11593,78 @@ p, li { white-space: pre-wrap; }
         <translation>Запустить удалённый чат с этим участником</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>Идентификатор владельца узла:</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Псевдоним:</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>Идентификатор личности</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Отправить сообщение</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Информация о личности</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Идентификатор личности:</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Имя владельца узла:</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation>Создать новую личность...</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Пригласить</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Среднее мнение об этой личности с соседних узлов. Отрицательное — плохо&lt;/p&gt;&lt;p&gt;Положительное — хорошо. Ноль нейтрален. &lt;p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>Ваше мнение:</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ваше собственное мнение о личности определяет видимость этой личности для вас самих и ваших доверенных узлов. Ваше мнение передаётся доверенным узлам и используется для вычисления оценки репутации: если ваше мнение о личности нейтрально, оценка репутации — это разница между положительными и отрицательными мнениями ваших контактов, а если нет, то оценку определяет ваше мнение.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Общий балл используется в чатах, форумах и каналах, чтобы определить действия, которые необходимо предпринять в отношении каждой конкретной личности. Когда общий балл меньше -1, личность блокируется, что предотвращает пересылку всех ею созданных сообщений и форумов/каналов, в обоих направлениях. Некоторые форумы также имеют специальные флаги для защиты от нежелательной почты, которые требуют не отрицательного уровня репутации, что делает их более чувствительными к плохим мнениям. Заблокированные личности постепенно теряют свою активность и в конечном итоге исчезают (через 5 дней).&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Вы можете изменить пороговые значения и время бездействия для удаления личностей в &quot;Настройках&quot; → &quot;Участники&quot;. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Отрицательное мнение</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Нейтральное мнение</translation>
     </message>
@@ -12814,17 +11675,17 @@ p, li { white-space: pre-wrap; }
         <translation>Положительное мнение</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Интегральное значение репутации, основанное на вашем мнении и мнении ваших контактов.&lt;/p&gt;&lt;p&gt;Отрицательное значение — плохая репутация, положительное — хорошая, ноль — нейтральная. Если значение слишком низкое,&lt;/p&gt;&lt;p&gt;личность будет помечена как плохая и отфильтрована в форумах, чатах,&lt;/p&gt;&lt;p&gt;каналах и т.п.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Общая:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Анонимные участники</translation>
     </message>
@@ -12839,24 +11700,24 @@ p, li { white-space: pre-wrap; }
         <translation>Поиск идентификатора</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Эта личность закреплена за вами</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>Личности, созданные мною</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>Мои контакты</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation>Показать...</translation>
     </message>
@@ -12871,7 +11732,12 @@ p, li { white-space: pre-wrap; }
         <translation>Личности, привязанные к моему узлу</translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>Другие круги</translation>
     </message>
@@ -12881,7 +11747,7 @@ p, li { white-space: pre-wrap; }
         <translation>Круги со мной</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>Идентификатор круга: </translation>
     </message>
@@ -12956,7 +11822,7 @@ p, li { white-space: pre-wrap; }
         <translation>Не член (нет доступа к данным доступным кругу)</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>Идентификатор личности: </translation>
     </message>
@@ -12986,7 +11852,7 @@ p, li { white-space: pre-wrap; }
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>Приглашён</translation>
     </message>
@@ -13001,7 +11867,7 @@ p, li { white-space: pre-wrap; }
         <translation>Член</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>Редактировать круг</translation>
     </message>
@@ -13049,7 +11915,7 @@ p, li { white-space: pre-wrap; }
         <translation>Разрешить членство</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -13060,7 +11926,7 @@ These identities will soon be not supported anymore.</source>
 Поддержка таких идентификаторов вскоре прекратится.</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[неизвестный узел]</translation>
@@ -13103,7 +11969,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Анонимная личность</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13145,7 +12011,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+2"/>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сообщение</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -13183,7 +12049,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation>информация</translation>
     </message>
@@ -13199,29 +12065,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Скопировать личность в буфер обмена</translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Послать приглашение</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Отправить приглашение с Вашим сертификатом?</translation>
-    </message>
-    <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Заблокированные участники</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Личности&lt;/h1&gt;    			&lt;p&gt;В этой вкладке вы имеете возможность создавать/редактировать &lt;b&gt;анонимные и псевдонимные личности&lt;/b&gt;, а также &lt;b&gt;круги&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Личности&lt;/b&gt; используются для безопасной публикации сообщений: от имени личностей вы посылаете сообщения в чаты, форумы и каналы,				получаете отклики через встроенный в RetroShare почтовый сервис, публикуете комментарии 				в каналах, чатах. От имени личностей в определённых случаях прокладываются анонимные туннели и т. п.&lt;/p&gt; 			&lt;p&gt;Личности не обязательно должны быть &lt;b&gt;подписаны&lt;/b&gt; вашим личным сертификатом.   			Подписанные личности иногда полезны, если вы хотите подчеркнуть авторство того или иного сообщения. Однако по подписанным личностям зачастую можно отследить IP-адрес автора сообщения.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Анонимные личности&lt;/b&gt; позволяют вам анонимно, а значит – безопасно, взаимодействовать с другими участниками тёмной сети. Анонимные личности не могут быть подменены,   			 но никто не может однозначно обозначить привязку анонимной личности к конкретному сертификату, а значит – и пользователю.&lt;/p&gt;                 	&lt;p&gt;&lt;b&gt;Круги&lt;/b&gt; – это совокупность личностей (анонимных или подписанных), информация о которых широко распространяется по тёмной сети. Круги используются                 		для создания форумов и каналов, содержимое которых доступно только участникам конкретного круга &lt;/p&gt;                 	&lt;p&gt;&lt;b&gt;Один круг&lt;/b&gt; может быть ограничен другим кругом, как следствие, определяя видимость его участников определённому множеству участников, принадлежащему другому кругу.                  		Есть возможность создавать самый приватный тип кругов, где информация о них доступна только членам самого круга, читайте – закрытого клуба.&lt;/p&gt;                 	&lt;p&gt;&lt;b&gt;Локальный круг&lt;/b&gt; есть совокупность доверенных узлов, представленных их PGP-идентификаторами, и широко используемых для ограничения                 		доступности каналов и форумов. Такого рода круги не распространяются по сети и список его членов доступен только вам.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Unknown ID:</source>
-        <translation type="vanished">Неизвестный идентификатор:</translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation> положительно</translation>
     </message>
@@ -13265,19 +12114,11 @@ These identities will soon be not supported anymore.</source>
         <source>Forums</source>
         <translation>Форумы</translation>
     </message>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Публикации</translation>
-    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Чаты</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Неизвестно</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13298,14 +12139,6 @@ These identities will soon be not supported anymore.</source>
         <source>Creation of author signature in service %1</source>
         <translation>Создание сигнатуры администратора в сервисе %1</translation>
     </message>
-    <message>
-        <source>Message/vote/comment</source>
-        <translation type="vanished">Сообщение / голос / комментарий</translation>
-    </message>
-    <message>
-        <source>%1 in %2 tab</source>
-        <translation type="vanished">%1 во вкладке %2</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -13326,19 +12159,11 @@ These identities will soon be not supported anymore.</source>
         <source>Signature in distant tunnel system.</source>
         <translation>Подпись в системе удалённого туннелирования</translation>
     </message>
-    <message>
-        <source>Update of identity data.</source>
-        <translation type="vanished"> обновление данных о личности.</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Базовая проверка подлинности сигнатуры</translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">Базовая сигнатура</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -13350,11 +12175,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Базовое дешифрование.</translation>
     </message>
     <message>
-        <source>Membership verification in circle %1.</source>
-        <translation type="vanished">Проверка членства в круге %1</translation>
-    </message>
-    <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation>Добавить в контакты</translation>
     </message>
@@ -13404,21 +12225,21 @@ These identities will soon be not supported anymore.</source>
         <translation>Приветствую, &lt;br&gt;предлагаю обменяться сертификатами RetroShare.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Участники</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Нажмите здесь, чтобы изменить свой аватар</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>Личности, привязанные к ближнему окружению</translation>
     </message>
@@ -13428,7 +12249,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Личности, привязанные к удалённому узлу</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Личности, привязанные к доверенному окружению</translation>
     </message>
@@ -13443,7 +12264,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Привязан к неизвестному узлу</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Начать чат</translation>
     </message>
@@ -13458,12 +12279,12 @@ These identities will soon be not supported anymore.</source>
         <translation>В удалённом чате с этим человеком отказано.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Последний раз появлялся: </translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 известных PGP</translation>
     </message>
@@ -13483,12 +12304,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Вы действительно хотите удалить эту личность?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Принадлежит...</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Имя узла:</translation>
     </message>
@@ -13498,7 +12319,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Идентификатор узла:</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>Действительно удалить? </translation>
     </message>
@@ -13506,7 +12327,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Псевдоним</translation>
     </message>
@@ -13536,7 +12357,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Псевдоним</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13546,12 +12367,19 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Новая личность</translation>
     </message>
@@ -13565,7 +12393,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13575,7 +12403,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Недоступен</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Редактировать личность</translation>
@@ -13586,27 +12419,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Обновить</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13626,7 +12459,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13636,11 +12469,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Ошибка при получении ключа!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Ошибка: недействительный идентификатор ключа</translation>
     </message>
@@ -13655,7 +12484,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Неизвестное имя</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Создать новую личность</translation>
     </message>
@@ -13665,10 +12494,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13694,7 +12528,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Создать</translation>
     </message>
@@ -13704,17 +12538,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Нажмите здесь, чтобы изменить аватар</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Установить аватар</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>Привязан к моему профилю</translation>
     </message>
@@ -13724,7 +12554,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Вы можете иметь один или несколько идентификаторов. Они используются, когда вы пишете в чате лобби, на форумах и канале комментариев. Они выступают в качестве получателя для удалённого чата и удалённой почтовой системы Retroshare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Псевдоним является слишком коротким. Пожалуйста, введите по крайней мере %1 символов.</translation>
     </message>
@@ -13783,10 +12613,6 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>PGP-псевдоним:</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">Идентификатор GXS:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13802,7 +12628,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
@@ -13812,12 +12638,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Отметить всё</translation>
     </message>
@@ -13836,26 +12662,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Цитата</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Отправить</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Сохранить изображение</translation>
     </message>
     <message>
         <location line="-7"/>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Невозможно сохранить изображение, неверное имя файла</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>Не является изображением</translation>
     </message>
@@ -13873,27 +12711,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Порт:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Статус:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13914,7 +12757,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13923,26 +12771,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Открыть папку</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Проверка...</translation>
     </message>
@@ -13952,7 +12805,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Проверить файлы</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation>Рекомендовать в сообщении для...</translation>
     </message>
@@ -13980,7 +12833,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Добавить контакт</translation>
     </message>
@@ -13996,7 +12849,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
@@ -14017,7 +12871,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
@@ -14028,12 +12882,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Помощник быстрого старта</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 — безопасная децентрализованная коммуникационная платформа</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Ещё не готово</translation>
     </message>
@@ -14062,11 +12916,12 @@ RetroShare безопасно приостановит доступ диска 
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Уведомить</translation>
     </message>
@@ -14077,31 +12932,35 @@ RetroShare безопасно приостановит доступ диска 
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Открыть почту</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>График пропускной способности</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Программа</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Свернуть</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Развернуть</translation>
     </message>
@@ -14116,7 +12975,12 @@ RetroShare безопасно приостановит доступ диска 
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 новое сообщение</translation>
     </message>
@@ -14146,7 +13010,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>%1 узлов сети соединено</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Вы действительно хотите выйти из RetroShare?</translation>
     </message>
@@ -14166,7 +13030,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Показать</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Убедитесь, что эта ссылка не была подделана, чтобы перенаправить вас на вредоносный веб-сайт.</translation>
     </message>
@@ -14211,12 +13075,13 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Управление правами доступа</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Статистика функционирования</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Показать веб-интерфейс</translation>
     </message>
@@ -14231,7 +13096,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>не хватает места в данной папке (текущий лимит</translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>Хотите выйти?</translation>
     </message>
@@ -14240,17 +13105,17 @@ RetroShare безопасно приостановит доступ диска 
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Составить</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Абзац</translation>
     </message>
@@ -14286,12 +13151,12 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Заголовок 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Увеличить размер шрифта</translation>
     </message>
@@ -14306,32 +13171,32 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Полужирный</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Выравнивание</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Добавить изображение</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Установка шрифта для стиля кода</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Подчёркнутый</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Тема:</translation>
     </message>
@@ -14342,32 +13207,32 @@ RetroShare безопасно приостановит доступ диска 
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>Список адресов</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation>Рекомендовать этого доверенного участника</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Задать цвет текста</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Задать цвет фона текста</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Рекомендованные файлы</translation>
     </message>
@@ -14437,7 +13302,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Добавить цитату</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Отправить: </translation>
     </message>
@@ -14461,10 +13326,6 @@ RetroShare безопасно приостановит доступ диска 
         <source>&amp;Justify</source>
         <translation>По ширине</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">Все адреса (смешано)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14476,7 +13337,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Мои контакты</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Здравствуйте, &lt;br&gt;я рекомендую вам один из моих лучших контактов. Вы можете доверять ему ровно настолько, насколько вы доверяете мне. Это хороший узел, поверьте.&lt;br&gt;</translation>
     </message>
@@ -14496,18 +13357,18 @@ RetroShare безопасно приостановит доступ диска 
         <translation>желает установить с вами соединение</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Наилучшие пожелания %1,&lt;br&gt;&lt;br&gt;%2 хочет установить с вами соединение.&lt;br&gt;&lt;br&gt;Откликнитесь, пожалуйста:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Это в интересах всей сети.&lt;br&gt;Команда разработчиков RetroShare</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Сохранить сообщение</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Сообщение не отправлено.
@@ -14519,7 +13380,17 @@ Do you want to save message to draft box?</source>
         <translation>Вставить ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Добавить к &quot;кому&quot;</translation>
     </message>
@@ -14539,7 +13410,7 @@ Do you want to save message to draft box?</source>
         <translation>Добавить как рекомендацию</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Оригинал сообщения</translation>
     </message>
@@ -14549,21 +13420,21 @@ Do you want to save message to draft box?</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Копия</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Отправлено</translation>
     </message>
@@ -14578,7 +13449,7 @@ Do you want to save message to draft box?</source>
         <translation>%1 %2 написал(а):</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Ответ:</translation>
     </message>
@@ -14588,30 +13459,30 @@ Do you want to save message to draft box?</source>
         <translation>Перенаправление:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Отправить сообщение без темы?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Пожалуйста, укажите хотя бы одного получателя</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Невидимая копия</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
@@ -14726,13 +13597,13 @@ Do you want to save message to draft box?</source>
         <translation>Подробности</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Открыть файл...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-файлы (*.htm *.html);;Все файлы (*)</translation>
     </message>
@@ -14752,7 +13623,7 @@ Do you want to save message to draft box?</source>
         <translation>Экспорт PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Сообщение не отправлено.
@@ -14774,7 +13645,7 @@ Do you want to save message ?</source>
         <translation>Добавить файл</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Привет, &lt;br&gt;Есть предложение обменяться сертификатами друг с другом. Не возражаете?&lt;br&gt;</translation>
     </message>
@@ -14798,28 +13669,24 @@ Do you want to save message ?</source>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">Вы получили предложение на соединение с действующим узлом RetroShare</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Ответить сейчас:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Из:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>Доверенные узлы сети</translation>
     </message>
@@ -14864,13 +13731,13 @@ Do you want to save message ?</source>
         <translation>Отсортированный список (в римской системе по убыванию)</translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Спасибо, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Удалённая личность:</translation>
     </message>
@@ -14880,12 +13747,12 @@ Do you want to save message ?</source>
         <translation>[Отсутствует]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Пожалуйста, создайте личность для подписи отдалённых сообщений или удалите отдалённых участников из списка назначения.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Имя и идентификатор узла:</translation>
     </message>
@@ -14963,7 +13830,7 @@ Do you want to save message ?</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Новая вкладка</translation>
     </message>
@@ -14973,7 +13840,7 @@ Do you want to save message ?</source>
         <translation>Новое окно</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Изменить метку</translation>
     </message>
@@ -14996,7 +13863,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Тема:</translation>
     </message>
@@ -15004,7 +13871,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
@@ -15032,7 +13899,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Рекомендованные файлы</translation>
     </message>
@@ -15042,37 +13909,37 @@ Do you want to save message ?</source>
         <translation>Скачать все рекомендованные файлы</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Из:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>В:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Копия:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Невидимая копия:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Метки:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Ответ</translation>
     </message>
@@ -15112,7 +13979,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>Послать приглашение</translation>
     </message>
@@ -15164,7 +14031,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Установить соединение с %1</translation>
     </message>
@@ -15174,12 +14041,12 @@ Do you want to save message ?</source>
         <translation>Добавить %1 в моё окружение</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Без темы</translation>
     </message>
@@ -15189,17 +14056,22 @@ Do you want to save message ?</source>
         <translation>Скачать</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15209,21 +14081,23 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Послать приглашение</translation>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Отправить приглашение с вашим сертификатом?</translation>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Скачать всё</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Распечатать документ</translation>
     </message>
@@ -15238,12 +14112,12 @@ Do you want to save message ?</source>
         <translation>HTML-файлы (*.htm *.html);;Все файлы (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Загружать изображения всегда для этого сообщения</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Скрыть панель вложений</translation>
     </message>
@@ -15265,42 +14139,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Составить</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Ответить на сообщение</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Ответ</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Ответить всем на данное сообщение</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Ответить всем</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Переслать выбранные сообщения</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Вперёд</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Удалить выделенное сообщение</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Удалить</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Напечатать данное сообщение</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15379,7 +14217,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Новое сообщение </translation>
     </message>
@@ -15389,60 +14227,16 @@ Do you want to save message ?</source>
         <translation>Составить</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Ответить на сообщение</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Ответ</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Ответить всем на выделенное сообщение</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Ответить всем</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Переслать выбранные сообщения</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Переслать</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Удалить выделенное сообщение</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Удалить</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Напечатать данное сообщение</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Печать</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Показать</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Входящие</translation>
@@ -15472,21 +14266,17 @@ Do you want to save message ?</source>
         <translation>Корзина</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Все входящие:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Папки</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Быстрый просмотр</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Печать...</translation>
@@ -15496,26 +14286,6 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>Предварительный просмотр</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Только кнопки</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Текст рядом с кнопкой</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Кнопки с текстом</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Текст под кнопками</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Установить текст под кнопкой</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15537,7 +14307,7 @@ Do you want to save message ?</source>
         <translation>Переслать сообщение</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
@@ -15547,7 +14317,7 @@ Do you want to save message ?</source>
         <translation>От</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
@@ -15557,39 +14327,7 @@ Do you want to save message ?</source>
         <translation>Содержимое</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Сортировка по вложенным файлам</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Сортировка по темам</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Сортировка по прочитанным сообщениям</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Сортировка по отправителю</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Сортировка по дате</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Сортировка по меткам</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Сортировка по звёздам</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Переслать выбранное сообщение</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Поиск темы</translation>
     </message>
@@ -15598,6 +14336,11 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Поиск отправителя</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15624,14 +14367,14 @@ Do you want to save message ?</source>
         <translation>Поиск вложений</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Сообщения&lt;/h1&gt; &lt;p&gt;В RetroShare имеется собственный почтовый сервис. Вы можете отправлять/получать письма в пределах доверенного окружения.&lt;/p&gt; &lt;p&gt;Благодаря глобальной системе маршрутизации данных, возможна рассылка писем другим участникам сети. Эти сообщения 	всегда подвергаются шифрованию и передаются адресату через промежуточные узлы сети. &lt;/p&gt;	&lt;p&gt;Для надёжной идентификации отправителя рекомендуется криптографически подписывать сообщения, используя 	the &lt;img width=&quot;16&quot; src=&quot;:/images/stock_signature_ok.png&quot;/&gt; кнопку 	в редакторе сообщений. Сообщения удалённым пользователям остаются в папке &quot;Исходящие&quot; до тех пор, пока не будет получено подтверждение в получении.&lt;/p&gt; &lt;p&gt;Почтовый сервис RetroShare может быть использован для передачи ссылок на файлы или рекомендаций по включению в круг доверенных, что укрепит вашу сеть, а также для откликов на объявления в каналах.&lt;/p&gt;</translation>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Отмечено звездой</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15705,7 +14448,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15719,7 +14462,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15734,38 +14477,33 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Черновики</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Нет оценённых сообщений. Оценка сообщений присваивает им специальный статус для последующего удобного поиска и ранжирования. Чтобы оценить сообщение щёлкните на звезду серого цвета рядом с ним.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Системные сообщения отсутствуют.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Кому</translation>
+        <translation>Кому</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Нажмите, чтобы отсортировать по получателю</translation>
-    </message>
-    <message>
-        <source>This message goes to a distant person.</source>
-        <translation type="vanished">Это сообщение будет отправлено удалённому участнику.</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15773,26 +14511,6 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Всего:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Почта</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Нажмите, чтобы отсортировать по подписи</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Это сообщение было подписано и подпись проверена</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Это сообщение было подписано, но подпись не была проверена  </translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">Это сообщение пришло от удалённых лиц.</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15820,7 +14538,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">Сохранить изображение</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Вставить как простой текст</translation>
     </message>
@@ -15874,7 +14602,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Развернуть</translation>
     </message>
@@ -15884,7 +14612,7 @@ Do you want to save message ?</source>
         <translation>Удалить объект</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation>от </translation>
     </message>
@@ -15919,18 +14647,10 @@ Do you want to save message ?</source>
         <translation>Ожидающее сообщение</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Спрятать</translation>
     </message>
-    <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Послать приглашение</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Отправить приглашение с вашим сертификатом?</translation>
-    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -16068,7 +14788,7 @@ Do you want to save message ?</source>
         <translation>Идентификатор участника</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Удалить неиспользуемые ключи...</translation>
     </message>
@@ -16078,7 +14798,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Чистый массив ключей</translation>
     </message>
@@ -16096,7 +14816,13 @@ Notes: Your old keyring will be backed up.
 При удалении может произойти сбой, если на одном компьютере запущено несколько экземпляров RetroShare.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Информация о массиве ключей</translation>
@@ -16132,18 +14858,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Несоответствие данных в хранилище ключей. Вероятнее всего, это ошибка. Пожалуйста, свяжитесь с разработчиками.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>Экспортировать/создать новый узел</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Только доверенные ключи</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Поиск по имени</translation>
     </message>
@@ -16153,12 +14874,12 @@ For security, your keyring was previously backed-up to file
         <translation>Поиск идентификатора участника</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>Сведения о профиле...</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -16167,13 +14888,6 @@ Reported error:</source>
 Сообщение о ошибке: </translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Сеть</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -16200,7 +14914,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16221,7 +14935,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Группы</translation>
     </message>
@@ -16251,19 +14965,19 @@ Reported error:</source>
         <translation type="unfinished">Импорт списка контактов, включая информацию о группах</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished">Поиск идентификатора</translation>
     </message>
@@ -16273,12 +14987,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished">Показать...</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16288,7 +15002,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Группа</translation>
     </message>
@@ -16403,7 +15117,7 @@ Reported error:</source>
         <translation type="unfinished">Свернуть всё</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Вы хотите удалить этот узел?</translation>
     </message>
@@ -16413,7 +15127,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Готово!</translation>
@@ -16527,11 +15241,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">Журнал</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16546,11 +15256,7 @@ at least one peer was not added to a group</source>
         <translation>Очистить всё</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Это проверка.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>Новые наверху</translation>
     </message>
@@ -16560,20 +15266,12 @@ at least one peer was not added to a group</source>
         <translation>Старые наверху</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Новостная лента&lt;/h1&gt; &lt;p&gt;Лента новостей отображает последние события вашей сети в порядке получения. Можно настроить какие виды событий отображать в журнале, нажав &lt;b&gt;Параметры&lt;/b&gt;. &lt;/p&gt; &lt;p&gt;События могут быть следующими: &lt;ul&gt; &lt;li&gt;попытка соединения (полезно для пополнения вашего окружения новыми доверенными участниками и отслеживания тех участников, которые пытаются к вам подключиться)&lt;/li&gt; &lt;li&gt;появление сообщений в форумах и каналах&lt;/li&gt; &lt;li&gt;появление новых форумов или каналов&lt;/li&gt; &lt;li&gt;личные сообщения от ваших контактов&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="vanished">Журнал</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16628,10 +15326,6 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Блоги</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Безопасность</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16653,10 +15347,6 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Попытка соединения</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16673,10 +15363,6 @@ at least one peer was not added to a group</source>
         <source>Ip security</source>
         <translation>IP-безопасность</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Журнал</translation>
-    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -16687,10 +15373,6 @@ at least one peer was not added to a group</source>
         <source>Circles</source>
         <translation>Круги</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Публикации</translation>
-    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -16743,26 +15425,6 @@ at least one peer was not added to a group</source>
         <source>Chat rooms</source>
         <translation>Чат-комнаты</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">Чаты</translation>
-    </message>
-    <message>
-        <source>Count occurrences of my current identity</source>
-        <translation type="vanished">Подсчёт нахождений моей текущей личности</translation>
-    </message>
-    <message>
-        <source>Count occurrences of any of the following texts (separate by newlines):</source>
-        <translation type="vanished">Подсчёт нахождений любых нижеследующих фрагментов текста (каждый с новой строки):</translation>
-    </message>
-    <message>
-        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
-        <translation type="vanished">Отметьте, если для подсчёта должны одновременно присутствовать и личность, и текст выше.</translation>
-    </message>
-    <message>
-        <source>Case sensitive</source>
-        <translation type="vanished">Учитывать регистр</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16838,24 +15500,16 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation>Временно отключить все всплывающие уведомления</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Канал</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Панель уведомлений</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">Подсчёт всех непрочитанных сообщений</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation>Требуется ключевая фраза</translation>
     </message>
@@ -16875,12 +15529,12 @@ at least one peer was not added to a group</source>
         <translation>Неверный пароль!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Пожалуйста, введите ваш пароль для PGP-ключа</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Незарегистрированный плагин/исполняемый файл.</translation>
     </message>
@@ -16895,19 +15549,7 @@ at least one peer was not added to a group</source>
         <translation>Пожалуйста, проверьте ваши системные часы.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Проверка файлов, открытых к доступу...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Хеширование файла</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Сохранение списка файлов...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Тест</translation>
     </message>
@@ -16918,17 +15560,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Неизвестный заголовок</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Шифрованное сообщение</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Для надлежащей работы чата требуется, чтобы системное время компьютера было точным. Пожалуйста, проверьте его. (Смещение системного времени в несколько минут может нарушить общение с другими участниками сети.)</translation>
     </message>
@@ -16936,7 +15580,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Успешное соединение с узлом сети!</translation>
     </message>
@@ -16989,10 +15633,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Диалоговое окно</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -17058,10 +15698,6 @@ at least one peer was not added to a group</source>
         <source>This profile has signed your own profile key</source>
         <translation>Этот ключ подписан вашим собственным PGP-ключом</translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Ключ подписи:</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17091,23 +15727,20 @@ p, li { white-space: pre-wrap; }
         <translation>PGP-ключ</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation>Эти опции применяются для всех местоположений, привязанных к профилю: </translation>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Механизм подписания ключей может оказаться полезным другим участникам сети, которые, добавляя чужой сертификат в своё окружение, имеют возможность посмотреть, кто подписал ключ в сертификате. Следует отметить, что подписание чужих ключей не является обязательным и не может быть впоследствии отменено. Поэтому подходите к вопросу подписания, взвесив все «за» и «против».&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation>Эти опции применяются для всех местоположений, привязанных к профилю: </translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Подписать PGP-ключ</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17144,12 +15777,7 @@ p, li { white-space: pre-wrap; }
         <translation>Вставить подписи</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Параметры</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare периодически проверяет папки ваших контактов, доступные вам к просмотру, на предмет наличия там интересующего вас файла. Если файл находится, в целях скачивания с контактом устанавливается прямое соединение – не через систему анонимных туннелей. В этом случае узел-источник из вашего окружения достоверно знает, что файл качаете именно вы – пользователь с конкретным сертификатом.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Чтобы исключить такого рода небезопасное поведение вашего клиент-сервера, снимите здесь галочку. Отметим, что прямое соединение всё равно установится, если вы напрямую выберете в открытой к просмотру папке файл для скачивания. Включение/отключение возможности прямого соединения при файлообмене применяется ко всем местоположениям одного узла.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -17163,10 +15791,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Эта опция позволяет вам автоматически скачивать рекомендованный в сообщении файл, если само сообщение поступило от конкретного узла сети. Такой подход может оказаться весьма удобным, например, когда вы пересылаете файлы с одного узла, принадлежащего вам, на другой. Применяется ко всем местоположениям, привязанным к конкретному сертификату.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -17199,21 +15823,21 @@ p, li { white-space: pre-wrap; }
         <translation> кБ/с</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Ошибка: не могу получить совокупность деталей.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Предоставленный алгоритм ключа не поддерживается RetroShare 
@@ -17232,7 +15856,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Предупреждение: в настройках файлообмена вы запретили прямую загрузку.</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Уровень доверия является способом выразить доверие в этом ключе. Он не используется сторонним программным обеспечением, но может быть полезным для вас, чтобы запомнить хорошие/плохие ключи.</translation>
     </message>
@@ -17301,10 +15925,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Может быть, неправильный пароль</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -17312,12 +15932,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>Профиль RetroShare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Это ваш собственный ключ PGP и он подписан: </translation>
     </message>
@@ -17343,7 +15963,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Чат</translation>
     </message>
@@ -17364,7 +15984,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Удалить объект</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -17404,7 +16024,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Смещение времени:</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Написать сообщение</translation>
     </message>
@@ -17418,10 +16038,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Соединение установлено</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Попытка соединения</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17460,17 +16076,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Неизвестный участник</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Спрятать</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Отправить сообщение</translation>
     </message>
@@ -17522,10 +16134,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Chat with this person as...</source>
         <translation>Инициировать чат с этим человеком от имени...</translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">Послать сообщение</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17584,10 +16192,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если не указано иное, любому участнику из вашего окружения будет автоматически присвоена положительная репутация.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
-        <translation type="vanished">давать положительный голос каждому из моего окружения</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -17645,13 +16249,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Для того, чтобы предотвратить активность заблокированных личностей в форумах или каналах, информация о них некоторое время должна храниться. После этого они &amp;quot;удаляются&amp;quot; из списка блокировки, скачиваются снова как незаблокированные и могут участвовать форумах, чатах и т.п.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Форма</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17659,23 +16256,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Фото</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Комментарий</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Резюме</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17736,14 +16321,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Добавить комментарий</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Напишите комментарий...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17814,10 +16391,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Создать альбом</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Просмотреть альбом</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17839,17 +16412,17 @@ p, li { white-space: pre-wrap; }
         <translation>Слайд-шоу</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Мои альбомы</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Подписанные альбомы</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Общие альбомы</translation>
     </message>
@@ -17879,7 +16452,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Название альбома</translation>
     </message>
@@ -17938,19 +16511,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17986,12 +16559,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Показать подробности об этом плагине</translation>
     </message>
@@ -18137,60 +16710,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Папки поиска плагинов</translation>
     </message>
-    <message>
-        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="vanished">Плагин отключён. Нажмите кнопку &quot;Включить&quot; и перезапустите RetroShare</translation>
-    </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[отключено]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Нет номера API. Пожалуйста, прочитайте руководство по разработке плагинов.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[проблема загрузки]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Нет номера SVN. Пожалуйста, прочитайте руководство по разработке плагинов.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Ошибка загрузки.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Пропущен символ. Неправильная версия?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Плагин отсутствует</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Плагины загружены.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Неизвестное состояние.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Плагины, находящиеся в стадии разработки, требуют проверки.
-Они не могут быть проверены по хэш-сумме, однако в обычной
-ситуации проверка хэш-суммы защищает вас от злонамеренных
-действий, осуществляемых подменёнными плагинами.</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;&lt;p&gt;Плагины загружаются из каталогов, перечисленных в нижней части списка.&lt;/p&gt;&lt;p&gt;По соображениям безопасности, разрешённые плагины загружаются автоматически до главного исполняемого файла RetroShare или изменения библиотеки плагинов. В таком случае, пользователь должен подтвердить их снова. После запуска программы, вы можете включить плагин вручную, нажав на кнопку &quot;Включить&quot; и перезагрузить RetroShare.&lt;/p&gt;    &lt;p&gt;Если вы хотите разрабатывать свои собственные плагины, свяжитесь с командой Разработчиков, они будут рады помочь вам!&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -18260,12 +16779,27 @@ malicious behavior of crafted plugins.</source>
         <translation>Разместить окно сверху</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">Заблокировать этого участника (устанавливает отрицательную репутацию)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished">Установить нейтральное мнение</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished">Установить положительное мнение</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -18299,22 +16833,6 @@ malicious behavior of crafted plugins.</source>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The person you are talking to has deleted the secured chat tunnel.</source>
-        <translation type="vanished">Собеседник, с которым вы общались, удалил защищённый туннель чата.</translation>
-    </message>
-    <message>
-        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
-        <translation type="vanished">Собеседник удалил защищённый туннель, сообщения будут доставлены как только появится возможность</translation>
-    </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Закрытие этого окна приведёт к завершению разговора, уведомлению участника и удалению шифрованного туннеля.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Удалить тоннель?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -18334,7 +16852,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Новый</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Голосовать &quot;за&quot;</translation>
     </message>
@@ -18354,8 +16872,8 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Комментарии</translation>
     </message>
@@ -18380,13 +16898,13 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Комментарий</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished">Комментарии </translation>
     </message>
@@ -18414,20 +16932,12 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Подписан: </translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Примечания</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -18442,12 +16952,22 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Загрузить файл изображения</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18463,7 +16983,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18473,23 +17003,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Отправить сообщение</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">Вы отправляете ссылку. Ключ к успешной презентации — это интересное содержание и информативное название.</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Отправить</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Отправить новое сообщение</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Пожалуйста, добавьте заголовок</translation>
     </message>
@@ -18509,12 +17023,22 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18529,7 +17053,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Отправить как</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18540,7 +17064,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Изображение</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18550,7 +17074,7 @@ malicious behavior of crafted plugins.</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Ссылка</translation>
     </message>
@@ -18558,44 +17082,12 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Опубликованное</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Ссылки&lt;/h1&gt; &lt;p&gt;Сервис «Ссылки» даёт Вам возможность поделиться с окружением полезными ссылками, информация о которых будет распространяться по сети как форумы ⇥ каналы&lt;/p&gt; ⇥ &lt;p&gt;Ссылки могут комментироваться подписчиками. Система продвижения сообщений даёт возможность ⇥ информировать о важных ссылках.&lt;/p&gt; ⇥ &lt;p&gt;Ограничения на тип и характер публикуемых ссылок отсутствует; будьте осторожны при переходах по ним.&lt;/p&gt; &lt;р&gt; Размещенные ссылки удаляются через %1 месяца. &lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Создать тему</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Мои темы</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Подписка на темы</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Популярные темы</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Другие темы</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Публикации</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18629,31 +17121,7 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Опубликованная тема</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Добавить администраторов темы</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Выбрать администраторов темы</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Создать новую тему</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Изменить тему</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Обновить тему</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18691,7 +17159,17 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Текстовая метка</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>Подписаться на сообщения</translation>
     </message>
@@ -18707,7 +17185,7 @@ malicious behavior of crafted plugins.</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Раскрыть</translation>
     </message>
@@ -18722,24 +17200,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">Описание канала ссылок</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Загрузка</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">Новые сообщения</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">Никогда</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18752,22 +17223,18 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Сайт</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Комментарии</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
@@ -18778,12 +17245,12 @@ malicious behavior of crafted plugins.</source>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished">Комментарии </translation>
     </message>
@@ -18793,7 +17260,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Автор этого сообщения (личность %1) заблокирован.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18803,21 +17270,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Голосовать &quot;за&quot;</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Голосовать &quot;против&quot;</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Установить как чтение и удаление элемента</translation>
     </message>
@@ -18827,7 +17290,7 @@ malicious behavior of crafted plugins.</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Новый комментарий:</translation>
     </message>
@@ -18837,7 +17300,7 @@ malicious behavior of crafted plugins.</source>
         <translation>Значение комментария</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
@@ -18878,77 +17341,10 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Загрузка</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">По</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Форма</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Горячий</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Новый</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">В начало списка</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Сегодня</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Вчера</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">На этой неделе</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">В этом месяце</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">В этом году</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Отправить новое сообщение</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Следующий</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Пожалуйста, создайте или выберите идентификатор подписавшего до голосования</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Предыдущий</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18968,7 +17364,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18978,15 +17384,15 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Администратор:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">Распространение:</translation>
     </message>
@@ -18996,42 +17402,42 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">Сообщения</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19051,7 +17457,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Горячий</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19081,17 +17487,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19106,12 +17512,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Пусто</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19121,27 +17532,31 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished">информация</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19156,7 +17571,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">Подписаться</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Никогда</translation>
     </message>
@@ -19208,12 +17623,12 @@ malicious behavior of crafted plugins.</source>
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ограничено для членов круга &quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ограничено для членов круга </translation>
     </message>
     <message>
         <location line="+3"/>
@@ -19230,6 +17645,16 @@ malicious behavior of crafted plugins.</source>
         <source>No Channel Selected</source>
         <translation type="unfinished">Не выбраны каналы</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -19238,14 +17663,6 @@ malicious behavior of crafted plugins.</source>
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Открывать каждое сообщение в новой вкладке</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Публикации</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -19259,10 +17676,6 @@ malicious behavior of crafted plugins.</source>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Сообщения</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -19331,25 +17744,17 @@ malicious behavior of crafted plugins.</source>
         <translation>Управление профилями</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Ubuntu&apos;; font-size:11pt; 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;Выберите ключ узла Retroshare из приведённого ниже списка, который будет использоваться на другом компьютере, и нажмите &quot;Экспортировать выбранный ключ&quot;.&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Чтобы создать новое местоположение на другом компьютере, выберите &quot;Новый профиль/узел&quot; в окне входа в систему. Оттуда вы сможете импортировать файл ключа и создать для него новое местоположение. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -19460,7 +17865,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Изменить ваш статус</translation>
@@ -19476,7 +17881,7 @@ and use the import button to load it</source>
         <translation>Управление профилями</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Публичная информация</translation>
     </message>
@@ -19511,12 +17916,12 @@ and use the import button to load it</source>
         <translation>Подключён с:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Прочее</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Мой адрес</translation>
     </message>
@@ -19560,51 +17965,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Сообщение от:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Учётная запись 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Учётная запись 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Учётная запись 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Добавить в Pulse</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">фильтр</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">Ссылка добавлена</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Показать как</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19614,12 +17995,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Из:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19649,13 +18030,13 @@ and use the import button to load it</source>
         <translation type="unfinished">Отрицательное мнение</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19667,12 +18048,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19681,17 +18072,13 @@ and use the import button to load it</source>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Сообщение-импульс для Телеграфа</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19706,34 +18093,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">От</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Дата</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Загрузить файл изображения</translation>
     </message>
 </context>
 <context>
@@ -19744,7 +18121,7 @@ and use the import button to load it</source>
         <translation type="unfinished">Форма</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19763,7 +18140,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19773,7 +18150,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19800,7 +18177,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19810,7 +18187,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19830,7 +18207,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19946,7 +18323,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19954,37 +18331,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -20016,7 +18398,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20024,8 +18406,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Подтверждение</translation>
     </message>
@@ -20296,12 +18678,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Сведения об участнике</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Запрос на файл отменён</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Эта версия RetroShare использует OpenPGP-SDK. В качестве побочного эффекта, она не использует системное публичное PGP хранилище, но имеет своё собственное хранилище, которое используется всеми экземплярами RetroShare. &lt;br&gt;&lt;br&gt;Похоже, что вы не имеете такое хранилище, хотя ключи PGP упоминаются учётными записями RetroShare, вероятно, потому, что вы только что обновились до этой новой версии программного обеспечения.</translation>
     </message>
@@ -20332,7 +18714,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Произошла непредвиденная ошибка. Пожалуйста, сообщите &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation>Не удаётся запустить менеджер Tor!</translation>
     </message>
@@ -20368,7 +18750,7 @@ The error reported is:&quot;</source>
         <translation>Не удалось запустить скрытую службу.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Множественные копии</translation>
@@ -20390,6 +18772,26 @@ The error reported is:&quot;</source>
 Файл блокировки:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20410,14 +18812,6 @@ The error reported is:&quot;</source>
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
-        <translation type="vanished">Туннель находится в ожидании... Сообщения будут доставлены как можно скорее</translation>
-    </message>
-    <message>
-        <source>Secured tunnel is working. Messages are delivered immediately!</source>
-        <translation type="vanished">Защищённый туннель функционирует. Сообщения доставляются немедленно!</translation>
-    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -20480,7 +18874,7 @@ Reported error is:
         <translation>Транзитный трафик</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Похоже, у вас имеются узлы, привязанные к DSA-ключам:</translation>
     </message>
@@ -20490,7 +18884,7 @@ Reported error is:
         <translation>К сожалению, на данный момент DSA-ключи не поддерживаются криптоплатформой RetroShare. Все эти узлы не будут задействованы.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>включено</translation>
     </message>
@@ -20500,7 +18894,7 @@ Reported error is:
         <translation>отключено</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Перенести IP %1 в белый список</translation>
     </message>
@@ -20516,7 +18910,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>%1 секунд назад</translation>
     </message>
@@ -20584,7 +18978,7 @@ Security: no anonymous IDs</source>
 Безопасность: анонимные участники запрещены</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation>Присоединиться к чат-комнате</translation>
     </message>
@@ -20612,7 +19006,7 @@ Security: no anonymous IDs</source>
         <translation>не получается обработать файл XML!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation>Неограниченно</translation>
     </message>
@@ -20792,13 +19186,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Имя</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished">Адрес</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Статус</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20991,10 +19401,6 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation>Нажмите, чтобы возобновить процесс хеширования</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Этот сертификат содержит:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -21045,6 +19451,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -21184,7 +19602,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Обширная сеть</translation>
     </message>
@@ -21354,7 +19772,7 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Блокируется загрузка внедрённых изображений.</translation>
     </message>
@@ -21367,7 +19785,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Разрешено по умолчанию</translation>
     </message>
@@ -21540,12 +19958,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Сохранить изображение</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21553,12 +19981,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation>Настройка древовидного представления</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21588,14 +20016,6 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">Показать столбец...</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[без заголовка]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -22258,7 +20678,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Имя</translation>
@@ -22379,7 +20799,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
@@ -22399,7 +20819,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22457,7 +20877,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished">Сообщения не будут перенаправляться вашему окружению.</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Отредактированное сообщение ... ]</translation>
     </message>
@@ -22471,11 +20891,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Пропущенное сообщение ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22489,6 +20904,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">От</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22511,13 +20931,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Сортировка по прочитанным сообщениям</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Сортировка по отправителю</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22540,7 +20965,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22561,7 +20988,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Сбрасывает ВСЕ сохранённые настройки RetroShare.</translation>
     </message>
@@ -22622,7 +21049,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Настройки локализации RetroShare.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Не получается открыть файл журнала &apos;%1&apos;: %2</translation>
     </message>
@@ -22643,11 +21070,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Не удалось создать каталог данных: %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Редакция</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation>Расширенный режим</translation>
     </message>
@@ -22677,7 +21100,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Информация об использовании графического интерфейса RetroShare</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>Указан недействительный код языка:</translation>
     </message>
@@ -22695,7 +21118,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Ошибка доступа к реестру, возможно необходимы права администратора.</translation>
@@ -22712,12 +21135,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Введите ключевое слово (не менее 3 символов)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Начать поиск</translation>
     </message>
@@ -22778,7 +21201,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Ключевые слова</translation>
     </message>
@@ -22793,7 +21216,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Поиск идентификатора</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Имя файла</translation>
     </message>
@@ -22893,23 +21316,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Скачать выделенное</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Имя файла</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Скачать</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Скопировать ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Отправить RetroShare-ссылку</translation>
     </message>
@@ -22919,7 +21342,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Скачать</translation>
     </message>
@@ -22956,7 +21379,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Удалить всё</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Папка</translation>
@@ -22967,17 +21390,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Новая RetroShare-ссылка</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Открыть папку</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Создание коллекции...</translation>
     </message>
@@ -22997,7 +21420,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Загрузить из файла коллекции...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Коллекция</translation>
     </message>
@@ -23005,7 +21428,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Сведения об участнике</translation>
     </message>
@@ -23021,22 +21444,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Удалить объект</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>IP-адрес:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Идентификатор участника:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Имя участника:</translation>
     </message>
@@ -23053,7 +21476,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Скрыть</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation>но сообщил:</translation>
     </message>
@@ -23078,8 +21501,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Это IP-адрес, к которому, как утверждает ваш контакт, он подключён. Если вы только что изменили свой IP-адрес, можно не обращать ванимания на это предупреждение. Если же нет, это означает, что подключение к этому контакту перенаправляется неким промежуточным узлом, что является достаточно подозрительным.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Это предупреждение показывается, чтобы защитить вас от атаки типа «перенаправление трафика». В этом случае контакт, к которому вы подключены не увидит ваш внешний IP-адрес, но увидит IP-адрес злоумышленника. &lt;/p&gt; &lt;p&gt;&lt;br/&gt;&lt;/p&gt; &lt;p&gt;Однако, если вы только что изменили IP-адрес по какой-либо причине (некоторые провайдеры регулярно меняют IP-адреса) это предупреждение просто говорит вам, что друг подключился на новый IP-адрес, прежде чем RetroShare поняла, что IP-адрес изменился. Ничего страшного в этом случае нет.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Ложные предупреждения можно легко отключить, составив белый список ваших собственных IP-адресов (например, диапазон вашего провайдера) или полностью отключить эти предупреждения в опции -&amp;gt; Уведомления -&amp;gt; Журнал.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23087,7 +21510,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>предлагает установить с вами соединение</translation>
     </message>
@@ -23118,7 +21541,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Развернуть</translation>
     </message>
@@ -23163,12 +21586,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Статус:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Написать сообщение</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Попытка соединения</translation>
     </message>
@@ -23188,17 +21611,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Неизвестная попытка соединения (исходящая)</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Неизвестная проблема безопасности</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23208,11 +21636,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Неизвестный участник</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Спрятать</translation>
     </message>
@@ -23222,7 +21646,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Вы хотите удалить этот узел из вашего окружения?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Сертификат имеет неправильную подпись!!! Этот участник — не тот, за кого он себя выдаёт.</translation>
     </message>
@@ -23232,12 +21656,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Утерян/повреждён сертификат. Не настоящий пользователь Retroshare.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>Сертификат вызвал внутреннюю ошибку.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Участник / узел не находится в доверенном окружении (PGP iD = </translation>
     </message>
@@ -23296,12 +21720,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Локальный адрес</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -23322,22 +21746,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Локальная сеть</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Поисковик внешнего IP-адреса</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Известные/предыдущие IP-адреса:</translation>
     </message>
@@ -23350,21 +21774,16 @@ behind a firewall or a VPN.</source>
         <translation>Если вы снимете этот флажок, RetroShare может определить ваш IP-адрес только при подключении к кому-нибудь. Этот флажок помогает в установлении соединений на начальном этапе, когда у вас мало контактов. Он также помогает, если вы находитесь за межсетевым экраном или используете VPN.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Разрешить RetroShare спрашивать мой IP-адрес у этих сайтов:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>кБ/с</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Диапазон доступных портов: от 1024 до 65535. Обычно порты ниже 1024 зарезервированы операционной системой.</translation>
     </message>
@@ -23374,23 +21793,46 @@ behind a firewall or a VPN.</source>
         <translation>Диапазон доступных портов: от 1024 до 65535. Обычно порты ниже 1024 зарезервированы операционной системой.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Onion-адрес</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Обнаружение включено (рекомендуется)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>Tor был автоматически настроен Retroshare. Здесь не нужно ничего менять.</translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Обнаружение выключено</translation>
     </message>
@@ -23400,7 +21842,7 @@ behind a firewall or a VPN.</source>
         <translation>Скрытые - см. конфигурацию</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>Адрес I2P</translation>
     </message>
@@ -23425,41 +21867,95 @@ behind a firewall or a VPN.</source>
         <translation>Входящие ОК</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>Прокси функционирует.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P-прокси не включён</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
-        <translation>BOB работает и доступен</translation>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
-        <translation>BOB недоступен! Он работает?</translation>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
-        <translation>RetroShare использует BOB для создания %1 туннеля на %2:%3 (с именем %4)
-
-При изменении параметров (например, порта) используйте кнопки внизу, чтобы перезапустить BOB.
-
-</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation>клиентского</translation>
     </message>
@@ -23474,71 +21970,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation>BOB обрабатывает запрос</translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation>проверка подключения</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation>создание ключа</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation>запуск</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation>завершение работы</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation>BOB обрабатывает запрос: %1</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation>BOB не функционирует</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation>BOB столкнулся с ошибкой: </translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation>BOB-туннель работает</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation>BOB работает нормально: туннель установлен</translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation>BOB-туннель не работает</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation>BOB неактивен: туннель закрыт</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation>Запрос нового ключа сервера</translation>
     </message>
@@ -23548,22 +21980,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation>Загрузить ключ сервера из base64</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation>Чтобы создать новый ключ, сначала остановите туннель BOB</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation>Чтобы загрузить ключ, сначала остановите туннель BOB</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation>Чтобы отключить BOB, сначала остановите туннель BOB</translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Вы доступны через скрытые службы.</translation>
     </message>
@@ -23577,12 +21994,12 @@ Also check your ports!</source>
 Также проверьте порты.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Скрытый режим]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Это очищает список известных IP-адресов, что может оказаться полезным, если по какой-либо причине ваш список адресов содержит недопустимые/ошибочные/недействующие адреса, которые нежелательно передавать контактам из вашего окружения.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23592,7 +22009,7 @@ Also check your ports!</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>Лимит загрузки (КБ/с) </translation>
     </message>
@@ -23607,24 +22024,24 @@ Also check your ports!</source>
         <translation>Лимит отдачи (КБ/с) </translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Лимит выгрузки охватывает всё программное обеспечение. Слишком маленький лимит выгрузки в конечном итоге может заблокировать службы с низким приоритетом (форумы, каналы). Минимально рекомендуемое значение - 50 КБ/с.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation>ПРЕДУПРЕЖДЕНИЕ:
 Эти значения не учитывают трансляторы.</translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23641,17 +22058,7 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
 Вы можете подключиться к скрытым службам, даже если используете стандартный узел, так почему бы не настроить Tor и/или I2P?</translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation>Автоиспользование I2P/BOB</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation>Включить I2P BOB (изменение этого параметра требует перезагрузки для вступления в силу)</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation>Появляются дополнительные настройки</translation>
     </message>
@@ -23661,12 +22068,7 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
         <translation>Расширенный режим</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation>Основной открытый мост I2P</translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation>Адрес экземпляра I2P</translation>
     </message>
@@ -23676,17 +22078,7 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation>Порт I2P-прокси</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation>BOB доступен</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
@@ -23726,7 +22118,7 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
         <translation>Загрузить ключ</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation>Запуск</translation>
     </message>
@@ -23741,12 +22133,7 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
         <translation>Стоп</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation>Статус BOB</translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation>Входящие</translation>
     </message>
@@ -23793,7 +22180,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 Если у вас есть проблемы с подключением через Tor, не забудьте проверить также журналы Tor.</translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation>Транслятор</translation>
     </message>
@@ -23848,7 +22260,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Всего:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation>Предупреждение: эта пропускная способность увеличивает максимальную ширину канала.</translation>
     </message>
@@ -23873,7 +22285,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Удалить сервер</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23887,7 +22299,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>IP-фильтры</translation>
     </message>
@@ -23910,7 +22322,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
@@ -23970,17 +22382,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Добавить в белый список</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Настройка скрытых служб</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Здесь указан socks-порт службы Tor-прокси. Ваш узел RetroShare будет использовать этот порт для соединения со&lt;/p&gt;&lt;p&gt;скрытыми узлами других пользователей. Если служба Tor установлена и правильно настроена, то индикатор слева должен быть зелёного цвета. &lt;/p&gt;&lt;p&gt;Отметим: это не означает, что весь ваш трафик транслируется через сеть Tor. Такое утверждение справедливо &lt;/p&gt;&lt;p&gt;только для скрытых узлов, с которыми вы соединены, или в случае, когда у вас самого скрытый узел.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если служба Tor установлена и правильно настроена, то индикатор слева должен быть зелёного цвета. &lt;/p&gt;&lt;p&gt;Отметим: это не означает, что весь ваш трафик транслируется через сеть Tor. Такое утверждение справедливо &lt;/p&gt;&lt;p&gt;только для скрытых узлов, с которыми вы соединены, или в случае, когда у вас самого скрытый узел.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23996,18 +22419,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если служба i2p установлена и правильно настроена, то индикатор слева должен быть зелёного цвета. &lt;/p&gt;&lt;p&gt;Это не означает, что весь ваш трафик транслируется через сеть i2p. Такое утверждение справедливо &lt;/p&gt;&lt;p&gt;только для скрытых узлов, с которыми вы соединены, или в случае, когда у вас самого скрытый узел.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>Исходящие I2P ОК</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Адрес службы</translation>
     </message>
@@ -24042,12 +22465,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Пожалуйста, заполните адрес службы</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>Диапазон IP-адресов</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Получено из DHT; попытка подмены IP-адреса</translation>
     </message>
@@ -24070,22 +22493,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Добавлен вами</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;IP адреса из белого списка собраны из следующих источников: IP адреса поступившие вручную при обмене сертификатами, диапазоны IP, введённые вами в этом окне или в окне безопасности элементов канала.&lt;/p&gt; &lt;p&gt;Поведение по умолчанию для Retroshare: (1) всегда разрешать подключение к участникам с IP из белого списка, даже если этот IP также занесён в чёрный список; (2) дополнительно требуется, чтобы IP адрес находился в белом списке. Вы можете изменить это поведение для каждого участника в окне &quot;Подробности&quot; каждого узла Retroshare. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT позволяет быстро соединяться с доверенными узлами, обрабатывая их поисковые запросы, что значительно упрощает процедуру установления соединения. Никакая информация на самом деле в DHT не хранится. Она используется только в качестве промежуточной системы, позволяющей бстрее установить соединение с другими узлами сети RetroShare.&lt;/p&gt;&lt;p&gt;Сервис обнаружения посылает информацию о местоположении и идентификаторы доверенных узлов всем подключенным участникам, чтобы помочь им в установлении соединения. Найденые контакты не соединяются автоматически; чтобы иметь возможность соединиться, обе стороны должны добавить сертификаты друг друга вручную. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Индикатор становится зелёным, как только Retroshare удаётся получить свой собственный IP от веб-сайтов перечисленных ниже, если вы включили это действие. Retroshare  также будет использовать другие средства, чтобы узнать свой IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Этот список автоматически заполняется информацией, собранной из нескольких источников: ретрансляция участников, информация о которых получена из DHT, диапазоны IP-адресов, введённые вами, а также диапазоны IP-адресов сообщённые вашими друзьями. Параметры по умолчанию должны защитить вас от крупномасштабной ретрансляции трафика.&lt;/p&gt; &lt;p&gt;Автоматический подбор ретранслирующих IP-адресов может привести к тому, что IP-адреса контактов из вашего окружения будут добавлены в чёрный список. В этом случае, используйте контекстное меню, чтобы вернуть их в белый список.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24120,26 +22543,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Автоматически запретить диапазон DHT по маске IP, начиная с</translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation>Ручная настройка исходящих Tor/I2P</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Настройте здесь свои  socks-прокси Tor и I2P. &lt;br/&gt;Если вы предпочитаете использовать BOB для автоматического управления I2P, откройте соседнюю вкладку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Socks-прокси Tor</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Исходящие Tor OK</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor-прокси не включён</translation>
     </message>
@@ -24219,7 +22638,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>проверить участников, с которыми вы хотите поделиться приватным ключом</translation>
     </message>
@@ -24229,12 +22648,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Доступен доверенному узлу</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Предоставить общий доступ</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Вы имеете возможность оповестить друзей о канале, предоставив им право публикации.
@@ -24254,7 +22673,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Менеджер доступа к папкам</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation>Доступная папка</translation>
     </message>
@@ -24274,17 +22693,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Доступно</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation>Добавить новую</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Добавить папку для доступа</translation>
     </message>
@@ -24294,7 +22713,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Применить</translation>
     </message>
@@ -24385,7 +22804,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Папка не найдена или неприменимое имя папки.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Это список разделяемых папок. Вы можете добавлять или удалять папки, используя кнопки внизу. Когда вы открываете доступ к папке, всё её содержимое доступно к скачиванию. Вы можете отдельно установить флаги доступа к каждой из разделяемых папок.</translation>
     </message>
@@ -24393,7 +22812,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Файлообмен</translation>
     </message>
@@ -24444,11 +22863,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>проверить файлы</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Скачать выделенное</translation>
     </message>
@@ -24458,7 +22882,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Скачать</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Скопировать RetroShare-ссылки в буфер обмена</translation>
     </message>
@@ -24473,7 +22897,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Отправить RetroShare-ссылки</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation>Некоторые файлы были пропущены</translation>
     </message>
@@ -24489,7 +22913,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Рекомендации</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Создание коллекции...</translation>
     </message>
@@ -24514,7 +22938,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Загрузить из файла коллекции...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Некоторые файлы были пропущены, поскольку они ещё не были проиндексированы.</translation>
     </message>
@@ -24657,12 +23081,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Загрузка параметров</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Создание интерфейса</translation>
     </message>
@@ -24686,7 +23110,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Запомнить пароль</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Войти</translation>
     </message>
@@ -25041,7 +23465,7 @@ This choice can be reverted in settings.</source>
         <translation>Статус сообщения</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Сообщение:</translation>
     </message>
@@ -25286,7 +23710,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Удалить все метки</translation>
     </message>
@@ -25322,12 +23746,15 @@ p, li { white-space: pre-wrap; }
         <translation>Настройка Tor...</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation>Статус Tor:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
@@ -25337,18 +23764,13 @@ p, li { white-space: pre-wrap; }
         <translation>Не запущен</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
-        <translation>Адрес скрытой службы:</translation>
+        <location line="+13"/>
+        <source>Hidden address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation>Статус начальной загрузки Tor:</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation>Не задан</translation>
     </message>
@@ -25358,12 +23780,57 @@ p, li { white-space: pre-wrap; }
         <translation>Onion-адрес:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">не соединён</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation>Убедитесь, что Tor находится в одной из папок, доступных для запуска исполняемых файлов</translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation>[Ожидание Tor...]</translation>
     </message>
@@ -25371,21 +23838,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Эта версия Retroshare использует Tor для подключения к вашим доверенным узлам.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation>Tor сейчас недоступен</translation>
     </message>
@@ -25396,11 +23859,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Нет конфигурации Tor</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25428,7 +23892,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Параметры передачи</translation>
@@ -25439,7 +23903,7 @@ p, li { white-space: pre-wrap; }
         <translation>Максимальное количество одновременных закачек:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation>Разделяемые папки</translation>
     </message>
@@ -25449,22 +23913,27 @@ p, li { white-space: pre-wrap; }
         <translation>Автоматически открывать доступ к входящей папке (рекомендуется)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation>Редактировать разделяемые ресурсы</translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished">Настроить разделяемые папки</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation>Автоматические проверять разделяемые папки каждые</translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation>минут(-ы)</translation>
     </message>
@@ -25549,7 +24018,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25558,7 +24027,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Максимальное количество закачек для участника (0 - неограниченно):</translation>
     </message>
@@ -25583,7 +24057,12 @@ p, li { white-space: pre-wrap; }
         <translation>Разрешить прямую загрузку:</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Последовательный</translation>
     </message>
@@ -25642,30 +24121,13 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; способна передавать данные и поисковые запросы между участниками сети, не обязательно между собой соединёнными. Однако этот трафик передаётся только через подключённые узлы из вашего окружения и является анонимным.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;В диалоговом окне раздач для каждой папки по отдельности вы можете установить свои флаги с целью обеспечения:&lt;/span&gt;&lt;/p&gt; &lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;обзора папок контактами из вашего окружения&lt;/span&gt;: файлы в папках видимы только вашим доверенным окружением.&lt;/li&gt; &lt;li style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;анонимного доступа&lt;/span&gt;: файлы доступны анонимно через F2F-туннели.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Максимум туннельных запросов, переданных в секунду:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;&lt;span style=&quot;font-weight:600;&quot;&gt; Потоковая&lt;/span&gt; передача файла требует предачи частей в 1 MB в возрастающем порядке, облегчая просмотр во время загрузки. &lt;span style=&quot;font-weight:600;&quot;&gt;Случайная&lt;/span&gt; передача является чисто случайной и напоминает заполнение мозаики. &lt;span style=&quot;font-weight:600;&quot;&gt;Прогрессивная&lt;/span&gt; передача является компромиссом, выбирая следующий фрагмент в случайном порядке в пределах менее чем 50 МБ после окончания загрузки предыдущего фрагмента. Это позволяет некоторые случайности, одновременно сокращая время инициализации большого пустого файла.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Retroshare будет приостанавливать все передачи и сохранение конфигурационного файла, если свободное место на диске ниже этого предела. Это предотвращает потерю информации на некоторых системах. Всплывающее окно предупредит вас, когда это произойдёт.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -25675,7 +24137,17 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Это значение определяет как много туннелей в секунду можно создавать.  &lt;/p&gt;&lt;p&gt;Если у вас быстрое подключение к сети, вы можете повысить это значение до 30-40, Учтите, что это создаёт много мелких пакетов и может сильно замедлить передачу файлов.&lt;/p&gt;&lt;p&gt;Значение по умолчанию - 20. Если вы не уверены, оставьте значение по умолчанию.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Предупреждение</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation>Указать входящую папку</translation>
     </message>
@@ -25703,7 +24175,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Загрузка завершена</translation>
     </message>
@@ -25727,39 +24199,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">У вас %1 завершённых закачек</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">У вас есть %1 завершённая загрузка</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 завершённых закачек</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 завершённых загрузок</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Обмен файлами</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Передача</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Имя</translation>
@@ -25966,11 +24422,7 @@ p, li { white-space: pre-wrap; }
         <translation>Выбрать...</translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt; &lt;p&gt;RetroShare поддерживает два метода передачи файлов: прямые передачи между друзьями и анонимные туннельные передачи. Кроме этого поддерживается загрузка от нескольких источников (вы также можете быть источником, пока скачиваете файл)&lt;/p&gt; &lt;p&gt;Есть возможность раздавать свои файлы, воспользуйтесь значком &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=16 /&gt; на панели. Эти файлы будут добавлены в список разделяемых вами ресурсов. Дополнительно вы можете указать доступность этих файлов для ближнего окружения&lt;/p&gt; &lt;p&gt;Вкладка &quot;Поиск&quot; позволяет искать файлы среди доступных ресурсов ваших контактов, а также у удалённых пользователей, через сервис анонимных туннелей.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+253"/>
+        <location line="+262"/>
         <source>Move in Queue...</source>
         <translation>Переместить в очереди...</translation>
     </message>
@@ -25995,7 +24447,7 @@ p, li { white-space: pre-wrap; }
         <translation>Выберите каталог</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Анонимный туннель со сквозным шифрованием 0x</translation>
     </message>
@@ -26016,7 +24468,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -26049,7 +24501,17 @@ p, li { white-space: pre-wrap; }
         <translation>Файл %1 не завершён. Если это медиафайл, попробуйте предпросмотр</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Предупреждение</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Измените имя файла</translation>
     </message>
@@ -26064,7 +24526,7 @@ p, li { white-space: pre-wrap; }
         <translation>Пожалуйста введите новое--и действительное--имя файла</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Раскрыть всё</translation>
@@ -26191,23 +24653,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Столбцы</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Файлообмен</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Путь</translation>
     </message>
@@ -26217,7 +24674,7 @@ p, li { white-space: pre-wrap; }
         <translation>Показать столбец &quot;Путь&quot;</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>Не удалось удалить файл предварительного просмотра</translation>
     </message>
@@ -26227,7 +24684,7 @@ p, li { white-space: pre-wrap; }
         <translation>Попробуйте ещё раз?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Создание коллекции...</translation>
     </message>
@@ -26242,7 +24699,12 @@ p, li { white-space: pre-wrap; }
         <translation>Просмотр коллекции...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+74"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
         <source>Collection</source>
         <translation>Коллекция</translation>
     </message>
@@ -26252,7 +24714,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 туннелей</translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Анонимный туннель 0x</translation>
     </message>
@@ -26473,10 +24935,6 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">Анонимные туннели</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26670,12 +25128,17 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Включить веб-интерфейс Retroshare</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Статус:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Параметры сети</translation>
     </message>
@@ -26709,35 +25172,33 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Port:</source>
-        <translation type="vanished">Порт:</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation>Разрешить доступ от всех IP-адресов (по умолчанию: только localhost)</translation>
     </message>
     <message>
-        <source>Apply setting and start browser</source>
-        <translation type="vanished">Применить настройки и запустить браузер</translation>
-    </message>
-    <message>
-        <source>Note: these settings do not affect retroshare-nogui. Retroshare-nogui has a command line switch to activate the web interface.</source>
-        <translation type="vanished">Примечание: эти настройки не влияют на retroshare-nogui. У Retroshare-nogui есть ключ командной строки для активации веб-интерфейса.</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;Веб-интерфейс&lt;/h1&gt; &lt;p&gt;Веб-интерфейс позволяет управлять Retroshare из браузера. Несколько устройств могут иметь контроль над одним экземпляром Retroshare. Так вы можете начать разговор на планшете и позднее использовать настольный компьютер для его продолжения.&lt;/p&gt; &lt;p&gt;Предупреждение: не оставляйте веб-интерфейс подключённым к интернету, потому что нет никакого контроля доступа и нет шифрования. Если вы хотите использовать веб-интерфейс через интернет, используйте SSH-туннель или прокси-сервер для безопасного соединения.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>Веб-интерфейс не включён</translation>
     </message>
@@ -26747,12 +25208,12 @@ p, li { white-space: pre-wrap; }
         <translation>Веб-интерфейс не включён. Включите его в настройках -&gt; Веб-интерфейс.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>не удалось запустить веб-интерфейс</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Веб-интерфейс</translation>
     </message>
@@ -26889,11 +25350,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki-страницы</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Новая группа</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Название страницы</translation>
     </message>
@@ -26908,7 +25365,7 @@ p, li { white-space: pre-wrap; }
         <translation>Уникальный идентификатор</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26996,7 +25453,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>История редактирования страницы</translation>
     </message>
@@ -27031,7 +25488,7 @@ p, li { white-space: pre-wrap; }
         <translation>Идентификатор страницы</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -27061,14 +25518,18 @@ p, li { white-space: pre-wrap; }
         <translation>Метки</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">История</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Показать историю редактирования</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
@@ -27089,7 +25550,7 @@ p, li { white-space: pre-wrap; }
         <translation>Вернуться</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Отправить</translation>
     </message>
@@ -27161,10 +25622,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">Диапазон времени</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -27176,16 +25633,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Обновить</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27200,7 +25648,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Другие</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27220,7 +25668,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27250,85 +25698,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Последний месяц</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Последняя неделя</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Сегодня</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Новый</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">от</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">до</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Поиск/Фильтр</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Обширная сеть</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Управление учётными записями</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Показаны:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Себя</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Сетевые узлы</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Следовавший</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Пользовательские</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Учётная запись 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Учётная запись 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Учётная запись 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">Флажок</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Сообщение-импульс для Телеграфа</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -27391,35 +25771,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Форма</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -27464,11 +25851,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Следовавший</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Неизвестно</translation>
@@ -27546,7 +25963,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 г. %2 дн.</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>к</translation>
@@ -27579,15 +25996,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Изображения (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation> Разрешаете ли вы соединения, подписанные этим ключом?</translation>
     </message>
@@ -27596,10 +26009,6 @@ p, li { white-space: pre-wrap; }
         <source>Name of the profile</source>
         <translation>Имя профиля</translation>
     </message>
-    <message>
-        <source>This column indicates trust level and whether you signed the profile PGP key</source>
-        <translation type="vanished">Этот столбец указывает уровень доверия и подписан ли PGP-ключ профиля</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
@@ -27710,10 +26119,6 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> - </source>
-        <translation type="vanished"> - </translation>
-    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_sl.ts b/retroshare-gui/src/lang/retroshare_sl.ts
index a8c42dad2..bb6973983 100644
--- a/retroshare-gui/src/lang/retroshare_sl.ts
+++ b/retroshare-gui/src/lang/retroshare_sl.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,13 +156,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Kakovost:</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -547,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -573,10 +566,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -619,7 +625,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -706,7 +712,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ponastavi</translation>
     </message>
     <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -725,14 +731,6 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Shrani</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Prekliči</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
@@ -810,7 +808,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -840,12 +838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -853,7 +851,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -873,7 +871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -911,7 +909,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,7 +929,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -961,7 +959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -971,7 +969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -979,12 +977,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1004,18 +1002,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1030,12 +1028,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1204,17 +1202,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1224,7 +1222,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1232,7 +1240,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1255,7 +1263,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1280,18 +1288,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1306,7 +1314,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -1316,17 +1324,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1334,7 +1332,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -1525,7 +1523,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1558,13 +1556,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1572,13 +1571,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1588,29 +1587,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1620,7 +1597,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1677,12 +1654,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1692,23 +1669,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-240"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-564"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1718,38 +1714,25 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Da</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Ne</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1761,47 +1744,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Vrsta:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1816,7 +1799,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Pokaži </translation>
@@ -1836,7 +1819,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1881,7 +1864,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1896,7 +1879,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1916,7 +1899,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1941,7 +1924,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1971,7 +1954,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1981,7 +1964,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2005,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2075,12 +2058,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2090,7 +2083,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2187,7 +2190,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Razlikuj velike in male črke</translation>
     </message>
@@ -2293,7 +2296,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2329,7 +2332,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2364,12 +2367,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2449,11 +2452,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2491,7 +2489,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2513,7 +2511,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2563,7 +2561,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2585,7 +2583,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2600,12 +2598,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2621,12 +2619,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2637,12 +2635,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2662,7 +2660,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2688,7 +2686,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2710,7 +2708,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2736,7 +2734,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2796,7 +2794,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2812,7 +2810,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2864,45 +2862,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2912,7 +2910,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2994,12 +2992,17 @@ Double click on it to add his name on text writer.</source>
         <translation>brez</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3019,7 +3022,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3087,7 +3090,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3103,12 +3106,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
@@ -3118,17 +3121,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3138,7 +3141,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3163,12 +3166,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3188,32 +3201,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3259,17 +3267,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3289,12 +3297,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3302,7 +3310,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3342,7 +3350,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3367,7 +3375,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3377,7 +3385,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3416,7 +3424,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3426,7 +3434,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3451,7 +3459,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3464,7 +3472,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3499,7 +3507,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3509,12 +3517,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3579,7 +3582,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3607,7 +3610,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3617,17 +3620,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3637,12 +3643,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3652,7 +3660,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3677,7 +3686,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3969,7 +3978,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3977,7 +3986,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3987,7 +3997,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4023,12 +4033,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4048,7 +4058,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4068,18 +4078,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4094,7 +4104,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Ime:</translation>
     </message>
@@ -4134,19 +4144,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4156,12 +4166,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
@@ -4171,7 +4193,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4224,13 +4246,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4249,7 +4271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4284,7 +4306,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4294,7 +4316,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4439,17 +4461,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4474,7 +4496,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4489,18 +4516,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4534,7 +4555,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4544,7 +4565,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+31"/>
+        <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;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4559,16 +4589,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+114"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4583,7 +4604,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4613,17 +4634,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4676,7 +4697,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4686,8 +4707,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4710,7 +4731,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4745,7 +4766,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4755,7 +4776,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4770,7 +4791,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4791,7 +4812,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4799,17 +4820,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4819,12 +4840,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4844,12 +4865,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4859,7 +4875,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4869,17 +4885,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4889,7 +4900,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4959,33 +4970,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5075,7 +5086,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5743,7 +5754,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5751,38 +5762,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5790,12 +5801,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5957,7 +5968,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5967,7 +5978,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6027,11 +6038,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6153,7 +6174,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6195,7 +6216,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6231,7 +6252,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6247,7 +6268,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6484,7 +6505,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6522,7 +6543,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6533,16 +6554,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Ime</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Stanje</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6625,33 +6762,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6669,7 +6811,17 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6679,17 +6831,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6710,38 +6857,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6761,12 +6908,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6776,38 +6923,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6851,13 +7003,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6867,7 +7019,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6902,7 +7054,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6912,12 +7064,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6927,12 +7074,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7158,27 +7300,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7188,39 +7316,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7228,49 +7374,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7295,7 +7437,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7345,12 +7487,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7474,7 +7616,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7482,7 +7624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7652,7 +7794,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7665,12 +7807,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7695,7 +7837,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7710,14 +7852,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
@@ -7728,13 +7870,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7747,7 +7889,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7883,7 +8025,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -7894,22 +8036,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7929,12 +8071,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7969,22 +8111,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8004,17 +8146,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8024,17 +8166,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Stanje</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8072,8 +8207,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8088,7 +8233,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8103,7 +8248,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8117,6 +8262,11 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8126,7 +8276,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8147,7 +8297,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8209,18 +8359,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8235,17 +8385,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8273,13 +8423,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8349,7 +8499,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8385,7 +8535,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8400,13 +8550,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8421,7 +8571,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8436,7 +8586,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8496,12 +8646,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8576,12 +8736,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8632,17 +8793,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8757,7 +8918,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8770,7 +8931,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8800,7 +8961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -8839,7 +9000,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8863,6 +9024,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -8872,7 +9048,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -8901,7 +9077,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8932,7 +9108,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8983,7 +9159,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8999,7 +9175,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9018,6 +9194,11 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9047,13 +9228,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9064,7 +9245,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9084,17 +9265,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9107,59 +9288,66 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9169,12 +9357,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9214,23 +9397,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9273,12 +9456,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9308,8 +9491,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9323,10 +9506,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">brez</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9396,12 +9575,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9462,7 +9641,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9482,7 +9661,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9534,7 +9713,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9544,7 +9723,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9559,7 +9738,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9625,12 +9804,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9665,12 +9844,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9681,12 +9860,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9694,7 +9873,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9754,7 +9933,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9777,7 +9956,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9793,12 +9972,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9815,23 +9994,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9847,22 +10026,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9872,12 +10057,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9887,7 +10072,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9962,7 +10147,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9978,27 +10168,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10006,7 +10191,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10066,7 +10251,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10123,12 +10308,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10151,7 +10336,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10164,14 +10349,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10181,7 +10366,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10191,7 +10376,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10211,6 +10401,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10222,7 +10420,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10270,7 +10468,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10657,7 +10855,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10673,7 +10871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10692,7 +10890,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10766,7 +10964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10776,7 +10974,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10804,7 +11002,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10814,7 +11012,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10824,7 +11022,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10844,13 +11042,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10862,12 +11084,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10882,12 +11104,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11152,14 +11369,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11169,12 +11386,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11184,7 +11401,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11199,27 +11416,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11235,29 +11452,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11277,18 +11504,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11298,78 +11527,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Vrsta:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11380,17 +11609,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11405,24 +11634,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11437,7 +11666,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11447,7 +11681,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11522,7 +11756,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11552,7 +11786,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">neznano</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11567,7 +11801,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11615,7 +11849,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11623,7 +11857,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11666,7 +11900,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11746,7 +11980,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11762,17 +11996,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11877,7 +12106,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11927,21 +12156,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11951,7 +12180,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11966,7 +12195,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11981,12 +12210,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12006,12 +12235,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12021,7 +12250,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12029,7 +12258,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12059,7 +12288,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12073,7 +12308,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12083,7 +12318,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12094,27 +12334,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12134,7 +12374,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12144,12 +12384,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12159,12 +12405,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12174,7 +12415,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12184,10 +12425,15 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12213,7 +12459,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Dodaj</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12223,13 +12469,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12239,7 +12485,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12313,7 +12559,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
@@ -12323,12 +12569,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12351,18 +12597,34 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12380,27 +12642,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12421,7 +12688,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12430,26 +12702,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12459,7 +12736,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12487,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12503,7 +12780,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
@@ -12524,7 +12802,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12535,12 +12813,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12565,11 +12843,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Stanje</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12580,31 +12859,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12619,7 +12902,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12649,7 +12937,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12669,7 +12957,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pokaži </translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12714,12 +13002,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12734,7 +13023,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12743,17 +13032,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12789,12 +13078,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12809,32 +13098,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12845,32 +13134,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12940,7 +13229,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12980,7 +13269,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13000,18 +13289,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13022,7 +13311,17 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13042,7 +13341,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13052,21 +13351,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13081,7 +13380,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13091,30 +13390,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13229,13 +13528,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13255,7 +13554,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13276,7 +13575,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13306,18 +13605,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13357,13 +13656,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13373,12 +13672,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13456,7 +13755,7 @@ Do you want to save message ?</source>
         <translation>Privzeto</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13466,7 +13765,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13489,7 +13788,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13497,7 +13796,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13525,7 +13824,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13535,37 +13834,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Do:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13605,7 +13904,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13657,7 +13956,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13667,12 +13966,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13682,17 +13981,22 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13701,14 +14005,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13723,12 +14037,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13750,10 +14064,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Izbriši</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -13832,7 +14142,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13842,20 +14152,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="vanished">Izbriši</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -13885,17 +14191,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -13926,7 +14232,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13936,7 +14242,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13946,7 +14252,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13955,6 +14261,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -13981,13 +14297,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14062,7 +14378,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14076,7 +14392,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14091,18 +14407,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14137,7 +14463,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14191,7 +14527,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14201,7 +14537,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14236,7 +14572,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14377,7 +14713,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14387,7 +14723,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14401,7 +14737,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14434,18 +14776,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14455,12 +14792,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14493,7 +14830,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14514,7 +14851,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14544,19 +14881,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14566,12 +14903,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14581,7 +14918,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14696,7 +15033,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14706,7 +15043,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -14813,7 +15150,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14828,7 +15165,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14838,12 +15175,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15081,7 +15418,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15101,12 +15438,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15121,7 +15458,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15132,17 +15469,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15150,7 +15489,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15289,7 +15628,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15334,12 +15678,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Možnosti</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15385,21 +15724,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15417,7 +15756,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15493,12 +15832,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15524,7 +15863,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15545,7 +15884,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
@@ -15585,7 +15924,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15643,7 +15982,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15961,17 +16300,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16000,7 +16339,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16059,19 +16398,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16107,12 +16446,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16323,12 +16662,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16381,7 +16735,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16401,8 +16755,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16427,13 +16781,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16461,12 +16815,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16481,12 +16835,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16502,7 +16866,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16512,7 +16886,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16532,12 +16906,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16552,7 +16936,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16563,7 +16947,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16573,7 +16957,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16581,12 +16965,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -16620,7 +17004,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16658,7 +17042,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16674,7 +17068,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16689,12 +17083,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16707,18 +17106,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16729,12 +17128,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16744,7 +17143,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16754,17 +17153,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16774,7 +17173,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16784,7 +17183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -16825,7 +17224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16848,7 +17247,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16858,15 +17267,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">neznano</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16876,42 +17285,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16931,7 +17340,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16961,17 +17370,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16986,12 +17395,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17001,27 +17415,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17036,7 +17454,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17110,6 +17528,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17199,16 +17627,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17316,7 +17744,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17332,7 +17760,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17367,12 +17795,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17416,27 +17844,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17446,12 +17874,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Od:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17481,13 +17909,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17499,12 +17927,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17519,7 +17957,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17534,26 +17972,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17564,7 +18000,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -17583,7 +18019,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17593,7 +18029,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17620,7 +18056,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17630,7 +18066,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17650,7 +18086,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17766,7 +18202,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17774,37 +18210,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17836,7 +18277,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17844,8 +18285,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18113,12 +18554,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18149,7 +18590,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18183,7 +18624,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18202,6 +18643,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18281,7 +18742,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18291,7 +18752,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18301,7 +18762,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18317,7 +18778,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18384,7 +18845,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18412,7 +18873,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18592,13 +19053,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Ime</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Stanje</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18841,6 +19318,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -18980,7 +19469,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19147,7 +19636,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19160,7 +19649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19333,12 +19822,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19346,12 +19845,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20039,7 +20538,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Ime</translation>
@@ -20160,7 +20659,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -20180,7 +20679,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20236,7 +20735,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20250,11 +20749,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20268,6 +20762,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20290,12 +20789,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20319,7 +20823,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20340,7 +20846,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20401,7 +20907,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20422,7 +20928,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20452,7 +20958,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20470,7 +20976,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20487,12 +20993,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20553,7 +21059,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20568,7 +21074,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20668,23 +21174,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20694,7 +21200,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20731,7 +21237,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -20742,17 +21248,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20772,7 +21278,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20780,7 +21286,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20796,22 +21302,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20828,7 +21334,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20853,8 +21359,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20862,7 +21368,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20893,7 +21399,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20938,12 +21444,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20963,17 +21469,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20983,7 +21484,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20993,7 +21504,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21003,12 +21514,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21067,12 +21578,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21093,22 +21604,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21121,21 +21632,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21145,23 +21651,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21171,7 +21700,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21196,37 +21725,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21241,71 +21828,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">neznano</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21315,22 +21838,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21342,12 +21850,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21357,7 +21865,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21372,23 +21880,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21399,17 +21907,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21419,12 +21917,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21434,17 +21927,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21484,7 +21967,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21499,12 +21982,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21540,7 +22018,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21595,7 +22098,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21620,7 +22123,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -21632,7 +22135,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21655,7 +22158,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Stanje</translation>
     </message>
@@ -21715,17 +22218,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21741,18 +22255,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21787,12 +22301,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21815,22 +22329,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21865,7 +22379,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21875,12 +22389,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21960,7 +22474,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21970,12 +22484,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -21994,7 +22508,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22014,17 +22528,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22034,7 +22548,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22125,7 +22639,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22133,7 +22647,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22184,11 +22698,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22198,7 +22717,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22213,7 +22732,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22229,7 +22748,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22254,7 +22773,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22397,12 +22916,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22426,7 +22945,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22765,7 +23284,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23002,7 +23521,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23038,12 +23557,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23053,18 +23575,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23074,12 +23591,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23087,7 +23649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23097,7 +23659,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23108,11 +23670,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23140,7 +23703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23151,7 +23714,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23161,22 +23724,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23261,7 +23829,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23270,7 +23838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23295,7 +23868,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23360,12 +23938,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23375,7 +23948,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23403,7 +23986,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23431,19 +24014,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Ime</translation>
@@ -23650,7 +24233,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23675,7 +24263,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23696,7 +24284,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -23729,7 +24317,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23744,7 +24342,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -23871,23 +24469,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Pot</translation>
     </message>
@@ -23897,7 +24490,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23907,7 +24500,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23922,7 +24515,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23932,7 +24525,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24346,12 +24939,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24391,17 +24989,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24411,12 +25019,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24553,7 +25161,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24568,7 +25176,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24656,7 +25264,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24691,7 +25299,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24721,14 +25329,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Stanje</translation>
     </message>
@@ -24749,7 +25361,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24832,16 +25444,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24856,7 +25459,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24876,7 +25479,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24906,7 +25509,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24916,7 +25519,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -24979,35 +25582,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25052,11 +25662,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25134,7 +25774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25171,7 +25811,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_sr.ts b/retroshare-gui/src/lang/retroshare_sr.ts
index 6d5a3f97d..208c6f3e6 100644
--- a/retroshare-gui/src/lang/retroshare_sr.ts
+++ b/retroshare-gui/src/lang/retroshare_sr.ts
@@ -122,12 +122,12 @@
         <translation>Напредна претрага</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Критеријум претраге</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Додајте додатни критеријум претраге.</translation>
     </message>
@@ -137,7 +137,7 @@
         <translation>Поништите критеријум претраге.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Отказује претрагу.</translation>
     </message>
@@ -157,13 +157,6 @@
         <translation>Претражи</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Јавно</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -548,7 +541,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -574,10 +567,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p kB</translation>
     </message>
@@ -620,7 +626,7 @@ p, li { white-space: pre-wrap; }
         <translation>Уклони</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -707,22 +713,10 @@ p, li { white-space: pre-wrap; }
         <translation>Поништи</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Брзина пријема</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Брзина слања</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Увек на врху</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Стил</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -738,23 +732,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% непровидно</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Сачувај</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Откажи</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Од:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Сакриј подешавања</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -827,7 +809,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Коментар</translation>
     </message>
@@ -857,12 +839,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -870,7 +852,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -890,7 +872,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -928,7 +910,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -948,7 +930,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -978,7 +960,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Промени статус порука</translation>
     </message>
@@ -988,7 +970,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -996,12 +978,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1021,18 +1003,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Прошири</translation>
     </message>
@@ -1047,12 +1029,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Уклони ставку</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1221,17 +1203,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1241,7 +1223,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1249,7 +1241,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1272,7 +1264,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1297,18 +1289,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Прошири</translation>
     </message>
@@ -1323,7 +1315,7 @@ into the image, so as to
         <translation type="unfinished">Уклони ставку</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
@@ -1333,17 +1325,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Коментар</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Сакриј</translation>
     </message>
@@ -1351,7 +1333,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
@@ -1542,7 +1524,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1575,13 +1557,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1589,13 +1572,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1605,29 +1588,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1637,7 +1598,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1694,12 +1655,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1709,23 +1670,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-240"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-564"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Приватно</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Јавно</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1735,38 +1715,25 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Да</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Не</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1778,47 +1745,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1833,7 +1800,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Прикажи</translation>
@@ -1853,7 +1820,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Уклони ставку</translation>
     </message>
@@ -1898,7 +1865,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1913,7 +1880,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1933,7 +1900,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1958,7 +1925,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +1955,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1998,14 +1965,10 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Стил</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2026,7 +1989,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2096,12 +2059,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">Претражи</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2111,7 +2084,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2208,7 +2191,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Разликује велика и мала слова</translation>
     </message>
@@ -2314,7 +2297,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2350,7 +2333,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
@@ -2385,12 +2368,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2470,11 +2453,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2512,7 +2490,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2534,7 +2512,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2584,7 +2562,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2606,7 +2584,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2621,12 +2599,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2642,12 +2620,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2658,12 +2636,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2683,7 +2661,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2709,7 +2687,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2731,7 +2709,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2757,7 +2735,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2817,7 +2795,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2833,7 +2811,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2885,45 +2863,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2933,7 +2911,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3015,12 +2993,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3040,7 +3023,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3108,7 +3091,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3124,12 +3107,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Назив:</translation>
     </message>
@@ -3139,17 +3122,17 @@ Double click on it to add his name on text writer.</source>
         <translation>Место:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Опције</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3159,7 +3142,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3184,12 +3167,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3209,32 +3202,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3280,17 +3268,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3310,12 +3298,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3323,7 +3311,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3363,7 +3351,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3388,7 +3376,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3398,7 +3386,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3437,7 +3425,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3447,7 +3435,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3472,7 +3460,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3485,7 +3473,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3520,7 +3508,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3530,12 +3518,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3600,7 +3583,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3628,7 +3611,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3638,17 +3621,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3658,12 +3644,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3673,7 +3661,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3698,7 +3687,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3990,7 +3979,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3998,7 +3987,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4008,7 +3998,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4044,12 +4034,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4069,7 +4059,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>ИД</translation>
     </message>
@@ -4089,18 +4079,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4115,11 +4105,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ИД</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Назив:</translation>
     </message>
@@ -4159,19 +4145,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4181,12 +4167,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
@@ -4196,7 +4194,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Претражи</translation>
@@ -4249,13 +4247,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4274,7 +4272,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4309,7 +4307,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4319,7 +4317,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4464,17 +4462,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4499,7 +4497,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4514,18 +4517,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4559,7 +4556,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4568,10 +4565,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Наслов</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4592,8 +4585,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4612,7 +4605,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4642,17 +4635,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4705,7 +4698,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4715,8 +4708,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4739,7 +4732,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4774,7 +4767,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4784,7 +4777,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4799,7 +4792,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4820,7 +4813,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4828,17 +4821,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Назив:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
@@ -4848,12 +4841,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4873,12 +4866,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4888,7 +4876,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4898,17 +4886,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4918,7 +4901,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4988,33 +4971,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5104,7 +5087,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5772,7 +5755,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5780,38 +5763,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5819,12 +5802,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5986,7 +5969,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5996,7 +5979,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6056,11 +6039,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6182,7 +6175,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ИД</translation>
     </message>
@@ -6224,7 +6217,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6260,7 +6253,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished">Претражи</translation>
@@ -6276,7 +6269,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6513,7 +6506,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6551,7 +6544,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6562,16 +6555,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Назив</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6654,33 +6763,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6698,7 +6812,17 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6708,17 +6832,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6739,38 +6858,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6790,12 +6909,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6805,38 +6924,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6880,13 +7004,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6896,7 +7020,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6931,7 +7055,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6941,12 +7065,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6956,12 +7075,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7187,27 +7301,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7217,39 +7317,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7257,49 +7375,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7324,7 +7438,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7374,12 +7488,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7503,7 +7617,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7511,7 +7625,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7681,7 +7795,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7694,12 +7808,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7724,7 +7838,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7739,14 +7853,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Последња порука</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
@@ -7757,13 +7871,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Популарност</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7776,7 +7890,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7912,7 +8026,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -7923,22 +8037,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7958,12 +8072,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7998,22 +8112,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8033,17 +8147,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8053,17 +8167,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Образац</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8101,8 +8208,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8117,7 +8234,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -8132,7 +8249,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8146,6 +8263,11 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8155,7 +8277,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8176,7 +8298,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8238,18 +8360,18 @@ p, li { white-space: pre-wrap; }
         <translation>Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Коментар</translation>
     </message>
@@ -8264,17 +8386,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8302,13 +8424,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8378,7 +8500,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8414,7 +8536,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8429,13 +8551,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8450,7 +8572,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8465,7 +8587,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8525,12 +8647,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8605,12 +8737,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8661,17 +8794,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8786,7 +8919,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8799,7 +8932,7 @@ p, li { white-space: pre-wrap; }
         <translation>Образац</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8829,7 +8962,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Коментар</translation>
@@ -8868,7 +9001,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8892,6 +9025,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -8901,7 +9049,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -8930,7 +9078,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8961,7 +9109,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9012,7 +9160,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9028,7 +9176,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -9047,6 +9195,11 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9076,13 +9229,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9093,7 +9246,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -9113,17 +9266,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Сакриј</translation>
     </message>
@@ -9136,63 +9289,66 @@ before you can comment</source>
         <translation>Образац</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">…</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Последња порука</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9202,12 +9358,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9247,23 +9398,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9306,16 +9457,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Сакриј</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Прошири</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9345,8 +9492,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9429,12 +9576,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9495,7 +9642,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9515,7 +9662,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9567,7 +9714,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9577,7 +9724,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9592,7 +9739,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9658,12 +9805,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9698,12 +9845,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9714,12 +9861,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9727,7 +9874,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Јавно</translation>
     </message>
@@ -9787,7 +9934,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9810,7 +9957,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9826,12 +9973,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9848,23 +9995,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9880,22 +10027,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9905,12 +10058,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ИД</translation>
     </message>
@@ -9920,7 +10073,7 @@ This message is missing. You should receive it later.</source>
         <translation>Последња порука</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9995,7 +10148,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Популарност</translation>
     </message>
@@ -10011,27 +10169,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10039,7 +10192,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10099,7 +10252,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10156,12 +10309,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10184,7 +10337,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10197,14 +10350,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10214,7 +10367,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10224,7 +10377,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10244,6 +10402,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10255,7 +10421,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10303,7 +10469,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10690,7 +10856,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10706,7 +10872,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10725,7 +10891,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10799,7 +10965,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Образац</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10809,7 +10975,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10837,7 +11003,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10847,7 +11013,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10857,7 +11023,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10877,13 +11043,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10895,12 +11085,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10915,12 +11105,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11185,14 +11370,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11202,12 +11387,12 @@ p, li { white-space: pre-wrap; }
         <translation>Претражи</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11217,7 +11402,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11232,27 +11417,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished">Затвори</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11268,29 +11453,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11310,18 +11505,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11331,78 +11528,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11413,17 +11610,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11438,24 +11635,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11470,7 +11667,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11480,7 +11682,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11555,7 +11757,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11585,7 +11787,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11600,7 +11802,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11648,7 +11850,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11656,7 +11858,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11699,7 +11901,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11779,7 +11981,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11795,17 +11997,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11910,7 +12107,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11960,21 +12157,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11984,7 +12181,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11999,7 +12196,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12014,12 +12211,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12039,12 +12236,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12054,7 +12251,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12062,7 +12259,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12092,7 +12289,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12106,7 +12309,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12116,7 +12319,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12127,27 +12335,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12167,7 +12375,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12177,12 +12385,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12192,12 +12406,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12207,7 +12416,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12217,10 +12426,15 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Уклони</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12246,7 +12460,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Додај</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12256,13 +12470,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12272,7 +12486,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12346,7 +12560,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Умножи</translation>
     </message>
@@ -12356,12 +12570,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Уклони</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12384,18 +12598,34 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12413,27 +12643,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Статус:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12454,7 +12689,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12463,26 +12703,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12492,7 +12737,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12520,7 +12765,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12536,7 +12781,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Опције</translation>
     </message>
@@ -12557,7 +12803,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12568,12 +12814,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12598,11 +12844,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12613,31 +12860,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Помоћ</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12652,7 +12903,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12682,7 +12938,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12702,7 +12958,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Прикажи</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12747,12 +13003,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12767,7 +13024,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12776,17 +13033,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12822,12 +13079,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12842,32 +13099,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12878,32 +13135,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12973,7 +13230,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13013,7 +13270,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13033,18 +13290,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13055,7 +13312,17 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13075,7 +13342,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13085,21 +13352,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13114,7 +13381,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13124,30 +13391,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13262,13 +13529,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13288,7 +13555,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13309,7 +13576,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13339,18 +13606,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13390,13 +13657,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13406,12 +13673,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13489,7 +13756,7 @@ Do you want to save message ?</source>
         <translation>Подразумевано</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13499,7 +13766,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13522,7 +13789,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13530,7 +13797,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13558,7 +13825,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13568,37 +13835,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13638,7 +13905,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13690,7 +13957,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13700,12 +13967,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13715,17 +13982,22 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13734,14 +14006,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13756,12 +14038,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13783,10 +14065,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Обриши</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -13865,7 +14143,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13875,20 +14153,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="vanished">Обриши</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -13918,17 +14192,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -13959,7 +14233,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Наслов</translation>
     </message>
@@ -13969,7 +14243,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13979,7 +14253,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13988,6 +14262,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14014,13 +14298,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14095,7 +14379,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14109,7 +14393,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14124,18 +14408,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14170,7 +14464,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14224,7 +14528,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -14234,7 +14538,7 @@ Do you want to save message ?</source>
         <translation>Уклони ставку</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14269,7 +14573,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Сакриј</translation>
     </message>
@@ -14410,7 +14714,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14420,7 +14724,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14434,7 +14738,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14467,18 +14777,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14488,12 +14793,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14526,7 +14831,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14547,7 +14852,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14577,19 +14882,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Претражи</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ИД</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14599,12 +14904,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14614,7 +14919,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14729,7 +15034,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14739,7 +15044,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -14846,7 +15151,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14861,7 +15166,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14871,12 +15176,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15114,7 +15419,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15134,12 +15439,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15154,7 +15459,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15165,17 +15470,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15183,7 +15490,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15322,7 +15629,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15367,12 +15679,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Опције</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15418,21 +15725,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15450,7 +15757,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15526,12 +15833,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15557,7 +15864,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15578,7 +15885,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Уклони ставку</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Назив:</translation>
     </message>
@@ -15618,7 +15925,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15676,7 +15983,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15843,13 +16150,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Образац</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -15862,10 +16162,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Коментар</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16005,17 +16301,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16044,7 +16340,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16103,19 +16399,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16151,12 +16447,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16367,12 +16663,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16425,7 +16736,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16445,8 +16756,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16471,13 +16782,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Коментар</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16505,12 +16816,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
@@ -16525,12 +16836,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16546,7 +16867,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16556,7 +16887,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16576,12 +16907,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16596,7 +16937,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16607,7 +16948,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16617,7 +16958,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16625,12 +16966,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -16664,7 +17005,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16702,7 +17043,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16718,7 +17069,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -16733,12 +17084,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16751,18 +17107,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16773,12 +17129,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Коментар</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16788,7 +17144,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16798,17 +17154,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16818,7 +17174,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16828,7 +17184,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
@@ -16869,22 +17225,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Образац</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">Ретрошер</translation>
-    </message>
-</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -16903,7 +17248,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -16913,15 +17268,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16931,42 +17286,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16986,7 +17341,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">Претражи</translation>
     </message>
@@ -17016,17 +17371,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17041,12 +17396,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17056,27 +17416,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17091,7 +17455,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Пријави ме</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17165,6 +17529,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17254,16 +17628,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17371,7 +17745,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17387,7 +17761,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17422,12 +17796,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17471,27 +17845,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17501,12 +17875,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17536,13 +17910,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17554,12 +17928,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17574,7 +17958,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17589,26 +17973,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>...</source>
-        <translation type="vanished">…</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17619,7 +18001,7 @@ and use the import button to load it</source>
         <translation type="unfinished">Образац</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -17638,7 +18020,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17648,7 +18030,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17675,7 +18057,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17685,7 +18067,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17705,7 +18087,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17821,7 +18203,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17829,37 +18211,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17891,7 +18278,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17899,8 +18286,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18168,12 +18555,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18204,7 +18591,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18238,7 +18625,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18257,6 +18644,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18336,7 +18743,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18346,7 +18753,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18356,7 +18763,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18372,7 +18779,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18439,7 +18846,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18467,7 +18874,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18647,13 +19054,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Назив</translation>
+    </message>
     <message>
         <location line="+1"/>
-        <source>Status</source>
+        <source>Node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18896,6 +19319,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19035,7 +19470,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19202,7 +19637,7 @@ p, li { white-space: pre-wrap; }
         <translation>Образац</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19215,7 +19650,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19388,12 +19823,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19401,12 +19846,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20094,7 +20539,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Назив</translation>
@@ -20215,7 +20660,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
@@ -20235,7 +20680,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20291,7 +20736,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20305,11 +20750,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20323,6 +20763,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20345,12 +20790,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20374,7 +20824,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20395,7 +20847,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20456,7 +20908,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20477,7 +20929,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20507,7 +20959,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20525,7 +20977,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20542,12 +20994,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20608,7 +21060,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20623,7 +21075,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20723,23 +21175,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20749,7 +21201,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20786,7 +21238,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -20797,17 +21249,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20827,7 +21279,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20835,7 +21287,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20851,22 +21303,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Уклони ставку</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20883,7 +21335,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20908,8 +21360,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20917,7 +21369,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20948,7 +21400,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -20993,12 +21445,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Статус:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21018,17 +21470,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21038,7 +21485,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation>Сакриј</translation>
     </message>
@@ -21048,7 +21505,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21058,12 +21515,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21122,12 +21579,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21148,22 +21605,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21176,21 +21633,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,23 +21652,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21226,7 +21701,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21251,37 +21726,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21296,71 +21829,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21370,22 +21839,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21397,12 +21851,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21412,7 +21866,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21427,23 +21881,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21454,17 +21908,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21474,12 +21918,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21489,17 +21928,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21539,7 +21968,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21554,12 +21983,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21595,7 +22019,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21650,7 +22099,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21675,7 +22124,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -21687,7 +22136,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21710,7 +22159,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21770,17 +22219,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21796,18 +22256,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21842,12 +22302,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21870,22 +22330,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21920,7 +22380,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21930,12 +22390,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22015,7 +22475,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22025,12 +22485,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22049,7 +22509,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22069,17 +22529,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22089,7 +22549,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Уклони</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22180,7 +22640,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22188,7 +22648,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22239,11 +22699,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22253,7 +22718,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22268,7 +22733,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22284,7 +22749,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22309,7 +22774,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22452,12 +22917,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22481,7 +22946,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22820,7 +23285,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23057,7 +23522,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23093,12 +23558,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23108,18 +23576,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23129,12 +23592,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23142,7 +23650,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23152,7 +23660,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23163,11 +23671,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23195,7 +23704,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23206,7 +23715,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23216,22 +23725,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23316,7 +23830,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23325,7 +23839,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23350,7 +23869,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23415,12 +23939,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23430,7 +23949,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23458,7 +23987,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23486,19 +24015,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Назив</translation>
@@ -23705,7 +24234,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23730,7 +24264,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23751,7 +24285,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -23784,7 +24318,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23799,7 +24343,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -23926,23 +24470,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Путања</translation>
     </message>
@@ -23952,7 +24491,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23962,7 +24501,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23977,7 +24516,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23987,7 +24526,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24401,12 +24940,17 @@ p, li { white-space: pre-wrap; }
         <translation>Образац</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Статус:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24446,17 +24990,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24466,12 +25020,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24608,7 +25162,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24623,7 +25177,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24711,7 +25265,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24746,7 +25300,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24776,14 +25330,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24804,7 +25362,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24887,16 +25445,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">…</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24911,7 +25460,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24931,7 +25480,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24961,7 +25510,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24971,7 +25520,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">Ретрошер</translation>
@@ -25034,35 +25583,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Образац</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Уклони</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Место:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25107,11 +25663,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25189,7 +25775,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25226,7 +25812,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_sv.ts b/retroshare-gui/src/lang/retroshare_sv.ts
index 3bdd3ebc7..ee425491b 100644
--- a/retroshare-gui/src/lang/retroshare_sv.ts
+++ b/retroshare-gui/src/lang/retroshare_sv.ts
@@ -84,13 +84,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Lägg till kommentar</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -128,12 +121,12 @@
         <translation>RetroShare: Avancerad sökning</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Sökkriterium</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Lägg till ytterligare sökkriterium.</translation>
     </message>
@@ -143,7 +136,7 @@
         <translation>Återställ sökkriterium.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Avbryter sökningen.</translation>
     </message>
@@ -163,177 +156,6 @@
         <translation>Sök</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Skapa album</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Albumnamn:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Kategori:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Djur</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Familj</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Kontakter</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Blommor</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Semester</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Landskap</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Husdjur</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Porträtt</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Resor</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">Arbete</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Blandat</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Taget:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Plats:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotograf:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beskrivning:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Fildelningsalternativ</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">Policy:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Kvallitet:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Kommentarer:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Identitet:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Publik</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Begränsad</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Storleksändra bilder (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Storleksändra bilder (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Skicka originalbilder</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Inga kommentarer tillåtna</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Autentiserade kommentarer</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Alla kommentarer tillåtna</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Publicera med identitet</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Dra &amp;amp; släpp för att infoga bilder. Klicka på en bild för att redigera.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Tillbaka</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Lägg till bilder</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Publicera album</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Namnlöst album</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Säg något om detta album...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Var togs dessa bilder?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Läs in albumminiatyr</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -342,19 +164,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Album</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Albumminiatyr</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Sammanfattning</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -370,34 +184,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Taget</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Plats:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Tidpunkt</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beskrivning:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Fildelningsalternativ</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Kommentarer</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Publicera identitet</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Synlighet</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -766,7 +552,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Varning! De här tjänsterna är experimentella. Hjälp oss gärna att testa dem.
@@ -782,14 +568,6 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <source>Circles</source>
         <translation>Cirklar</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">GxsForum</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">Gxs-kanaler</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -801,10 +579,23 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation>Bilder</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -841,17 +632,13 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Lägg till profilbild</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Lägg till din probild</translation>
     </message>
@@ -870,10 +657,6 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Läs in profilbild</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -942,22 +725,10 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation>Återställ</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Mottagningshastighet</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Sändningshastighet</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Alltid överst</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stil</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -973,23 +744,11 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <source>% Opaque</source>
         <translation>% Opak</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Spara</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">Avbryt</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Sedan:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Dölj inställningar</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1062,7 +821,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentar</translation>
     </message>
@@ -1092,12 +851,12 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1105,7 +864,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1125,7 +884,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1163,7 +922,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1183,7 +942,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1213,7 +972,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Dela</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Växla meddelandestatus</translation>
     </message>
@@ -1223,7 +982,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Nytt</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1231,12 +990,12 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Jag gillar detta</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1256,18 +1015,18 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Profilbild</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1282,12 +1041,12 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Ta bort objektet</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1456,17 +1215,17 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Kanaler</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Flikar</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
@@ -1476,11 +1235,17 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">Ladda inlägg i bakgrunden (Tråd)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">Nerladdningar</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Öppna varje kanal i en ny flik</translation>
     </message>
@@ -1488,7 +1253,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1511,7 +1276,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Jag gillar detta</translation>
     </message>
@@ -1536,18 +1301,18 @@ into the image, so as to
         <translation type="unfinished">Profilbild</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1562,7 +1327,7 @@ into the image, so as to
         <translation type="unfinished">Ta bort objektet</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -1572,17 +1337,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Dölj</translation>
     </message>
@@ -1590,7 +1345,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -1781,7 +1536,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Visa chattlobby</translation>
     </message>
@@ -1793,22 +1548,6 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">Du har %1 nya meddelanden</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">Du har %1 nytt meddelande</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 nya meddelanden</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 nytt meddelande</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1830,13 +1569,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Okänd lobby</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Ta bort alla</translation>
     </message>
@@ -1844,13 +1584,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Antal</translation>
     </message>
@@ -1860,29 +1600,7 @@ into the image, so as to
         <translation>Ämne</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1892,7 +1610,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1949,12 +1667,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1964,31 +1682,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Skapa ny chattlobby</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Ämne saknas]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Vald lobbyinformation</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Privat</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Publik</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1998,42 +1716,25 @@ Double click a chat room to enter and chat.</source>
         <translation>Avsluta Prenumeration</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Prenumerera</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Sök Chat Lobbyn</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Sök namn</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Prenumererat</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Kolumner</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Nej</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2045,47 +1746,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Ämne:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Säkerhet:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Användare:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
@@ -2100,13 +1801,24 @@ Double click a chat room to enter and chat.</source>
         <translation>Inga anonyma ID</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>kolumn</translation>
@@ -2120,7 +1832,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Ta bort objektet</translation>
     </message>
@@ -2165,7 +1877,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
@@ -2180,19 +1892,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Chattinställningar</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Aktivera uttryckssymboler i privat chatt</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Aktivera uttryckssymboler i gruppchatt</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Aktivera anpassat teckensnitt</translation>
     </message>
@@ -2212,7 +1912,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Aktivera kursiv stil</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2237,11 +1937,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished">Ladda inbäddade bilder</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Chattlobby</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Blinka med flikikon</translation>
     </message>
@@ -2250,10 +1946,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Privatchatt</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2275,11 +1967,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Blinka med fönster-/flikikon</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Chatteckensnitt</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Ändra teckensnitt</translation>
     </message>
@@ -2289,14 +1977,10 @@ Double click a chat room to enter and chat.</source>
         <translation>Teckensnitt:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Historik</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Stil</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2311,17 +1995,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Gruppchatt</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Privatchatt</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2385,22 +2065,28 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Chatlobbyn</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Aktiverad:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">Sök</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2410,7 +2096,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2507,11 +2203,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Maximalt antal dagar att spara (0 = behåll allt):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Sök som standard</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Skiftlägeskänslig</translation>
     </message>
@@ -2617,7 +2309,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Visa chatt</translation>
     </message>
@@ -2653,7 +2345,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
@@ -2688,12 +2380,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2773,11 +2465,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2815,7 +2502,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>skriver...</translation>
     </message>
@@ -2837,7 +2524,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Vill du verkligen ta bort historiken?</translation>
     </message>
@@ -2887,7 +2574,7 @@ after HTML conversion.</source>
         <translation>är upptagen och kanske inte svarar.</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2909,7 +2596,7 @@ after HTML conversion.</source>
         <translation>Sluta inte att färga efter X hittade (använder mer CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2924,16 +2611,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Status)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Ange teckensnitt &amp; färg</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Bifoga en fil</translation>
     </message>
@@ -2949,12 +2632,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2965,12 +2648,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2990,7 +2673,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Skriv ett meddelande här</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3016,7 +2699,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Visningsdetaljer:</translation>
     </message>
@@ -3038,7 +2721,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Privata cirklar</translation>
     </message>
@@ -3064,7 +2747,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Kontakter</translation>
     </message>
@@ -3124,7 +2807,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Vänners vänner</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Externa Cirklar (Administratör)</translation>
     </message>
@@ -3140,7 +2823,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Cirklar</translation>
     </message>
@@ -3192,45 +2875,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Fel: Kan inte hämta användaruppgifter.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3240,7 +2923,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Kryptering</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation>Inte ansluten</translation>
     </message>
@@ -3322,12 +3005,17 @@ Double click on it to add his name on text writer.</source>
         <translation>ingen</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3347,7 +3035,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>med</translation>
     </message>
@@ -3364,104 +3052,16 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Anslut kontakt ((Steg för steg-guide))</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Lägg till en ny kontakt</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Du får en certifikatfil från en kontakt</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;Skapa kontakt med en utvald kontakt till en befintlig kontakt</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">Inkludera signaturer</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Kopiera certifikatet till Urklipp</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Spara certifikatet till fil</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">Starta e-postprogrammet</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Certifikatfiler</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Använd PGP-certifikat som sparats i filer.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Importera en kontakts certifikat...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Du behöver generera en certifikatfil och ge den till din kontakt. Du kan också använda en befintlig certifikatfil.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Exportera mitt certifikat...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Dra och släpp din kontakts certifikat i det här fönstret, eller ange sökväg i nedanstående textfält</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Bläddra</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Kontakter till kontakter</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Välj vem du vill skapa kontakt med</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Visa mig:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Skapa kontakt med dessa användare</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare-ID</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">Använd RetroShare-ID för att lägga till en kontakt som är tillgänglig i ditt nätverk.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Lägg till kontaktens RetroShare-ID...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Klistra in kontaktens RetroShare-ID i nedanstående indataruta</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Ange kontaktens RetroShare-ID. Ex. Användare@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3503,27 +3103,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">E-post</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Bjud in kontakter via e-post</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Ange kontaktens e-postadresser (separera med semikolon)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Kontaktens e-postadresser:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Ange kontaktens e-postadresser</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Ämne: </translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3539,40 +3119,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Fakta om begäran</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Användarinformation</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">E-post:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Nod:</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Alternativ</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Lägg till kontakt till grupp:</translation>
     </message>
@@ -3582,7 +3154,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Autentisera kontakt (Signera PGP-nyckel)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3607,16 +3179,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Lägg till en kontakt att ansluta till</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Klicka på &apos;Slutför&apos; för att acceptera denna kontaktförfrågan</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Något fel uppstod</translation>
     </message>
@@ -3636,32 +3214,27 @@ Double click on it to add his name on text writer.</source>
         <translation>Fakta om din kontakt:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Nyckelvaliditet:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>Signerad av:</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Denna användare finns redan på din kontaktlista. Att lägga till den kanske bara anger IP-adress.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3707,45 +3280,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Certifikatinläsning misslyckades</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">Kan inte hämta användarinformation för PGP-nyckel %1</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">Vilken användare som helst, som jag inte signerat</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Kontakter till mina kontakter som redan litar på mig</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Signerade användare som visas som avvisade</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Användarnamn</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Också signerad av</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Användar-ID</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare-inbjudan</translation>
     </message>
@@ -3765,12 +3310,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3778,7 +3323,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3818,7 +3363,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Du har en kontaktförfrågan från</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3843,7 +3388,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3853,47 +3398,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Certifikatinläsning misslyckades! %1 kan inte hittas</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">%1 finns inte tillgänglig i ditt nätverk</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Använd nytt certifikatformat (säkrare, mer robust)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Använd gammalt (bakåtkompatibelt) certifikatformat</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">Ta bort signaturer</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">RetroShare-inbjudan</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Anslut kontakt Hjälp</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Du kan kopiera denna text och skicka den till din kontakt via e-post eller på något annat sätt.</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Ditt certifikat är kopierat till Urklipp, klistra in och skicka det till din kontakt via e-post eller på något annat sätt.</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Spara som...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3932,11 +3437,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Ingen ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Använd som direkt källa, om tillgänglig</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3946,7 +3447,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP-adress</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3965,41 +3466,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Rekommendera många användare åt varandra</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Kontaktrekommendationer</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">Meddelande:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Rekommendera kontakter</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Till</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Välj minst en kontakt för rekommendation.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Välj minst en kontakt som mottagare.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Lägg till nyckel till nyckelring</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Den här nyckeln finns redan i din nyckelring</translation>
     </message>
@@ -4012,7 +3485,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Certifikatet har fel versionsnummer. Kom ihåg att v0.6 och v0.5-nätverk inte är kompatibla med varandra.</translation>
     </message>
@@ -4047,7 +3520,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4057,12 +3530,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4127,7 +3595,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>UDP Inställning</translation>
     </message>
@@ -4155,7 +3623,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Anslutningsassistent</translation>
     </message>
@@ -4165,17 +3633,20 @@ p, li { white-space: pre-wrap; }
         <translation>Ogiltigt Användar-ID</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Okänt tillstånd</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Frånkopplad</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Bakom symmetrisk NAT</translation>
     </message>
@@ -4185,12 +3656,14 @@ p, li { white-space: pre-wrap; }
         <translation>Bakom NAT &amp; Ingen DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>NET Återstart</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>Bakom NAT</translation>
     </message>
@@ -4200,7 +3673,8 @@ p, li { white-space: pre-wrap; }
         <translation>Ingen DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>NET TILLSTÅND BRA!</translation>
     </message>
@@ -4225,7 +3699,7 @@ p, li { white-space: pre-wrap; }
         <translation>Söker RS-användare</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Sökning kräver DHT</translation>
     </message>
@@ -4517,7 +3991,7 @@ p, li { white-space: pre-wrap; }
         <translation>Försök igen genom att importera en fullständig Nyckel</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4525,7 +3999,8 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>OVERIFIERBAR VIDAREBEFORDRING!</translation>
     </message>
@@ -4535,7 +4010,7 @@ p, li { white-space: pre-wrap; }
         <translation>OVERIFIERBAR VIDAREBEFORDRING &amp; INGEN DHT</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Söker</translation>
     </message>
@@ -4571,12 +4046,12 @@ p, li { white-space: pre-wrap; }
         <translation>Cirkeldetaljer</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4596,7 +4071,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4616,18 +4091,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filter</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Användarnamn</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4642,15 +4117,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Typ</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">Namn:</translation>
     </message>
@@ -4690,19 +4157,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Ange ett namn för din cirkel</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Ingen begränsad cirkel vald</translation>
     </message>
@@ -4712,12 +4179,24 @@ p, li { white-space: pre-wrap; }
         <translation>Inga cirkel begränsningar valda</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Lägg till</translation>
     </message>
@@ -4727,7 +4206,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Sök</translation>
@@ -4742,10 +4221,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Signerad</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Signerad av kända noder</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4762,10 +4237,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP-identitet</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">Anonymt Id</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4788,17 +4259,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">Skapa</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP-länkat ID</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4817,7 +4284,7 @@ p, li { white-space: pre-wrap; }
         <translation>Skapa en ny grupp</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished">Gruppnamn:</translation>
     </message>
@@ -4852,7 +4319,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Nytt kanalinlägg</translation>
     </message>
@@ -4862,7 +4329,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanalinlägg</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4923,23 +4390,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Använd Dra och släpp / Lägg till fil, för att hash-beräkna nya filer.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Kopiera/Klistra in RetroShare-länkar från dina utdelade mappar&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Bifofoga fil</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Lägg till kanalminiatyr</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Meddelande</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Ämne:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5025,17 +4480,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5054,17 +4509,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Filen är redan tillagd och hash-beräknad</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Ange ett ämne</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Läs in miniatyrbild</translation>
     </message>
@@ -5079,18 +4535,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Generera massdata</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Vill du verkligen generera %1 meddelanden?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Du är på väg att lägga till filer som du inte delar. Vill du verkligen fortsätta?</translation>
     </message>
@@ -5124,7 +4574,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Posta foruminlägg</translation>
     </message>
@@ -5133,10 +4583,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Ämne</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5157,8 +4603,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5177,7 +4623,7 @@ p, li { white-space: pre-wrap; }
         <translation>Du kan bifoga filer via Dra &amp; släpp i det här fönstret</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5207,17 +4653,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Inga forum</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>Som svar på</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5270,7 +4716,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Läs in en bildfil</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5280,8 +4726,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Generera massdata</translation>
     </message>
@@ -5290,10 +4736,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Vill du verkligen generera %1 meddelanden?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Skicka</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5308,23 +4750,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Skapa ny chattlobby</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">En chattlobby är en decentraliserad och anonym chattgrupp. Samtliga deltagare tar emot alla meddelanden. När lobbyn är skapad kan du bjuda in andra kontakter via kontakt-fliken</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Lobbynamn:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Lobbyämne:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5359,7 +4785,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Skapa</translation>
     </message>
@@ -5369,7 +4795,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5384,11 +4810,7 @@ Do you want to discard this message?</source>
         <translation>Välj de kontakter du vill gruppchatta med.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Inbjudna kontakter</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -5409,7 +4831,7 @@ Do you want to discard this message?</source>
         <translation>Kontakter:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Identitet att använda:</translation>
     </message>
@@ -5417,17 +4839,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Öppen information</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
@@ -5437,12 +4859,12 @@ Do you want to discard this message?</source>
         <translation>Plats-ID:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Programversion:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Uppkopplad sedan:</translation>
     </message>
@@ -5462,12 +4884,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5477,7 +4894,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Annan information</translation>
     </message>
@@ -5487,17 +4904,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Certifikat</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5507,11 +4919,7 @@ Do you want to discard this message?</source>
         <translation>Inkludera signaturer</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Spara nyckel som fil</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exportera identitet</translation>
     </message>
@@ -5585,33 +4993,33 @@ och där läsa in den med importfunktionen.</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP fingeravtryck:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Nodinformation</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP Id :</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Vännoder:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5650,14 +5058,6 @@ och där läsa in den med importfunktionen.</translation>
         <source>Node</source>
         <translation>Nod</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Skapa ny node...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">visa statistikfönster</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5709,7 +5109,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6377,7 +5777,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Starta</translation>
     </message>
@@ -6385,38 +5785,38 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>till</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>Ignorera skiftläge</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>dd.MM.yyyy</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6424,12 +5824,12 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>Uttrycks-widget</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Ta bort det här uttrycket</translation>
     </message>
@@ -6591,7 +5991,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Bild</translation>
     </message>
@@ -6601,7 +6001,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6661,11 +6061,21 @@ och där läsa in den med importfunktionen.</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Kontakters mappar</translation>
     </message>
@@ -6787,7 +6197,7 @@ och där läsa in den med importfunktionen.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6829,7 +6239,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Visa grupper</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Grupp</translation>
     </message>
@@ -6865,7 +6275,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Lägg till i grupp</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Sök</translation>
@@ -6881,7 +6291,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Sortera efter stadie</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7118,7 +6528,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Bekräfta kontaktförfrågan</translation>
     </message>
@@ -7135,10 +6545,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Sök:</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7160,7 +6566,7 @@ at least one peer was not added to a group</source>
         <translation>Sök kontakter</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Markera alla</translation>
     </message>
@@ -7171,16 +6577,132 @@ at least one peer was not added to a group</source>
         <translation>Markera ingen</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Namn</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Status</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Skapa kontakt</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Redigera statusmeddelande</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Sändning</translation>
     </message>
@@ -7263,33 +6785,38 @@ at least one peer was not added to a group</source>
         <translation>Återställ standardteckensnitt</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Nyckelring</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retroshare utsändningschat: meddelanden skickas till alla anslutna vänner.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Nätverksgraf</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Ange ditt statusmeddelande här.</translation>
     </message>
@@ -7307,7 +6834,17 @@ at least one peer was not added to a group</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Samtliga indatafält kräver minst 3 tecken</translation>
     </message>
@@ -7317,17 +6854,12 @@ at least one peer was not added to a group</source>
         <translation>Lösenorden stämmer inte överens</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Detta lösenord är för PGP</translation>
@@ -7348,38 +6880,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7399,12 +6931,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7414,42 +6946,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Avancerade alternativ</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>gömd adress</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7493,13 +7026,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importera profil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7509,7 +7042,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7544,7 +7077,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7554,12 +7087,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7569,12 +7097,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7800,36 +7323,13 @@ and use the import button to load it</source>
         <translation>Kom igång</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Bjud in kontakter</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;RetroShare är ingentig utan dina kontakter. Klicka på knappen för att starta processen.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Skicka en inbjudan med ditt certifikat, via e-post, till dina vänner.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Tillse att du får en inbjudan i retur... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Du kan endast ansluta till kontakter om ni båda har lagt till varandra.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Lägg till dina kontakter i RetroShare</translation>
     </message>
@@ -7839,89 +7339,103 @@ p, li { white-space: pre-wrap; }
         <translation>Lägg till kontakter</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Anslut till kontakter</translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+76"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avancerat: Öppna brandväggsport</translation>
+    </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Anslut till kontakter</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avancerat: Öppna brandväggsport</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Mer hjälp och support</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>RetroShare Hemsida</translation>
     </message>
@@ -7946,7 +7460,7 @@ p, li { white-space: pre-wrap; }
         <translation>Återkoppling (e-post)</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare Inbjudan</translation>
     </message>
@@ -7996,12 +7510,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare återkoppling</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>RetroShare support</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8125,7 +7639,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Visa gruppchatt</translation>
     </message>
@@ -8133,7 +7647,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8303,7 +7817,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
@@ -8316,12 +7830,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8346,19 +7860,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Sortera efter namn</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Sortera efter popularitet</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Sortera efter senaste inlägg</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8373,14 +7875,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Senaste inlägget</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
@@ -8391,17 +7893,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularitet</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Visa</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8414,7 +7912,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>och</translation>
     </message>
@@ -8550,7 +8048,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanaler</translation>
@@ -8561,22 +8059,22 @@ p, li { white-space: pre-wrap; }
         <translation>Skapa kanal</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Aktivera automatisk nedladdning</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Mina kanaler</translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Kanalabonnemang</translation>
     </message>
@@ -8596,12 +8094,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Inaktivera automatisk nedladdning</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8636,22 +8134,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Spela upp</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
@@ -8671,17 +8169,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Vill du verkligen avbryta och radera filen?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Kan inte öppna mapp</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Spela upp fil</translation>
     </message>
@@ -8691,33 +8189,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1 finns inte i den mappen.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulär</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Filname</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Storlek</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Rubrik</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Status</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Skapa ny kanal</translation>
     </message>
@@ -8755,9 +8230,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Abonnera på kanal</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8771,7 +8256,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Visa</translation>
     </message>
@@ -8786,7 +8271,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanalbeskrivning</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Läser in</translation>
     </message>
@@ -8801,8 +8286,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Ny kanal</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8813,7 +8299,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8834,7 +8320,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Spela upp</translation>
     </message>
@@ -8890,28 +8376,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Filer</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Varning! Det är mindre än %1 timmar och %2 minuter kvar tills den här filen raderas. Överväg att spara den.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Nytt</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
@@ -8926,21 +8408,17 @@ p, li { white-space: pre-wrap; }
         <translation>Jag gillar inte detta</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Läser in</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8965,83 +8443,16 @@ p, li { white-space: pre-wrap; }
         <translation>Spela upp media</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Posta i kanal</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Läser in</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Sök kanaler</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Rubrik</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Sök titel</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">Meddelande</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">Sök meddelanden</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Filname</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Sök filnamn</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Inga kanaler markerade</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Inaktivera automatisk nedladdning</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Aktivera automatisk nedladdning</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Visa filer</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Flöden</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Filer</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Beskrivning:</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Posta i kanal</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9111,7 +8522,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9147,7 +8558,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentarer</translation>
     </message>
@@ -9162,13 +8573,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Flöden</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9183,7 +8594,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9198,7 +8609,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9258,12 +8669,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9338,12 +8759,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">Prenumererat</translation>
     </message>
@@ -9394,17 +8816,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9519,7 +8941,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Kommentarsbehållare</translation>
     </message>
@@ -9532,7 +8954,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulär</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9562,7 +8984,7 @@ p, li { white-space: pre-wrap; }
         <translation>Uppdatera</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
@@ -9601,7 +9023,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Besvara kommentar</translation>
     </message>
@@ -9625,6 +9047,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Rösta ned</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9634,7 +9071,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kommentera</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9663,26 +9100,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Kommentera&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">Signerad av</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9711,7 +9132,7 @@ before you can comment</source>
 innan du kan kommentera</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9753,14 +9174,6 @@ innan du kan kommentera</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Lägg till forumadministratörer</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Välj forumadministratörer</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9770,7 +9183,7 @@ innan du kan kommentera</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Prenumerera på forum</translation>
     </message>
@@ -9786,7 +9199,7 @@ innan du kan kommentera</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Visa</translation>
     </message>
@@ -9806,8 +9219,9 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Läser in</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9838,13 +9252,13 @@ innan du kan kommentera</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Ämne:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Avsluta prenumeration på forum</translation>
     </message>
@@ -9855,7 +9269,7 @@ innan du kan kommentera</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Visa</translation>
     </message>
@@ -9875,21 +9289,17 @@ innan du kan kommentera</translation>
         <translation>Svar svar på:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Läser in</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
@@ -9902,63 +9312,66 @@ innan du kan kommentera</translation>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Starta ny tråd i aktuellt forum</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Sök i forum</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Senaste inlägget</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished">Ny tråd</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>Trådvy</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Platt vy</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Rubrik</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Författare</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Läser in</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9968,12 +9381,7 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>Svarsmeddelande</translation>
     </message>
@@ -9997,10 +9405,6 @@ innan du kan kommentera</translation>
         <source>Download all files</source>
         <translation>Ladda ner alla filer</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Nästa olästa</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10017,31 +9421,23 @@ innan du kan kommentera</translation>
         <translation>Sök författare</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">Innehåll</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">Sökinnehåll</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Inget namn</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Svara</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10084,16 +9480,12 @@ innan du kan kommentera</translation>
         <translation>Kopiera RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Expandera</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10123,8 +9515,8 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10138,22 +9530,6 @@ innan du kan kommentera</translation>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">Anonym</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">signerad</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">ingen</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... Meddelande saknas ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10223,12 +9599,12 @@ innan du kan kommentera</translation>
         <translation>Originalmeddelande</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">Redigera</translation>
     </message>
@@ -10289,7 +9665,7 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10309,7 +9685,7 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10361,7 +9737,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10371,7 +9747,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10386,7 +9762,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10452,12 +9828,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forum</translation>
@@ -10488,35 +9864,16 @@ This message is missing. You should receive it later.</source>
         <translation>Andra forum</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Väntar</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Tar emot</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Läser in</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Lägg till ikon</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Nyckelmottagare kan publicera på begränsad Wiki-grupp, och kan visa och publicera på privata kanaler</translation>
     </message>
@@ -10525,22 +9882,14 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Dela publiceringsnyckel</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">Markera de användare du vill dela privat publiceringsnyckel med.</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Dela nyckel med</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>Meddelandedistribution</translation>
     </message>
@@ -10548,7 +9897,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Publik</translation>
     </message>
@@ -10567,14 +9916,6 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Ny tråd</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Obligatorisk</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Krypterade meddelanden</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10616,7 +9957,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished">Kommentarer:</translation>
     </message>
@@ -10639,7 +9980,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10655,12 +9996,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10677,23 +10018,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10709,26 +10050,28 @@ This message is missing. You should receive it later.</source>
         <translation>Lägg till ett namn</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Läs in grupplogotyp</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Kommer att användas för att skicka feedback</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Ägare:</translation>
     </message>
@@ -10738,12 +10081,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10753,7 +10096,7 @@ This message is missing. You should receive it later.</source>
         <translation>Senaste inlägget</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10828,7 +10171,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Popularitet</translation>
     </message>
@@ -10844,27 +10192,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Skapa</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Upphovsman</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10872,7 +10215,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Läser in</translation>
     </message>
@@ -10932,7 +10275,7 @@ This message is missing. You should receive it later.</source>
         <translation>Redigera detaljer</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10989,12 +10332,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopiera RetroShare-länk</translation>
     </message>
@@ -11017,7 +10360,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>Ingen signatur</translation>
     </message>
@@ -11030,22 +10373,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Läser in</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Hittades inte</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">Ingen signatur</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11055,7 +10390,7 @@ This message is missing. You should receive it later.</source>
         <translation>okänd nyckel</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11065,7 +10400,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11085,6 +10425,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11096,7 +10444,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11144,17 +10492,13 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Läser in</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11535,7 +10879,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11551,7 +10895,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Upphovsmän</translation>
     </message>
@@ -11570,7 +10914,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11648,7 +10992,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulär</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11658,7 +11002,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11686,7 +11030,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11696,7 +11040,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Kopiera certifikatet till Urklipp</translation>
     </message>
@@ -11706,7 +11050,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Spara certifikatet till fil</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11726,13 +11070,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11744,12 +11112,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11764,12 +11132,7 @@ new short format</source>
         <translation type="unfinished">RetroShare-inbjudan</translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished">Spara som...</translation>
     </message>
@@ -12034,14 +11397,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Alla</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Rykte</translation>
     </message>
@@ -12051,12 +11414,12 @@ p, li { white-space: pre-wrap; }
         <translation>Sök</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>Anonymt Id</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Skapa ny identitet</translation>
     </message>
@@ -12066,7 +11429,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12081,27 +11444,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished">Stäng</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12117,29 +11480,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Cirklar</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12159,18 +11532,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Privata cirklar</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Redigera identitet</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Ta bort identitet</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12180,78 +11555,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>Identitets-ID</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>Skicka meddelande</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Identitetsinfo</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Identitets-ID :</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Negativ</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Neutral</translation>
     </message>
@@ -12262,17 +11637,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positiv</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>Anonym</translation>
     </message>
@@ -12287,24 +11662,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12319,7 +11694,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12329,7 +11709,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12404,7 +11784,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12434,7 +11814,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">okänd</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12449,7 +11829,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished">Editera cirkeln</translation>
     </message>
@@ -12497,7 +11877,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12505,7 +11885,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -12548,7 +11928,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12628,7 +12008,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12644,17 +12024,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12759,7 +12134,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12809,21 +12184,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Din avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12833,7 +12208,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12848,7 +12223,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12863,12 +12238,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12888,12 +12263,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Ägd av</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Nodnamn:</translation>
     </message>
@@ -12903,7 +12278,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Nod-ID :</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12911,7 +12286,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Användarnamn</translation>
     </message>
@@ -12941,7 +12316,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudonym</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12951,12 +12326,19 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Ny identitet</translation>
     </message>
@@ -12970,7 +12352,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12980,7 +12362,12 @@ These identities will soon be not supported anymore.</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Editera identitet</translation>
@@ -12991,27 +12378,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13031,7 +12418,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13041,11 +12428,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Ett fel uppstod vid hämtning av nyckeln!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Fel NyckelID felaktigt</translation>
     </message>
@@ -13060,7 +12443,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Okänt riktigt namn</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Skapa ny Identitet</translation>
     </message>
@@ -13070,10 +12453,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">Ta bort</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13099,7 +12487,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Lägg till</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Skapa</translation>
     </message>
@@ -13109,13 +12497,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Din avatar</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13125,7 +12513,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13184,10 +12572,6 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>PGP-namn:</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">GXS-id:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13203,7 +12587,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Kopiera</translation>
     </message>
@@ -13213,12 +12597,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Markera alla</translation>
     </message>
@@ -13237,26 +12621,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Citera</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Skicka</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13274,27 +12670,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13315,7 +12716,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13324,26 +12730,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Kontrollerar...</translation>
     </message>
@@ -13353,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Kontrollera filer</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13381,7 +12792,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Lägg till kontakt</translation>
     </message>
@@ -13397,7 +12808,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Alternativ</translation>
     </message>
@@ -13418,7 +12830,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Avsluta</translation>
     </message>
@@ -13429,12 +12841,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Snabbstartsguide</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 en säker, decentraliserad kommunikationsplattform</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Pågående</translation>
     </message>
@@ -13463,11 +12875,12 @@ Frigör mer diskutrymme och klicka OK.</translation>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Meddela</translation>
     </message>
@@ -13478,31 +12891,35 @@ Frigör mer diskutrymme och klicka OK.</translation>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Öppna meddelanden</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Bandbreddsgraf</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Program</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Hjälp</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Minimera</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Maximera</translation>
     </message>
@@ -13517,7 +12934,12 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 nytt meddelande</translation>
     </message>
@@ -13547,7 +12969,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>%1 kontakter anslutna</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Vill du verkligen avsluta RetroShare?</translation>
     </message>
@@ -13567,7 +12989,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Visa</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Tillse att den här länken inte leder till en webbsida med skadlig kod.</translation>
     </message>
@@ -13612,12 +13034,13 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Tjänståtkomstmatrix</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13632,7 +13055,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13641,17 +13064,17 @@ Frigör mer diskutrymme och klicka OK.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Skriv</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Rubrik</translation>
     </message>
@@ -13687,12 +13110,12 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Rubrik 6</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Teckenstorlek</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Öka teckenstorlek</translation>
     </message>
@@ -13707,32 +13130,32 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Fet</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Justering</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Lägg till en bild</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Anger teckensnitt</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Understruken</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Ämne:</translation>
     </message>
@@ -13743,32 +13166,32 @@ Frigör mer diskutrymme och klicka OK.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Rekommenderade filer</translation>
     </message>
@@ -13838,7 +13261,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Lägg till blockcitat</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Skicka till:</translation>
     </message>
@@ -13878,7 +13301,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hej! Jag rekommenderar mina kontakter. Du kan autentisera dem också, när du autentiserar mig.</translation>
     </message>
@@ -13898,18 +13321,18 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>vill bli en av dina kontakter på RetroShare</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hej %1!&lt;br&gt;&lt;br&gt;%2 vill bli en av dina kontakter på RetroShare.&lt;br&gt;&lt;br&gt;Svara nu:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Tack!&lt;br&gt;RetroShare Team</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>Spara meddelande</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Meddelandet har inte skickats.
@@ -13921,7 +13344,17 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Klistra in RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Lägg till i &quot;Till&quot;</translation>
     </message>
@@ -13941,7 +13374,7 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Lägg till som rekommendation</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Ursprungligt meddelande</translation>
     </message>
@@ -13951,21 +13384,21 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Från</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Till</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Kopia</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Skickat</translation>
     </message>
@@ -13980,7 +13413,7 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>På %1, skrev %2:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Svar:</translation>
     </message>
@@ -13990,30 +13423,30 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Vidarebefordran:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Vill du skicka meddelandet utan angivet ämne?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Ange minst en mottagare.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Dold kopia</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Okänd</translation>
     </message>
@@ -14128,13 +13561,13 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Detaljer</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Öppna fil...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-filer (*.htm *.html);;Alla Filer (*)</translation>
     </message>
@@ -14154,7 +13587,7 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Exportera PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Meddelandet har inte skickats.
@@ -14176,7 +13609,7 @@ Vill du spara meddelandet?</translation>
         <translation>Lägg till fil</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14206,18 +13639,18 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Från:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14257,13 +13690,13 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14273,12 +13706,12 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14356,7 +13789,7 @@ Vill du spara meddelandet?</translation>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Ny flik</translation>
     </message>
@@ -14366,7 +13799,7 @@ Vill du spara meddelandet?</translation>
         <translation>Nytt fönster</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Redigera tagg</translation>
     </message>
@@ -14389,7 +13822,7 @@ Vill du spara meddelandet?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Ämne:</translation>
     </message>
@@ -14397,7 +13830,7 @@ Vill du spara meddelandet?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>Meddelande</translation>
     </message>
@@ -14425,7 +13858,7 @@ Vill du spara meddelandet?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Rekommenderade filer</translation>
     </message>
@@ -14435,37 +13868,37 @@ Vill du spara meddelandet?</translation>
         <translation>Ladda ner alla rekommenderade filer</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Ämne:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Från:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Till:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Kopia:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Dold kopia:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Taggar:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Svara</translation>
     </message>
@@ -14487,7 +13920,7 @@ Vill du spara meddelandet?</translation>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Framåt</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -14505,7 +13938,7 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14557,7 +13990,7 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>Bekräfta %1 som kontakt</translation>
     </message>
@@ -14567,12 +14000,12 @@ Vill du spara meddelandet?</translation>
         <translation>Lägg till %1 som kontakt</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Inget ämne</translation>
     </message>
@@ -14582,17 +14015,22 @@ Vill du spara meddelandet?</translation>
         <translation>Ladda ner</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14601,14 +14039,24 @@ Vill du spara meddelandet?</translation>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Ladda ner alla</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Skriv ut dokument</translation>
     </message>
@@ -14623,12 +14071,12 @@ Vill du spara meddelandet?</translation>
         <translation>HTML-filer (*.htm *.html);;Alla Filer (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Ladda alltid bilder för detta meddelande</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14650,42 +14098,6 @@ Vill du spara meddelandet?</translation>
         <source>Compose</source>
         <translation>Skriv</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Svara på markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Svara</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Svara alla på markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Svara alla</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Vidarebefordra markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">Vidarebefordra</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Ta bort markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Ta bort</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Skriv ut markerat meddelande</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14764,7 +14176,7 @@ Vill du spara meddelandet?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Nytt meddelande</translation>
     </message>
@@ -14774,60 +14186,16 @@ Vill du spara meddelandet?</translation>
         <translation>Skriv</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Svara på markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Svara</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Svara alla på markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Svara alla</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Vidarebefordra markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">Vidarebefordra</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Ta bort markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Ta bort</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Skriv ut markerat meddelande</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Skriv ut</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Visa</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Inkorg</translation>
@@ -14857,21 +14225,17 @@ Vill du spara meddelandet?</translation>
         <translation>Papperskorg</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Totalt inkorg:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Mappar</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Snabbvy</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Skriv ut...</translation>
@@ -14881,26 +14245,6 @@ Vill du spara meddelandet?</translation>
         <source>Print Preview</source>
         <translation>Förhandsgranskning</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Endast ikoner</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Text intill ikon</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Endast text</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Text under ikon</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Ange text under ikon</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14922,7 +14266,7 @@ Vill du spara meddelandet?</translation>
         <translation>Vidarebefordra meddelande</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Ämne</translation>
     </message>
@@ -14932,7 +14276,7 @@ Vill du spara meddelandet?</translation>
         <translation>Från</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -14942,39 +14286,7 @@ Vill du spara meddelandet?</translation>
         <translation>Innehåll</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Klicka för att sortera efter bilagor</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Klicka för att sortera efter ämne</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Klicka för att sortera efter &apos;Lästa&apos;</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Klicka för att sortera efter &apos;Från&apos;</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Klicka för att sortera efter datum</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Klicka för att sortera efter taggar</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Klicka för att sortera efter &apos;Stjärnmärkt&apos;</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Vidarebefordra markerat meddelande</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Sök på ämne</translation>
     </message>
@@ -14983,6 +14295,11 @@ Vill du spara meddelandet?</translation>
         <source>Search From</source>
         <translation>Sök på avsändare</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15009,14 +14326,14 @@ Vill du spara meddelandet?</translation>
         <translation>Sök på bilagor</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Stjärnmärkt</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15090,7 +14407,7 @@ Vill du spara meddelandet?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15104,7 +14421,7 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15119,34 +14436,33 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Utkast</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Det finns inga stjärnmärkta meddelanden. Stjärnorna ger meddelanden en särskild status, för att dom skall bli lättare att hitta. För att stjärnmärka ett meddelande, klickar du på den grå stjärnan vid sidan av önskat meddelande.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Det finns inga systemmeddelanden.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Till</translation>
+        <translation>Till</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Klicka för att sortera efter</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15154,22 +14470,6 @@ Vill du spara meddelandet?</translation>
         <source>Total:</source>
         <translation>Totalt:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">Meddelanden</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">Klicka för att sortera enligt signatur</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Det här meddelandet har blivit signerat och signaturen kollar</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Det här meddelandet har blivit signerat men signaturen stämmer inte</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15197,7 +14497,17 @@ Vill du spara meddelandet?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15251,7 +14561,7 @@ Vill du spara meddelandet?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Expandera</translation>
     </message>
@@ -15261,7 +14571,7 @@ Vill du spara meddelandet?</translation>
         <translation>Ta bort objektet</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished">Från</translation>
     </message>
@@ -15296,7 +14606,7 @@ Vill du spara meddelandet?</translation>
         <translation>Väntande</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
@@ -15437,7 +14747,7 @@ Vill du spara meddelandet?</translation>
         <translation>Användar-ID</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Ta bort oanvända nycklar...</translation>
     </message>
@@ -15447,7 +14757,7 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Rensa nyckelringen</translation>
     </message>
@@ -15465,7 +14775,13 @@ Notera: Din gamla nyckelring kommer att säkerhetskopieras.
      Borttagningen kan misslyckas om du kör flera Retroshare-instanser på samma maskin.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Nyckelringsinformation</translation>
@@ -15501,18 +14817,13 @@ För din säkerhet har din nyckelring säkerhetskopierats till filen
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Inkonsistent data i nyckelringen. Detta är troligtvis en bug. Var god och kontakta utvecklarna.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15522,25 +14833,18 @@ För din säkerhet har din nyckelring säkerhetskopierats till filen
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Nätverk</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -15567,7 +14871,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15588,7 +14892,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Grupper</translation>
     </message>
@@ -15618,19 +14922,19 @@ Reported error:</source>
         <translation type="unfinished">importera din vänlista inklusive grupper</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Sök</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15640,12 +14944,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15655,7 +14959,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Grupp</translation>
     </message>
@@ -15770,7 +15074,7 @@ Reported error:</source>
         <translation type="unfinished">Fäll ihop alla</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Vill du ta bort denna nod?</translation>
     </message>
@@ -15780,7 +15084,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Färdig!</translation>
@@ -15887,7 +15191,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15902,11 +15206,7 @@ at least one peer was not added to a group</source>
         <translation>Ta bort alla</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Detta är ett test.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15916,12 +15216,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15976,10 +15276,6 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Bloggar</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Säkerhet</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16001,10 +15297,6 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Meddelande</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Anslutningsförsök</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16158,10 +15450,6 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Flöde</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -16171,7 +15459,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16191,12 +15479,12 @@ at least one peer was not added to a group</source>
         <translation>Fel lösenord!</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Oregisterad insticks-/programfil</translation>
     </message>
@@ -16211,19 +15499,7 @@ at least one peer was not added to a group</source>
         <translation>Kontrollera din systemklocka.</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Undersöker delade filer...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Hash-beräknar fil</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Sparar filindex...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Testa</translation>
     </message>
@@ -16234,17 +15510,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Okänd titel</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Krypterat meddelande</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16252,7 +15530,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Kontakten ansluten</translation>
     </message>
@@ -16394,7 +15672,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16403,10 +15686,6 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">Signera GPG-nyckel</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16443,12 +15722,7 @@ p, li { white-space: pre-wrap; }
         <translation>Inkludera signaturer</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">Alternativ</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16494,21 +15768,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Fel: Kan inte hämta användaruppgifter.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Angiven nyckelalgoritm stöds inte av RetroShare. (För tillfället stöds endast RSA-nycklar)</translation>
@@ -16526,7 +15800,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16595,10 +15869,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Lösenordet kanske är fel</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -16606,12 +15876,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16637,7 +15907,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Chatta</translation>
     </message>
@@ -16658,7 +15928,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Ta bort objektet</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
@@ -16698,7 +15968,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>Skriv meddelande</translation>
     </message>
@@ -16712,10 +15982,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Kontakten anslöt</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Anslutningsförsök</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16754,17 +16020,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Okänd användare</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>Sänd Meddelande</translation>
     </message>
@@ -16931,13 +16193,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulär</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16945,23 +16200,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>Fotodelning</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Bild</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Bildtext</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Kommentar</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Sammanfattning</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17022,14 +16265,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Lägg till kommentar</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Skriv en kommentar...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17100,10 +16335,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Skapa album</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Visa album</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17125,17 +16356,17 @@ p, li { white-space: pre-wrap; }
         <translation>Bildspel</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Mina album</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Albumprenumerationer</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Delade album</translation>
     </message>
@@ -17165,7 +16396,7 @@ före redigering!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Albumnamn</translation>
     </message>
@@ -17224,19 +16455,19 @@ före redigering!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17272,12 +16503,12 @@ före redigering!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Visa mer information om det här insticksprogrammet</translation>
     </message>
@@ -17423,44 +16654,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Mappar med insticksprogram</translation>
     </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Inget API-nummer. Läs manualen för insticksutveckling.</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Inget SVN-nummer. Läs manualen för insticksutveckling.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Inläsningsfel.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Saknat tecken, fel version?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Det finns inga insticksprogram</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Insticksprogram inläst.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Okänd status.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Markera detta för instick under utveckling.
-De kommer inte att hash-beräknas, vilket i normala
-fall görs som skydd mot skadligt beteende från
-felaktigt utformade insticksprogram. </translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -17530,12 +16723,27 @@ felaktigt utformade insticksprogram. </translation>
         <translation>Alltid överst</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -17569,14 +16777,6 @@ felaktigt utformade insticksprogram. </translation>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Om du stänger fönstret kommer konversationen att avslutas, den andra parten meddelas och den krypterade tunneln tas bort.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Ta bort tunneln?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -17596,7 +16796,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished">Nytt</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17616,8 +16816,8 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentarer</translation>
     </message>
@@ -17642,13 +16842,13 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentar</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17676,20 +16876,12 @@ felaktigt utformade insticksprogram. </translation>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">Signerad av:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Anteckningar</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -17704,12 +16896,22 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Läs in en bildfil</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -17725,7 +16927,17 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17735,15 +16947,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">Skicka</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Skicka</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17763,12 +16967,22 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17783,7 +16997,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished">Posta som</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17794,7 +17008,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished">Bild</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17804,7 +17018,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation>Rubrik</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Länk</translation>
     </message>
@@ -17812,32 +17026,12 @@ felaktigt utformade insticksprogram. </translation>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Postade länkar</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Mina rubriker</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Rubrikprenumerationer</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Populära rubriker</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Andra rubriker</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17871,27 +17065,7 @@ felaktigt utformade insticksprogram. </translation>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Postad rubrik</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Lägg till rubrikadministratörer</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Välj rubrikadministratörer</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Skapa nytt ämne</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Redigera Ämne</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17929,7 +17103,17 @@ felaktigt utformade insticksprogram. </translation>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17945,7 +17129,7 @@ felaktigt utformade insticksprogram. </translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Visa</translation>
     </message>
@@ -17960,16 +17144,17 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Läser in</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17982,22 +17167,18 @@ felaktigt utformade insticksprogram. </translation>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Webbplats</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Kommentarer</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
@@ -18008,12 +17189,12 @@ felaktigt utformade insticksprogram. </translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18023,7 +17204,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18033,21 +17214,17 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished">Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Markera som läst och ta bort objektet</translation>
     </message>
@@ -18057,7 +17234,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation>Nytt</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18067,7 +17244,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -18108,69 +17285,10 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Läser in</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Av</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Formulär</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Het</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nytt</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Topp</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">I dag</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">I går</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Den här veckan</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Den här månaden</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Detta år</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Nästa</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Skapa nytt eller välj ett befintligt signatur-ID först</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Föregående</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18190,7 +17308,17 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18200,15 +17328,15 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">okänd</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18218,42 +17346,42 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18273,7 +17401,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished">Het</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">Sök</translation>
     </message>
@@ -18303,17 +17431,17 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18328,12 +17456,17 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18343,27 +17476,31 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished">Redigera</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18378,7 +17515,7 @@ felaktigt utformade insticksprogram. </translation>
         <translation type="unfinished">Prenumerera</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18452,6 +17589,16 @@ felaktigt utformade insticksprogram. </translation>
         <source>No Channel Selected</source>
         <translation type="unfinished">Inga kanaler markerade</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -18460,10 +17607,6 @@ felaktigt utformade insticksprogram. </translation>
         <source>Tabs</source>
         <translation>Flikar</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Öppna varje ämne i en ny flik</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -18477,10 +17620,6 @@ felaktigt utformade insticksprogram. </translation>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Postat</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -18549,16 +17688,16 @@ felaktigt utformade insticksprogram. </translation>
         <translation>Profilhanterare</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -18670,7 +17809,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Redigera statusmeddelande</translation>
@@ -18686,7 +17825,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Profilhanterare</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Publik information</translation>
     </message>
@@ -18721,12 +17860,12 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Ansluten sedan:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Annan information</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Min adress</translation>
     </message>
@@ -18770,51 +17909,27 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Inlägg från:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Konto 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Konto 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Konto 3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Lägg till i Pulse</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">filter</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">URL-Adder</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Visa som</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18824,12 +17939,12 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished">Från:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18859,13 +17974,13 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished">Negativ</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18877,12 +17992,22 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18891,17 +18016,13 @@ och där läsa in den med importfunktionen.</translation>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Posta Pulse till Wire</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18916,34 +18037,24 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Från</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Datum</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Läs in en bildfil</translation>
     </message>
 </context>
 <context>
@@ -18954,7 +18065,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished">Formulär</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18973,7 +18084,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18983,7 +18094,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19010,7 +18121,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19020,7 +18131,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19040,7 +18151,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19156,7 +18267,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19164,37 +18275,42 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19226,7 +18342,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19234,8 +18350,8 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Bekräftelse</translation>
     </message>
@@ -19506,12 +18622,12 @@ Tecknen &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; kommer att ersätt
         <translation>Användarinformation</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Filbegäran avbruten</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Denna version av RetroShare använder OpenPGP-SDK. Som sidoeffekt använder den inte systemets delade PGP-nyckelring, utan har sin egen nyckelring som delas av alla RetroShare-instanser. &lt;br&gt;&lt;br&gt;Du verkar inte ha någon sådan nyckelring, även om GPG-nycklar associeras med befintliga RetroShare-konton, troligen för att du just uppgraderat till denna nya version av programmet.</translation>
     </message>
@@ -19542,7 +18658,7 @@ Tecknen &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; kommer att ersätt
         <translation>Ett oväntat fel uppstod. Rapportera &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19576,7 +18692,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Flera instanser</translation>
@@ -19597,6 +18713,26 @@ The error reported is:&quot;</source>
  Låsfil:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -19677,7 +18813,7 @@ Rapporterat fel är: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19687,7 +18823,7 @@ Rapporterat fel är: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19697,7 +18833,7 @@ Rapporterat fel är: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19713,7 +18849,7 @@ Rapporterat fel är: %2</translation>
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19780,7 +18916,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19808,7 +18944,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19988,13 +19124,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Namn</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Nod</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20237,6 +19389,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -20399,7 +19563,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Nätverksövergripande</translation>
     </message>
@@ -20579,7 +19743,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulär</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Laddning av inbäddade bilder är blockerad.</translation>
     </message>
@@ -20592,7 +19756,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20765,12 +19929,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20778,12 +19952,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21475,7 +20649,7 @@ Om du tror att den är giltig, ta bort strängen från filen och öppna den på
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Namn</translation>
@@ -21596,7 +20770,7 @@ Om du tror att den är giltig, ta bort strängen från filen och öppna den på
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -21616,7 +20790,7 @@ Om du tror att den är giltig, ta bort strängen från filen och öppna den på
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21672,7 +20846,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21686,11 +20860,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... Meddelande saknas ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -21704,6 +20873,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Från</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished">Till</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -21726,13 +20900,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Klicka för att sortera efter &apos;Lästa&apos;</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Klicka för att sortera efter &apos;Från&apos;</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21755,7 +20934,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21776,7 +20957,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Återställer ALLA sparade RetroShare-inställningar.</translation>
     </message>
@@ -21837,7 +21018,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Anger RetroShares språk.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Kan inte öppna loggfil &apos;%1&apos;: %2</translation>
     </message>
@@ -21858,11 +21039,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Kunde inte skapa datamapp: %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Revision</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21892,7 +21069,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21910,7 +21087,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21927,12 +21104,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Ange nyckelord här (minst 3 tecken)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Starta sökning</translation>
     </message>
@@ -21994,7 +21171,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Rensa</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Nyckelord</translation>
     </message>
@@ -22009,7 +21186,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Sök ID</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Filnamn</translation>
     </message>
@@ -22109,23 +21286,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Nedladdning vald</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Filnamn</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Ladda ner</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopiera RetroShare-länk</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>Skicka RetroShare-länk</translation>
     </message>
@@ -22135,7 +21312,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>Nedladdningsunderrättelse</translation>
     </message>
@@ -22172,7 +21349,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ta bort alla</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Mapp</translation>
@@ -22183,17 +21360,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Ny RetroShare-länk</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Skapa samling...</translation>
     </message>
@@ -22213,7 +21390,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ladda ner från samlingsfil...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Samling</translation>
     </message>
@@ -22221,7 +21398,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Användarinformation</translation>
     </message>
@@ -22237,22 +21414,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ta bort objektet</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>IP-adress:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Användar-ID</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22269,7 +21446,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22294,8 +21471,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22303,7 +21480,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>vill bli en av dina kontakter på RetroShare</translation>
     </message>
@@ -22334,7 +21511,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Expandera</translation>
     </message>
@@ -22379,12 +21556,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>Skriv meddelande</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Anslutningsförsök</translation>
     </message>
@@ -22404,17 +21581,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Okänt (utgående) anslutningsförsök</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Okänt säkerhetsproblem</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22424,11 +21606,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Okänd användare</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
@@ -22438,7 +21616,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Vill du verkligen ta bort den här kontakten?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Certifikatet har fel signatur!! Den här klienten är inte vem den utger sig för att vara.</translation>
     </message>
@@ -22448,12 +21626,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>Certifikatet orsakade ett internt fel.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22512,12 +21690,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Lokal adress</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22538,22 +21716,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Lokalt nätverk</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Sökverktyg för externt IP</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Kända / Tidigare IP:</translation>
     </message>
@@ -22569,21 +21747,16 @@ när du ansluter till någon. Att låta det här vara markerat
 bra om du sitter bakom en brandvägg eller en VPN-tunnel.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>Låt RetroShare fråga om min externa IP-adress på dessa sidor:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22593,23 +21766,46 @@ bra om du sitter bakom en brandvägg eller en VPN-tunnel.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22619,7 +21815,7 @@ bra om du sitter bakom en brandvägg eller en VPN-tunnel.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>I2P-adress</translation>
     </message>
@@ -22644,37 +21840,95 @@ bra om du sitter bakom en brandvägg eller en VPN-tunnel.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22689,71 +21943,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished">okänd</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22763,22 +21953,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22790,12 +21965,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22805,7 +21980,7 @@ Also check your ports!</source>
         <translation>Rensa</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22820,23 +21995,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22847,17 +22022,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22867,12 +22032,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22882,17 +22042,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22932,7 +22082,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished">Starta</translation>
     </message>
@@ -22947,12 +22097,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stopp</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">Inkommande</translation>
     </message>
@@ -22988,7 +22133,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23043,7 +22213,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Totalt:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23068,7 +22238,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23080,7 +22250,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>IP-filter</translation>
     </message>
@@ -23103,7 +22273,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -23163,17 +22333,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23189,18 +22370,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23235,12 +22416,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23263,22 +22444,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23313,7 +22494,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23323,12 +22504,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23408,7 +22589,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Markera de användare du vill dela privat publiceringsnyckel med.</translation>
     </message>
@@ -23418,12 +22599,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Dela med kontakt</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Dela</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Du kan meddela dina vänner om din kanal genom att dela den med dem.
@@ -23443,7 +22624,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Delade mappar</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23463,17 +22644,17 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation type="unfinished">Synlighet</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Lägg till en delad katalog</translation>
     </message>
@@ -23483,7 +22664,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Verkställ och stäng</translation>
     </message>
@@ -23574,7 +22755,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Mappen kan inte hittas, eller ogiltigt mappnamn.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Det här är en lista på delade mappar. Du kan lägga till eller ta bort mappar med knapparna nedantill. När du lägger till en ny katalog så delas alla filer i denna katalog ut. Du kan ange olika rättigheter för varje enskild katalog.</translation>
     </message>
@@ -23582,7 +22763,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Filer</translation>
     </message>
@@ -23633,11 +22814,16 @@ Välj de kontakter du vill dela kanalen med.</translation>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>Kontrollera filer</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Ladda ner markerat</translation>
     </message>
@@ -23647,7 +22833,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Ladda ner</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Kopiera RetroShare-länk till Urklipp</translation>
     </message>
@@ -23662,7 +22848,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Skicka RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23678,7 +22864,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Rekommendation(er)</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Skapa samling...</translation>
     </message>
@@ -23703,7 +22889,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Ladda ner från samlingsfil...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23846,12 +23032,12 @@ Välj de kontakter du vill dela kanalen med.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Läser in konfiguration</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Skapar gränssnitt</translation>
     </message>
@@ -23875,7 +23061,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Kom ihåg lösenordet</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Logga in</translation>
     </message>
@@ -24216,7 +23402,7 @@ This choice can be reverted in settings.</source>
         <translation>Statusmeddelande</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>Meddelande:</translation>
     </message>
@@ -24461,7 +23647,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Ta bort alla taggar</translation>
     </message>
@@ -24497,12 +23683,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24512,18 +23701,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24533,12 +23717,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Fel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Inte ansluten</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24546,7 +23775,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24556,7 +23785,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24567,11 +23796,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24599,7 +23829,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Överföringsalternativ</translation>
@@ -24610,7 +23840,7 @@ p, li { white-space: pre-wrap; }
         <translation>Max antal samtidiga nedladdningar:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24620,22 +23850,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Dela inkommande automatiskt (Rekommenderas)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24720,7 +23955,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24729,7 +23964,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24754,7 +23994,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Strömmande</translation>
     </message>
@@ -24819,12 +24064,7 @@ p, li { white-space: pre-wrap; }
         <translation>Max antal tunnelförfrågningar per sekund:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24834,7 +24074,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Varning</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24862,7 +24112,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>Nedladdning slutförd</translation>
     </message>
@@ -24886,39 +24136,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">Du har %1 slutförda nedladdningar</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">Du har %1 slutförd nedladdning</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 slutförda nedladdningar</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 slutförd nedladdning</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>Nerladdningar</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Uppladdningar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Namn</translation>
@@ -25125,7 +24359,12 @@ p, li { white-space: pre-wrap; }
         <translation>Specificera</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation>Flytta i kön...</translation>
     </message>
@@ -25150,7 +24389,7 @@ p, li { white-space: pre-wrap; }
         <translation>Välj mapp</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25171,7 +24410,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -25204,7 +24443,17 @@ p, li { white-space: pre-wrap; }
         <translation>%1 är inte slutförd. Är det en mediafil kan du försöka förhandsgranska den.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Varning</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Byt filnamn</translation>
     </message>
@@ -25219,7 +24468,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ange nytt giltigt filnamn</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Expandera alla</translation>
@@ -25346,23 +24595,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Kolumner</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Filöverföringar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Sökväg</translation>
     </message>
@@ -25372,7 +24616,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visa Väg-kolumn</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25382,7 +24626,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Skapa samling...</translation>
     </message>
@@ -25397,7 +24641,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visa samling...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation>Samling</translation>
     </message>
@@ -25407,7 +24651,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25821,12 +25065,17 @@ p, li { white-space: pre-wrap; }
         <translation>Formulär</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Status:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25866,17 +25115,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25886,12 +25145,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Webbgränssnitt</translation>
     </message>
@@ -26028,11 +25287,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki-sidor</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Ny grupp</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Sidnamn</translation>
     </message>
@@ -26047,7 +25302,7 @@ p, li { white-space: pre-wrap; }
         <translation>Original-ID</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26135,7 +25390,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Sidredigeringshistorik</translation>
     </message>
@@ -26170,7 +25425,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sid-ID</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -26200,14 +25455,18 @@ p, li { white-space: pre-wrap; }
         <translation>Taggar</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Historik</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Visa redigeringshistorik</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -26228,7 +25487,7 @@ p, li { white-space: pre-wrap; }
         <translation>Återställ</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Skicka</translation>
     </message>
@@ -26300,10 +25559,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">Tidsintervall</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -26315,16 +25570,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Uppdatera</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26339,7 +25585,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Andra</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26359,7 +25605,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26389,85 +25635,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Förra månaden</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Förra veckan</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">I dag</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Nytt</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">Från</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">tills</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Sök/Filter</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Nätverksövergripande</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Hantera konton</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Visar:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Du själv</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Kontakter</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Följande</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Anpassad</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">Konto 1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">Konto 2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">Konto 3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">Kryssruta</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Posta Pulse till Wire</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -26530,35 +25708,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulär</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">Ta bort</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Plats:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -26603,11 +25788,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">N/A</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">Följande</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Okänd</translation>
@@ -26685,7 +25900,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1å %2d</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26722,7 +25937,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_tr.ts b/retroshare-gui/src/lang/retroshare_tr.ts
index b0d731573..cd2651115 100644
--- a/retroshare-gui/src/lang/retroshare_tr.ts
+++ b/retroshare-gui/src/lang/retroshare_tr.ts
@@ -84,13 +84,6 @@
         <translation>Yalnızca Gizli Düğüm</translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Yorum Ekle</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: Gelişmiş Arama</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>Arama Ölçütü</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>Başka bir arama ölçütü ekler.</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>Arama ölçütlerini sıfırlar.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>Aramayı iptal eder.</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>Arama</translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">Albüm Oluştur</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">Albüm Adı:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">Kategori:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">Hayvanlar</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">Aile</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Arkadaşlar</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">Çiçekler</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">Tatil</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">Manzaralar</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">Evcil hayvanlar</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">Portreler</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">Seyahat</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">İş</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">Rastgele</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">Başlık:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Nerede:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">Fotoğrafçı:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Açıklama:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Paylaşım Ayarları</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">İlke:</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">Kalite:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">Yorum:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">Kimlik:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Genel</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">Kısıtlanmış</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">Görselleri Yeniden Boyutlandır (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">Görselleri Yeniden Boyutlandır (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">Orijinal Görselleri Gönder</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">Yorum İzni Yok</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">Kimliği Doğrulanmış Yorumlar</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">Herkes Yorum Yapabilir</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">Kimlikle Yayınla</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Görsel eklemek için Sürükleyip Bırakın. Ayrıntılarını düzenlemek istediğiniz görsele tıklayın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">Geri</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">Fotoğraf Ekle</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">Albümü Yayınla</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">Başlıksız Albüm</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">Bu albüm hakkında birşeyler yazın...</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">Bu fotoğraflar nerede çekildi ?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">Albüm Küçük Görseli Yükle</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>Albüm</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">Albüm Küçük Görseli</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Özet</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>Başlık</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">Nerede:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">Ne Zaman</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Açıklama:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">Paylaşım Ayarları</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">Yorumlar </translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">Kimliği Yayınla</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">Görünürlük</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Uyarı: Buradaki hizmetler henüz deneme aşamasındadır. Bu hizmetleri geliştirmemize yardımcı olun. 
@@ -783,14 +569,6 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <source>Circles</source>
         <translation>Çevreler</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">GxsForumları</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">GxsKanalları</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation>Fotoğraflar</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">Görseli kaydet</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -842,17 +633,13 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">Avatar Ekle</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>Avatar görselinizi ayarlayın</translation>
     </message>
@@ -871,10 +658,6 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">Avatar Yükle</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation>Sıfırlayın</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">Alma Hızı</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">Gönderme Hızı</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>Her zaman üstte</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Biçem</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <source>% Opaque</source>
         <translation>% Mat</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">Kaydedin</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">İptal</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Başlangıç:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">Ayarlar Gizlensin</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,7 +822,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1093,12 +852,12 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Bu iletinin yazarı (%1 kodlu) engellendi.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
@@ -1126,7 +885,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
@@ -1184,7 +943,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">Paylaş</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">İleti Okundu Durumunu Değiştir</translation>
     </message>
@@ -1224,7 +983,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">Yeni</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
@@ -1232,12 +991,12 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">Genişlet</translation>
     </message>
@@ -1283,12 +1042,12 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,17 +1216,17 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>Kanallar</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>Sekmeler</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
@@ -1477,11 +1236,17 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">İletiler artalanda yüklensin (İş Parçacığı)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">İndirmeler</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>Her kanal yeni bir sekmede açılsın</translation>
     </message>
@@ -1489,7 +1254,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
@@ -1537,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">Genişlet</translation>
     </message>
@@ -1563,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
     </message>
@@ -1573,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished">Yorumlar</translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">Gizle</translation>
     </message>
@@ -1591,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
@@ -1782,7 +1537,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>Sohbet Odasını Görüntüle</translation>
     </message>
@@ -1794,22 +1549,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>Sohbetler</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">%1 yeni iletiniz var</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">%1 yeni iletiniz var</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 yeni ileti</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 yeni ileti</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1831,13 +1570,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>Bilinmeyen Oda</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>Tümünü Kaldır</translation>
     </message>
@@ -1845,13 +1585,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>Kullanıcı Sayısı</translation>
     </message>
@@ -1861,33 +1601,7 @@ into the image, so as to
         <translation>Konu</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>Abone Olduğunuz Özel Sohbet Odaları</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>Abone Olduğunuz Herkese Açık Sohbet Odaları</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>Özel Sohbet Odaları</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>Herkese Açık Sohbet Odaları</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Sohbet Odaları&lt;/h1&gt;                              	                      &lt;p&gt;Sohbet odaları merkezi olmayan sohbet yerleridir ve IRC gibi çalışır.                                      	                      İsimsiz kimlikle ve arkadaş olmanız gerekmeden tonlarca insanla konuşmanızı sağlar.&lt;/p&gt;                    	                      &lt;p&gt;Bir sohbet odası herkese açık (arkadaşlarınız görebilir) ya da özel (siz çağırmadıkça                                     arkadaşlarınız göremez &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Özel bir odaya çağrıldığınızda içinde arkadaşlarınızın olup olmadığını   	                      görebilirsiniz.&lt;/p&gt;                                                                                               	                      &lt;p&gt;Soldaki listede arkadaşlarınızın                                                                                     	                      bulunduğu sohbet odalarını görebilirsiniz. Ayrıca                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Sağ tıklayarak yeni bir sohbet odası oluşturabilirsiniz.&lt;/li&gt;                                                              		     &lt;li&gt;Bir sohbet odasına girmek ve arkadaşlarınıza göstermek için çift tıklayın&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Not: Sohbet odalarının bilgisayarınızda doğru şekilde çalışması için bilgisayarınızın tarih ve saati doğru olmalıdır. Bu nedenle sistem ayarlarınızı denetleyin!	                      &lt;/p&gt;                                      	                      </translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>Sohbet odası oluştur</translation>
     </message>
@@ -1897,7 +1611,7 @@ into the image, so as to
         <translation>Bu odadan ayrılın</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>İsimsiz olmayan bir kimlik oluşturup bu odaya katılın</translation>
     </message>
@@ -1956,12 +1670,12 @@ Ayrıntıları görmek için soldan bir sohbet odası seçin.
 Odaya katılıp sohbet etmek için çift tıklayın.</translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 sizi %2 adlı sohbet odasına çağırıyor</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Bu sohbet odası için isimsiz olmayan bir kimlik seçin:</translation>
     </message>
@@ -1971,31 +1685,31 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Bu sohbet odası için bir kimlik seçin:</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">Sohbet odası oluşturun</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Konu belirtilmemiş]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">Seçilmiş oda bilgileri</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>Özel</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>Herkese Açık</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>İsimsiz kodlar kullanılabilir</translation>
     </message>
@@ -2005,42 +1719,25 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Otomatik Aboneliği Kaldır</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>Otomatik Aboneliği Ekle</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>Sohbet Odası Arama</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>Ad Arama</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">Abone Olundu</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>Sütunlar</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">Evet</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">Hayır</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2052,47 +1749,47 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>Sohbet Odası Adı:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>Sohbet Odası Kodu:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>Konu:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>Tür:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>Güvenlik:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>Eşler:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
@@ -2107,13 +1804,24 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>İsimsiz kodlar kullanılamaz</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Görüntüle</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>sütun</translation>
@@ -2127,7 +1835,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>Ögeyi Kaldır</translation>
     </message>
@@ -2172,46 +1880,22 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">Uzak Sohbet</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Herkes</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">Kişiler</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Hiçkimse</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">Şuradan şifreli uzak sohbeti kabul et</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">Sohbet Ayarları</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">Özel Sohbette İfadeler Kullanılabilsin</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">Grup Sohbetinde İfadeler Kullanılabilsin</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>Özel yazı türleri kullanılsın</translation>
     </message>
@@ -2220,10 +1904,6 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Enable custom font size</source>
         <translation>Özel yazı boyutu kullanılsın</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">En küçük yazı boyutu</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2235,7 +1915,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Eğik yazım kullanılsın</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2260,11 +1940,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Gömülü görselleri yükle</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">Sohbet Odası</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>Yanıp sönen sekme simgesi</translation>
     </message>
@@ -2273,10 +1949,6 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Do not send typing notifications</source>
         <translation>Yazıyor bildirimleri gönderilmesin</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">Özel Sohbet</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2298,11 +1970,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Yanıp sönen pencere/sekme simgesi</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">Sohbet Yazı Türü</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>Sohbet Yazı Türünü Değiştir</translation>
     </message>
@@ -2312,14 +1980,10 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Sohbet Yazı Türü:</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>Geçmiş</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">Biçem</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2334,17 +1998,13 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Variant:</source>
         <translation>Çeşit:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">Grup Sohbeti</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Özel sohbet</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation>Sohbet için varsayılan yazı türünü seçin.</translation>
     </message>
@@ -2408,22 +2068,28 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Farklı sohbet sistemleri için RetroShare tarafından diskinizde saklanacak sohbet iletisi sayısı ve görüşme geçmişinin ne kadarını görüntüleneceği buradan ayarlanabilir. En fazla saklama süresi, eski iletilerin silinmesini ve sohbet geçmişinin geçici sohbetlerle dolmasını engeller (sohbet odaları ve uzak sohbet gibi).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">Sohbet Odaları</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Etkin:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished">Arama</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2433,7 +2099,17 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Sohbet odaları</translation>
@@ -2480,7 +2156,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Açiklama:</translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2530,11 +2206,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>En fazla saklama süresi, gün olarak (0=sınırsız):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">Varsayılan arama</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>Büyük küçük harfe duyarlı</translation>
     </message>
@@ -2573,10 +2245,6 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Threshold for automatic search</source>
         <translation>Otomatik arama eşiği</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">Sohbet odaları için varsayılan kimlik:</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2644,7 +2312,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>Sohbeti Görüntüle</translation>
     </message>
@@ -2680,7 +2348,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
@@ -2715,12 +2383,12 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Yatık</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>Emoticon ekle</translation>
     </message>
@@ -2729,10 +2397,6 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Attach a Picture</source>
         <translation>Görsel Ekle</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2804,11 +2468,6 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Insert horizontal rule</source>
         <translation>Yatay çizgi ekle</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>Görseli kaydet</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2846,7 +2505,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>yazıyor...</translation>
     </message>
@@ -2870,7 +2529,7 @@ karakter fazla olacak.</translation>
         <translation>Yazı türünüzü seçin.</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Geçmişi tamamen silmek istediğinize emin misiniz?</translation>
     </message>
@@ -2920,7 +2579,7 @@ karakter fazla olacak.</translation>
         <translation> Meşgul ve yanıtlamayabilir</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>B/K Harfe Duyarlı Arama</translation>
     </message>
@@ -2942,7 +2601,7 @@ karakter fazla olacak.</translation>
         <translation>X nesne bulunduktan sonra renklendirmeye devam edilsin (daha fazla işlemci gücü gerekir)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Önceki &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2957,16 +2616,12 @@ karakter fazla olacak.</translation>
         <translation>&lt;b&gt;Bul &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(Durum)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">Metin yazı türü ve rengini ayarlayın</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>Dosya Ekle</translation>
     </message>
@@ -2982,12 +2637,12 @@ karakter fazla olacak.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Seçili metni işaretleyin&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation>Kişi kodu:</translation>
     </message>
@@ -2999,12 +2654,12 @@ Double click on it to add his name on text writer.</source>
 Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation>İmzalanmamış</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation> öge bulundu.</translation>
     </message>
@@ -3024,7 +2679,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>Buraya iletinizi yazın</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Şuradan sonra renklendirme durdurulmasın</translation>
     </message>
@@ -3050,7 +2705,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>Ayrıntılar görüntüleniyor:</translation>
     </message>
@@ -3072,7 +2727,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>Kişisel Çevreler</translation>
     </message>
@@ -3098,7 +2753,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>Arkadaşlar</translation>
     </message>
@@ -3158,7 +2813,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>Arkadaşların Arkadaşları</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>Dış Çevreler (Yönetici)</translation>
     </message>
@@ -3174,7 +2829,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>Çevreler</translation>
     </message>
@@ -3226,43 +2881,48 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>Hata: eş ayrıntıları alınamıyor.</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3274,7 +2934,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>Şifreleme</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>Bağlı değil</translation>
     </message>
@@ -3356,25 +3016,17 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>yok</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Bu sertifikanın içeriği:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;bir &lt;b&gt;düğüm kodu&lt;/b&gt; ve &lt;b&gt;ad&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">bir &lt;b&gt;onion adresi&lt;/b&gt; ve &lt;b&gt;kapı&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">bir &lt;b&gt;IP adresi&lt;/b&gt; ve &lt;b&gt;kapı&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Yeni arkadaşlar eklemek için bu sertifikayı kullanabilirsiniz. Sertifikayı e-posta ile gönderebilir ya da elden ele verebilirsiniz.&lt;/p&gt;</translation>
     </message>
@@ -3389,7 +3041,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt; tarafından kullanılan şifreleme yöntemi. Arkadaş düğümlerle kurulan bağlantı&lt;/p&gt;&lt;p&gt; her zaman yoğun bir şekilde şifrelenir ve DHE varsa bağlantı &lt;/p&gt;&lt;p&gt;&amp;quot;mükemmel bir yönlendirme gizliliğine&amp;quot;.&lt;/p&gt; sahiptir&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation>ile</translation>
     </message>
@@ -3406,118 +3058,16 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <source>Connect Friend Wizard</source>
         <translation>Arkadaş Bağlantı Yardımcısı</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">Yeni Arkadaş Ekle</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;Arkadaşınızdan bir sertifika dosyası aldıysanız</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;Arkadaşlarınızın seçtiği kişilerle arkadaş olun</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Email 
- (Your friend will receive an email with instructions how to download RetroShare)</source>
-        <translation type="vanished">&amp;Eposta yoluyla Davetiye gönderin
-(Arkadaşınıza RetroShare indirme bilgilerini içeren bir e-posta gönderilir)</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">İmzalar katılsın</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">Sertifikanızı panoya kopyalayın</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">Sertifikanızı bir dosyaya kaydedin</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">E-posta programını çalıştırın</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Dosyadan arkadaşınızın Sertifikasını yükleyin</translation>
     </message>
-    <message>
-        <source>Open certificate</source>
-        <translation type="vanished">Sertifika yükleyin</translation>
-    </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">Lütfen, arkadaşınızın RetroShare sertifikasını alttaki kutuya yapıştırın</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">Sertifika dosyaları</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">Dosyalarda kayıtlı PGP sertifikaları kullanılır.</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">Arkadaşınız sertifikasını içe aktarın...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">Sertifikanızın olduğu bir dosya üretip bunu arkadaşınıza ulaştırmalısınız. İsterseniz önceden oluşturulmuş bir dosyayı da kullanabilirsiniz.</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">Sertifikamı dışa aktar...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">Arkadaşınızın sertifikasını sürükleyip bu pencereye bırakın ya da alttaki kutudan dosya yolunu seçin</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">Gözat</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">Arkadaşların arkadaşları</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">Şimdi kiminle arkadaş olmak istediğinizi seçin.</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">Göster:</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">Bu eşlerle arkadaş olun</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare Kodu</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">İletişim ağınızdaki bir arkadaşınızı eklemek için, RetroShare Kodunu kullanın.</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">Arkadaşınızın RetroShare Kodunu Ekleyin...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">Arkadaşınızın RetroShare Kodunu alttaki kutuya yapıştırın</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">Arkadaşınızın RetroShare Kodunu yazın, Eş@BDE8D16A46D938CF gibi</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3559,27 +3109,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>E-posta</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">Arkadaşlarınızı e-posta ile çağırın</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">Arkadaşlarınızın e-posta adreslerini yazın (adresleri noktalı virgül ile ayırın)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">Arkadaşlarınızın e-posta adresleri:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">Arkadaşlarınızın E-posta adreslerini yazın</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">Konu:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3595,77 +3125,32 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>İstek hakkında ayrıntılar</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>Eş bilgileri</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>Ad:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">E-posta:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">Düğüm:</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">Lütfen unutmayın, çok fazla arkadaş eklerseniz, RetroShare aşırı miktarda bant genişliğine, belleğe ve işlemci gücüne gerek duyar. İstediğiniz kadar ekleyebilirsiniz, ama 40 arkadaştan fazlası çok fazla kaynağa gerek duyabilir.</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Konum:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">Bu yardımcı RetroShare ağındaki arkadaşlarınızla bağlantı kurmanızı sağlar. &lt;br&gt;Arkadaşlarınızı nasıl eklemek istediğinizi seçin:</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">Sertifikayı el ile yazın</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">RetroShare kodunu el ile yazın</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">Web Posta Hizmeti &amp;Sunucuları Üzerinden bir Çağrı Gönderin</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">Arkadaşlarınızı diğerlerine önerin</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">RetroShare sertifikası</translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">Lütfen, arkadaşınızın RetroShare sertifikasını aşağıya yapıştırın</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">Sertifikayı yapıştırın</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Arkadaşınızın RetroShare sertifikasını bu kutuya yapıştırın. UYARI: bu sertifika arkadaşınızın profil anahtarından farklıdır. Arkadaşınızın profil anahtarını (bir bölümünü bile) buraya yapıştırmayın, çalışmaz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>Gruba arkadaş ekleyin:</translation>
     </message>
@@ -3675,7 +3160,7 @@ resources.</source>
         <translation>Arkadaşı doğrulayın (PGP anahtarını imzalayın)</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3700,16 +3185,22 @@ resources.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>Bağlantı kurulacak arkadaş olarak ekleyin</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">Arkadaşlık isteğini kabul etmek için Tamam üzerine tıklayın.</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>Maalesef, bir sorun çıktı</translation>
     </message>
@@ -3729,32 +3220,27 @@ resources.</source>
         <translation>Arkadaşınızın bilgileri:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>Anahtar geçerliliği:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>İmzalayanlar</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Bir arkadaşınızın anahtarını imzaladığınızda, diğer arkadaşlarınıza bu arkadaşınıza güvendiğinizi gösterirsiniz. Aşağıdaki imzalar, listelenmiş anahtar sahiplerinin geçerli PGP anahtarını özgün olarak tanındığını şifreli olarak ispatlar.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Bu eş zaten arkadaş listenizde. Eklerseniz yalnız IP adresi değişebilir.</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3800,49 +3286,17 @@ resources.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>Sertifika Yüklenemedi</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">PGP anahtarı %1 olan eş bilgileri alınamıyor</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">İmzalamadığım eşler</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">Bana güvenmiş olan arkadaşlarımın arkadaşları</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">Reddedilmiş görünen imzalanmış eşler</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">Eş adı</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">Ayrıca imzalayan</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">Eş Kodu</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">Sertifika geçerli görünüyor</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Geçerli bir Retroshare sertifikası değil!</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare Çağrısı</translation>
     </message>
@@ -3864,12 +3318,12 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Bu sizin kendi sertifikanız! Kendi kendinizle arakadaş olmak istemezsiniz. Değil mi?</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3877,7 +3331,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation>Bu anahtar zaten güvenilir listenizde</translation>
     </message>
@@ -3917,7 +3371,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>Şu kişi arkadaşlık isteğinde bulundu</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3942,7 +3396,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3952,47 +3406,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">Sertifika yüklenemedi: %1 dosyası bulunamadı</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">%1 eşi ağınızda bulunamadı</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">Yeni sertifika biçimi kullanılsın (güvenli, daha sağlam)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">Eski sertifika biçimi kullanılsın (geriye dönük uyumlu)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">İmzaları kaldır</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">RetroShare Çağrı</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">Arkadaş Bağlantısı Yardımı</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">Bu metni kopyalayarak e-posta ya da başka bir şekilde arkadaşınıza yollayabilirsiniz</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Sertifikanız Panoya kopyalandı, e-postanıza yapıştırarak ya da başka bir şekilde arkadaşınıza iletebilirsiniz</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">Farklı Kaydet...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4031,11 +3445,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>*** Yok ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">Olabildiğinde doğrudan kaynak olarak kullanılsın</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>IP Adresi:</translation>
     </message>
@@ -4045,7 +3455,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>IP Adresi</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>Gelişmiş ayarları görüntüle</translation>
     </message>
@@ -4054,10 +3464,6 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Bir arkadaşınızın anahtarını imzaladığınızda, diğer arkadaşlarınıza bu arkadaşınıza güvendiğinizi gösterirsiniz. Böylece arkadaşlarınız bu anahtara güvenme durumunuza göre bağlantıları onaylamaya karar verebilir.  Anahtar imzalama işlemi isteğe bağlıdır ancak geri alınamaz. Bu nedenle ne yaptığınızdan emin olun.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare , doğrudan aktarım yapabilmeniz için düzenli aralıklarla, aktarımlarınızla eşleşen görülebilir dosyalar için arkadaş listenizi kontrol eder. Bu durumda, arkadaşınız dosyayı indirdiğinizi bilebilir.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Bu işlemi yalnızca bu arkadaşınız için engellemek istiyorsanız, kutudaki işareti kaldırın. İsterseniz hala açıkca sorarak doğrudan aktarım yapabilirsiniz, Örneğin arkadaşınızın dosya listesinden indirebilirsiniz. Bu ayar aynı düğümdeki tüm konumlara uygulanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4068,45 +3474,13 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu seçeneği kullanan eşlerin bağlantı adresleri beyaz listede değilse bağlanamazlar. Böylece trafik yönlendirme saldırılarından korunursunuz. Bu seçenek kullanıldığında, reddedilen eşler, Haber Kaynağı &amp;quot;güvenlik akışı ögeleri&amp;quot; bölümünde bildirilir. O bölümden IP adreslerini kara ya da beyaz listeye ekleyebilirsiniz. Aynı düğümdeki tüm konumlara uygulanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">Arkadaşlarınızı birbirine önerin</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">Arkadaş Önerileri</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">Aşağıda RetroShare sertifikanızı görebilirsiniz. Bu metni arkadaşınıza iletmelisiniz</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">İleti:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">Arkadaş önerin</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">Kime</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">Önerilecek en az bir arkadaşınızı seçin.</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">Lütfen arkadaşlarınızdan en az birini alıcı olarak seçin.</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Anahtarı, anahtarlığa ekle</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>Bu anahtar zaten anahtarlığınızda bulunuyor</translation>
     </message>
@@ -4122,7 +3496,7 @@ uzak iletiler göndermek için
 kullanılabilir.</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Sertifikanın sürüm numarası hatalı. v0.6 ve v0.5 ağlarının birbiriyle uyumlu olmadığını unutmayın.</translation>
     </message>
@@ -4157,7 +3531,7 @@ kullanılabilir.</translation>
         <translation>IP adresini beyaz listeye ekle</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>Bu sertifikada bir IP adresi yok!</translation>
     </message>
@@ -4167,27 +3541,10 @@ kullanılabilir.</translation>
         <translation>&lt;p&gt;Bu sertifikada bir IP adresi yok. IP adresini bulmak için keşif ve DHT özelliğine güvenmelisiniz. Beyaz listeye eklenme zorunlu olsun seçeneğini etkinleştirdiğiniz için Haber Akışı sekmesinde eşle ilgili bir güvenlik uyarısı görüntülenecek. Oraya bakarak eşin IP adresini beyaz listeye alabilirsiniz.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished">[Bilinmiyor]</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>Sertifikasıyla birlikte %1 üzerinden eklendi</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">Panodan arkadaşınızın Sertifikasını yapıştırın</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">Sertifika Yüklenemedi: %1 dosyası okunamıyor</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">Sertifika Yüklenemedi: %1 dosyasında bir şeyler yanlış</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4249,7 +3606,7 @@ kullanılabilir.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>UDP Kurulumu</translation>
     </message>
@@ -4285,7 +3642,7 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;kapatabilirsiniz.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>Bağlantı Yardımcısı</translation>
     </message>
@@ -4295,17 +3652,20 @@ p, li { white-space: pre-wrap; }
         <translation>Eş Kodu Geçersiz</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>Durum Bilinmiyor</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>Çevrimdisi</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>Simetrik NAT Arkasında</translation>
     </message>
@@ -4315,12 +3675,14 @@ p, li { white-space: pre-wrap; }
         <translation>NAT Arkasında ve DHT Yok</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>Ağı Yeniden Başlat</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>NAT Arkasında</translation>
     </message>
@@ -4330,7 +3692,8 @@ p, li { white-space: pre-wrap; }
         <translation>DHT Yok</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>AĞ DURUMU İYİ!</translation>
     </message>
@@ -4355,7 +3718,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare Eşleri Bulunuyor</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>Arama için DHT gerekli</translation>
     </message>
@@ -4647,7 +4010,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lütfen yeniden tam Sertifikayı içe aktarmayı deneyin</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4655,7 +4018,8 @@ p, li { white-space: pre-wrap; }
         <translation>Kullanılamıyor</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>YÖNLENDİRME DOĞRULANAMIYOR!</translation>
     </message>
@@ -4665,7 +4029,7 @@ p, li { white-space: pre-wrap; }
         <translation>YÖNLENDİRME DOĞRULANAMIYOR ve DHT YOK</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>Aranıyor</translation>
     </message>
@@ -4701,12 +4065,12 @@ p, li { white-space: pre-wrap; }
         <translation>Çevre Ayrıntıları</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tüm çağrılan üyeler, çevre adını, ilgili yöneticiyi ve çağrılan üye listesini görebilir. Çevre özel değil ise bu bilgiler çağrılan üyelerin düğümlerine komşu düğümler tarafından da görülebilir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4726,7 +4090,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>Kodlar</translation>
     </message>
@@ -4746,18 +4110,18 @@ p, li { white-space: pre-wrap; }
         <translation>Süzgeç</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>Takma Ad</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>Çağrılmış Üyeler</translation>
     </message>
@@ -4772,15 +4136,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bilinen Kişiler</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">Kod</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">Tür</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>Ad:</translation>
     </message>
@@ -4820,23 +4176,19 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Çevreler başka bir çevrenin üyeleriyle kısıtlanabilir. Yalnız bu ikinci çevredeki kişiler yeni çevreyi ve içeriğini (üye listesi, vb) görebilir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">Yalnız şu çevrenin üyelerine görüntülensin:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>Lütfen Çevrenize bir ad verin</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>Herhangi Bir Sınırlama Çevresi Seçilmemiş</translation>
     </message>
@@ -4846,12 +4198,24 @@ p, li { white-space: pre-wrap; }
         <translation>Herhangi Bir Çevre Sınırlaması Seçilmemiş</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Bilinmiyor]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>Ekle</translation>
     </message>
@@ -4861,7 +4225,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Arama</translation>
@@ -4876,10 +4240,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>İmzalanmış</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">Bilinen düğümler tarafından imzalanmış</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4896,10 +4256,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP Kodu</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">İsimsiz Kod</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4922,17 +4278,13 @@ p, li { white-space: pre-wrap; }
         <translation>Yeni Çevre Ekle</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Ekle</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP Bağlantılı Kod</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>Üye Ekle</translation>
     </message>
@@ -4951,7 +4303,7 @@ p, li { white-space: pre-wrap; }
         <translation>Grup Ekle</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>Grup Adı:</translation>
     </message>
@@ -4986,7 +4338,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>Yeni Kanal İletisi</translation>
     </message>
@@ -4996,7 +4348,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal İletisi</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5057,23 +4409,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Yeni dosyaları karmak için, Sürükle Bırak ya da  Dosya Ekleme düğmelerini kullanın.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Paylaştığınız bölümlerden RetroShare bağlantılarını Kopyalayıp Yapıştırın&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">Dosya Ekle</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Kanal Küçük Görseli Ekle</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">İleti</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">Konu:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5159,17 +4499,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5188,17 +4528,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">Dosya Zaten Eklenmiş ve Karılmış</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Lütfen bir konu ekleyin</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>Küçük Görsel Yükle</translation>
     </message>
@@ -5213,18 +4554,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>Toplu veri üret</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>Gerçekten %1 ileti oluşturmak istiyor musunuz?</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Gerçekte paylaşmadığınız dosyaları eklemek istediğinize emin misiniz?</translation>
     </message>
@@ -5258,7 +4593,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>Forum İletisi Gönder</translation>
     </message>
@@ -5267,10 +4602,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">Konu</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5291,8 +4622,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5311,7 +4642,7 @@ p, li { white-space: pre-wrap; }
         <translation>Eklemek istediğiniz dosyaları sürükleyip bu pencereye bırakabilirsiniz</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5341,17 +4672,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>Forum Yok</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>Şuna Yanıt</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">Başlık</translation>
     </message>
@@ -5405,7 +4736,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished">Görsel Dosyası Yükle</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>Bu forum için uyumlu bir kod bulunamadı</translation>
     </message>
@@ -5415,8 +4746,8 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>Kimliklerinizin hiç biri bu foruma ileti göndermenize izin vermiyor. Bu durum forum kimliklerinizin hiç birini içermeyen bir çevre ile kısıtlanmış olduğundan ya da forum özellikleri PGP imzalı bir kimlik zorunlu olacak şekilde ayarlanmış olduğundan olabilir.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>Toplu veri üret</translation>
     </message>
@@ -5425,10 +4756,6 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Gerçekten %1 ileti üretmek istiyor musunuz?</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Gönder</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5443,23 +4770,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">Sohbet Odası Oluştur</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">Sohbet odası merkezi olmayan, isimsiz bir sohbet grubudur. Tüm katılımcılar tüm iletileri alabilir. Odayı oluşturduktan sonra Arkadaşlar sekmesinden diğer arkadaşlarınızı çağırabilirsiniz.</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">Oda Adı:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">Oda Konusu:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5494,7 +4805,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">Ekle</translation>
     </message>
@@ -5504,11 +4815,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu seçenek işaretlendiğinde bu odaya yalnız PGP imzalı kodlar katılıp konuşabilir. Bu sınırlama sonucunda en azından odadaki bazı kişiler spam gönderenin düğümünü tespit edebileceğinden isimsiz spam gönderenler engellenir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>PGP imzalı kimlikler zorunlu olsun</translation>
     </message>
@@ -5523,11 +4830,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>Grup sohbeti yapmak istediğiniz Arkadaşlarınızı seçin.</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">Çağrılan Arkadaşlar</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Sohbet Odası Ekle</translation>
@@ -5548,7 +4851,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>İlgililer:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>Kullanılacak kimlik:</translation>
     </message>
@@ -5556,17 +4859,17 @@ Bu iletiyi silmek istiyor musunuz?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>Herkese Açık Bilgiler</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>Ad:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>Konum:</translation>
     </message>
@@ -5576,12 +4879,12 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>Konum Kodu:</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>Yazılım Sürümü:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>Çevrimiçi süresi:</translation>
     </message>
@@ -5601,12 +4904,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5616,7 +4914,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>Diğer Bilgiler</translation>
     </message>
@@ -5626,17 +4924,12 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>Sertifika</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5646,11 +4939,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>İmzalar katılsın</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">Anahtarı dosyaya kaydet</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">Kimliği Dışa Aktar</translation>
     </message>
@@ -5724,33 +5013,33 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP Parmak İzi:</translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>Düğüm Bilgileri</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP Kodu :</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>Arkadaş Düğümleriniz:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5789,14 +5078,6 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>Node</source>
         <translation>Düğüm</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">Yeni düğüm ekle...</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">istatistik penceresini görüntüle</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5813,10 +5094,6 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;RetroShare bağlantılarda vekil sunucu olarak Bittorrent DHT özelliğini kullanır. IP adresiniz DHT üzerinde &quot;kaydedilmez&quot;. 				                        Bunun yerine DHT, standart DHT istekleri işlenirken arkadaşlarınızın size ulaşması için kullanılır. 												RetroShare arkadaşlarınızın birinden bir DHT yanıtı aldığında durum simgesi yeşile döner.&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5852,7 +5129,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6520,7 +5797,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>Dosyayı başlat</translation>
     </message>
@@ -6528,38 +5805,38 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>hedef</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>büyük küçük harf önemsiz</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>gg.AA.yyyy</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6567,12 +5844,12 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>İfade Gereci</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>Bu ifadeyi sil</translation>
     </message>
@@ -6734,7 +6011,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>Görsel</translation>
     </message>
@@ -6744,7 +6021,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Görüntü</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>Ses</translation>
     </message>
@@ -6804,11 +6081,21 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>Arkadaş Klasörleri</translation>
     </message>
@@ -6930,7 +6217,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation>Kod</translation>
     </message>
@@ -6965,10 +6252,6 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>Show State</source>
         <translation>Durum Görüntülensin</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">Güvenilen düğümler</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6976,7 +6259,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Gruplar Görüntülensin</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>Grup</translation>
     </message>
@@ -7012,7 +6295,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Gruba ekle</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Arama</translation>
@@ -7028,7 +6311,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Duruma göre sırala</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>Profil bilgileri</translation>
     </message>
@@ -7272,7 +6555,7 @@ en az bir eş bir gruba eklenemedi</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>Arkadaşlık İsteğini Onayla</translation>
     </message>
@@ -7289,10 +6572,6 @@ en az bir eş bir gruba eklenemedi</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">Arama :</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7314,7 +6593,7 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Arkadaş Arama</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>Tümünü işaretle</translation>
     </message>
@@ -7325,16 +6604,134 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Tümünün işaretini kaldır</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished">Ad</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">Durum</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">Arkadaş ol</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished">Vekil sunucu etkinleştirilmemiş ya da bozuk.
+Tüm hizmetler düzgün çalışıyor mu??
+Ayrıca kapı ayarlarınızı da denetleyin!</translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>Durum iletisini düzenle</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>Yayınla</translation>
     </message>
@@ -7417,33 +6814,38 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Yazı türünü varsayılana çevir</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>Anahtarlık</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Ağ&lt;/h1&gt; &lt;p&gt;Ağ sekmesi arkadaşınız olan RetroShare düğümlerini: yani size bağlı olan komşu RetroShare düğümlerini görüntüler.&lt;/p&gt; &lt;p&gt;Bilgiye daha iyi erişim sağlamak için düğümleri gruplandırabilirsiniz. Örneğin yalnızca bazı düğümlerin belirli dosyalarınıza erişmesine izin verebilirsiniz.&lt;/p&gt; &lt;p&gt;Sağ tarafta, 3 adet kullanışlı sekme bulacaksınız:&lt;ul&gt; &lt;li&gt;Yayın; bağlı olduğunuz tüm düğümlere aynı anda ileti gönderir&lt;/li&gt; &lt;li&gt;Yerel ağ çizelgesi; keşif bilgilerine bağlı olarak, etrafınızdaki ağı görüntüler&lt;/li&gt; &lt;li&gt;Anahtarlık; genellikle arkadaşlarınız tarafından size yönlendirilmiş, biriktirdiğiniz düğüm anahtarlarını bulundurur.&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>RetroShare sohbeti yayını: iletiler bağlı olan tüm arkadaşlara gönderilir.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>Ağ çizelgesi</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>Durum iletinizi buraya yazın.</translation>
     </message>
@@ -7461,7 +6863,17 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Parola</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Tüm alanlara en az 3 karakter yazılmalıdır</translation>
     </message>
@@ -7471,17 +6883,12 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Parola ve onayı aynı değil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>Kapı</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation>BOB kullan</translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Bu parola PGP için</translation>
@@ -7502,50 +6909,38 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Yeni sertifikanız üretilemedi. PGP parolası yanlış olabilir!</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="vanished">Ayarlar</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation>PGP Anahtar Uzunluğu</translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Buraya güçlü bir parola yazın. Bu parola kişisel düğüm anahtarınızı korumak için kullanılacak!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lütfen olabildiğince fazla rastlantısallık oluşturmak için, farenizi ekranda gezdirin. Düğüm anahtarlarını oluşturmak için yüzde değeri en az %20 olmalıdır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>Standart düğüm</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">TOR/I2P Gizli Düğüm</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Düğüm adınız bu bilgisayarda çalışacak olan RetroShare kopyasını&lt;/p&gt;&lt;p&gt;belirlemek için kullanılır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Use existing profile</source>
-        <translation type="vanished">Varolan profili kullan</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>Düğüm adı</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7565,12 +6960,12 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Profil adı sizi ağda tanımlamak için kullanılır.&lt;/p&gt;&lt;p&gt;Arkadaşlarınızın sizden gelen bağlantıları onaylamasını sağlar.&lt;/p&gt;&lt;p&gt;Aynı profili kullanarak farklı bilgisayarlar üzerinde &lt;/p&gt;&lt;p&gt;birden çok RetroShare düğümü oluşturabilirsiniz.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>Bu profili dışa aktar</translation>
     </message>
@@ -7580,42 +6975,43 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu değer şu formda bir Tor Onion adresi olmalıdır: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;ya da  şu formda bir I2P adresi olmalıdır: [52 karakter].b32.i2p &lt;/p&gt;&lt;p&gt;Bir adres edinmek için Tor ya da I2P uygulamasını yeni bir gizli hizmet / sunucu tüneli oluşturacak şekilde yapılandırmalısınız. &lt;/p&gt;&lt;p&gt;Bu değeri şu anda boş bırakabilirsiniz ancak düğümünüz yalnız Ayarlar-&amp;gt;Ağ-&amp;gt;Gizli Hizmet yapılandırma bölümünden Tor/I2P hizmet adresini doğru olarak ayarlamışsanız çalışır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kimlikler, sohbet odalarında, forumlarda ve kanal yorumlarında yazışırken kullanılır. &lt;/p&gt;&lt;p&gt;Kimlikler ayrıca RetroShare ağı üzerinden e-posta alıp gönderebilir. İmzalanmış bir kimliği&lt;/p&gt;&lt;p&gt;şimdi oluşturabileceğiniz gibi daha sonra gerek duyduğunuz zaman da oluşturabilirsiniz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>Git!</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">Gelişmiş Ayarlar</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>gizli adres</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Profiliniz bir PGP anahtar çiftiyle ilişkilendirildi. RetroShare şu anda DSA anahtarlarını yok sayıyor.</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bağlantı kapınız.&lt;/p&gt;&lt;p&gt;1024 ile 65535 arasındaki herhangi bir değer&lt;/p&gt;&lt;p&gt;kullanılabilir. Bu değer daha sonra değiştirilebilir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7663,13 +7059,13 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>Profiliniz kaydedilemedi. Bir sorun çıktı.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Profili içe aktar</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Yeni profil ve yeni bir RetroShare düğümü oluştur</translation>
     </message>
@@ -7679,7 +7075,7 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>Yeni bir RetroShare düğümü oluştur</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation>Tor/I2P adresi</translation>
     </message>
@@ -7714,7 +7110,7 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7724,12 +7120,7 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tüm alanlar geçerli olana kadar düğüm oluşturamazsınız.&lt;/p&gt;</translation>
     </message>
@@ -7739,12 +7130,7 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>&lt;p&gt;Yeteri kadar rasgelelik elde edilene kadar düğüm oluşturamazsınız. En az %20&apos;ye ulaşana kadar, lütfen farenizi oynatmaya devam edin.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation>BOB özelliği aktif I2P adres örneği</translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation>I2P adres örneği</translation>
     </message>
@@ -7970,36 +7356,13 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>Buradan Başlayın</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Arkadaşlarınızı Çağırın</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Arkadaşlarınız olmadan RetroShare bir hiçtir. Çağırma işlemini başlatmak için düğmeye tıklayın.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Arkadaşlarınızı &amp;quot;Kimlik sertifikanız&amp;quot; ile çağırın.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Arkadaşlarınızın çağrınızı aldıklarından emin olun... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Arkadaşlarınızı ekleyebilmeniz için hem siz hem de arkadaşınız birbirinizi eklemelisiniz.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Arkadaşlarınızı RetroShare Üzerine Ekleyin</translation>
     </message>
@@ -8009,124 +7372,103 @@ p, li { white-space: pre-wrap; }
         <translation>Arkadaşlarınızı Ekleyin</translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Arkadaşlarınızla aynı anda çevrimiçi olduğunuzda RetroShare sizi otomatik olarak bağlar!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;İstemcinizin bağlantılar kurabilmesi için önce RetroShare ağını bulması gerekir.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Bu işlem RetroShare ilk kez başlatıldığında 5-30 dakika arasında sürer.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Bağlantılar kurulduğunda DHT göstergesi (Durum Çubuğunda) yeşile döner.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Bir kaç dakika sonra NAT göstergesi (gene Durum Çubuğunda) sarı ya da yeşile döner.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Gösterge kırmızı kalırsa RetroShare bağlantısının kurulmasında zorluk çıkaran bir Güvenlik Duvarı var demektir.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Bu durumda bağlantı kurmakla ilgili ayrıntılı bilgi almak için ilgili yardım bölümüne bakın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>Arkadaşlarınıza Bağlanın</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare başarımını arttırmak için bir Dış Kapı açabilirsiniz. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Böylece bağlantı kurmayı hızlandırarak daha çok kişinin sizinle bağlantı kurmasını sağlayabilirsiniz. &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Bunu yapmanın en kolay yolu İnternet bağlantısı için kullandığınız modem üzerinde UPnP özelliğini etkinleştirmektir.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Ayarlar her modem için farklı olduğundan, İnternet üzerinde modem modelinize göre arama yaparak ayarları nasıl yapacağınızı öğrenebilirsiniz.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Bu bilgilerin sizin için bir anlamı yoksa dert etmeyin. RetroShare gene de çalışacaktır.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Gelişmiş: Güvenlik Duvarında Kapı Açın</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare uygulamasını başlatmakta sorun mu yaşıyorsunuz?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) SSS Wiki sayfasına bakın. Buradaki bilgiler biraz eskidi, ancak güncel tutmaya çalışıyoruz..&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Çevrimiçi Forumlara bakın. Soru sorun ve özellikleri tartışın.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) RetroShare İçi Forumları deneyin &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- Bunlar arkadaşlarınıza bağlandığınızda çevrimiçi olur.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) Hala sorun yaşıyorsanız bize e-posta gönderin.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare kullanmanın tadını çıkarın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>Arkadaşlarınıza Bağlanın</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Arkadaşlarınız size çağrı gönderdiğinde, Arkadaş Ekleme penceresini açmak için tıklayın.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Eklemek istediğiniz arkadaşınızın Kod Sertifikasını pencereye yapıştırın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Gelişmiş: Güvenlik Duvarında Kapı Açın</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>Ayrıntılı Yardım ve Destek Alın</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>RetroShare Web Sitesini Açın</translation>
     </message>
@@ -8151,7 +7493,7 @@ p, li { white-space: pre-wrap; }
         <translation>E-posta Geri Bildirimi</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare Çağrısı</translation>
     </message>
@@ -8201,12 +7543,12 @@ p, li { white-space: pre-wrap; }
         <translation>RestroShare Geri Bildirimi</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>RetroShare Desteği</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Canlı sohbet, ileti gönderme gibi pek çok özellik vardır,</translation>
     </message>
@@ -8330,7 +7672,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>Grup Sohbetini Görüntüle</translation>
     </message>
@@ -8338,7 +7680,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[Bilinmiyor]</translation>
     </message>
@@ -8504,19 +7846,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Paylaşarak arkadaşlarınıza forumunuzu duyurabilirsiniz. Forumunuzu paylaşmak istediğiniz arkadaşlarınızı seçin.</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">Konu yönetici izinlerini paylaş</translation>
-    </message>
-    <message>
-        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
-        <translation type="vanished">Arkadaşlarınıza konuyu düzenleme izni verebilirsiniz. Aşağıdaki listeden arkadaşlarınızı seçin. Not: verilen yönetici izinlerinin geri alınamayacağını unutmayın.</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>Başlık</translation>
     </message>
@@ -8529,12 +7863,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>Açıklama</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8559,35 +7893,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">Azalan Düzende Sırala</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">Artan Düzende Sırala</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">Ada Göre Sırala</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">Beğeniye Göre Sırala</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">Son İletiye Göre Sırala</translation>
-    </message>
-    <message>
-        <source>Sort by Number of Posts</source>
-        <translation type="vanished">İleti Sayısına Göre Sırala</translation>
-    </message>
-    <message>
-        <source>Sort by Unread</source>
-        <translation type="vanished">Okunmamışlara Göre Sırala</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Yöneticisiniz (Düzenle menüsünden ad ve açıklamaları değiştirebilirsiniz)</translation>
     </message>
@@ -8602,14 +7908,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Son İleti</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
@@ -8620,17 +7926,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Hiç</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">Görünüm</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8643,7 +7945,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>ve</translation>
     </message>
@@ -8779,7 +8081,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanallar</translation>
@@ -8790,26 +8092,22 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal Ekle</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>Otomatik İndirme Kullanılsın</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>Kanallarım</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Kanallar&lt;/h1&gt;        &lt;p&gt;Kanallar ağa yaymak istediğiniz verileri (film, müzik gibi)  göndermenizi sağlar.&lt;/p&gt;                &lt;p&gt;Arkadaşlarınızın abone olduğu kanalları görebilirsiniz. Abone olduğunuz kanallar da otomatik olarak arkadaşlarınıza iletilir. Böylece ağdaki iyi kanallar öne çıkar.&lt;/p&gt;    &lt;p&gt;Bir kanala yalnız kanalı oluşturan kişi veri gönderebilir. Kanal özel bir kanal değilse ağdaki diğer eşler bu verileri yalnızca okuyabilir. Bununla birlikte veri gönderme ya da okuma izinlerini arkadaşınız oluan RetroShare düğümleri ile paylaşabilirsiniz.&lt;/p&gt;	 &lt;p&gt;Kanallar isimsiz olabileceği gibi bir RetroShare kimliğiyle ilişkilendirilebilir. Böylece okuyucular gerek duyduğunda sizinle iletişim kurabilir. Gönderdiğiniz verilere kullanıcıların yorum yapmasını istiyorsanız &quot;Yorumlar Kullanılsın&quot; seçeneğini etkinleştirin.&lt;/p&gt;    &lt;p&gt;Bu değeri değiştirmediyseniz, kanala gönderilen veriler %1 gün tutulur ve son %2 gündeki veriler eşitlenir.&lt;/p&gt;    </translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>Abone Olunan Kanallar</translation>
     </message>
@@ -8829,12 +8127,12 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal indirme klasörünü seçin</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>Otomatik İndirmeyi Devre Dışı Bırak</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>İndirme klasörünü ayarla</translation>
     </message>
@@ -8869,22 +8167,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">Oynat</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>Klasörü aç</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
@@ -8904,17 +8202,17 @@ p, li { white-space: pre-wrap; }
         <translation>Denetleniyor</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>İşlemi iptal edip dosyayı silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>Klasör açılamadı</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">Dosyayı Oynat</translation>
     </message>
@@ -8924,37 +8222,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1 dosyası konumda bulunamadı.</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Form</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Dosya Adı</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">Boyut</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Başlık</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">Yayınlanmış</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">Durum</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>Yeni Kanal Ekle</translation>
     </message>
@@ -8992,9 +8263,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>Kanala Abone Ol</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Metin Etiketi</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9008,7 +8289,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -9023,7 +8304,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal Açıklaması</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>Yükleniyor</translation>
     </message>
@@ -9038,8 +8319,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">Kanal Ekle</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">Hiç</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -9050,7 +8332,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>Yeni Yorum:</translation>
     </message>
@@ -9071,7 +8353,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>Oynat</translation>
     </message>
@@ -9127,28 +8409,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Dosya</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">Uyarı! Bu dosyanın silinmesine %1 saat %2 dakikadan az kaldı. Dosyayı kaydetmeyi düşünün.</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>Yeni</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>Yorum</translation>
     </message>
@@ -9163,21 +8441,17 @@ p, li { white-space: pre-wrap; }
         <translation>Beğenmedim</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Yükleniyor</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation>Yorumlar</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9202,139 +8476,16 @@ p, li { white-space: pre-wrap; }
         <translation>Ortamı Oynat</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">Kanala Gönder</translation>
-    </message>
-    <message>
-        <source>Add new post</source>
-        <translation type="vanished">Yeni ileti oluştur</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Yükleniyor</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">Kanal Arama</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">Başlık</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">Başlık Arama</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">İleti</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">İleti Arama</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">Dosya Adı</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">Dosya Adı Arama</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">Bir Kanal Seçilmemiş</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">Hiç</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">Herkese Açık</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle &quot;</source>
-        <translation type="vanished">Çevre üyeleri ile kısıtlı &quot;</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle </source>
-        <translation type="vanished">Çevre üyeleri ile kısıtlı</translation>
-    </message>
-    <message>
-        <source>Your eyes only</source>
-        <translation type="vanished">Yalnız sizin gözlerinize</translation>
-    </message>
-    <message>
-        <source>You and your friend nodes</source>
-        <translation type="vanished">Siz ve arkadaş düğümlerinize</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">Otomatik İndirmeyi Devre Dışı Bırak</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">Otomatik İndirmeyi Etkinleştir</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">Akışları görüntüle</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">Dosyaları görüntüle</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">Yönetici:</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">Son İleti:</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">bilinmiyorr</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">Dağıtım:</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">Akış</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">Dosya</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">Abone</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">Açıklama:</translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">Gönderiler (komşu düğümlerden):</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Kanala Gönder</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished">Yeni ileti oluştur</translation>
     </message>
@@ -9404,7 +8555,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9440,7 +8591,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished">Yorumlar </translation>
     </message>
@@ -9455,13 +8606,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Akış</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9476,7 +8627,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9491,7 +8642,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9551,12 +8702,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9608,7 +8769,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+40"/>
         <source>Public</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Herkese Açık</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -9631,14 +8792,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Siz ve arkadaş düğümlerinize</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abone</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -9673,7 +8835,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>Enable Auto-Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Otomatik İndirme Kullanılsın</translation>
     </message>
 </context>
 <context>
@@ -9687,17 +8849,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9717,27 +8879,11 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Ögeyi Sil</translation>
     </message>
-    <message>
-        <source>for identity </source>
-        <translation type="vanished">şu kimlik için</translation>
-    </message>
-    <message>
-        <source>You received a membership request for circle:</source>
-        <translation type="vanished">Şu çevreye üyelik talebi aldınız:</translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Üyelik onayı talebi</translation>
     </message>
-    <message>
-        <source>Revoke membership request</source>
-        <translation type="vanished">Üyelik iptali talebi</translation>
-    </message>
-    <message>
-        <source>You received an invitation for circle:</source>
-        <translation type="vanished">Şu çevreye davet edildiniz:</translation>
-    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -9828,7 +8974,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>Yorum Taşıyıcı</translation>
     </message>
@@ -9841,7 +8987,7 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9871,7 +9017,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yenile</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Yorum</translation>
@@ -9910,7 +9056,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>Yorumu Yanıtla</translation>
     </message>
@@ -9934,6 +9080,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Beğenmedim</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9943,7 +9104,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yorum Yap</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9972,26 +9133,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Yorum&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">İmzalayan</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -10020,7 +9165,7 @@ before you can comment</source>
 bir kimlik oluşturmalısınız</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10062,14 +9207,6 @@ bir kimlik oluşturmalısınız</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">Forum Yöneticileri Ekle</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">Forum Yöneticilerini Seçin</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -10079,7 +9216,7 @@ bir kimlik oluşturmalısınız</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>Foruma Abone Ol</translation>
     </message>
@@ -10095,7 +9232,7 @@ bir kimlik oluşturmalısınız</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -10115,8 +9252,9 @@ bir kimlik oluşturmalısınız</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Yükleniyor</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10147,13 +9285,13 @@ bir kimlik oluşturmalısınız</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>Konu:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>Forum Aboneliğinden Ayrıl</translation>
     </message>
@@ -10164,7 +9302,7 @@ bir kimlik oluşturmalısınız</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -10184,21 +9322,17 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Şuna Yanıt Olarak:</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Yükleniyor</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>Forum Akışı</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
@@ -10211,63 +9345,66 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Seçilmiş Foruma Yeni Konu Ekle</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>Forum Arama</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">Son İleti</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation>Yeni Konu</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>İç İçe Görünüm</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>Düz Görünüm</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>Başlık</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>Yazar</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>Görseli Kaydet</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>Yükleniyor</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10277,12 +9414,7 @@ bir kimlik oluşturmalısınız</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>İletiyi Yanıtla</translation>
     </message>
@@ -10306,10 +9438,6 @@ bir kimlik oluşturmalısınız</translation>
         <source>Download all files</source>
         <translation>Tüm dosyaları indir</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">Sonraki Okunmamış</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10326,35 +9454,23 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Yazar Arama</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">İçerik</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">İçerik Arama</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;Foruma abone olduğunuzda diğer abone olan arkadaşlarınızın gönderilerini alabilir ve forumu tüm diğer arkadaşlarınıza görünür kılabilirsiniz..&lt;/p&gt;&lt;p&gt;İstediğinizde soldaki forum listesine sağ tıklayarak abonelikten ayrılabilirsiniz.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>Adsız</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>Yanıtla</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10397,20 +9513,12 @@ bir kimlik oluşturmalısınız</translation>
         <translation>RetroShare Bağlantısını Kopyala</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">Genişlet</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[Engellenmiş]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[bilinmiyor]</translation>
     </message>
@@ -10440,8 +9548,8 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Yalnız sizin gözlerinize</translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation>Dağıtım</translation>
     </message>
@@ -10455,26 +9563,6 @@ bir kimlik oluşturmalısınız</translation>
         <source>Anti-spam</source>
         <translation>Önemsiz İleti Ayıklama</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... Düzeltilmiş İleti ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">İsimsiz</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">imzalanmış</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">yok</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[... İleti Eksik ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10544,16 +9632,12 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Özgün İleti</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation>Yeni konu</translation>
     </message>
     <message>
-        <source>Read status</source>
-        <translation type="vanished">Okunma durumu</translation>
-    </message>
-    <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation>Düzenle</translation>
     </message>
@@ -10614,7 +9698,7 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Yazarın değerlendirmesi</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10634,7 +9718,7 @@ bir kimlik oluşturmalısınız</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Değerlendirme olumlu ise İsimsiz/bilinmeyen iletiler iletilir</translation>
     </message>
@@ -10686,7 +9770,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10696,7 +9780,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10711,29 +9795,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information for this identity is currently missing.</source>
-        <translation type="vanished">Bu kimlikle ilgili bilgiler şu anda eksik.</translation>
-    </message>
-    <message>
-        <source>You have banned this ID. The message will not be
-displayed nor forwarded to your friends.</source>
-        <translation type="vanished">Bu kodu engellediniz. Bu leti arkadaşlarınıza
-görüntülenmeyecek ve iletilmeyecek.</translation>
-    </message>
-    <message>
-        <source>You have not set an opinion for this person,
- and your friends do not vote positively: Spam regulation 
-prevents the message to be forwarded to your friends.</source>
-        <translation type="vanished">Bu kişiyle ilgili bir değerlendirme yapmamışsınız ve
-arkadaşlarınız da olumlu olarak değerlendirmemiş:
-İstenmeyen ileti kuralı bu iletinin arkadaşlarınıza iletilmesini engeller.</translation>
-    </message>
-    <message>
-        <source>Message will be forwarded to your friends.</source>
-        <translation type="vanished">İleti arkadaşlarınıza iletilecek.</translation>
-    </message>
-    <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation>(En yeni)</translation>
     </message>
@@ -10742,10 +9804,6 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>(Old) </source>
         <translation>(Eski)</translation>
     </message>
-    <message>
-        <source>You cant act on the author to a non-existant Message</source>
-        <translation type="vanished">Var olmayan bir iletinin yazarına işlem yapamazsınız</translation>
-    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -10803,12 +9861,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forumlar&lt;/h1&gt;               			&lt;p&gt;RetroShare Forumları İnternet forumları gibi görünür, ancak merkezi olmayan bir şekilde çalışır.&lt;/p&gt;    			&lt;p&gt;Arkadaşlarınızın abone olduğu forumları görebilir ve abone olduğunuz forumları arkadaşlarınıza iletebilirsiniz. Böylece ilgi gören forumlar ağ üzerinde kendiliğinden üst sıralara çıkar.&lt;/p&gt;                        &lt;p&gt;Başka şekilde yapılandırmadıysanız, forum iletileri %1 gün saklanır ve son %2 gündeki iletiler eşitlenir.&lt;/p&gt;                </translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forumlar</translation>
@@ -10839,35 +9897,16 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Diğer Forumlar</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">Bekliyor</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">Alınıyor</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Yükleniyor</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">Simge Ekle</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Temel alıcılar kısıtlanmış türde gruplar üzerinde yayınlama işlemi yapabilir ve özel türde kanallar üzerinde okuma yayınlama işlemi yapabilir.</translation>
     </message>
@@ -10876,22 +9915,14 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>Share Publish Key</source>
         <translation>Yayınlama Anahtarını Paylaş</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">özel yayın anahtarınızı paylaşacağınız eşleri seçin</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">Anahtarı Şunlarla Paylaş</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>Açıklama</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>İleti Dağıtımı</translation>
     </message>
@@ -10899,7 +9930,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>Herkese Açık</translation>
     </message>
@@ -10918,14 +9949,6 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>New Thread</source>
         <translation>Konu Ekle</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">Zorunlu</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">Şifreli İletiler</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10967,7 +9990,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Önemsiz ileti koruması</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>Yorumlar:</translation>
     </message>
@@ -10990,7 +10013,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Önemsiz İleti Ayıklama:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11006,12 +10029,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation>Çevre ile sınırlı:</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation>Arkadaşlarınız ile sınırlı</translation>
     </message>
@@ -11028,23 +10051,23 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>İleti izleme</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>PGP imzası zorunlu</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>Hiç</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation>Yalnız gruptaki arkadaş düğümleri</translation>
     </message>
@@ -11060,30 +10083,28 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Lütfen bir ad ekleyin</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>Bilinen bir kodun PGP imzası zorunludur</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>Grup Logosunu Yükle</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>Grup Değişikliklerini Gönder</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">Grup Üst Verisi Hazırlanamadı - Lütfen Gözden Geçirin</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">Geri bildirim göndermek için kullanılır</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>Sahip:</translation>
     </message>
@@ -11093,12 +10114,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Buraya açıklayıcı bilgiler yazın</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>Bilgiler</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>Kod</translation>
     </message>
@@ -11108,7 +10129,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Son İleti</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;İletiler, oluşturduğunuz kanal, forum ya da gönderiye abone olundukça, arkadaş düğümleriniz aracılığı ile yayılır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -11183,7 +10204,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>İmzasız ve bilinmeyen düğüm kodlarını gözden düşür</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>Beğenilme</translation>
     </message>
@@ -11199,27 +10225,22 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">Ekle</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>Yazar</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>GxsKodEtiketi</translation>
     </message>
@@ -11227,7 +10248,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>Yükleniyor</translation>
     </message>
@@ -11287,7 +10308,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Ayrıntıları Düzenle</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation>İletilerin eşitleneceği süre...</translation>
     </message>
@@ -11344,16 +10365,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share publish permissions</source>
-        <translation type="vanished">Yayınlama izinlerini paylaş</translation>
-    </message>
-    <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare Bağlantısını Kopyala</translation>
     </message>
@@ -11376,7 +10393,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>İmza Yok</translation>
     </message>
@@ -11389,40 +10406,24 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">Yükleniyor</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>Bulunamadı</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">İmza Yok</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[Engellenmiş]</translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">Doğrulama</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>Anahtar Bilinmiyor</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">isimsiz</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11432,7 +10433,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Kimlik&amp;nbsp;Adı</translation>
     </message>
@@ -11446,16 +10452,20 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>Node</source>
         <translation type="unfinished">Düğüm</translation>
     </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">İmzalayan</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Bilinmiyor]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11467,7 +10477,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11515,17 +10525,13 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Bilinmiyor]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Yükleniyor</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11642,10 +10648,6 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>Group ID / Author</source>
         <translation>Grup Kodu / Yazar</translation>
     </message>
-    <message>
-        <source>Number of messages / Publish TS</source>
-        <translation type="vanished">İleti sayısı / Yayım Zamanı</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -11661,10 +10663,6 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>Popularity</source>
         <translation>Beğenilme</translation>
     </message>
-    <message>
-        <source>Details</source>
-        <translation type="vanished">Ayrıntılar</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -11697,41 +10695,6 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Hayır</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">Doğrulanmış tüneller:</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">Tünel Kodu: %1</translation>
-    </message>
-    <message>
-        <source>from: %1</source>
-        <translation type="vanished">şuradan: %1</translation>
-    </message>
-    <message>
-        <source>to: %1</source>
-        <translation type="vanished">şuraya: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">durum: %1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">toplam gönderilen: %1 bayt</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">toplam alınan: %1 bayt</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Eş Bilinmiyor</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11944,48 +10907,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>About</source>
         <translation>Hakkında</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare Açık Kaynaklı platformlar arası, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;kişisel ve güvenli, merkezi olmayan bir iletişim platformudur.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Kimliği doğrulanmış eşler ağı ve OpenSSL ile şifrelenmiş ilerişim üzerinden &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;arkadaşlarınız ile güvenli sayısal içerik paylaşımı sağlar.&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare dosya paylaşımı, sohbet, iletiler ve kanallar gibi özellikler sunar&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Ayrıntılı bilgi alınabilecek bağlantılar:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Web Sayfası&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Wiki Sayfası&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Forumu&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Proje Sayfası&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Takım Bloğu&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Geliştirici Twitter Hesabı&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+37"/>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -12001,7 +10928,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>Geliştiriciler</translation>
     </message>
@@ -12020,7 +10947,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -12033,36 +10960,6 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;&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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Çevirileri:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Web Sitesi Çevirmenleri:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;İsveçce: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Almanca: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Lehçe: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -12128,12 +11025,12 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+158"/>
+        <location line="+165"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12148,7 +11045,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12157,32 +11054,12 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Did you receive a certificate from a friend?</source>
-        <translation type="vanished">Bir arkadaşınızdan bir sertifika dosyası aldınız mı?</translation>
-    </message>
-    <message>
-        <source>Add friends certificate</source>
-        <translation type="vanished">Arkadaş sertifikasını ekle</translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">Sertifika dosyası ekle</translation>
-    </message>
-    <message>
-        <source>Share your RetroShare Key</source>
-        <translation type="vanished">RetroShare Anahtarınızı Paylaşın</translation>
-    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
-        <translation type="vanished">Aşağıdaki metin sizin RetroShare sertifikanızdır. Bu metni arkadaşlarınıza gönderin</translation>
-    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -12192,20 +11069,12 @@ private and secure decentralized communication platform.
 merkezi olmayan kişisel ve güvenli bir iletişim platformu.</translation>
     </message>
     <message>
-        <source>Launch startup wizard</source>
-        <translation type="vanished">Başlangıç yardımcısını çalıştır</translation>
-    </message>
-    <message>
-        <source>Do you need help with RetroShare?</source>
-        <translation type="vanished">RetroShare hakkında yardıma ihtiyacınız var mı?</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+134"/>
         <source>Open Web Help</source>
         <translation>Web Yardımını Aç</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Sertifikanızı Panoya Kopyalayın</translation>
     </message>
@@ -12215,7 +11084,7 @@ merkezi olmayan kişisel ve güvenli bir iletişim platformu.</translation>
         <translation>Sertifikanızı Bir Dosyaya Kaydedin</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>E-posta ile Gönder</translation>
     </message>
@@ -12235,13 +11104,37 @@ merkezi olmayan kişisel ve güvenli bir iletişim platformu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12253,17 +11146,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+57"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12272,19 +11160,11 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;RetroShare uygulamasına hoş geldiniz!&lt;/h1&gt;   &lt;p&gt;&lt;b&gt;Arkadaş&lt;/b&gt; edinmeniz gerek! Bir arkadaş ağı oluşturduğunuzda ya da var olan bir ağa katıldığınızda,	  dosya gönderip almak, sohbet etmek ve forumlarda yazışmak gibi işlemler yapabilirsiniz. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;Bunun için, bu sayfadaki sertifikanızı kopyalayıp arkadaşlarınıza gönderin ve arkadaşınızın sertifikasını ekleyin.&lt;/p&gt;    &lt;p&gt;Diğer bir seçenek İnternet üzerinde &quot;Retroshare chat servers&quot; (bağımsız olarak yönetilirler) ifadesini aramaktır. Bu sunucular adanmış bir RetroShare düğümü ile  	sertifika değiş tokuşu yapabilmenizi sağlar. Böylece başka kişilerle	  isimsiz olarak tanışabilirsiniz.&lt;/p&gt; </translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>RetroShare Çağrı</translation>
     </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">Sertifikanız Panoya kopyalandı, e-postanıza yapıştırarak ya da başka bir şekilde arkadaşınıza iletebilirsiniz</translation>
-    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -12556,14 +11436,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>Tümü</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>Değerlendirme</translation>
     </message>
@@ -12573,12 +11453,12 @@ p, li { white-space: pre-wrap; }
         <translation>Arama</translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>İsimsiz Kod</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>Yeni kimlik ekle</translation>
     </message>
@@ -12588,7 +11468,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yeni çevre ekle</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>Kişiler</translation>
     </message>
@@ -12603,27 +11483,27 @@ p, li { white-space: pre-wrap; }
         <translation>Kişi</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation>Engelleme seçeneği:</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Aynı düğüm tarafından imzalanmış tüm kimlikler otomatik engellensin</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation>Arkadaş değerlendirmeleri:</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>Olumlu değerlendirme</translation>
     </message>
@@ -12639,29 +11519,39 @@ p, li { white-space: pre-wrap; }
         <translation>Olumsuz değerlendirme</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation>Kullanım istatistikleri</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Çevreler</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>Çevre adı</translation>
     </message>
@@ -12681,18 +11571,20 @@ p, li { white-space: pre-wrap; }
         <translation>Kişisel Çevreler</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Kimliği Düzenle</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>Kimliği Sil</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>Bu eş ile sohbet et</translation>
     </message>
@@ -12702,97 +11594,78 @@ p, li { white-space: pre-wrap; }
         <translation>Bu eş ile bir sohbet başlatır</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>Sahip düğüm kodu :</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>Kimlik adı :</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>Kimlik Kodu</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>İleti Gönder</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>Kimlik Bilgileri</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>Kimlik Kodu :</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>Sahip düğüm adı :</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation>Yeni ekle...</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>Tür:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>Çağrı Gönder</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Komşu düğümlerin bu kimlik hakkında ortalama değerlendirmesi. Olumsuz kötü,&lt;/p&gt;&lt;p&gt;olumlu iyi, sıfır kararsızdır&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>Değerlendirmeniz:</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Bir kimlik hakkındaki değerlendirmeniz, bu kimliğin siz ve arkadaşlarınıza görüntülenmesini belirler. Değerlendirmeniz arkadaşlarınızla paylaşılır ve değerlendirme notunun hesaplanmasında kullanılır: Bir kimlik hakkındaki değerlendirmeniz kararsız ise, değerlendirme notu, arkadaşlarınızın olumlu ve olumsuz değerlendirmeleri arasındaki fark olur. Kararsız değil ise sizin değerlendirmeniz notu belirler.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Genel not her bir kimliğin sohbet odaları, forumlar ve kanallarda yapabileceği işlemleri belirler. Genel not -1 değerinden düşükse, bu kimlikten gelen ve ona gönderilen tüm forum/kanal iletiler engellenir. Ayrıca kötü değerlendirmelere karşı daha duyarlı bazı forumlarda daha yüksek değerlendirme notu gerektiren özel anti-spam işaretleri bulunur. Engellenen kimliklerin etkinliği yavaşça azalır ve bir süre sonra kaybolur (5 gün sonra).  &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>Olumsuz</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>Kararsız</translation>
     </message>
@@ -12803,17 +11676,17 @@ p, li { white-space: pre-wrap; }
         <translation>Olumlu</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Siz ve arkadaşlarınız için hesaplanmış genel değerlendirme notu.&lt;/p&gt;&lt;p&gt;Olumsuz kötü, olumlu iyi, sıfır kararsızdır. Not çok düşükse,&lt;/p&gt;&lt;p&gt;kimlik kötü olarak işaretlenir ve forumlar, sohbet odaları,&lt;/p&gt;&lt;p&gt;kanallar gibi ögelerin dışında bırakılır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>Genel Değerlendirme:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>İsimsiz</translation>
     </message>
@@ -12828,24 +11701,24 @@ p, li { white-space: pre-wrap; }
         <translation>Kod Arama</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>Bu kimlik size ait</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>Kendi kimliklerim</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>Kişilerim</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation>Ögeleri Görüntüle</translation>
     </message>
@@ -12860,7 +11733,12 @@ p, li { white-space: pre-wrap; }
         <translation>Düğümümle bağlantılı</translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>Diğer çevreler</translation>
     </message>
@@ -12870,7 +11748,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üyesi olduğum çevreler</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>Çevre Kodu:</translation>
     </message>
@@ -12945,7 +11823,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üye değil (bu çevrenin verilerine erişemezsiniz)</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>Kimlik Kodu:</translation>
     </message>
@@ -12975,7 +11853,7 @@ p, li { white-space: pre-wrap; }
         <translation>bilinmiyor</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>Çağrılmış</translation>
     </message>
@@ -12990,7 +11868,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üye</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>Çevreyi Düzenle</translation>
     </message>
@@ -13038,7 +11916,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üyeliği onayla</translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -13049,7 +11927,7 @@ Bu izden kurtulup yeni bir tane kullanmalısınız.
 Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Düğüm bilinmiyor]</translation>
@@ -13092,7 +11970,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>İsimsiz kimlik</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13172,7 +12050,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation>bilgiler</translation>
     </message>
@@ -13188,29 +12066,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Kimliği panoya kopyala</translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Çağrı gönderilsin mi?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Sertifikanız ile bir çağrı göndermek istediğinize emin misiniz?</translation>
-    </message>
-    <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>Engellenmiş</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Kimlikler&lt;/h1&gt; 			&lt;p&gt;Bu sekmeden &lt;b&gt;sahte isimsiz kimlikler&lt;/b&gt; ve &lt;b&gt;çevreler&lt;/b&gt; oluşturup düzenleyebilirsiniz. &lt;/p&gt; 			&lt;p&gt;&lt;b&gt;Kimlikler&lt;/b&gt; verilerinizin güvenli olarak tanınmasını sağlamak için forum ve kanal iletilerini imzalamakta 				ve RetroShare iç e-posta sistemini kullanarak geri bildirimleri almak, 				kanal iletilerinden sonra yorum yapmak gibi işlemler için kullanılır&lt;/p&gt; 			&lt;p&gt; Kimlikler isteğe bağlı olarak RetroShare düğümünüzün sertifikası ile &lt;b&gt;imzalanabilir&lt;/b&gt;. 			İmzalanmış kimliklere güvenilmesi daha kolaydır ancak bunlar düğümünüzün IP adresinin kolayca belirlenmesini sağlar.&lt;/p&gt; 			&lt;p&gt;&lt;b&gt;İsimsiz kimlikler&lt;/b&gt; diğer kullanıcılar ile kimliğinizi gizli tutarak etkileşimde bulunmanızı sağlar. Kandırılamazlar 			ancak hiç kimse verilen bir kimliğin gerçek sahibini ispatlayamaz.&lt;/p&gt; 	&lt;p&gt;&lt;b&gt;Çevreler&lt;/b&gt; ağ üzerinde bir alanı paylaşan bir kimlik grubudur (isimsiz ya da imzalanmış). Çevreler 		forum ve kanal gibi ögelerin görüntülenmesini kısıtlamak için kullanılır. &lt;/p&gt; 	&lt;p&gt;Bir &lt;b&gt;çevre&lt;/b&gt; başka bir çevre tarafından  		ya da yalnız kendi üyeleri tarafından görülebilecek şekilde kendi içinde kısıtlanabilir.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Unknown ID:</source>
-        <translation type="vanished">Kod Bilinmiyor :</translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation>olumlu</translation>
     </message>
@@ -13254,19 +12115,11 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>Forums</source>
         <translation>Forumlar</translation>
     </message>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Gönderilme</translation>
-    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Sohbet</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">Bilinmiyor</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13287,14 +12140,6 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>%1 hizmetinin yönetici imzasının oluşturma</translation>
     </message>
-    <message>
-        <source>Message/vote/comment</source>
-        <translation type="vanished">İleti/oy/yorum</translation>
-    </message>
-    <message>
-        <source>%1 in %2 tab</source>
-        <translation type="vanished">%1 %2 sekmesinde</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -13315,19 +12160,11 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Uzak tünel sistemi imzası.</translation>
     </message>
-    <message>
-        <source>Update of identity data.</source>
-        <translation type="vanished">Kimlik verisinin güncellenmesi.</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Genel imza doğrulama.</translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">Genel imza.</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -13339,11 +12176,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Genel şifre çözme.</translation>
     </message>
     <message>
-        <source>Membership verification in circle %1.</source>
-        <translation type="vanished">%1 çevresinde üyelik doğrulama.</translation>
-    </message>
-    <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation>Kişilere Ekle</translation>
     </message>
@@ -13393,21 +12226,21 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Merhaba,&lt;br&gt;RetroShare üzerinde sizinle arkadaş olmak istiyorum.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Kişiler</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Avatarınız</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>Komşu düğümlerle bağlantılı</translation>
     </message>
@@ -13417,7 +12250,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Uzak düğümlerle bağlantılı</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Bir arkadaşın RetroShare düğümüyle bağlantılı</translation>
     </message>
@@ -13432,7 +12265,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Bilinmeyen bir RetroShare düğümüyle bağlantılı</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>Bu kişiyle sohbet edin</translation>
     </message>
@@ -13447,12 +12280,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Bu kişi ile uzak sohbet reddedildi.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>Son kullanılma:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 Bilinen PGP</translation>
     </message>
@@ -13472,12 +12305,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Bu kimliği silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>Sahibi</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>Düğüm adı:</translation>
     </message>
@@ -13487,7 +12320,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Düğüm Kodu:</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>Gerçekten silinsin mi?</translation>
     </message>
@@ -13495,7 +12328,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>Takma ad</translation>
     </message>
@@ -13525,7 +12358,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Takma Ad</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13535,12 +12368,19 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>Yeni kimlik</translation>
     </message>
@@ -13554,7 +12394,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13564,7 +12404,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Kullanılamıyor</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Kimliği düzenle</translation>
@@ -13575,27 +12420,27 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished">Güncelle</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13615,7 +12460,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13625,11 +12470,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">Anahtar alınamadı!</translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>Anahtar kodu geçersiz</translation>
     </message>
@@ -13644,7 +12485,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Gerçek ad bilinmiyor</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>Yeni Kimlik Oluştur</translation>
     </message>
@@ -13654,10 +12495,15 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Tür</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13683,7 +12529,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Ekle</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">Ekle</translation>
     </message>
@@ -13693,17 +12539,13 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Avatarınız</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">Avatarı Ayarla</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>Profilinizle bağlantılı</translation>
     </message>
@@ -13713,7 +12555,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Bir ya da bir kaç kimliğiniz olabilir. Kimlikler sohbet odalarında, forumlarda ve kanal yorumlarında yazışırken kullanılır. Uzak sohbet ve RetroShare uzak posta sistemi için hedef olarak kullanılırlar.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Takma ad çok kısa. Lütfen en az %1 karakter yazın.</translation>
     </message>
@@ -13772,10 +12614,6 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>PGP name:</source>
         <translation>PGP adı:</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">GXS kodu:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13791,7 +12629,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>Kopyala</translation>
     </message>
@@ -13801,12 +12639,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>Tümünü işaretle</translation>
     </message>
@@ -13825,26 +12663,38 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>Quote</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">Gönder</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>Görseli kaydet</translation>
     </message>
     <message>
         <location line="-7"/>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Dosya adı geçersiz olduğundan görsel kaydedilemiyor</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>Bu bir görsel değil</translation>
     </message>
@@ -13862,27 +12712,32 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">Kapı:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">Durum:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13903,7 +12758,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13912,26 +12772,31 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>Dosya Aç</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>Klasör Aç</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>Denetleniyor...</translation>
     </message>
@@ -13941,7 +12806,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Dosyaları denetle</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation>Şu kişiye iletiyle öner...</translation>
     </message>
@@ -13969,7 +12834,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>Arkadaş Ekle</translation>
     </message>
@@ -13985,7 +12850,8 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>Ayarlar</translation>
     </message>
@@ -14006,7 +12872,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>Çık</translation>
     </message>
@@ -14017,12 +12883,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Hızlı Başlangıç Yardımcısı</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 merkezi olmayan güvenli bir iletişim platformudur</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>Tamamlanmamış</translation>
     </message>
@@ -14051,11 +12917,12 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>Durum</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>Bildir</translation>
     </message>
@@ -14066,31 +12933,35 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>İletileri Aç</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>Bant Genişliği Çizelgesi</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>Uygulamalar</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>Yardım</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>Küçült</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>Büyüt</translation>
     </message>
@@ -14105,7 +12976,12 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 yeni ileti</translation>
     </message>
@@ -14135,7 +13011,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>%1 arkadaş bağlı</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>RetroShare uygulamasından çıkmak istiyor musunuz?</translation>
     </message>
@@ -14155,7 +13031,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Görüntüle</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Bu bağlantının sizi zararlı yazılım bulunduran bir web sitesine yönlendirmediğinden emin olun.</translation>
     </message>
@@ -14200,12 +13076,13 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Hizmet izinleri matrisi</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>İstatistikler</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>Web arayüzünü görüntüle</translation>
     </message>
@@ -14220,7 +13097,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>klasöründe yer azaldı (geçerli sınır</translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>Gerçekten çıkmak istiyor musunuz?</translation>
     </message>
@@ -14229,17 +13106,17 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>Yeni İleti</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>Kişiler</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>Paragraf</translation>
     </message>
@@ -14275,12 +13152,12 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>6. Başlık</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>Yazı Boyutu</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>Yazı boyutunu büyüt</translation>
     </message>
@@ -14295,32 +13172,32 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Koyu</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>Yatık</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>Hizalama</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>Bir görsel ekle</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>Metin yazı türünü kod biçeminde ayarla</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>Altı çizili</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>Konu:</translation>
     </message>
@@ -14331,32 +13208,32 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>Etiketler</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>Adres listesi:</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation>Bu arkadaşı öner</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>Metin rengini ayarla</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>Metin art alan rengini ayarla</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>Önerilen Dosyalar</translation>
     </message>
@@ -14426,7 +13303,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Blok Alıntısı Ekle</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>Kime:</translation>
     </message>
@@ -14450,10 +13327,6 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <source>&amp;Justify</source>
         <translation>&amp;Yanlara</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">Tüm adresler (karışık)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14465,7 +13338,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Kişilerim</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Merhaba, &lt;br&gt;İyi bir arkadaşımı öneriyorum; bana güveniyorsan ona da güvenebilirsin. &lt;br&gt;</translation>
     </message>
@@ -14485,18 +13358,18 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>RetroShare üzerinde sizinle arkadaş olmak istiyor</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Merhaba %1, %2 &lt;br&gt;&lt;br&gt;RetroShare üzerinde seninle arkadaş olmak istiyor. &lt;br&gt;&lt;br&gt;İsteği şimdi yanıtlayabilirsin: &lt;br&gt;%3&lt;br&gt;&lt;br&gt;Teşekkürler,&lt;br&gt;RetroShare Takımı</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>İletiyi Kaydet</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>İleti gönderilemedi
@@ -14508,7 +13381,17 @@ Do you want to save message to draft box?</source>
         <translation>RetroShare Bağlantısını Yapıştır</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>&quot;Kime&quot; alanına ekle</translation>
     </message>
@@ -14528,7 +13411,7 @@ Do you want to save message to draft box?</source>
         <translation>Öneri Olarak Ekle</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>Özgün İleti</translation>
     </message>
@@ -14538,21 +13421,21 @@ Do you want to save message to draft box?</source>
         <translation>Kimden</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>Kime</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>Kopya</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>Gönderildi</translation>
     </message>
@@ -14567,7 +13450,7 @@ Do you want to save message to draft box?</source>
         <translation>%1 zamanında, %2 yazdı:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>Ynt:</translation>
     </message>
@@ -14577,30 +13460,30 @@ Do you want to save message to draft box?</source>
         <translation>İlet:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Bu iletiyi konusu olmadan mı göndermek istiyorsunuz?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>Lütfen en az bir alıcı ekleyin.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>Gizli Kopya</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>Bilinmiyor</translation>
     </message>
@@ -14715,13 +13598,13 @@ Do you want to save message to draft box?</source>
         <translation>Ayrıntılar</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>Dosya Aç...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML Dosyaları (*.htm *.html);;Tüm Dosyalar (*)</translation>
     </message>
@@ -14741,7 +13624,7 @@ Do you want to save message to draft box?</source>
         <translation>PDF Olarak Dışa Aktar</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>İleti gönderilemedi
@@ -14763,7 +13646,7 @@ Do you want to save message ?</source>
         <translation>Başka Dosya Ekleyin</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Merhaba,&lt;br&gt;RetroShare üzerinde sizinle arkadaş olmak istiyorum.&lt;br&gt;</translation>
     </message>
@@ -14787,28 +13670,24 @@ Do you want to save message ?</source>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">Bir arkadaşlık isteğiniz var</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Şimdi yanıtlayın:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>Kimden:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>Arkadaş Düğümleri</translation>
     </message>
@@ -14853,13 +13732,13 @@ Do you want to save message ?</source>
         <translation>Sıralı liste (büyük romen)</translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Teşekkürler, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>Uzak kimlik:</translation>
     </message>
@@ -14869,12 +13748,12 @@ Do you want to save message ?</source>
         <translation>[Eksik]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Lütfen uzak iletileri imzalamak için bir kimlik oluşturun ya da hedef listesinden uzak eşleri kaldırın.</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>Düğüm adı ve kodu:</translation>
     </message>
@@ -14952,7 +13831,7 @@ Do you want to save message ?</source>
         <translation>Varsayilan</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>Yeni sekmede</translation>
     </message>
@@ -14962,7 +13841,7 @@ Do you want to save message ?</source>
         <translation>Yeni pencerede</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>Etiketi Düzenle</translation>
     </message>
@@ -14985,7 +13864,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>Konu:</translation>
     </message>
@@ -14993,7 +13872,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>İleti</translation>
     </message>
@@ -15021,7 +13900,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>Önerilen Dosyalar</translation>
     </message>
@@ -15031,37 +13910,37 @@ Do you want to save message ?</source>
         <translation>Önerilen Tüm Dosyaları İndir</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>Konu:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>Kimden:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>Kime:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>Kopya:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>Gizli Kopya:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>Etiketler:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">Yanıtla</translation>
     </message>
@@ -15083,7 +13962,7 @@ Do you want to save message ?</source>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">İleri</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -15101,7 +13980,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>Çağrı Gönder</translation>
     </message>
@@ -15145,7 +14024,7 @@ Do you want to save message ?</source>
         <location line="+5"/>
         <location line="+3"/>
         <source>Buttons Text Beside Icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Düğme Simgelerinin Yanında Metin</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -15153,7 +14032,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>%1 kullanıcısını arkadaş olarak onayla</translation>
     </message>
@@ -15163,12 +14042,12 @@ Do you want to save message ?</source>
         <translation>%1 kullanıcısını arkadaş olarak ekle</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>Konu yok</translation>
     </message>
@@ -15178,17 +14057,22 @@ Do you want to save message ?</source>
         <translation>Indir</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15198,21 +14082,23 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Çağrı Gönder</translation>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Sertifikanız ile bir çağrı göndermek istediğinize emin misiniz?</translation>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>Tümünü indir</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>Belgeyi Yazdır</translation>
     </message>
@@ -15227,12 +14113,12 @@ Do you want to save message ?</source>
         <translation>HTML Dosyaları (*.htm *.html);;Tüm Dosyalar (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>Bu iletideki görseller her zaman yüklensin</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>Dosya ekleme panosu gizlensin</translation>
     </message>
@@ -15254,42 +14140,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Yeni İleti</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Seçilmiş iletiyi yanıtla</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Yanıtla</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Seçilmiş iletinin tüm alıcılarını yanıtla</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Tümünü yanıtla</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Seçilmiş iletiyi ilet</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">İlet</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Seçilmiş iletiyi sil</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Sil</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Seçilmiş iletiyi yazdır</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15368,7 +14218,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>Yeni İleti</translation>
     </message>
@@ -15378,60 +14228,16 @@ Do you want to save message ?</source>
         <translation>Yeni İleti</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">Seçilmiş iletiyi yanıtla</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">Yanıtla</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">Seçilmiş iletinin tüm alıcılarını yanıtla</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">Tümünü yanıtla</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">Seçilmiş iletiyi ilet</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">İlet</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">Seçilmiş iletiyi sil</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">Sil</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">Seçilmiş iletiyi yazdır</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">Yazdır</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">Görünüm</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>Etiketler</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Gelen</translation>
@@ -15461,21 +14267,17 @@ Do you want to save message ?</source>
         <translation>Çöp</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>Toplam Gelen:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">Klasörler</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>Hızlı Görünüm</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Yazdır...</translation>
@@ -15485,26 +14287,6 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>Baskı Önizleme</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">Yalnız Düğme Simgeleri</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">Düğme Simgelerinin Yanındaki Metin</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">Düğme Üzerindeki Metin</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">Simgenin Altındaki Düğme Metni</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">Simge Altındaki Metni Ayarlayın</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15526,7 +14308,7 @@ Do you want to save message ?</source>
         <translation>İletiyi İlet</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>Konu</translation>
     </message>
@@ -15536,7 +14318,7 @@ Do you want to save message ?</source>
         <translation>Kimden</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
@@ -15546,39 +14328,7 @@ Do you want to save message ?</source>
         <translation>İçindekiler</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">Dosya eklerine göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">Konuya göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">Okunmuş durumuna göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">Gönderene göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">Tarihe göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">Etiketlere göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">Yıldızlara göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">Seçilmiş iletiyi ilet</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>Konu Arama</translation>
     </message>
@@ -15587,6 +14337,11 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Gönderen Arama</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15613,14 +14368,14 @@ Do you want to save message ?</source>
         <translation>Dosya Eki Arama</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;İletiler&lt;/h1&gt;                          &lt;p&gt;RetroShare kendi iç posta sistemine sahiptir. Bağlantılı arkadaş düğümleri ile e-posta alışverişi yapılabilir.&lt;/p&gt;  &lt;p&gt;Genel yöneltme sistemini kullanarak diğer kişilerin kimliklerine de ileti gönderilebilir. Bu iletiler her zaman şifrelenip imzalanır ve hedefe ulaşmadan önce ara düğümlerden geçirilir. &lt;/p&gt;    &lt;p&gt;Onay alındısı gelene kadar uzak iletiler Giden kutusunda kalır.&lt;/p&gt; &lt;p&gt;Genel olarak iletiler arkadaşlarınızla dosya bağlantılarını paylaşmak, ağınızı güçlendirmek için arkadaş düğümlerini başka arkadaş düğümlerine önermek ya da bir kanal sahibine geri bildirim göndermek için kullanılabilir.&lt;/p&gt;                    </translation>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>Yıldızlı</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15694,7 +14449,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15708,7 +14463,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15723,38 +14478,33 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Taslaklar</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">Henüz yıldızlı bir ileti yok. Kolayca ayırt etmek istediğiniz iletilere yıldız ekleyebilirsiniz. Yıldız eklemek için bir iletinin yanındaki açık gri yıldıza tıklayın.</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">Henüz bir sistem iletisi yok.</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">Kime</translation>
+        <translation>Kime</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">Alıcıya göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>This message goes to a distant person.</source>
-        <translation type="vanished">Bu ileti uzaktaki bir kişiye gönderiliyor.</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15762,26 +14512,6 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Toplam:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">İletiler</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">İmzaya göre sıralamak için tıklayın</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">Bu ileti imzalanmış ve imza denetlenmiş</translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">Bu ileti imzalanmış ancak imza denetlenmemiş</translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">Bu ileti uzak bir kişiden geliyor.</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15809,7 +14539,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">Görseli kaydet</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>Düz metin olarak yapıştır</translation>
     </message>
@@ -15863,7 +14603,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -15873,7 +14613,7 @@ Do you want to save message ?</source>
         <translation>Ögeyi Sil</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation>kimden</translation>
     </message>
@@ -15908,18 +14648,10 @@ Do you want to save message ?</source>
         <translation>Bekleyen İleti</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
-    <message>
-        <source>Send invite?</source>
-        <translation type="vanished">Çağrı gönderilsin mi?</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">Sertifikanız ile bir çağrı göndermek istediğinize emin misiniz?</translation>
-    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -16057,7 +14789,7 @@ Do you want to save message ?</source>
         <translation>Eş Kodu</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>Kullanılmayan anahtarları sil...</translation>
     </message>
@@ -16067,7 +14799,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>Anahtarlığı temizle</translation>
     </message>
@@ -16086,7 +14818,13 @@ Notlar: Eski anahtarlığınız yedeklenecek.
 Aynı bilgisayarda birden çok RetroShare kopyası çalışıyorsa silme işlemi tamamlanamayabilir.</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Anahtarlık bilgileri</translation>
@@ -16122,18 +14860,13 @@ Güvenlik için anahtarlığınız dosyaya yedeklendi
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Anahtarlık verileri tutarlı değil. Bu sorun bir hatadan kaynaklanıyor olabilir. Lütfen yazılımı geliştirenler ile görüşün.</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>Yeni bir düğüm dışa aktar/oluştur</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Yalnız güvenilen anahtarlar</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>Ad Arama</translation>
     </message>
@@ -16143,12 +14876,12 @@ Güvenlik için anahtarlığınız dosyaya yedeklendi
         <translation>Eş Kodu Arama</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>Profil ayrıntıları...</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -16157,13 +14890,6 @@ Reported error:</source>
 Bildirilen hata:</translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">Ağ</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -16190,7 +14916,7 @@ Bildirilen hata:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16211,7 +14937,7 @@ Bildirilen hata:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">Gruplar</translation>
     </message>
@@ -16241,19 +14967,19 @@ Bildirilen hata:</translation>
         <translation type="unfinished">arkadaş listenizi gruplarla birlikte içe aktarın</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Arama</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">Kod</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16263,12 +14989,12 @@ Bildirilen hata:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished">Ögeleri Görüntüle</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16278,7 +15004,7 @@ Bildirilen hata:</translation>
         <translation type="unfinished">IP Adresi</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">Grup</translation>
     </message>
@@ -16393,7 +15119,7 @@ Bildirilen hata:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Bu düğümü silmek istiyor musunuz?</translation>
     </message>
@@ -16403,7 +15129,7 @@ Bildirilen hata:</translation>
         <translation type="unfinished">Bu Arkadaşı silmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Tamam!</translation>
@@ -16517,11 +15243,7 @@ en az bir eş bir gruba eklenemedi</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">Günlük kayıtları</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16536,11 +15258,7 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Tümünü Kaldır</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">Bu bir denemedir.</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>Yeniden eskiye</translation>
     </message>
@@ -16550,20 +15268,12 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Eskiden yeniye</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Haber Akışı&lt;/h1&gt;                                                             &lt;p&gt;Haber Akışı ağınızdaki son gelişmeleri aldığınız tarihe göre sıralayarak görüntüler. Bu özellik arkadaşlarınızın yaptığı işlemlerin bir özetini verir. Hangi işlemlerin görüntüleneceğini seçmek için &lt;b&gt;Ayarlar&lt;/b&gt; üzerine tıklayabilirsiniz. &lt;/p&gt;                                         &lt;p&gt;Seçenekler şunlardır:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Bağlanma girişimleri (yeni kişiler ile arkadaş olmak ve size ulaşmaya çalışanları görmek için)&lt;/li&gt;    &lt;li&gt;Kanal ve Forum iletileri&lt;/li&gt;                                                                               &lt;li&gt;Abone olabileceğiniz yeni kanal ve forumlar&lt;/li&gt;                                                          &lt;li&gt;Arkadaşlarınızdan gelen özel iletiler&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="vanished">Haber</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16618,10 +15328,6 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Blogs</source>
         <translation>Bloglar</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">Güvenlik</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16643,10 +15349,6 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Message</source>
         <translation>İleti</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">Bağlanma girişimi</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16663,10 +15365,6 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Ip security</source>
         <translation>IP güvenliği</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">Haber</translation>
-    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -16677,10 +15375,6 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Circles</source>
         <translation>Çevreler</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Bağlantılar</translation>
-    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -16733,26 +15427,6 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Chat rooms</source>
         <translation>Sohbet odaları</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">Sohbet Odaları</translation>
-    </message>
-    <message>
-        <source>Count occurrences of my current identity</source>
-        <translation type="vanished">Geçerli kimliğimi içerenler sayılsın</translation>
-    </message>
-    <message>
-        <source>Count occurrences of any of the following texts (separate by newlines):</source>
-        <translation type="vanished">Şu metinlerden herhangi birini içerenler sayılsın (her metni ayrı bir satıra yazın):</translation>
-    </message>
-    <message>
-        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
-        <translation type="vanished">Denetlendi, sayının arttırılması için kimlik ve yukarıdaki metin aynı olmalıdır.</translation>
-    </message>
-    <message>
-        <source>Case sensitive</source>
-        <translation type="vanished">Büyük küçük harfe duyarlı</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16828,24 +15502,16 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Tüm Bildirimleri geçici olarak devre dışı bırak</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">Akış</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Sistem Tepsisi</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">Tüm okunmamış iletiler sayılsın</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation>Parola zorunludur</translation>
     </message>
@@ -16865,12 +15531,12 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Parola Yanlış !</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Lütfen RetroShare parolanızı yazın</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>Kaydedilmemiş eklenti ya da çalıştırılabilir dosya</translation>
     </message>
@@ -16885,19 +15551,7 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Lütfen sistem saatini denetleyin</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">Paylaşılan dosyalar inceleniyor...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">Dosya karılıyor</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">Dosya dizini kaydediliyor...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>Deneme</translation>
     </message>
@@ -16908,17 +15562,19 @@ en az bir eş bir gruba eklenemedi</translation>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Başlık bilinmiyor</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Şifreli ileti</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Sohbet odalarının düzgün çalışması için bilgisayarınızın saatinin doğru olması gerekir. Lütfen sorunun bu olup olmadığını denetleyin (arkadaşlarınızla bir kaç dakikalık saat farkınız olabileceği algılandı).</translation>
     </message>
@@ -16926,7 +15582,7 @@ en az bir eş bir gruba eklenemedi</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>Arkadaş Çevrimiçi</translation>
     </message>
@@ -16978,10 +15634,6 @@ Düşük Trafik: %10 standart trafik ve YAPILACAK: tüm dosya aktarımları dura
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">Pencere</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -17047,10 +15699,6 @@ Düşük Trafik: %10 standart trafik ve YAPILACAK: tüm dosya aktarımları dura
         <source>This profile has signed your own profile key</source>
         <translation>Bu profil kendi profil anahtarınız ile imzalanmış</translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">Anahtar imzaları :</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17080,23 +15728,20 @@ p, li { white-space: pre-wrap; }
         <translation>PGP anahtarı</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation>Bu seçenekler profildeki tüm düğümlere uygulanır:</translation>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Bir arkadaşınızın anahtarını imzaladığınızda, diğer arkadaşlarınıza bu arkadaşınıza güvendiğinizi gösterirsiniz. Böylece arkadaşlarınız bu anahtara güvenme durumunuza göre bağlantıları onaylamaya karar verebilir.  Anahtar imzalama işlemi isteğe bağlıdır ancak geri alınamaz. Bu nedenle ne yaptığınızdan emin olun.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation>Bu seçenekler profildeki tüm düğümlere uygulanır:</translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">PGP anahtarını imzala</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17133,12 +15778,7 @@ p, li { white-space: pre-wrap; }
         <translation>Imzalar katılsın</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>Seçenekler</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare , doğrudan aktarım yapabilmeniz için düzenli aralıklarla, aktarımlarınızla eşleşen görülebilir dosyalar için arkadaş listenizi kontrol eder. Bu durumda, arkadaşınız dosyayı indirdiğinizi bilebilir.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Bu işlemi yalnızca bu arkadaşınız için engellemek istiyorsanız, kutudaki işareti kaldırın. İsterseniz hala açıkca sorarak doğrudan aktarım yapabilirsiniz, Örneğin arkadaşınızın dosya listesinden indirebilirsiniz. Bu ayar aynı düğümdeki tüm konumlara uygulanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -17152,10 +15792,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu seçenek, bu düğümden gelen bir iletide önerilen bir dosyanın otomatik olarak indirilmesini sağlar. Bu işlem örneğin kendi düğümleriniz arasında dosya göndermek gibi amaçlarla kullanılabilir. Aynı düğümdeki tüm konumlara uygulanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -17188,21 +15824,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Hata: eş ayrıntıları alınamadı.</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Verilen anahtar algoritmasi RetroShare tarafından desteklenmiyor
@@ -17223,7 +15859,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Güvenilirlik düzeyi bu anahtara güveninizi göstermenin bir yoludur. Yazılım tarafından kullanılmaz ya da paylaşılmaz ancak iyi ve kötü anahtarları anımsamanıza yardımcı olur.</translation>
     </message>
@@ -17292,10 +15928,6 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">Parola yanlış olabilir</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -17303,12 +15935,12 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>RetroShare profili</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Bu sizin kendi PGP anahtarınız ve imzalayan :</translation>
     </message>
@@ -17334,7 +15966,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>Sohbet</translation>
     </message>
@@ -17355,7 +15987,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>Ögeyi Sil</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>Ad:</translation>
     </message>
@@ -17395,7 +16027,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>İleti Yaz</translation>
     </message>
@@ -17409,10 +16041,6 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>Friend Connected</source>
         <translation>Arkadaş Bağlandı</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">Bağlantı Girişimi</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17451,17 +16079,13 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Bilinmeyen Eş</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>İleti Gönder</translation>
     </message>
@@ -17513,10 +16137,6 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>Chat with this person as...</source>
         <translation>Bu kişiyle şu kimlikle sohbet et...</translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">Bu kişiye ileti gönder</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17575,10 +16195,6 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ayarlanmadığında, kişi listenizdeki herkes olumlu olarak değerlendirilir. Böylece kullanılan düğümlerin değerlendirmesi otomatik olarak yükseltilir. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
-        <translation type="vanished">kişilerim otomatik olarak &quot;Olumlu&quot; değerlendirilsin</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -17636,13 +16252,6 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forum ya da kanal gibi ortamlarda kullanıldıklarından engellenip silinmiş kimliklerin geri gelmesini önlemek için engellenmiş kimlikler bir süre için bir listede tutulur. Bu sürenin sonunda engelleme listesinden &amp;quot;temizlenerek&amp;quot; forum, sohbet odası gibi yerlerde kullanılıyorlarsa yeniden indilrilirler.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Form</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17650,23 +16259,11 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">Fotoğraf</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">Yorum</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">Özet</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17727,14 +16324,6 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">Yorum Ekle</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">Yorum yaz...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17805,10 +16394,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Albüm Ekle</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">Albümü Görüntüle</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17830,17 +16415,17 @@ p, li { white-space: pre-wrap; }
         <translation>Saydam Sunumu</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>Albümlerim</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>Abone Olunan Albümler</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>Paylaşılan Albümler</translation>
     </message>
@@ -17870,7 +16455,7 @@ lütfen bir albüm seçin!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>Albüm Adı</translation>
     </message>
@@ -17929,19 +16514,19 @@ lütfen bir albüm seçin!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17977,12 +16562,12 @@ lütfen bir albüm seçin!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>Bu uygulama eki ile ilgili ayrıntılı bilgilere bakın</translation>
     </message>
@@ -18128,60 +16713,6 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Uygulama eklerinin aranacağı klasörler</translation>
     </message>
-    <message>
-        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="vanished">Uygulama eki devre dışı. Etkinleştir düğmesine tıklayıp RetroShare yazılımını yeniden başlatın</translation>
-    </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[Devre Dışı]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Herhangi bir API numarası belirtilmemiş. Lütfen uygulama eki geliştirme kılavuzunu okuyun.</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[yükleme sorunu]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">Herhangi bir SVN numarası belirtilmemiş. Lütfen uygulama eki geliştirme kılavuzunu okuyun.</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">Yükleme hatası.</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">Simge eksik. Sürüm yanlış olabilir mi?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">Herhangi bir uygulama eki nesnesi yok</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">Uygulama ekleri yüklendi.</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">Durum bilinmiyor.</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">Uygulama eki geliştirirken bu seçeneği işaretleyin.
-Böylece karma denetimi yapılmaz. Ancak
-normal zamanlarda karma denetimi sizi
-uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Uygulama&amp;nbsp;Ekleri&lt;/h1&gt;                   &lt;p&gt;Uygulama ekleri aşağıdaki listedeki klasörlerden yüklenir.&lt;/p&gt;                       &lt;p&gt;Güvenlik nedeniyle onaylanmış uygulama ekleri temel RetroShare çalıştırılabilir dosyası ya da uygulama eki kitaplıkları değişene kadar otomatik olarak yüklenir. Bu durumda kullanıcı uygulama eklerini yeniden onaylamalıdır. Bir uygulama ekini el ile etkinleştirmek için &quot;Etkinleştir&quot; düğmesine tıklayıp RetroShare yazılımını yeniden başlatın.&lt;/p&gt;&lt;p&gt;Kendi uygulama eklerinizi geliştirmek isterseniz, geliştirici ekibiyle görüşebilirsiniz. Size seve seve yardımcı olurlar!&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -18251,12 +16782,27 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation>Pencere en üstte kalsın</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">Bu kişiyi engelle (Olumsuz olarak değerlendirir)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished">Kararsız olarak değerlendir</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished">Olumlu olarak değerlendir</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -18290,22 +16836,6 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The person you are talking to has deleted the secured chat tunnel.</source>
-        <translation type="vanished">Konuştuğunuz kişi güvenli sohbet tünelini silmiş.</translation>
-    </message>
-    <message>
-        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
-        <translation type="vanished">Sohbet eşiniz güvenli tüneli kaldırmış, iletileriniz en kısa zamanda gönderilecektir</translation>
-    </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">Bu pencereyi kapatmak görüşmenizi sona erdirerek, eşinizi bilgilendirir ve şifrelenmiş tüneli kaldırır.</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">Tünel kapatılsın mı?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -18325,7 +16855,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Yeni</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
@@ -18345,8 +16875,8 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished">Yorumlar </translation>
     </message>
@@ -18371,13 +16901,13 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished">Yorumlar</translation>
     </message>
@@ -18405,20 +16935,12 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">İmzalayan:</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">Notlar</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -18433,12 +16955,22 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Görsel Dosyası Yükle</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18454,7 +16986,17 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18464,23 +17006,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">İleti Gönder</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">Bir bağlantı gönderiyorsunuz. Başarılı bir gönderinin sırrı ilginç bir içerik ve açıklayıcı bir başlıktır.</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">Gönder</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Yeni bir ileti gönder</translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>Lütfen bir başlık ekleyin</translation>
     </message>
@@ -18500,12 +17026,22 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18520,7 +17056,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Şu olarak gönder</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18531,7 +17067,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Görsel</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18541,7 +17077,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation>Başlık</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>Bağlantı</translation>
     </message>
@@ -18549,44 +17085,12 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">Gönderilen Bağlantılar</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Gönderilen&lt;/h1&gt;        &lt;p&gt;Gönderilen hizmeti İnternet bağlantılarının forum ve kanalllar gibi RetroShare düğümleri üzerinden paylaşılmasını sağlar&lt;/p&gt; 	 &lt;p&gt;Bağlantılara abone olan kullanıcılar tarafından yorum yapılabilir. Bir değerlendirme sistemi sayesinde önemli bağlantılar vurgulanabilir.&lt;/p&gt;      &lt;p&gt;Paylaşılacak bağlantılarla ilgili bir kısıtlama yoktur. Bu nedenle bağlantıları açarken dikkatli olun.&lt;/p&gt;     &lt;p&gt;Başka şekilde ayarlamadıysanız, gönderilen bağlantılar %1 gün saklanır ve son %2 gündeki iletiler eşitlenir.&lt;/p&gt;     </translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">Başlık Ekle</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">Başlıklarım</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">Abone Olunmuş Başlıklar</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">Beğenilen Başlıklar</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">Diğer Başlıklar</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Bağlantılar</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18620,31 +17124,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">Gönderilen Konu</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">Konu Yöneticisi Ekle</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">Konu Yöneticilerini Seçin</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">Yeni Konu Ekle</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">Konuyu Düzenle</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">Konuyu Güncelle</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18682,7 +17162,17 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished">Metin Etiketi</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>Gönderilenlere Abone Ol</translation>
     </message>
@@ -18698,7 +17188,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -18713,24 +17203,17 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">Gönderilen Açıklaması</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">Yükleniyor</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">Gönderilen Ekle</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">Hiç</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18743,22 +17226,18 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">Site</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>Yorumlar </translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18769,12 +17248,12 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>Yorum yapın</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished">Yorumlar</translation>
     </message>
@@ -18784,7 +17263,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Bu iletinin yazarı (%1 kodlu) engellendi.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18794,21 +17273,17 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>Beğendim</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>Beğenmedim</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>Okunmuş olarak işaretle ve ögeyi sil</translation>
     </message>
@@ -18818,7 +17293,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation>Yeni</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>Yeni Yorum:</translation>
     </message>
@@ -18828,7 +17303,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation>Yorum Değeri</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
     </message>
@@ -18869,77 +17344,10 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>Yükleniyor</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">Gönderen</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Form</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">Sıcak</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Yeni</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">Beğenilen</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Bügün</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">Dün</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">Bu Hafta</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">Bu Ay</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">Bu Yil</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">Yeni bir ileti gönder</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">Sonraki</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">Lütfen oylamadan önce bir imzalayan kimliği oluşturun ya da seçin</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">Önceki</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18959,7 +17367,17 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18969,15 +17387,15 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Yönetici:</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">Dağıtım:</translation>
     </message>
@@ -18987,42 +17405,42 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">İletiler</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19042,7 +17460,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Sıcak</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished">Arama</translation>
     </message>
@@ -19072,17 +17490,17 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19097,12 +17515,17 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19112,34 +17535,38 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Düzenle</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished">bilgiler</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Subscribed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Abone</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -19147,7 +17574,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation type="unfinished">Abone Ol</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">Hiç</translation>
     </message>
@@ -19194,7 +17621,7 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
     <message>
         <location line="+32"/>
         <source>Public</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Herkese Açık</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -19221,6 +17648,16 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <source>No Channel Selected</source>
         <translation type="unfinished">Bir Kanal Seçilmemiş</translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -19229,14 +17666,6 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <source>Tabs</source>
         <translation>Sekmeler</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">Her konu yeni bir sekmede açılsın</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">Bağlantılar</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -19250,10 +17679,6 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">Gönderilme</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -19322,16 +17747,16 @@ uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
         <translation>Profil Yönetimi</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -19443,7 +17868,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Durum iletisini düzenle</translation>
@@ -19459,7 +17884,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Profil Yönetimi</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>Genel Bilgiler</translation>
     </message>
@@ -19494,12 +17919,12 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Çevrimiçi süresi:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>Diğer Bilgiler</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>Adresim</translation>
     </message>
@@ -19543,51 +17968,27 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">Şu Hesapla Gönderilsin:</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">1. Hesap</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">2. Hesap</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">3. Hesap</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>Pulse üzerine ekle</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">süzgeç</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">Adres Ekleyici</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>Şu Şekilde Görüntüle</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19597,12 +17998,12 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished">Kimden:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19632,13 +18033,13 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished">Olumsuz</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19650,12 +18051,22 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19664,17 +18075,13 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Pulse Wire Üzerine Gönder</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19689,34 +18096,24 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">Kimden</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">Tarih</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">Görsel Dosyası Yükle</translation>
     </message>
 </context>
 <context>
@@ -19727,7 +18124,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19746,7 +18143,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19756,7 +18153,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19783,7 +18180,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19793,7 +18190,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19813,7 +18210,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19929,7 +18326,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19937,37 +18334,42 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19999,7 +18401,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20007,8 +18409,8 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>Onaylama</translation>
     </message>
@@ -20279,12 +18681,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Eş ayrıntıları</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>Dosya isteği iptal edildi</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>Bu RetroShare sürümü OpenPGP-SDK kullanır. Bu nedenle sistem paylaşımlı PGP anahtarlığını kullanamaz, ama çalışan tüm RetroShare kopyaları ile paylaşılan kendi anahtarlığı bulunur.&lt;br&gt;&lt;br&gt;Büyük olasılıkla uygulamanın yeni sürümüne henüz geçtiğiniz için, var olan RetroShare hesaplarında PGP anahtarlarının olduğu anılmasına rağmen, böyle bir anahtarlığınız yok gibi görünüyor.</translation>
     </message>
@@ -20315,7 +18717,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Beklenmeyen bir sorun çıktı. Lütfen &apos;RsInit::InitRetroShare beklenmeyen dönüş kodu %1&apos; hatasını bildirin.</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20349,7 +18751,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Birden çok kopya</translation>
@@ -20371,6 +18773,26 @@ Kilit dosyası:</translation>
 Kilit dosyası:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20453,7 +18875,7 @@ Bildirilen hata:
         <translation>Veri iletilen</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>DSA anahtarlarıyla ilişkili düğümleriniz var gibi görünüyor:</translation>
     </message>
@@ -20463,7 +18885,7 @@ Bildirilen hata:
         <translation>Bu RetroShare sürümü henüz DSA anahtarlarını desteklenmiyor. Tüm bu düğümler kullanılamayacak. Bunun için çok üzgünüz.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>etkin</translation>
     </message>
@@ -20473,7 +18895,7 @@ Bildirilen hata:
         <translation>devre dışı</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>%1 IP adresini beyaz listeye taşı</translation>
     </message>
@@ -20489,7 +18911,7 @@ Bildirilen hata:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>%1 saniye önce</translation>
     </message>
@@ -20557,7 +18979,7 @@ Security: no anonymous IDs</source>
 Güvenlik: İsimsiz kodlar kullanılamaz</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation>Sohbet odasına katıl</translation>
     </message>
@@ -20585,7 +19007,7 @@ Güvenlik: İsimsiz kodlar kullanılamaz</translation>
         <translation>XML dosyası işlenemedi!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation>Süresiz</translation>
     </message>
@@ -20765,13 +19187,29 @@ Güvenlik: İsimsiz kodlar kullanılamaz</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished">Ad</translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">Düğüm</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Durum</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20964,10 +19402,6 @@ Güvenlik: İsimsiz kodlar kullanılamaz</translation>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;Bu sertifikanın içeriği:</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -21018,6 +19452,18 @@ Güvenlik: İsimsiz kodlar kullanılamaz</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -21180,7 +19626,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>Tüm Ağda</translation>
     </message>
@@ -21363,7 +19809,7 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Gömülü görsellerin yüklenmesi engellenmiş.</translation>
     </message>
@@ -21376,7 +19822,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>Varsayılan olarak onaylandı</translation>
     </message>
@@ -21549,12 +19995,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">Görseli kaydet</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21562,12 +20018,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation>Ağaç Görünümü Ayarları</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21597,14 +20053,6 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">Görüntülenecek sütun...</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[başlık yok]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -22267,7 +20715,7 @@ Dosyanın doğru olduğunu düşünüyorsanız bu satırı silerek dosyayı Retr
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Ad</translation>
@@ -22388,7 +20836,7 @@ Dosyanın doğru olduğunu düşünüyorsanız bu satırı silerek dosyayı Retr
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
     </message>
@@ -22408,7 +20856,7 @@ Dosyanın doğru olduğunu düşünüyorsanız bu satırı silerek dosyayı Retr
         <translation type="unfinished">IP Adresi</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22467,7 +20915,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished">İleti arkadaşlarınıza iletilecek.</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Düzeltilmiş İleti ... ]</translation>
     </message>
@@ -22481,11 +20929,6 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>[Unknown]</source>
         <translation type="unfinished">[Bilinmiyor]</translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[... İleti Eksik ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22499,6 +20942,11 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>From</source>
         <translation type="unfinished">Kimden</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22521,13 +20969,18 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">Okunmuş durumuna göre sıralamak için tıklayın</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">Gönderene göre sıralamak için tıklayın</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22550,7 +21003,9 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22571,7 +21026,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>TÜM RetroShare ayarlarını sıfırlar.</translation>
     </message>
@@ -22632,7 +21087,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>RetroShare arayüz dilini ayarlar.</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>&apos;%1&apos;:%2 günlük dosyası açılamadı</translation>
     </message>
@@ -22653,11 +21108,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Veri klasörü oluşturulamadı: %1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Değişiklik</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22687,7 +21138,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>Belirtilen dil kodu geçersiz:</translation>
     </message>
@@ -22705,7 +21156,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Kayıt Defterine Erişim Hatası. Yönetici izinleri gerekiyor olabilir.</translation>
@@ -22722,12 +21173,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Buraya bir anahtar sözcük yazın (en az 3 karakter uzunluğunda)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>Aramayı Başlat</translation>
     </message>
@@ -22789,7 +21240,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Temizle</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>Anahtar Sözcükler</translation>
     </message>
@@ -22804,7 +21255,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Kod Arama</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>Dosya Adı</translation>
     </message>
@@ -22904,23 +21355,23 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Seçilmişleri indir</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>Dosya Adı</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>Indir</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare Bağlantısını Kopyala</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>RetroShare Bağlantısını Gönder</translation>
     </message>
@@ -22930,7 +21381,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>İndirme Bildirimi</translation>
     </message>
@@ -22967,7 +21418,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Tümünü Kaldır</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Klasör</translation>
@@ -22978,17 +21429,17 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>Yeni RetroShare Bağlantıları</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>Klasör Aç</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>Derleme Oluştur...</translation>
     </message>
@@ -23008,7 +21459,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Derleme dosyasından indir...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>Derleme</translation>
     </message>
@@ -23016,7 +21467,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>Eş ayrıntıları</translation>
     </message>
@@ -23032,22 +21483,22 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Ögeyi Sil</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>IP Adresi:</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>Eş Kodu:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>Konum:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>Eş Adı:</translation>
     </message>
@@ -23064,7 +21515,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation>ancak bildirilen:</translation>
     </message>
@@ -23089,8 +21540,8 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>&lt;p&gt;Arkadaşınız bu IP adresine bağlanmak istiyor. IP adresini yeni değiştirdiyseniz bu uyarıyı dikkate almayın. IP adresini değiştirmediyseniz aradaki bir eş tarafından bu arkadaşınıza şüpheli bir IP adresi gönderiliyor olabilir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Bu uyarı sizi trafik iletme saldırılarına karşı korumayı amaçlıyor. Böyle bir durumda, bağlı olduğunuz arkadaşınız dış IP adresiniz yerine saldırganın IP adresini görür. &lt;/p&gt; &lt;p&gt;&lt;br/&gt;&lt;/p&gt; &lt;p&gt;Bununla birlikte, bir nedenle IP adreslerini değiştirdiyseniz (Bazı hizmet sağlayıcılar düzenli olarak IP adreslerini değiştirir), bu uyarı size yalnızca RetroShare farketmeden önce bir arkadaşınıza yeni bir IP adresi ile bağlandığınızı belirtir. Bu durumda bir sorun yoktur.&lt;/p&gt; &lt;p&gt;&lt;br/&gt;&lt;/p&gt; &lt;p&gt;Kendi IP adreslerinizi beyaz listeye ekleyerek (örneğin, hizmet sağlayıcınızın IP adresi aralığını) hatalı uyarıları gizleyebilir ya da Ayarlar-&amp;gt;Bildirim-&amp;gt;Haber Akışı bölümünden tamamen devre dışı bırakabilirsiniz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23098,7 +21549,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>RetroShare üzerinde arkadaşınız olmak istiyor</translation>
     </message>
@@ -23129,7 +21580,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -23174,12 +21625,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Durum:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>İleti Yaz</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>Bağlantı Girişimi</translation>
     </message>
@@ -23199,17 +21650,22 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Bilinmeyen (Giden) Bağlantı İsteği</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>Bilinmeyen Güvenlik Sorunu</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23219,11 +21675,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">Bilinmeyen Eş</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
@@ -23233,7 +21685,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Bu Arkadaşı silmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Sertifika imzası yanlış!! Bu eş, olduğunu iddia ettiği kişi değil.</translation>
     </message>
@@ -23243,12 +21695,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Eksik/Bozuk sertifika. Kullanıcı gerçek bir RetroShare kullanıcısı değil.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>Sertifika içeride bir soruna yol açtı.</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Eş/Düğüm arkadaş listesinde değil (PGP kodu=</translation>
     </message>
@@ -23307,12 +21759,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>Yerel Adres</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23333,22 +21785,22 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Kapı:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>Yerel ağ</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>Dış IP adres bulucu</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>Bilinen / Önceki IP Adresleri:</translation>
     </message>
@@ -23365,21 +21817,16 @@ Ayrıca güvenlik duvarı ya da VPN bağlantısı kullanıyorsanız da
 yardımcı olur.</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>RetroShare IP adresinizi şu sitelere sorabilsin:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Kullanılabilecek kapı numaraları 10 ile 65535 arasındadır. Normal olarak 1024 altındaki kapı numaraları sistem kullanımına ayrılmıştır.</translation>
     </message>
@@ -23389,23 +21836,46 @@ yardımcı olur.</translation>
         <translation>Kullanılabilecek kapı numaraları 10 ile 65535 arasındadır. Normal olarak 1024 altındaki kapı numaraları sistem kullanımına ayrılmıştır.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>Onion Adresi</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>Keşif Açık (Önerilir)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>Keşif Kapalı</translation>
     </message>
@@ -23415,7 +21885,7 @@ yardımcı olur.</translation>
         <translation>Gizli - Yapılandırmaya Bakın</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>I2P Adresi</translation>
     </message>
@@ -23440,37 +21910,95 @@ yardımcı olur.</translation>
         <translation>geliş tamam</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>Vekil sunucu çalışıyor görünüyor.</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P vekil sunucusu etkinleştirilmemiş</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23485,71 +22013,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23559,22 +22023,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Gizli bir hizmet üzerinden ulaşılabiliyorsunuz.</translation>
     </message>
@@ -23588,12 +22037,12 @@ Tüm hizmetler düzgün çalışıyor mu??
 Ayrıca kapı ayarlarınızı da denetleyin!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[Gizli Kip]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu işlem bilinen adresler listesini temizler. Böylece adres listenizde olabilecek herhangi bir nedenle geçersiz/ilgisiz/süresi geçmiş adreslerin kişi adresi olarak arkadaşlarınıza bildirilmesi engellenir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23603,7 +22052,7 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation>Temizle</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>İndirme sınırı (KB/s) </translation>
     </message>
@@ -23618,23 +22067,23 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation>Yükleme sınırı (KB/s) </translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Yükleme sınırı tüm uygulamayı kapsar. Yükleme sınırı çok küçük olursa düşük öncelikli hizmetler engellenebilir (forumlar, kanallar). Önerilen en küçük değer: 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23645,17 +22094,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23665,12 +22104,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23680,17 +22114,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23730,7 +22154,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished">Başlat</translation>
     </message>
@@ -23745,12 +22169,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Durdur</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">Gelen</translation>
     </message>
@@ -23786,7 +22205,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished">Aktarıcı</translation>
     </message>
@@ -23841,7 +22285,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Toplam:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23866,7 +22310,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23878,7 +22322,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>IP Süzgeçleri</translation>
     </message>
@@ -23901,7 +22345,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>Durum</translation>
     </message>
@@ -23961,17 +22405,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Beyaz listeye ekle</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>Gizli Hizmet Yapılandırması</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tor Socks vekil sunucusunun kapı numarası. RetroShare düğümünüz bu kapıyı kullanarak&lt;/p&gt;&lt;p&gt;Gizli düğümlere bağlanabilir. Bilgisayarınızda bu kapı etkinleştiğinde sağdaki LED yeşile döner. &lt;/p&gt;&lt;p&gt;Bununla birlikte bu durum RetroShare trafiğinizin Tor üzerinden aktığı anlamına gelmez. Tor üzerinden veri akışı yalnız &lt;/p&gt;&lt;p&gt;Gizli düğümlere bağlandığınızda ya da Gizli bir düğüm çalıştırıyorsanız gerçekleşir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bilgisayarınızda soldaki kapı dinlemesi etkinleştiğinde bu LED yeşile döner. &lt;/p&gt;&lt;p&gt;Bununla birlikte bu durum RetroShare trafiğinizin Tor üzerinden aktığı anlamına gelmez. Tor üzerinden veri akışı yalnız &lt;/p&gt;&lt;p&gt;Gizli düğümlere bağlandığınızda ya da Gizli bir düğüm çalıştırıyorsanız gerçekleşir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23987,18 +22442,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bilgisayarınızda soldaki kapı dinlemesi etkinleştiğinde bu LED yeşile döner. &lt;/p&gt;&lt;p&gt;Bununla birlikte bu durum RetroShare trafiğinizin I2P üzerinden aktığı anlamına gelmez. I2P üzerinden veri akışı yalnız &lt;/p&gt;&lt;p&gt;Gizli düğümlere bağlandığınızda ya da Gizli bir düğüm çalıştırıyorsanız gerçekleşir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P gidiş tamam</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>Hizmet Adresi</translation>
     </message>
@@ -24033,12 +22488,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Lütfen bir hizmet adresi yazın</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>IP Aralığı</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>DHT tarafından IP maskelemesi için bildirildi</translation>
     </message>
@@ -24061,22 +22516,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Sizin eklediğiniz</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Beyaz listeye IP adresleri şu kaynaklardan toplanır: El ile değiş tokuş edilmiş bir sertifika ile gelen IP adresleri, bu bölümden el ile yazılan ya da güvenlik akışı ögelerinden alınan IP adresi aralıkları.&lt;/p&gt;&lt;p&gt;RetroShare varsayılan olarak (1) IP adresi beyaz listede bulunan eşlerle bağlantıya kara listede bulunsalar bile her zaman izin verir; (2) isteğe bağlı olarak IP adreslerinin beyaz listede bulunması gerekir. Bu davranış her bir eş için RetroShare düğümlerinin &amp;quot;Ayrıntılar&amp;quot; penceresinden değiştirilebilir. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT, Bittorrent DHT özelliğini kullanan arkadaşlarınızdan gelen bağlantı isteklerini yanıtlamanızı sağlayarak bağlanabilirliği büyük ölçüde arttırır. DHT üzerinde herhangi bir veri saklanmaz. Yalnızca diğer RetroShrare düğümleri ile iletişim kurmak için bir vekil sistem olarak kullanılır.&lt;/p&gt;&lt;p&gt;Keşif hizmeti, güvendiğiniz kişilerin düğüm adı ve kodunu bağlı olduğunuz eşlere ileterek yeni arkadaşlar edinmelerine yardımcı olur. Asla otomatik olarak arkadaşlık kurulmaz. İki eşin bağlanabilmesi için birbirlerine karşılıklı olarak güvenmeleri gerekir. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu işlem etkinleştirildiğinde, aşağıdaki web sitelerinden kendi IP adresinizi aldığınızda RetroShare bu imi yeşile döndürür. RetroShare kendi IP adresinizi bulmak için başka yöntemler de kullanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu liste çeşitli kaynaklardan toplanan bilgiler ile otomatik olarak doldurulur: DHT tarafından bildirilen maskelenmiş eşler, sizin yazdığınız IP aralıkları ve arkadaşlarınız tarafından bildirilen IP aralıkları. Varsayılan ayarlar sizi büyük ölçekli trafik aktarımlarına karşı korur.&lt;/p&gt;&lt;p&gt;Maskelenmiş IP adreslerinin otomatik olarak öngörülmesi yüzünden arkadaşlarınızın IP adresleri kara listeye eklenebilir. Bu durumda bu IP adreslerini beyaz listeye eklemek için sağ tıklayın.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24111,7 +22566,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Şuradan başlayan DHT maskeleme IP adresleri otomatik engellensin</translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24121,12 +22576,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks Vekil Sunucusu</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor gidiş tamam</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor vekil sunucusu etkinleştirilmemiş</translation>
     </message>
@@ -24206,7 +22661,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>özel yayın anahtarınızı paylaşacağınız eşleri seçin</translation>
     </message>
@@ -24216,12 +22671,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Arkadaşla Paylaş</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>Paylaş</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Kanalınızı paylaşarak arkadaşlarınıza bildirebilirsiniz.
@@ -24241,7 +22696,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Paylaşılan Klasör Yönetimi</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation>Paylaşılan klasör</translation>
     </message>
@@ -24261,17 +22716,17 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Görünürlük</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation>Yeni ekle</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>Paylaşım Klasörü Ekle</translation>
     </message>
@@ -24281,7 +22736,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>Uygula ve kapat</translation>
     </message>
@@ -24372,7 +22827,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Klasör bulunamadı ya da klasör adı kabul edilmiyor.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Paylaşılan klasörlerin listesi. Alttaki düğmeleri kullanarak klasörler ekleyip çıkarabilirsiniz. Yeni bir klasörü ilk kez eklediğinizde, bu klasördeki tüm dosyalar paylaşılır. Ardından paylaşılan her klasör için ayrı ayrı paylaşım işaretlerini ayarlayabilirsiniz.</translation>
     </message>
@@ -24380,7 +22835,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>Dosyalar</translation>
     </message>
@@ -24431,11 +22886,16 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>dosyaları seçin</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>Seçilmişleri indir</translation>
     </message>
@@ -24445,7 +22905,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>İndir</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>RetroShare Bağlantılarını Panoya Kopyala</translation>
     </message>
@@ -24460,7 +22920,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>RetroShare Bağlantılarını Gönder</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation>Bazı dosyalar yok sayıldı</translation>
     </message>
@@ -24476,7 +22936,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Öneriler</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>Derleme Ekle...</translation>
     </message>
@@ -24501,7 +22961,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Derleme dosyasından indir...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24644,12 +23104,12 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>Yapılandırmayı yükle</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>Arayüz ekle</translation>
     </message>
@@ -24673,7 +23133,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Parolam Hatırlansın</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>Oturum Aç</translation>
     </message>
@@ -25026,7 +23486,7 @@ Bu seçim ayarlardan değiştirilebilir.</translation>
         <translation>Durum iletisi</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>İleti:</translation>
     </message>
@@ -25271,7 +23731,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>Tüm Etiketleri Kaldır</translation>
     </message>
@@ -25307,12 +23767,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation>Bilinmiyor</translation>
     </message>
@@ -25322,18 +23785,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25343,12 +23801,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">Hata</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">Bağlı değil</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25356,7 +23859,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25366,7 +23869,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25377,11 +23880,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25409,7 +23913,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Aktarım Ayarları</translation>
@@ -25420,7 +23924,7 @@ p, li { white-space: pre-wrap; }
         <translation>Aynı anda en çok indirme sayısı:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation>Paylaşılan Klasörler</translation>
     </message>
@@ -25430,22 +23934,27 @@ p, li { white-space: pre-wrap; }
         <translation>Gelen klasörü otomatik olarak paylaşılsın (Önerilir)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation>Paylaşımı Düzenle</translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished">Paylaşılan klasörleri yapılandır</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation>Paylaşılan klasörler şu aralıkla denetlensin</translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation>dakika</translation>
     </message>
@@ -25530,7 +24039,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25539,7 +24048,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25564,7 +24078,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>Akış</translation>
     </message>
@@ -25623,38 +24142,13 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; arkadaşlar arasında yapılmasına gerek olmayan veri ve arama isteklerini aktarımlarını eşler arasında yapabilir. Bu trafikte yalnız bağlantılı arkadaş listesi bulunur ve isimsizdir.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;Paylaşılan her bir klasör için paylaşım işaretleri paylaşılan dosyalar penceresinden ayarlanabilir :&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Arkadaşlar gözatabilir&lt;/span&gt;: Bu dosyaları yalnız arkadaşlarınız görebilir.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;İsimsiz olarak paylaşılan&lt;/span&gt;: Bu dosyalara uzak F2F tünelleri üzerinden isimsiz olarak erişilebilir.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Saniyede iletilecek en fazla tünel isteği sayısı:</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Akış &lt;/span&gt;artan sırada, önizlemeye izin verecek şekilde 1MB boyutlu dosya parçaları aktarımının istenmesine neden olur. &lt;span style=&quot; font-weight:600;&quot;&gt;Rastgele&lt;/span&gt; Tümüyle rastgeledir ve kaynaşmaya yönelik davranır. &lt;span style=&quot; font-weight:600;&quot;&gt;Gelişen&lt;/span&gt; Ortalama çözüm. dosya parçasının sonundaki 50MB bölümden rastgele seçilir. Böylece büyük boş dosya hazırlama süresini beklemeden biraz rastlantısallık sağlanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Boş disk alanı bu sınırın altına inerse RetroShare tüm aktarımları ve yapılandırma dosyası kayıtlarını durdurur. Böylece bazı sistemlerde oluşabilecek veri kayıpları engellenir. Gerçekleşirse bu durum açılan bir pencere ile bildirilir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -25664,7 +24158,17 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu değer saniyede iletilebilecek tünel isteği sayısını belirler. &lt;/p&gt;&lt;p&gt;İnternet bağlantı hızınız yüksek ise, durağan olarak daha uzun tünellerin geçişine izin vermek için bu değeri 30-40 yapabilirsiniz. Bu işlem çok sayıda küçük paket oluşturarak kendi dosya aktarımınızı yavaşlatabileceğinden çok dikkatli olun. &lt;/p&gt;&lt;p&gt;Varsayılan değer: 20. Emin değilseniz böyle bırakın.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">Uyarı</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation>Gelen Klasörünü Ayarla</translation>
     </message>
@@ -25692,7 +24196,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>İndirme tamamlandı</translation>
     </message>
@@ -25716,39 +24220,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">%1 dosya indirildi</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">%1 dosya indirildi</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 dosya indirildi</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 dosya indirildi</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>İndirmeler</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Yüklemeler</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Ad</translation>
@@ -25955,11 +24443,7 @@ p, li { white-space: pre-wrap; }
         <translation>Belirtin...</translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
-        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Dosya Aktarımı&lt;/h1&gt;                                                             &lt;p&gt;RetroShare iki şekilde dosya aktarımı sunar: Arkadaşlarınızdan doğrudan aktarım ve uzak isimsiz tünel aktarımı. Ek olarak, dosya aktarımı birden çok kaynak kullanabilir ve karşılıklıdır (indirme yapılırken yükleme de yapılır)&lt;/p&gt;                                         &lt;p&gt;Sol yan çubuktaki &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; simgesini kullanarak dosyaları paylaşabilirsiniz.     Paylaşılan dosyalar Dosyalarım sekmesi altında görüntülenir. Her bir arkadaş grubunuzun bu dosyaları kendi Arkadaşların Dosyaları sekmelerinde görüp görümeyeceğini seçebilirsiniz.&lt;/p&gt;    &lt;p&gt;Arama sekmesi arkadaşlarınızın dosya listelerinde arama yapar ve birden çok sıçramalı tünel sistemi üzerinden uzak dosyalara isimsiz olarak erişebilir.&lt;/p&gt;     </translation>
-    </message>
-    <message>
-        <location line="+253"/>
+        <location line="+262"/>
         <source>Move in Queue...</source>
         <translation>Kuyrukta Taşı...</translation>
     </message>
@@ -25984,7 +24468,7 @@ p, li { white-space: pre-wrap; }
         <translation>Klasör seçin</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>İsimsiz uçtan uca şifrelenmiş tünel 0x</translation>
     </message>
@@ -26005,7 +24489,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -26038,7 +24522,17 @@ p, li { white-space: pre-wrap; }
         <translation>%1 dosyası tamamlanmamış. Bu bir ortam dosyası ise önizlemeyi deneyin.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">Uyarı</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>Dosya adını değiştir</translation>
     </message>
@@ -26053,7 +24547,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lütfen yeni -ve geçerli- bir dosya adı yazın</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Tümünü genişlet</translation>
@@ -26180,23 +24674,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Sütunlar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>Dosya Aktarımları</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>Yol</translation>
     </message>
@@ -26206,7 +24695,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yol Sütunu Görüntülensin</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>Önizleme dosyası silinemedi</translation>
     </message>
@@ -26216,7 +24705,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yeniden denensin mi?</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>Derleme Ekle...</translation>
     </message>
@@ -26231,7 +24720,12 @@ p, li { white-space: pre-wrap; }
         <translation>Derlemeyi Görüntüle...</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+74"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
         <source>Collection</source>
         <translation>Derleme</translation>
     </message>
@@ -26241,7 +24735,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>İsimsiz tünel 0x</translation>
     </message>
@@ -26462,10 +24956,6 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">İsimsiz tüneller</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26659,12 +25149,17 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>RetroShare Web arayüzü kullanılsın</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">Durum:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>Web parametreleri</translation>
     </message>
@@ -26704,17 +25199,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Web Arayüzü&lt;/h1&gt;       &lt;p&gt;Web arayüzü ile RetroShare web tarayıcı üzerinden kullanılabilir. Birden çok aygıt bir RetroShare kopyası üzerinden denetlenebilir. Böylece bir tablet üzerinden başlattığınız sohbeti masaüstü bilgisayar üzerinden sürdürebilirsiniz.&lt;/p&gt;     &lt;p&gt;Uyarı: Erişim denetimi ve şifreleme olmadığından, web arayüzünü İnternet üzerine açmayın. Web arayüzünü İnternet üzerinden kullanmak istiyorsanız bağlantı güvenliğini sağlamak için bir SSH tüneli ya da vekil sunucusu kullanın.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>Web arayüzü etkinleştirilmemiş</translation>
     </message>
@@ -26724,12 +25229,12 @@ p, li { white-space: pre-wrap; }
         <translation>Web arayüzü etkinleştirilmemiş. Ayarlar &gt; Web arayüzü bölümünden etkinleştirebilirsiniz.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>Web arayüzü başlatılamadı</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>Web arayüzü</translation>
     </message>
@@ -26866,11 +25371,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki Sayfaları</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">Yeni Grup</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>Sayfa Adı</translation>
     </message>
@@ -26885,7 +25386,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kaynak Kodu</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26973,7 +25474,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>Sayfa Düzenleme Geçmişi</translation>
     </message>
@@ -27008,7 +25509,7 @@ p, li { white-space: pre-wrap; }
         <translation>SayfaKodu</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -27038,14 +25539,18 @@ p, li { white-space: pre-wrap; }
         <translation>Etiketler</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">Geçmiş</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Düzenleme Geçmişi Görüntülensin</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>Durum</translation>
     </message>
@@ -27066,7 +25571,7 @@ p, li { white-space: pre-wrap; }
         <translation>Geri Al</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>Gönder</translation>
     </message>
@@ -27138,10 +25643,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">ZamanAralığı</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -27153,16 +25654,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">Yenile</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27177,7 +25669,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Diğerleri</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27197,7 +25689,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27227,85 +25719,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">Geçen Ay</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">Geçen Hafta</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">Bugün</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">Yeni</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">başlangıç</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">bitiş</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">Arama/Süzgeç</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">Tüm Ağda</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">Hesap Yönetimi</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">Görüntülenen:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>Benimkiler</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">Arkadaşlar</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>İzlenen</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">Özel</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">1. Hesap</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">2. Hesap</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">3. Hesap</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">İşaret Kutusu</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">Wire Üzerine Pulse Gönderin</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -27368,35 +25792,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Konum:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -27441,11 +25872,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">Kullanılamıyor</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">İzlenen</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Bilinmeyen</translation>
@@ -27523,7 +25984,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2g</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -27556,15 +26017,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">Görseller (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_zh_CN.ts b/retroshare-gui/src/lang/retroshare_zh_CN.ts
index a07132cf4..d35ab9a92 100644
--- a/retroshare-gui/src/lang/retroshare_zh_CN.ts
+++ b/retroshare-gui/src/lang/retroshare_zh_CN.ts
@@ -84,13 +84,6 @@
         <translation>仅隐藏节点</translation>
     </message>
 </context>
-<context>
-    <name>AddCommentDialog</name>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">添加评论</translation>
-    </message>
-</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -129,12 +122,12 @@
         <translation>RetroShare: 高级搜索</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation>搜索条件</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation>追加搜索条件。</translation>
     </message>
@@ -144,7 +137,7 @@
         <translation>重置搜索条件。</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation>取消搜索。</translation>
     </message>
@@ -164,177 +157,6 @@
         <translation>搜索 </translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Create Album</source>
-        <translation type="vanished">创建相册</translation>
-    </message>
-    <message>
-        <source>Album Name:</source>
-        <translation type="vanished">相册名称:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="vanished">类别:</translation>
-    </message>
-    <message>
-        <source>Animals</source>
-        <translation type="vanished">动物</translation>
-    </message>
-    <message>
-        <source>Family</source>
-        <translation type="vanished">家人</translation>
-    </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">好友</translation>
-    </message>
-    <message>
-        <source>Flowers</source>
-        <translation type="vanished">花</translation>
-    </message>
-    <message>
-        <source>Holiday</source>
-        <translation type="vanished">假日</translation>
-    </message>
-    <message>
-        <source>Landscapes</source>
-        <translation type="vanished">风景</translation>
-    </message>
-    <message>
-        <source>Pets</source>
-        <translation type="vanished">宠物</translation>
-    </message>
-    <message>
-        <source>Portraits</source>
-        <translation type="vanished">人像</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="vanished">旅行</translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="vanished">工作</translation>
-    </message>
-    <message>
-        <source>Random</source>
-        <translation type="vanished">随机</translation>
-    </message>
-    <message>
-        <source>Caption:</source>
-        <translation type="vanished">标题:</translation>
-    </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">地点:</translation>
-    </message>
-    <message>
-        <source>Photographer:</source>
-        <translation type="vanished">拍照人:</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">描述:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">共享设置</translation>
-    </message>
-    <message>
-        <source>Policy:</source>
-        <translation type="vanished">策略：</translation>
-    </message>
-    <message>
-        <source>Quality:</source>
-        <translation type="vanished">质量:</translation>
-    </message>
-    <message>
-        <source>Comments:</source>
-        <translation type="vanished">评论:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="vanished">标识:</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">公开</translation>
-    </message>
-    <message>
-        <source>Restricted</source>
-        <translation type="vanished">受限</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 1Mb)</source>
-        <translation type="vanished">调整大小 图像 (&lt; 1Mb)</translation>
-    </message>
-    <message>
-        <source>Resize Images (&lt; 10Mb)</source>
-        <translation type="vanished">调整大小 图像 (&lt; 10Mb)</translation>
-    </message>
-    <message>
-        <source>Send Original Images</source>
-        <translation type="vanished">发送原图</translation>
-    </message>
-    <message>
-        <source>No Comments Allowed</source>
-        <translation type="vanished">禁止评论</translation>
-    </message>
-    <message>
-        <source>Authenticated Comments</source>
-        <translation type="vanished">署名评论</translation>
-    </message>
-    <message>
-        <source>Any Comments Allowed</source>
-        <translation type="vanished">允许任何评论</translation>
-    </message>
-    <message>
-        <source>Publish with Identity</source>
-        <translation type="vanished">使用身份发布</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; 拖 &amp;amp;放插入图片。 点击一张图片，在下面编辑详情。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="vanished">返回</translation>
-    </message>
-    <message>
-        <source>Add Photos</source>
-        <translation type="vanished">添加照片</translation>
-    </message>
-    <message>
-        <source>Publish Album</source>
-        <translation type="vanished">发布相册</translation>
-    </message>
-    <message>
-        <source>Untitle Album</source>
-        <translation type="vanished">未命名相册</translation>
-    </message>
-    <message>
-        <source>Say something about this album...</source>
-        <translation type="vanished">写点什么吧…</translation>
-    </message>
-    <message>
-        <source>Where were these taken?</source>
-        <translation type="vanished">这些是在哪里拍摄的?</translation>
-    </message>
-    <message>
-        <source>Load Album Thumbnail</source>
-        <translation type="vanished">加载相册缩略图</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -343,19 +165,11 @@ p, li { white-space: pre-wrap; }
         <source>Album</source>
         <translation>相册</translation>
     </message>
-    <message>
-        <source>Album Thumbnail</source>
-        <translation type="vanished">相册缩略图</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>文字标签</translation>
     </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">概述</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -371,34 +185,6 @@ p, li { white-space: pre-wrap; }
         <source>Caption</source>
         <translation>标题</translation>
     </message>
-    <message>
-        <source>Where:</source>
-        <translation type="vanished">地点:</translation>
-    </message>
-    <message>
-        <source>When</source>
-        <translation type="vanished">何时</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">描述:</translation>
-    </message>
-    <message>
-        <source>Share Options</source>
-        <translation type="vanished">分享选项</translation>
-    </message>
-    <message>
-        <source>Comments</source>
-        <translation type="vanished">评论</translation>
-    </message>
-    <message>
-        <source>Publish Identity</source>
-        <translation type="vanished">发布身份</translation>
-    </message>
-    <message>
-        <source>Visibility</source>
-        <translation type="vanished">可见性</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -767,7 +553,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare </translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation> 注意: 这里提供的服务都处于试验阶段。欢迎测试。
@@ -783,14 +569,6 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>圈子</translation>
     </message>
-    <message>
-        <source>GxsForums</source>
-        <translation type="vanished">Gxs论坛</translation>
-    </message>
-    <message>
-        <source>GxsChannels</source>
-        <translation type="vanished">Gxs频道</translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -802,10 +580,23 @@ p, li { white-space: pre-wrap; }
         <translation>照片</translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished">保存图像</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -842,17 +633,13 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Avatar</source>
-        <translation type="vanished">添加头像</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation>设置头像</translation>
     </message>
@@ -871,10 +658,6 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Load Avatar</source>
-        <translation type="vanished">载入头像</translation>
-    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -943,22 +726,10 @@ p, li { white-space: pre-wrap; }
         <translation>重置</translation>
     </message>
     <message>
-        <source>Receive Rate</source>
-        <translation type="vanished">接收速度</translation>
-    </message>
-    <message>
-        <source>Send Rate</source>
-        <translation type="vanished">发送速度</translation>
-    </message>
-    <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation>置顶</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">样式</translation>
-    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -974,23 +745,11 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% 不透明</translation>
     </message>
-    <message>
-        <source>Save</source>
-        <translation type="vanished">保存</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">取消 </translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>自从:</translation>
     </message>
-    <message>
-        <source>Hide Settings</source>
-        <translation type="vanished">隐藏设置</translation>
-    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -1063,7 +822,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1093,12 +852,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;此消息的作者(ID为%1)被禁止。&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,7 +865,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">赞</translation>
     </message>
@@ -1126,7 +885,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1164,7 +923,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished">赞</translation>
     </message>
@@ -1184,7 +943,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1214,7 +973,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">分享</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">切换消息阅读状态</translation>
     </message>
@@ -1224,7 +983,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1232,12 +991,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished">赞</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1257,18 +1016,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">展开</translation>
     </message>
@@ -1283,12 +1042,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1457,17 +1216,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation>频道</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation>标签</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation>常规</translation>
     </message>
@@ -1477,11 +1236,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load posts in background (Thread)</source>
-        <translation type="vanished">在新标签页打开 (Thread)</translation>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished">下载</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation>在新标签中打开所有频道</translation>
     </message>
@@ -1489,7 +1254,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1512,7 +1277,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished">赞</translation>
     </message>
@@ -1537,18 +1302,18 @@ into the image, so as to
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">展开</translation>
     </message>
@@ -1563,7 +1328,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1573,17 +1338,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">隐藏</translation>
     </message>
@@ -1591,7 +1346,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
@@ -1782,7 +1537,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation>显示聊天室</translation>
     </message>
@@ -1794,22 +1549,6 @@ into the image, so as to
         <source>Chats</source>
         <translation>聊天室</translation>
     </message>
-    <message>
-        <source>You have %1 new messages</source>
-        <translation type="vanished">您有 %1 个新消息</translation>
-    </message>
-    <message>
-        <source>You have %1 new message</source>
-        <translation type="vanished">您有 %1 个新消息</translation>
-    </message>
-    <message>
-        <source>%1 new messages</source>
-        <translation type="vanished">%1 个新消息</translation>
-    </message>
-    <message>
-        <source>%1 new message</source>
-        <translation type="vanished">%1 个新消息</translation>
-    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1831,13 +1570,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation>未知聊天室</translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation>删除全部</translation>
     </message>
@@ -1845,13 +1585,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation>数量</translation>
     </message>
@@ -1861,33 +1601,7 @@ into the image, so as to
         <translation>主题</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation>订阅的私有聊天室</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation>订阅的公共聊天室</translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation>私密聊天室</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation>公共聊天室</translation>
-    </message>
-    <message>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;聊天室&lt;/h1&gt; 	 &lt;p&gt;聊天室差不多与IRC用法相同， 	 方便你与为数众多的人聊天而不需要互加好友，&lt;/p&gt; 	 &lt;p&gt;聊天室可以公开(你的好友看到)或私人(你的好友看不到它，除非你邀请他们 &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	 一旦你被邀请到私人房间，你将能够在您的好友使用时 	 看到它.&lt;/p&gt; 	 &lt;p&gt;左侧列表显示 	 你好友正参与的聊天大厅 	 	 &lt;ul&gt; 			 &lt;li&gt;你也可以右键创建新的房间&lt;/li&gt; 		 &lt;li&gt;双击进入，聊天，并介绍给你的好友&lt;/li&gt; 	 &lt;/ul&gt; 	聊天室基于时钟的， 为了聊天室更好的工作，请检查你的系统时间!	 &lt;/p&gt; 	</translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation>创建聊天室</translation>
     </message>
@@ -1897,7 +1611,7 @@ into the image, so as to
         <translation>离开此房间</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>创建一个匿名身份并进入此房间</translation>
     </message>
@@ -1956,12 +1670,12 @@ Double click a chat room to enter and chat.</source>
 双击房间可以进入聊天 </translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 邀请你进入房间%2</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>为此聊天室选择一个非匿名身份:</translation>
     </message>
@@ -1971,31 +1685,31 @@ Double click a chat room to enter and chat.</source>
         <translation>对这个聊天室选择一个身份：</translation>
     </message>
     <message>
-        <source>Create chat lobby</source>
-        <translation type="vanished">新建聊天室</translation>
-    </message>
-    <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[主题未设置]</translation>
     </message>
     <message>
-        <source>Selected lobby info</source>
-        <translation type="vanished">所选聊天室信息</translation>
-    </message>
-    <message>
-        <location line="+530"/>
+        <location line="-226"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation>私人</translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation>公开</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation>匿名 ID已接受</translation>
     </message>
@@ -2005,42 +1719,25 @@ Double click a chat room to enter and chat.</source>
         <translation>取消自动订阅</translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation>启用自动订阅</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation>搜索聊天室</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation>搜索名称</translation>
     </message>
     <message>
-        <source>Subscribed</source>
-        <translation type="vanished">已订阅</translation>
-    </message>
-    <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation>列</translation>
     </message>
-    <message>
-        <source>Yes</source>
-        <translation type="vanished">是</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="vanished">否</translation>
-    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -2052,47 +1749,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation>聊天室名称：</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation>聊天室 ID ：</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation>话题:</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>类型:</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation>安全</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation>节点:</translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation>文本标签</translation>
     </message>
@@ -2107,13 +1804,24 @@ Double click a chat room to enter and chat.</source>
         <translation>没有匿名 ID</translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-43"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-538"/>
         <location line="+3"/>
         <source>column</source>
         <translation>列</translation>
@@ -2127,7 +1835,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>删除项目</translation>
     </message>
@@ -2172,46 +1880,22 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation>常规</translation>
     </message>
-    <message>
-        <source>Distant Chat</source>
-        <translation type="vanished">私聊</translation>
-    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>所有人</translation>
     </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="vanished">联系人</translation>
-    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>无人</translation>
     </message>
     <message>
-        <source>Accept encrypted distant chat from</source>
-        <translation type="vanished">接受加密的远程聊天从</translation>
-    </message>
-    <message>
-        <source>Chat Settings</source>
-        <translation type="vanished">聊天设置</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Private Chat</source>
-        <translation type="vanished">私聊中启用表情图标</translation>
-    </message>
-    <message>
-        <source>Enable Emoticons Group Chat</source>
-        <translation type="vanished">群聊中启用表情图标</translation>
-    </message>
-    <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation>启用自定义字体</translation>
     </message>
@@ -2220,10 +1904,6 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>启用自定义字号</translation>
     </message>
-    <message>
-        <source>Minimum font size</source>
-        <translation type="vanished">最小字体</translation>
-    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -2235,7 +1915,7 @@ Double click a chat room to enter and chat.</source>
         <translation>启用斜体</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2260,11 +1940,7 @@ Double click a chat room to enter and chat.</source>
         <translation>加载内嵌图像</translation>
     </message>
     <message>
-        <source>Chat Lobby</source>
-        <translation type="vanished">聊天室</translation>
-    </message>
-    <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation>闪烁标签图标</translation>
     </message>
@@ -2273,10 +1949,6 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation>不要显示输入提示</translation>
     </message>
-    <message>
-        <source>Private Chat</source>
-        <translation type="vanished">私聊</translation>
-    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -2298,11 +1970,7 @@ Double click a chat room to enter and chat.</source>
         <translation>闪烁窗口/标签图标</translation>
     </message>
     <message>
-        <source>Chat Font</source>
-        <translation type="vanished">聊天字体</translation>
-    </message>
-    <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation>更改聊天字体</translation>
     </message>
@@ -2312,14 +1980,10 @@ Double click a chat room to enter and chat.</source>
         <translation>聊天字体：</translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation>历史</translation>
     </message>
-    <message>
-        <source>Style</source>
-        <translation type="vanished">样式</translation>
-    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -2334,17 +1998,13 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation>变量:</translation>
     </message>
-    <message>
-        <source>Group chat</source>
-        <translation type="vanished">群聊</translation>
-    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>私聊</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation>选择你的默认聊天字体</translation>
     </message>
@@ -2408,22 +2068,28 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;对于不同的聊天系统，这个选项卡是用来设置允许RetroShare可以保存多少聊天消息，以及显示多少条过去的对话。最大存储周期允许丢弃旧消息以防滞留过多不重要的消息(比如，聊天室和年代久远的聊天记录).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Chatlobbies</source>
-        <translation type="vanished">聊天室</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>已启用:</translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2433,7 +2099,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">聊天室</translation>
@@ -2480,7 +2156,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">描述:</translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2530,11 +2206,7 @@ Double click a chat room to enter and chat.</source>
         <translation>最长存储时间，天数 (0 = 保持全部):</translation>
     </message>
     <message>
-        <source>Search by default</source>
-        <translation type="vanished">默认搜索</translation>
-    </message>
-    <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>区分大小写</translation>
     </message>
@@ -2573,10 +2245,6 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation>自动搜索的最大值</translation>
     </message>
-    <message>
-        <source>Default identity for chat lobbies:</source>
-        <translation type="vanished">聊天室的默认身份</translation>
-    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2644,7 +2312,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation>显示聊天</translation>
     </message>
@@ -2680,7 +2348,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
@@ -2715,12 +2383,12 @@ Double click a chat room to enter and chat.</source>
         <translation>斜体</translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation>插入表情</translation>
     </message>
@@ -2729,10 +2397,6 @@ Double click a chat room to enter and chat.</source>
         <source>Attach a Picture</source>
         <translation>附加图片</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QT工具按钮:禁用 {&lt;/p&gt;&lt;p&gt;⇥image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2804,11 +2468,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation>插入水平线</translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation>保存图像</translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2846,7 +2505,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation>正在输入...</translation>
     </message>
@@ -2868,7 +2527,7 @@ after HTML conversion.</source>
         <translation>选择字体</translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>您确认要删除聊天记录?</translation>
     </message>
@@ -2918,7 +2577,7 @@ after HTML conversion.</source>
         <translation>处于忙碌状态可能无法回复您的消息。</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation>区分大小写查找</translation>
     </message>
@@ -2940,7 +2599,7 @@ after HTML conversion.</source>
         <translation>X物品发现后，请勿停止着色(需要更多CPU占用)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;查找以前的&lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2955,16 +2614,12 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;查找 &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation>(状态)</translation>
     </message>
     <message>
-        <source>Set text font &amp; color</source>
-        <translation type="vanished">设置文字大小及颜色</translation>
-    </message>
-    <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation>附加文件</translation>
     </message>
@@ -2980,12 +2635,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;标记选择文本&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation>个人ID</translation>
     </message>
@@ -2996,12 +2651,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation>未签名</translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation>已找到</translation>
     </message>
@@ -3021,7 +2676,7 @@ Double click on it to add his name on text writer.</source>
         <translation>在此输入消息</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation>请勿停止着色</translation>
     </message>
@@ -3047,7 +2702,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation>显示详情:</translation>
     </message>
@@ -3069,7 +2724,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation>私人圈</translation>
     </message>
@@ -3095,7 +2750,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation>好友</translation>
     </message>
@@ -3155,7 +2810,7 @@ Double click on it to add his name on text writer.</source>
         <translation>好友的好友</translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation>公共圈子(管理)</translation>
     </message>
@@ -3171,7 +2826,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation>圈子</translation>
     </message>
@@ -3223,43 +2878,48 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation>错误：无法获取节点详情。</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+26"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+15"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -3271,7 +2931,7 @@ Double click on it to add his name on text writer.</source>
         <translation>加密</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
         <source>Not connected</source>
         <translation>未连接</translation>
     </message>
@@ -3353,25 +3013,17 @@ Double click on it to add his name on text writer.</source>
         <translation>无</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+112"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;此证书包含：</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;a &lt;b&gt;节点 ID&lt;/b&gt; 和 &lt;b&gt;名字&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">an &lt;b&gt;洋葱地址&lt;/b&gt; 和&lt;b&gt;端口&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
-        <translation type="vanished">an &lt;b&gt;IP地址&lt;/b&gt; 和&lt;b&gt;端口&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <location line="+23"/>
+        <location line="+34"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;您可以使用此证书结交新朋友。通过电子邮件发送，或手动发送。&lt;/ p&gt;</translation>
     </message>
@@ -3386,7 +3038,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这个加密方式是 &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. 到好友的连接&lt;/p&gt;&lt;p&gt;是强加密的，如果有DHE&lt;/p&gt;&lt;p&gt;&amp;quot;安全效果会更加完美&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation> 和</translation>
     </message>
@@ -3403,118 +3055,16 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>好友连接向导</translation>
     </message>
-    <message>
-        <source>Add a new Friend</source>
-        <translation type="vanished">添加新好友</translation>
-    </message>
-    <message>
-        <source>&amp;You get a certificate file from your friend</source>
-        <translation type="vanished">&amp;通过好友的证书文件</translation>
-    </message>
-    <message>
-        <source>&amp;Make friend with selected friends of my friends</source>
-        <translation type="vanished">&amp;将好友的好友加为好友</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Email 
- (Your friend will receive an email with instructions how to download RetroShare)</source>
-        <translation type="vanished">&amp;发送邀请邮件
-(你的好友将会受到一封RetroShare下载教程邮件)</translation>
-    </message>
-    <message>
-        <source>Include signatures</source>
-        <translation type="vanished">包含签名</translation>
-    </message>
-    <message>
-        <source>Copy your Cert to Clipboard</source>
-        <translation type="vanished">复制您的证书到剪贴板</translation>
-    </message>
-    <message>
-        <source>Save your Cert into a File</source>
-        <translation type="vanished">保存您的证书至文件</translation>
-    </message>
-    <message>
-        <source>Run Email program</source>
-        <translation type="vanished">运行 Email 程序</translation>
-    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>从文件打开你好友的证书</translation>
     </message>
-    <message>
-        <source>Open certificate</source>
-        <translation type="vanished">打开证书</translation>
-    </message>
-    <message>
-        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
-        <translation type="vanished">请粘贴你朋友的证书链接到下面的输入框</translation>
-    </message>
-    <message>
-        <source>Certificate files</source>
-        <translation type="vanished">证书文件</translation>
-    </message>
-    <message>
-        <source>Use PGP certificates saved in files.</source>
-        <translation type="vanished">使用文件中的 PGP 证书。</translation>
-    </message>
-    <message>
-        <source>Import friend&apos;s certificate...</source>
-        <translation type="vanished">导入好友证书...</translation>
-    </message>
-    <message>
-        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
-        <translation type="vanished">您需要生成您的证书文件，将其发送给您的好友。您也可以使用之前生成过的文件。</translation>
-    </message>
-    <message>
-        <source>Export my certificate...</source>
-        <translation type="vanished">导出我的证书...</translation>
-    </message>
-    <message>
-        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
-        <translation type="vanished">拖拽您的好友证书到此窗口或在下框中指定证书文件的位置</translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="vanished">浏览</translation>
-    </message>
-    <message>
-        <source>Friends of friends</source>
-        <translation type="vanished">好友的好友</translation>
-    </message>
-    <message>
-        <source>Select now who you want to make friends with.</source>
-        <translation type="vanished">选择您要加为好友的节点。</translation>
-    </message>
-    <message>
-        <source>Show me:</source>
-        <translation type="vanished">显示：</translation>
-    </message>
-    <message>
-        <source>Make friend with these peers</source>
-        <translation type="vanished">将这些节点加为好友</translation>
-    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare ID</translation>
     </message>
-    <message>
-        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
-        <translation type="vanished">使用 RetroShare ID 添加您网络中的节点为好友。</translation>
-    </message>
-    <message>
-        <source>Add Friends RetroShare ID...</source>
-        <translation type="vanished">添加好友的 RetroShare ID...</translation>
-    </message>
-    <message>
-        <source>Paste Friends RetroShare ID in the box below</source>
-        <translation type="vanished">粘贴好友的 RetroShare ID 至下框中</translation>
-    </message>
-    <message>
-        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
-        <translation type="vanished">输入好友的 RetroShare ID，例如：Peer@BDE8D16A46D938CF</translation>
-    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3556,27 +3106,7 @@ Double click on it to add his name on text writer.</source>
         <translation>邮箱</translation>
     </message>
     <message>
-        <source>Invite Friends by Email</source>
-        <translation type="vanished">通过邮件邀请好友</translation>
-    </message>
-    <message>
-        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
-        <translation type="vanished">输入您好友的 Email 地址(多个地址用分号分隔)</translation>
-    </message>
-    <message>
-        <source>Your friends&apos; email addresses:</source>
-        <translation type="vanished">您好友的邮件地址:</translation>
-    </message>
-    <message>
-        <source>Enter Friends Email addresses</source>
-        <translation type="vanished">输入好友的电子邮件地址</translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="vanished">主题:</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3592,77 +3122,32 @@ Double click on it to add his name on text writer.</source>
         <translation>请求详情</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation>节点详情</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
-    <message>
-        <source>Email:</source>
-        <translation type="vanished">Email:</translation>
-    </message>
-    <message>
-        <source>Node:</source>
-        <translation type="vanished">节点:</translation>
-    </message>
-    <message>
-        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
-resources.</source>
-        <translation type="vanished">请注意，如果你添加太多的好友，RetroShare 将会需要大量带宽，内存和CPU占用，你可以尽可能多的加好友，但是超过40个好友可能就会占用大量资源</translation>
-    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>选项</translation>
     </message>
     <message>
-        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
-        <translation type="vanished">这个向导将帮助你连接到你的朋友(们)进入RetroShare网络，&lt;br&gt;请选择你想怎么添加你的好友</translation>
-    </message>
-    <message>
-        <source>Enter the certificate manually</source>
-        <translation type="vanished">手动输入证书</translation>
-    </message>
-    <message>
-        <source>Enter RetroShare ID manually</source>
-        <translation type="vanished">手动输入 RetroShare ID</translation>
-    </message>
-    <message>
-        <source>&amp;Send an Invitation by Web Mail Providers</source>
-        <translation type="vanished">通过网页邮箱发送邀请</translation>
-    </message>
-    <message>
-        <source>Recommend many friends to each other</source>
-        <translation type="vanished">批量推荐好友</translation>
-    </message>
-    <message>
-        <source>RetroShare certificate</source>
-        <translation type="vanished">RetroShare 证书</translation>
-    </message>
-    <message>
-        <source>Please paste below your friend&apos;s Retroshare certificate</source>
-        <translation type="vanished">请在下面粘贴你的好友的 RetroShare 证书</translation>
-    </message>
-    <message>
-        <source>Paste certificate</source>
-        <translation type="vanished">粘贴证书</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这里只能输入你的好友的RetroShare证书。 注意，这跟你好友账户的密钥是不一样的。不要再这里粘贴好友的密钥，没用的 (就算是密钥的一部分也不行)。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation>添加至好友分组:</translation>
     </message>
@@ -3672,7 +3157,7 @@ resources.</source>
         <translation>为好友的 PGP 密钥签名</translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3697,16 +3182,22 @@ resources.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation>添加为可以建立连接的好友</translation>
     </message>
     <message>
-        <source>To accept the Friend Request, click the Finish button.</source>
-        <translation type="vanished">点击完成可接受好友请求。</translation>
-    </message>
-    <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation>抱歉，出现错误</translation>
     </message>
@@ -3726,32 +3217,27 @@ resources.</source>
         <translation>您的好友详情:</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation>密钥有效性:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation>签名者</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;签署好友的钥匙是表达你对这个好友，给你的其他好友的信任的一种方式。 下面的签名加密地证明所列出的密钥的所有者将当前的PGP密钥识别为真实的&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>此节点已经存在于您的好友列表中。重复添加仅设置其IP地址。</translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3797,49 +3283,17 @@ resources.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation>证书载入失败</translation>
     </message>
     <message>
-        <source>Cannot get peer details of PGP key %1</source>
-        <translation type="vanished">无法获取PGP密钥 %1 的节点详情</translation>
-    </message>
-    <message>
-        <source>Any peer I&apos;ve not signed</source>
-        <translation type="vanished">任意未签名节点</translation>
-    </message>
-    <message>
-        <source>Friends of my friends who already trust me</source>
-        <translation type="vanished">我好友的好友中信任我的节点</translation>
-    </message>
-    <message>
-        <source>Signed peers showing as denied</source>
-        <translation type="vanished">显示为拒绝的已签名节点</translation>
-    </message>
-    <message>
-        <source>Peer name</source>
-        <translation type="vanished">节点名称</translation>
-    </message>
-    <message>
-        <source>Also signed by</source>
-        <translation type="vanished">其他签名者</translation>
-    </message>
-    <message>
-        <source>Peer id</source>
-        <translation type="vanished">节点 ID</translation>
-    </message>
-    <message>
-        <source>Certificate appears to be valid</source>
-        <translation type="vanished">证书似乎有效</translation>
-    </message>
-    <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>不是一个有效的 RetroShare 证书！</translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare 邀请</translation>
     </message>
@@ -3861,12 +3315,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>这是你自己的证书！你该不会是想和自己交朋友吧？</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3874,7 +3328,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation>此密钥已经在你的信任列表中</translation>
     </message>
@@ -3914,7 +3368,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>您有一个好友请求来自</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3939,7 +3393,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3949,47 +3403,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Certificate Load Failed:file %1 not found</source>
-        <translation type="vanished">证书载入失败: 未找到文件 %1</translation>
-    </message>
-    <message>
-        <source>This Peer %1 is not available in your Network</source>
-        <translation type="vanished">节点 %1 在您的网络中不可用</translation>
-    </message>
-    <message>
-        <source>Use new certificate format (safer, more robust)</source>
-        <translation type="vanished">使用新证书格式(更安全，更强大)</translation>
-    </message>
-    <message>
-        <source>Use old (backward compatible) certificate format</source>
-        <translation type="vanished">使用旧证书格式(向后兼容)</translation>
-    </message>
-    <message>
-        <source>Remove signatures</source>
-        <translation type="vanished">删除签名</translation>
-    </message>
-    <message>
-        <source>RetroShare Invite</source>
-        <translation type="vanished">RetroShare 邀请</translation>
-    </message>
-    <message>
-        <source>Connect Friend Help</source>
-        <translation type="vanished">“连接好友”的帮助信息</translation>
-    </message>
-    <message>
-        <source>You can copy this text and send it to your friend via email or some other way</source>
-        <translation type="vanished">您可以复制此文本并将其通过邮件或其他方式发送给您的好友</translation>
-    </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">您的证书已复到剪切板，请将其通过邮件或其他方式发送给您的好友</translation>
-    </message>
-    <message>
-        <source>Save as...</source>
-        <translation type="vanished">另存为...</translation>
-    </message>
-    <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -4028,11 +3442,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** 无 ***</translation>
     </message>
     <message>
-        <source>Use as direct source, when available</source>
-        <translation type="vanished">可用时，作为直连数据源。</translation>
-    </message>
-    <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation>IP 地址:</translation>
     </message>
@@ -4042,7 +3452,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP 地址:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation>显示高级选项</translation>
     </message>
@@ -4051,10 +3461,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;签署好友的钥匙是表达你对这个好友，给你的其他好友的信任的一种方式。 它可以帮助他们决定是否允许基于您自己的信任的密钥进行连接。 签署密钥是绝对可选的，不能撤销，所以请做出明智的选择.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare会定期检查您的好友列表中的可浏览文件与您的传输匹配，以建立直接传输。 在这种情况下，您的好友知道您正在下载文件.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;要防止此行为（仅适用于此好友），请取消选中此框。 如果您明确要求，您仍然可以执行直接传输。 从你好友的文件列表下载。 此设置应用于同一节点的所有位置.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -4065,45 +3471,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt; &lt;head /&gt; &lt;body&gt; &lt;p&gt;如果连接地址不在白名单中，则具有此选项的对等人无法连接。 这样可以防止流量转发攻击。 当被使用时，被拒绝的对方将被“安全馈送项目”报告。 在新闻Feed部分。 从那里，您可以对其IP进行白名单/黑名单。 适用于同一节点的所有位置。&lt;/ p&gt; &lt;/ body&gt; &lt;/ html&gt;</translation>
     </message>
-    <message>
-        <source>Recommend many friends to each others</source>
-        <translation type="vanished">批量互荐好友</translation>
-    </message>
-    <message>
-        <source>Friend Recommendations</source>
-        <translation type="vanished">好友推荐</translation>
-    </message>
-    <message>
-        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
-        <translation type="vanished">下面的文本是你的 RetroShare 证书。你必须提供给你的好友</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="vanished">消息:</translation>
-    </message>
-    <message>
-        <source>Recommend friends</source>
-        <translation type="vanished">推荐好友</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="vanished">收件人</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend for recommendation.</source>
-        <translation type="vanished">请选择至少一个好友以推荐。</translation>
-    </message>
-    <message>
-        <source>Please select at least one friend as recipient.</source>
-        <translation type="vanished">请选择至少一个好友以接收。</translation>
-    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>将密钥添加到钥匙环中</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation>密钥已存在于您的钥匙环中</translation>
     </message>
@@ -4119,7 +3493,7 @@ even if you don&apos;t make friends.</source>
 发送远程信息有用。</translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>证书包含错误的版本号，记住0.6版本跟0.5版本不能相互添加</translation>
     </message>
@@ -4154,7 +3528,7 @@ even if you don&apos;t make friends.</source>
         <translation>添加至白名单</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation>证书里没有IP</translation>
     </message>
@@ -4164,27 +3538,10 @@ even if you don&apos;t make friends.</source>
         <translation>&lt;p&gt;此证书没有IP。 你会依靠节点发现和DHT找到它。 由于您需要清除白名单，节点将在NewsFeed选项卡中引发安全警告。 从那里，你可以将他的IP列入白名单。&lt;/ p&gt;</translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished">[未知]</translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation>添加来自1%的证书</translation>
     </message>
-    <message>
-        <source>Paste Cert of your friend from Clipboard</source>
-        <translation type="vanished">复制对方的证书到剪贴板</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:can&apos;t read from file %1</source>
-        <translation type="vanished">签名载入失败:无法读取文件 %1</translation>
-    </message>
-    <message>
-        <source>Certificate Load Failed:something is wrong with %1</source>
-        <translation type="vanished">证书载入失败: %1 出错</translation>
-    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -4246,7 +3603,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation>UDP 设置</translation>
     </message>
@@ -4274,7 +3631,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation>连接助手</translation>
     </message>
@@ -4284,17 +3641,20 @@ p, li { white-space: pre-wrap; }
         <translation>无效节点 ID</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation>未知状态</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation>离线</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation>受限于对称 NAT</translation>
     </message>
@@ -4304,12 +3664,14 @@ p, li { white-space: pre-wrap; }
         <translation>受限于 NAT 且无 DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation>NET 重启</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation>受限于 NAT</translation>
     </message>
@@ -4319,7 +3681,8 @@ p, li { white-space: pre-wrap; }
         <translation>无 DHT</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation>网络状况很好!</translation>
     </message>
@@ -4344,7 +3707,7 @@ p, li { white-space: pre-wrap; }
         <translation>正在探索 RS 节点</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation>查询需要 DHT</translation>
     </message>
@@ -4636,7 +3999,7 @@ p, li { white-space: pre-wrap; }
         <translation>请重试导入完整的证书</translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4644,7 +4007,8 @@ p, li { white-space: pre-wrap; }
         <translation>不适用</translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>端口转发状态无法确认！</translation>
     </message>
@@ -4654,7 +4018,7 @@ p, li { white-space: pre-wrap; }
         <translation>端口转发状态无法确定，无 DHT！</translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation>正在搜索</translation>
     </message>
@@ -4690,12 +4054,12 @@ p, li { white-space: pre-wrap; }
         <translation>圈子详情</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4715,7 +4079,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4735,18 +4099,18 @@ p, li { white-space: pre-wrap; }
         <translation>过滤</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation>昵称</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation>已邀请成员</translation>
     </message>
@@ -4761,15 +4125,7 @@ p, li { white-space: pre-wrap; }
         <translation>认识的人</translation>
     </message>
     <message>
-        <source>ID</source>
-        <translation type="vanished">ID</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="vanished">类型</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
@@ -4809,23 +4165,19 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;圈子可以限制在另一个圈子的成员身上。 只有该第二圈的成员才能看到新圈子及其内容(成员列表等)。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Only visible to members of:</source>
-        <translation type="vanished">仅对下列成员可见:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation>请为您的圈子命名</translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation>未选择受限圈子</translation>
     </message>
@@ -4835,12 +4187,24 @@ p, li { white-space: pre-wrap; }
         <translation>未选择圈子限制</translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[未知]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
@@ -4850,7 +4214,7 @@ p, li { white-space: pre-wrap; }
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>搜索 </translation>
@@ -4865,10 +4229,6 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>已签名</translation>
     </message>
-    <message>
-        <source>Signed by known nodes</source>
-        <translation type="vanished">签名者:已知节点</translation>
-    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4885,10 +4245,6 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP ID</translation>
     </message>
-    <message>
-        <source>Anon Id</source>
-        <translation type="vanished">匿名 ID</translation>
-    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4911,17 +4267,13 @@ p, li { white-space: pre-wrap; }
         <translation>新建圈子</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>创建</translation>
     </message>
     <message>
-        <source>PGP Linked Id</source>
-        <translation type="vanished">PGP 关联 ID</translation>
-    </message>
-    <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation>添加成员</translation>
     </message>
@@ -4940,7 +4292,7 @@ p, li { white-space: pre-wrap; }
         <translation>创建分组</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation>组名称:</translation>
     </message>
@@ -4975,7 +4327,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation>新频道贴文</translation>
     </message>
@@ -4985,7 +4337,7 @@ p, li { white-space: pre-wrap; }
         <translation>邮件</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5046,23 +4398,11 @@ p, li { white-space: pre-wrap; }
 &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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;使用拖放 / 添加文件按钮, Hash 新文件。&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; 从你的分享复制/粘贴 RetroShare 链接&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>Add File to Attach</source>
-        <translation type="vanished">附加文件</translation>
-    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>添加频道缩略图</translation>
     </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">消息</translation>
-    </message>
-    <message>
-        <source>Subject :</source>
-        <translation type="vanished">主题:</translation>
-    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -5148,17 +4488,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5177,17 +4517,18 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>File already Added and Hashed</source>
-        <translation type="vanished">文件已添加并生成散列校验值</translation>
-    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>请添加主题</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation>载入图片缩略图</translation>
     </message>
@@ -5202,18 +4543,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation>生成大量数据</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation>你真的想生成 ％1 消息吗？</translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>你正在添加未分享的文件，仍想继续?</translation>
     </message>
@@ -5247,7 +4582,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation>论坛发帖</translation>
     </message>
@@ -5256,10 +4591,6 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>论坛</translation>
     </message>
-    <message>
-        <source>Subject</source>
-        <translation type="vanished">主题</translation>
-    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -5280,8 +4611,8 @@ p, li { white-space: pre-wrap; }
         <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5300,7 +4631,7 @@ p, li { white-space: pre-wrap; }
         <translation>您可以通过拖拽在此窗口中添加文件</translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5330,17 +4661,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation>无论坛</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation>回复</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">标题</translation>
     </message>
@@ -5393,7 +4724,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">载入图片文件</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation>没有兼容此论坛的 ID</translation>
     </message>
@@ -5403,8 +4734,8 @@ Do you want to discard this message?</source>
         <translation>您的身份不允许在此论坛中发布。 这可能是由于论坛限于一个不包含您的身份的圈子，或者论坛需要PGP签名的身份。</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation>生成大量数据</translation>
     </message>
@@ -5413,10 +4744,6 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>你真的想生成 ％1 消息吗？</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">发送</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -5431,23 +4758,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <source>Create Chat Lobby</source>
-        <translation type="vanished">新建聊天室</translation>
-    </message>
-    <message>
-        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
-        <translation type="vanished">聊天室是分布式的匿名群组聊天。每个参加者都可以收到全部消息。一旦聊天室创建成功，您可以从好友标签页中邀请其他好友。</translation>
-    </message>
-    <message>
-        <source>Lobby name:</source>
-        <translation type="vanished">聊天室名称:</translation>
-    </message>
-    <message>
-        <source>Lobby topic:</source>
-        <translation type="vanished">聊天室主题:</translation>
-    </message>
-    <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5482,7 +4793,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished">创建</translation>
     </message>
@@ -5492,11 +4803,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果您检查这个，只有PGP签名的ID可以在这个大厅加入和谈话。 这个限制防止匿名垃圾邮件发送，因为大厅中的至少一些人可能找到垃圾邮件发送者的节点&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation>需要 PGP 签名的身份</translation>
     </message>
@@ -5511,11 +4818,7 @@ Do you want to discard this message?</source>
         <translation>选择群聊好友</translation>
     </message>
     <message>
-        <source>Invited friends</source>
-        <translation type="vanished">已邀请好友</translation>
-    </message>
-    <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>创建聊天室</translation>
@@ -5536,7 +4839,7 @@ Do you want to discard this message?</source>
         <translation>联系人:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation>使用身份</translation>
     </message>
@@ -5544,17 +4847,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation>公开信息</translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
@@ -5564,12 +4867,12 @@ Do you want to discard this message?</source>
         <translation>地点 ID：</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation>软件版本:</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation>在线始于:</translation>
     </message>
@@ -5589,12 +4892,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5604,7 +4902,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation>其它信息</translation>
     </message>
@@ -5614,17 +4912,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation>证书</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5634,11 +4927,7 @@ Do you want to discard this message?</source>
         <translation>包含签名</translation>
     </message>
     <message>
-        <source>Save Key into a file</source>
-        <translation type="vanished">保存密钥到文件</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished">导出身份</translation>
     </message>
@@ -5712,33 +5001,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>文本标签</translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation>PGP 指纹: </translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation>节点信息</translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation>PGP Id :</translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation>好友节点:</translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5777,14 +5066,6 @@ and use the import button to load it</source>
         <source>Node</source>
         <translation>节点</translation>
     </message>
-    <message>
-        <source>Create new node...</source>
-        <translation type="vanished">新建节点</translation>
-    </message>
-    <message>
-        <source>show statistics window</source>
-        <translation type="vanished">显示统计窗口</translation>
-    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5801,10 +5082,6 @@ and use the import button to load it</source>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
-    <message>
-        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;RetroShare使用Bittorrent的DHT作为连接的代理。 它不会将您的IP存储在DHT中.。				                        相反，您的好友可以使用DHT来处理标准的DHT请求。 												一旦RetroShare从您的一个好友获得DHT响应，状态栏符号将变为绿色。&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5840,7 +5117,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -6508,7 +5785,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation>启动文件任务</translation>
     </message>
@@ -6516,38 +5793,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation>至</translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation>忽略大小写</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
-        <translation>dd.MM.yyyy</translation>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -6555,12 +5832,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation>表情部件</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation>删掉这个表达式</translation>
     </message>
@@ -6722,7 +5999,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation>图片</translation>
     </message>
@@ -6732,7 +6009,7 @@ and use the import button to load it</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
@@ -6792,11 +6069,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation>C</translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation>好友目录</translation>
     </message>
@@ -6918,7 +6205,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6953,10 +6240,6 @@ and use the import button to load it</source>
         <source>Show State</source>
         <translation>显示状态</translation>
     </message>
-    <message>
-        <source>Trusted nodes</source>
-        <translation type="vanished">信任的节点</translation>
-    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6964,7 +6247,7 @@ and use the import button to load it</source>
         <translation>显示分组</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation>分组</translation>
     </message>
@@ -7000,7 +6283,7 @@ and use the import button to load it</source>
         <translation>添加至分组</translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>搜索</translation>
@@ -7016,7 +6299,7 @@ and use the import button to load it</source>
         <translation>以状态分类</translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation>用户信息</translation>
     </message>
@@ -7258,7 +6541,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation>确认好友请求</translation>
     </message>
@@ -7275,10 +6558,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
-    <message>
-        <source>Search :</source>
-        <translation type="vanished">搜索 ：</translation>
-    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -7300,7 +6579,7 @@ at least one peer was not added to a group</source>
         <translation>搜索好友</translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation>标记全部</translation>
     </message>
@@ -7311,16 +6590,134 @@ at least one peer was not added to a group</source>
         <translation>取消标记</translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished">地址</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished">状态</translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished">接受好友</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished">代理未启用或中断。
+所有服务都开启并正常运行吗？
+另外请检查您的端口！</translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation>编辑状态消息</translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation>广播</translation>
     </message>
@@ -7403,33 +6800,38 @@ at least one peer was not added to a group</source>
         <translation>重置为默认字体</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation>钥匙环</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;网络&lt;/h1&gt;                                       &lt;p&gt;“网络”选项卡显示您的好友RetroShare节点：与您连接的相邻RetroShare节点。    &lt;/p&gt;                                                       &lt;p&gt;您可以将节点分组在一起，以允许设置更精细的信息访问级别，例如仅允许某些节点查看某些文件。&lt;/p&gt;     &lt;p&gt;在右边，你会发现3个有用的选项卡：                                                                     &lt;ul&gt;                                                                                                                &lt;li&gt;广播一次向所有连接的节点发送消息&lt;/li&gt;                                   &lt;li&gt;本地网络图根据节点发现信息显示您周围的网络&lt;/li&gt;                       &lt;li&gt;密钥环包含您收集的节点密钥，主要由您的好友节点转发给您&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>RetroShare 广而告之：此处的消息会发给当前连接的所有好友。</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation>网络</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation>网络图表</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation>在这里设置你的状态消息。</translation>
     </message>
@@ -7447,7 +6849,17 @@ at least one peer was not added to a group</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>所有字段都需要最少3个字符</translation>
     </message>
@@ -7457,17 +6869,12 @@ at least one peer was not added to a group</source>
         <translation>密码不符</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation>端口</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>这是保护PGP密钥的密码。</translation>
@@ -7488,42 +6895,38 @@ at least one peer was not added to a group</source>
         <translation>新证书生成失败，可能您的 PGP 密码有误! </translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;请输入一个强壮的密码。您需要靠它保护您的 PGP 密钥。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;请移动鼠标以尽可能多地收集随机性。至少需要达到20％来创建你的节点密钥。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation>标准节点</translation>
     </message>
     <message>
-        <source>TOR/I2P Hidden node</source>
-        <translation type="vanished">TOR/I2P 隐藏节点</translation>
-    </message>
-    <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;您的节点名称指定将在此计算机上运行的RetroShare实例。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation>节点名称</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7543,12 +6946,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;用户档案文件名称通过网络识别您。&lt;/p&gt;&lt;p&gt;您的好友使用它来接受您的连接。&lt;/p&gt;&lt;p&gt;您可以在不同的计算机上创建具有&lt;/p&gt;&lt;p&gt;同一个用户档案的多个RetroShare节点。&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation>导出账户文件</translation>
     </message>
@@ -7558,42 +6961,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; 这里应该是洋葱的隐藏地址格式: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;或者是I2P的格式 : [52 个字符].b32.i2p &lt;/p&gt;&lt;p&gt; 你必须通过建立Tor/I2P隐藏服务才能获得一个地址。&lt;/p&gt;&lt;p&gt; 当然你现在也可以留空，但是只有你正确配置了Tor/I2p地址过后才能正常工作。配置在选项-&amp;gt；网络-&amp;gt；隐藏服务配置。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;I在你聊天室，论坛，频道评论中发东西时需要使用身份。&lt;/p&gt;&lt;p&gt;他们也使用RetroShare的网络来收发邮件。你可以立即创建&lt;/p&gt;&lt;p&gt;签名身份，或在你需要的时候再创建。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation>开始！</translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced options</source>
-        <translation type="vanished">高级选项</translation>
-    </message>
-    <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation>隐藏地址</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>您的用户档案与PGP密钥相关联。RetroShare目前忽略DSA密钥。</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这是你的连接端口。&lt;/p&gt;&lt;p&gt;1024到65535之间的任何值&lt;/p&gt;&lt;p&gt;都可以。你可以在以后更改&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7641,13 +7045,13 @@ and use the import button to load it</source>
         <translation>您的用户档案未保存。有错误发生。</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>导入用户档案</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>创建新的用户档案和RetroShare节点</translation>
     </message>
@@ -7657,7 +7061,7 @@ and use the import button to load it</source>
         <translation>新建 RetroShare 节点</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7692,7 +7096,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7702,12 +7106,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7717,12 +7116,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7948,36 +7342,13 @@ and use the import button to load it</source>
         <translation>入门指南</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>邀请好友</translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;离开好友，RetroShare 就失去了意义。点击按钮开始添加好友。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;将您的 &quot;ID 证书&quot; 通过电邮邀请发送给您的好友。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;请记得获得回请...&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;只有均已加对方为好友的节点之间才能相互连接。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>添加您的好友至 RetroShare</translation>
     </message>
@@ -7987,131 +7358,103 @@ p, li { white-space：pre-wrap；}
         <translation>添加好友</translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;和你的好友同时在线，RetroShare将会自动连接你&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;在你创建连接之前，你的客户端必须能找到RetroShare网络。&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt; 你第一次开启RetroShare时将会花费5-30分钟在&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt; 当能创建连接的时候DHT指示器会(状态栏) 变成绿色。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt; 几分钟之后，NAT指示器 (也是状态栏) 变成黄色或绿色&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;如果它仍然是红色，那么你有一个讨厌的防火墙，RetroShare会努力连接。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;有关连接的更多建议，请参阅更多帮助部分。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
+        <translation>连接到好友</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;您可以通过打开外部端口改善 RetroShare 的网络性能。&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;这可以加快程序的连接速度，让更多的节点与您相连。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;最简单的方式是启用您路由中的 UPnP 自动映射功能。&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;由于各路由器的设置不尽相同，您需要知道您的路由器型号，在网上搜索具体的设置说明。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;如果这些都不管用，不必担心，RetroShare 仍能正常工作。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>高级:打开防火端口</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;是否在初次使用 RetroShare 时遇到问题? &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) 请查看 FAQ Wiki。虽然其中内容略显陈旧，但我们正在努力更新。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) 查看在线论坛。提出问题并讨论程序功能。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) 尝试 RetroShare 内的论坛功能&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- 这些论坛将在您与好友建立连接后上线。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) 如果您仍有困难，请电邮联系我们。&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation>连接到好友</translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>高级:打开防火端口</translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation>更多帮助与支持</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation>访问 RS 网站</translation>
     </message>
@@ -8136,7 +7479,7 @@ p, li { white-space: pre-wrap; }
         <translation>反馈电邮</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare 邀请</translation>
     </message>
@@ -8186,12 +7529,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare 反馈</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation>RetroShare 支持</translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>他拥有多种功能，包括内置的聊天，传信等。</translation>
     </message>
@@ -8315,7 +7658,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation>显示群组聊天</translation>
     </message>
@@ -8323,7 +7666,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation>[未知]</translation>
     </message>
@@ -8489,19 +7832,11 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>您可以通过与他们分享让您的好友知道您的论坛。 选择您要与之共享论坛的好友。</translation>
     </message>
-    <message>
-        <source>Share topic admin permissions</source>
-        <translation type="vanished">共享话题的管理权限</translation>
-    </message>
-    <message>
-        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
-        <translation type="vanished">您可以允许您的好友编辑主题。 在下面的列表中选择它们。 注意：无法撤销发布的管理员权限。</translation>
-    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>标题</translation>
     </message>
@@ -8514,12 +7849,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8544,31 +7879,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort Descending Order</source>
-        <translation type="vanished">按降序排列</translation>
-    </message>
-    <message>
-        <source>Sort Ascending Order</source>
-        <translation type="vanished">按升序排列</translation>
-    </message>
-    <message>
-        <source>Sort by Name</source>
-        <translation type="vanished">按名称排序</translation>
-    </message>
-    <message>
-        <source>Sort by Popularity</source>
-        <translation type="vanished">按活跃度排序</translation>
-    </message>
-    <message>
-        <source>Sort by Last Post</source>
-        <translation type="vanished">按新贴文排序</translation>
-    </message>
-    <message>
-        <source>Sort by Unread</source>
-        <translation type="vanished">按未读信息分类</translation>
-    </message>
-    <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>你是管理员(修改名字和描述请用编辑菜单)</translation>
     </message>
@@ -8583,14 +7894,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>最新贴文</translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -8601,17 +7912,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">活跃度</translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>从不</translation>
     </message>
     <message>
-        <source>Display</source>
-        <translation type="vanished">显示</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8624,7 +7931,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation>与</translation>
     </message>
@@ -8760,7 +8067,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>频道</translation>
@@ -8771,26 +8078,22 @@ p, li { white-space: pre-wrap; }
         <translation>创建频道</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation>启用自动下载</translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation>我的频道</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;频道&lt;/h1&gt;        &lt;p&gt; 频道里你可以推送 (比如电影, 音乐) ，这些会传输到网络的各处&lt;/p&gt;                &lt;p&gt;您可以看到您的好友订阅的频道，并自动将订阅频道转发给您的好友。这促进了网络中的良好沟通。&lt;/p&gt;    &lt;p&gt;只有频道的创建者可以在该频道上发布。 网络中的其他对等体只能从其中读取，除非该信道是私有的。然而，您可以 	 与好友的RetroShare节点共享发布权限或阅读权限。&lt;/p&gt;	 &lt;p&gt; 频道也能设置为匿名的，或附加到RetroShare身份，	以便读者可以在需要时联系您。&lt;/p&gt;    &lt;p&gt; 频道推送能保存 %1 days, 能同步%2天以内的消息，除非你修改了这个。&lt;/p&gt;                </translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation>订阅的频道</translation>
     </message>
@@ -8810,12 +8113,12 @@ p, li { white-space: pre-wrap; }
         <translation>选择频道下载目录</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation>禁用自动下载</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation>设置下载目录</translation>
     </message>
@@ -8850,22 +8153,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished">播放</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation>打开文件夹</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -8885,17 +8188,17 @@ p, li { white-space: pre-wrap; }
         <translation>检查中</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>您确定要取消和删除这些文件吗?</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation>无法打开文件夹</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished">播放文件</translation>
     </message>
@@ -8905,37 +8208,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">文件位置 %1 不存在。</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">表单</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">文件名</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="vanished">大小</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">标题</translation>
-    </message>
-    <message>
-        <source>Published</source>
-        <translation type="vanished">已发布</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="vanished">状态</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation>新建频道</translation>
     </message>
@@ -8973,9 +8249,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
-        <translation>订阅频道</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8989,7 +8275,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -9004,7 +8290,7 @@ p, li { white-space: pre-wrap; }
         <translation>频道描述</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation>正在载入</translation>
     </message>
@@ -9019,8 +8305,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Channel</source>
-        <translation type="vanished">新频道</translation>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished">从不</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -9031,7 +8318,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation>新评论：</translation>
     </message>
@@ -9052,7 +8339,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
@@ -9108,28 +8395,24 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>文件</translation>
     </message>
-    <message>
-        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
-        <translation type="vanished">警告! 距离文件删除，您还有 %1 小时 %2 分，请考虑保存。</translation>
-    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>新</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation>评论***</translation>
     </message>
@@ -9144,21 +8427,17 @@ p, li { white-space: pre-wrap; }
         <translation>踩</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">正在载入</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9183,135 +8462,16 @@ p, li { white-space: pre-wrap; }
         <translation>播放影音</translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Post to Channel</source>
-        <translation type="vanished">发布至频道</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">正在载入</translation>
-    </message>
-    <message>
-        <source>Search channels</source>
-        <translation type="vanished">搜索频道</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">标题</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">搜索标题</translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="vanished">信息</translation>
-    </message>
-    <message>
-        <source>Search Message</source>
-        <translation type="vanished">搜索消息</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="vanished">文件名</translation>
-    </message>
-    <message>
-        <source>Search Filename</source>
-        <translation type="vanished">搜索文件名</translation>
-    </message>
-    <message>
-        <source>No Channel Selected</source>
-        <translation type="vanished">未选择频道! </translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation type="vanished">从不</translation>
-    </message>
-    <message>
-        <source>Public</source>
-        <translation type="vanished">公共</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle &quot;</source>
-        <translation type="vanished">仅限于圈子的成员</translation>
-    </message>
-    <message>
-        <source>Restricted to members of circle </source>
-        <translation type="vanished">仅限于圈子的成员</translation>
-    </message>
-    <message>
-        <source>Your eyes only</source>
-        <translation type="vanished">只有你能看见</translation>
-    </message>
-    <message>
-        <source>You and your friend nodes</source>
-        <translation type="vanished">你和你好友的节点</translation>
-    </message>
-    <message>
-        <source>Disable Auto-Download</source>
-        <translation type="vanished">禁用自动下载</translation>
-    </message>
-    <message>
-        <source>Enable Auto-Download</source>
-        <translation type="vanished">启用自动下载</translation>
-    </message>
-    <message>
-        <source>Show feeds</source>
-        <translation type="vanished">显示feeds</translation>
-    </message>
-    <message>
-        <source>Show files</source>
-        <translation type="vanished">显示文件</translation>
-    </message>
-    <message>
-        <source>Administrator:</source>
-        <translation type="vanished">管理员：</translation>
-    </message>
-    <message>
-        <source>Last Post:</source>
-        <translation type="vanished">最新贴文</translation>
-    </message>
-    <message>
-        <source>unknown</source>
-        <translation type="vanished">未知</translation>
-    </message>
-    <message>
-        <source>Distribution:</source>
-        <translation type="vanished">传播范围</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">订阅</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="vanished">文件</translation>
-    </message>
-    <message>
-        <source>Subscribers</source>
-        <translation type="vanished">订阅</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">描述： </translation>
-    </message>
-    <message>
-        <source>Posts (at neighbor nodes):</source>
-        <translation type="vanished">贴文(相邻节点)</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished">发布至频道</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9381,7 +8541,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -9417,7 +8577,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9432,13 +8592,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">订阅</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9453,7 +8613,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9468,7 +8628,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9528,12 +8688,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9590,17 +8760,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">仅限于圈子的成员&quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">仅限于圈子的成员 </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your eyes only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">只有你能看见 </translation>
     </message>
     <message>
         <location line="+2"/>
@@ -9608,12 +8778,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">你和你好友的节点</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished">已订阅</translation>
     </message>
@@ -9664,17 +8835,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -9789,7 +8960,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation>评论容器</translation>
     </message>
@@ -9802,7 +8973,7 @@ p, li { white-space: pre-wrap; }
         <translation>表格</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9832,7 +9003,7 @@ p, li { white-space: pre-wrap; }
         <translation>刷新</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>评论</translation>
@@ -9871,7 +9042,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation>回复评论</translation>
     </message>
@@ -9895,6 +9066,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>踩</translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9904,7 +9090,7 @@ p, li { white-space: pre-wrap; }
         <translation>发表评论</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -9933,26 +9119,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;评论&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Signed by</source>
-        <translation type="vanished">签名者</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9980,7 +9150,7 @@ before you can comment</source>
         <translation>评论前您需要先创建身份</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10022,14 +9192,6 @@ before you can comment</source>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add Forum Admins</source>
-        <translation type="vanished">添加论坛管理员</translation>
-    </message>
-    <message>
-        <source>Select Forum Admins</source>
-        <translation type="vanished">选择论坛管理员</translation>
-    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -10039,7 +9201,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation>订阅论坛</translation>
     </message>
@@ -10055,7 +9217,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -10075,8 +9237,9 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">正在载入</translation>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -10107,13 +9270,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation>主题:</translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation>退订论坛</translation>
     </message>
@@ -10124,7 +9287,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -10144,21 +9307,17 @@ before you can comment</source>
         <translation>回复</translation>
     </message>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">正在载入</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation>论坛feed</translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
@@ -10171,63 +9330,66 @@ before you can comment</source>
         <translation>表格</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>新建主题帖</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>搜索论坛</translation>
     </message>
     <message>
-        <source>Last Post</source>
-        <translation type="vanished">最新贴文</translation>
-    </message>
-    <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished">新帖子</translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation>话题视图</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation>普通视图</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>标题</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation>保存图像</translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation>正在载入</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10237,12 +9399,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation>回复贴文</translation>
     </message>
@@ -10266,10 +9423,6 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>下载全部文件</translation>
     </message>
-    <message>
-        <source>Next unread</source>
-        <translation type="vanished">下一条未读</translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -10286,35 +9439,23 @@ before you can comment</source>
         <translation>搜索作者</translation>
     </message>
     <message>
-        <source>Content</source>
-        <translation type="vanished">内容</translation>
-    </message>
-    <message>
-        <source>Search Content</source>
-        <translation type="vanished">搜索内容</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
-        <translation type="vanished">&lt;p&gt;订阅论坛将收集 	                                        您订阅的好友的 	                                        可用帖子。&lt;/p&gt;&lt;p&gt;之后，您可以从左侧的论坛列表的上下文菜单中取消订阅。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>未命名</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation>回复</translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10357,20 +9498,12 @@ before you can comment</source>
         <translation>复制 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">展开</translation>
-    </message>
-    <message>
-        <source>[Banned]</source>
-        <translation type="vanished">[被屏蔽的]</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation>[未知]</translation>
     </message>
@@ -10400,8 +9533,8 @@ before you can comment</source>
         <translation>只有你能看见 </translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation>传播范围</translation>
     </message>
@@ -10415,26 +9548,6 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation>反垃圾</translation>
     </message>
-    <message>
-        <source>[ ... Redacted message ... ]</source>
-        <translation type="vanished">[ ... 丢失消息 ... ]</translation>
-    </message>
-    <message>
-        <source>Anonymous</source>
-        <translation type="vanished">匿名</translation>
-    </message>
-    <message>
-        <source>signed</source>
-        <translation type="vanished">已签名</translation>
-    </message>
-    <message>
-        <source>none</source>
-        <translation type="vanished">无</translation>
-    </message>
-    <message>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="vanished">[ ... 丢失消息 ... ]</translation>
-    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -10504,16 +9617,12 @@ before you can comment</source>
         <translation>原始贴文</translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Read status</source>
-        <translation type="vanished">读取状态</translation>
-    </message>
-    <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">编辑</translation>
     </message>
@@ -10574,7 +9683,7 @@ before you can comment</source>
         <translation>作者的信誉</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10594,7 +9703,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>如果匿名账户/未知节点评分是正的，允许发帖</translation>
     </message>
@@ -10646,7 +9755,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10656,7 +9765,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10671,28 +9780,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information for this identity is currently missing.</source>
-        <translation type="vanished">这个身份的信息现在丢失了</translation>
-    </message>
-    <message>
-        <source>You have banned this ID. The message will not be
-displayed nor forwarded to your friends.</source>
-        <translation type="vanished">您已屏蔽此ID。 该消息将不会显示，也不会转发给您的好友。</translation>
-    </message>
-    <message>
-        <source>You have not set an opinion for this person,
- and your friends do not vote positively: Spam regulation 
-prevents the message to be forwarded to your friends.</source>
-        <translation type="vanished">您未曾设置过对此人的评价，
-您的好友们也没有对此人有正面评判。
-防垃圾邮件规则阻止了向您的好友转发此消息。</translation>
-    </message>
-    <message>
-        <source>Message will be forwarded to your friends.</source>
-        <translation type="vanished">信息将被转发给你的好友</translation>
-    </message>
-    <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10701,10 +9789,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>(Old) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You cant act on the author to a non-existant Message</source>
-        <translation type="vanished">你不能对不存在的消息指定作者</translation>
-    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -10762,12 +9846,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;论坛&lt;/h1&gt;               			&lt;p&gt;RetroShare 论坛看起来像互联网论坛，但他们以分散的方式工作&lt;/p&gt;    			&lt;p&gt;您会看到您的好友订阅的论坛，并将订阅的论坛转发给      			你的好友。这将自动促进网络中有趣的论坛的发展。&lt;/p&gt;                        &lt;p&gt;论坛信息会保存%1 天并且会同步最后%2天的内容，除非你有另外的配置&lt;/p&gt;                </translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>论坛</translation>
@@ -10798,35 +9882,16 @@ prevents the message to be forwarded to your friends.</source>
         <translation>其他论坛</translation>
     </message>
 </context>
-<context>
-    <name>GxsForumsFillThread</name>
-    <message>
-        <source>Waiting</source>
-        <translation type="vanished">等待中</translation>
-    </message>
-    <message>
-        <source>Retrieving</source>
-        <translation type="vanished">正在获取</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">正在载入</translation>
-    </message>
-</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <source>Add Icon</source>
-        <translation type="vanished">添加图标</translation>
-    </message>
-    <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>密钥接收者可以在受限小组中发帖，可以在个人频道中发帖和浏览。</translation>
     </message>
@@ -10835,22 +9900,14 @@ prevents the message to be forwarded to your friends.</source>
         <source>Share Publish Key</source>
         <translation>分享发帖密钥</translation>
     </message>
-    <message>
-        <source>check peers you would like to share private publish key with</source>
-        <translation type="vanished">选择您希望与之共享个人发帖密钥的节点</translation>
-    </message>
-    <message>
-        <source>Share Key With</source>
-        <translation type="vanished">密钥共享给</translation>
-    </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation>传播范围</translation>
     </message>
@@ -10858,7 +9915,7 @@ prevents the message to be forwarded to your friends.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation>公开</translation>
     </message>
@@ -10877,14 +9934,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>New Thread</source>
         <translation>新帖子</translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="vanished">必需</translation>
-    </message>
-    <message>
-        <source>Encrypted Msgs</source>
-        <translation type="vanished">加密消息</translation>
-    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -10926,7 +9975,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>垃圾信息保护</translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation>评论:</translation>
     </message>
@@ -10949,7 +9998,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>反垃圾</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10965,12 +10014,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation>仅限于圈子</translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation>限于你的好友</translation>
     </message>
@@ -10987,23 +10036,23 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation>消息追踪</translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation>需要 PGP 签名</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation>从不</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation>仅分组中的好友节点</translation>
     </message>
@@ -11019,30 +10068,28 @@ prevents the message to be forwarded to your friends.</source>
         <translation>请添加名称</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation>需要已知ID的 PGP 签名</translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation>加载小组Logo</translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation>提交群组更改</translation>
     </message>
     <message>
-        <source>Failed to Prepare Group MetaData - please Review</source>
-        <translation type="vanished">群组元数据准备失败-请查阅</translation>
-    </message>
-    <message>
-        <source>Will be used to send feedback</source>
-        <translation type="vanished">将用于发送反馈 </translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation>拥有着:</translation>
     </message>
@@ -11052,12 +10099,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>在此设置描述性介绍</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -11067,7 +10114,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>最新贴文</translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11142,7 +10189,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>取消收藏来自未知节点的未签名ID</translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation>活跃度</translation>
     </message>
@@ -11158,27 +10210,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished">创建</translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>作者</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation>GXS ID 标签</translation>
     </message>
@@ -11186,7 +10233,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation>正在载入</translation>
     </message>
@@ -11246,7 +10293,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>编辑详情</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation>同步最后的贴文...</translation>
     </message>
@@ -11303,16 +10350,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share publish permissions</source>
-        <translation type="vanished">共享发布权限</translation>
-    </message>
-    <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation>复制 RetroShare 链接</translation>
     </message>
@@ -11335,7 +10378,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation>无签名</translation>
     </message>
@@ -11348,40 +10391,24 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <source>Loading</source>
-        <translation type="vanished">正在载入</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation>未找到</translation>
     </message>
-    <message>
-        <source>No Signature</source>
-        <translation type="vanished">无签名</translation>
-    </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation>[被屏蔽的] </translation>
     </message>
-    <message>
-        <source>Authentication</source>
-        <translation type="vanished">验证</translation>
-    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>未知密钥</translation>
     </message>
     <message>
-        <source>anonymous</source>
-        <translation type="vanished">匿名</translation>
-    </message>
-    <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11391,7 +10418,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>身份 名称</translation>
     </message>
@@ -11405,16 +10437,20 @@ prevents the message to be forwarded to your friends.</source>
         <source>Node</source>
         <translation type="unfinished">节点</translation>
     </message>
-    <message>
-        <source>Signed&amp;nbsp;by</source>
-        <translation type="vanished">签名者</translation>
-    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[未知]</translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -11426,7 +10462,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11474,17 +10510,13 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[未知]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">正在载入</translation>
-    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -11648,41 +10680,6 @@ prevents the message to be forwarded to your friends.</source>
         <translation>否</translation>
     </message>
 </context>
-<context>
-    <name>GxsTunnelsDialog</name>
-    <message>
-        <source>Authenticated tunnels:</source>
-        <translation type="vanished">已验证的路由</translation>
-    </message>
-    <message>
-        <source>Tunnel ID: %1</source>
-        <translation type="vanished">路由 ID:%1</translation>
-    </message>
-    <message>
-        <source>from: %1</source>
-        <translation type="vanished">来自: %1</translation>
-    </message>
-    <message>
-        <source>to: %1</source>
-        <translation type="vanished">到: %1</translation>
-    </message>
-    <message>
-        <source>status: %1</source>
-        <translation type="vanished">状态:%1</translation>
-    </message>
-    <message>
-        <source>total sent: %1 bytes</source>
-        <translation type="vanished">总共发送: 1% bytes</translation>
-    </message>
-    <message>
-        <source>total recv: %1 bytes</source>
-        <translation type="vanished">总共收到: 1% bytes</translation>
-    </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">未知节点</translation>
-    </message>
-</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -11895,48 +10892,12 @@ prevents the message to be forwarded to your friends.</source>
         <source>About</source>
         <translation>关于</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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare是一个开源跨平台，&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;私有安全的去中心化交流平台。	&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt; 通过他能安全地跟好友分享 , &lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt; 使用WOT认证节点和OpenSSL进行加密所有的通信。&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare提供文件分享, 聊天, 邮箱和频道&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; 更多信息请看外链:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;RetroShare 主页&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare 论坛&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; 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;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare 项目主页&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare 团队博客&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare 开发组Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+37"/>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -11952,7 +10913,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
@@ -11971,7 +10932,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11984,36 +10945,6 @@ p, li { white-space: pre-wrap; }
 &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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare 翻译:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare 网页翻译:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -12079,12 +11010,12 @@ p, li { white-space: pre-wrap; }
         <translation>表单</translation>
     </message>
     <message>
-        <location line="+121"/>
+        <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+158"/>
+        <location line="+165"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12099,7 +11030,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12108,32 +11039,12 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Did you receive a certificate from a friend?</source>
-        <translation type="vanished">你收到好友的证书了吗？</translation>
-    </message>
-    <message>
-        <source>Add friends certificate</source>
-        <translation type="vanished">添加好友证书</translation>
-    </message>
-    <message>
-        <source>Add certificate file</source>
-        <translation type="vanished">添加证书文件</translation>
-    </message>
-    <message>
-        <source>Share your RetroShare Key</source>
-        <translation type="vanished">分享你的RetroShare密钥</translation>
-    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
-        <translation type="vanished">下面的文本是你的 RetroShare 证书。把它发送给你的好友</translation>
-    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -12144,16 +11055,12 @@ private and secure decentralized communication platform.
 </translation>
     </message>
     <message>
-        <source>Launch startup wizard</source>
-        <translation type="vanished">初次使用向导</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+134"/>
         <source>Open Web Help</source>
         <translation>打开网络帮助</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>复制您的证书到剪贴板</translation>
     </message>
@@ -12163,7 +11070,7 @@ private and secure decentralized communication platform.
         <translation>保存您的证书至文件</translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation>通过邮件发送</translation>
     </message>
@@ -12183,13 +11090,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12201,17 +11132,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+57"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12225,10 +11151,6 @@ new short format</source>
         <source>RetroShare Invite</source>
         <translation>RetroShare邀请</translation>
     </message>
-    <message>
-        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation type="vanished">您的证书已复到剪切板，请将其通过邮件或其他方式粘贴发送给您的好友</translation>
-    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -12500,14 +11422,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation>信誉</translation>
     </message>
@@ -12517,12 +11439,12 @@ p, li { white-space: pre-wrap; }
         <translation>搜索 </translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation>匿名 ID</translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation>新建身份</translation>
     </message>
@@ -12532,7 +11454,7 @@ p, li { white-space: pre-wrap; }
         <translation>新建圈子</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation>个人</translation>
     </message>
@@ -12547,27 +11469,27 @@ p, li { white-space: pre-wrap; }
         <translation>人物</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation>屏蔽选项</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>自动屏蔽掉这个节点签名过的身份</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation>好友点赞</translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation>正面的投票</translation>
     </message>
@@ -12583,29 +11505,39 @@ p, li { white-space: pre-wrap; }
         <translation>负面的投票</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation>使用统计 </translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>圈子</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation>圈子名称</translation>
     </message>
@@ -12625,18 +11557,20 @@ p, li { white-space: pre-wrap; }
         <translation>私人圈子</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>编辑身份</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation>删除身份</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation>与此节点聊天</translation>
     </message>
@@ -12646,78 +11580,78 @@ p, li { white-space: pre-wrap; }
         <translation>跟这个节点开启一个远程聊天</translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation>所有者节点名称：</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation>身份名称</translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation>() </translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation>身份ID</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation>发送消息</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation>身份信息</translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation>身份 ID：</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation>所有者节点名称：</translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation>创建新的...</translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>类型:</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation>发送邀请</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;关于这个身份，相邻节点的综合评价。 负的是差的，&lt;/p&gt;&lt;p&gt; 正的是好的，零是中立的&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation>你的评价</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation>负面的</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation>中立的</translation>
     </message>
@@ -12728,17 +11662,17 @@ p, li { white-space: pre-wrap; }
         <translation>正面的</translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;总体信誉得分，源于你和你的好友&lt;/p&gt;&lt;p&gt; 负的是差的，正的是好的，零是中立的，如果分数太低&lt;/p&gt;&lt;p&gt;这个身份就被标记为差的 , 会被论坛，聊天室频道等&lt;/p&gt;&lt;p&gt;过滤。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation>总体: </translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation>匿名</translation>
     </message>
@@ -12753,24 +11687,24 @@ p, li { white-space: pre-wrap; }
         <translation>搜索 ID</translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation>这个身份被你是拥有者</translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation>我所拥有的身份</translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation>我的通讯录</translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation>显示项目</translation>
     </message>
@@ -12785,7 +11719,12 @@ p, li { white-space: pre-wrap; }
         <translation>链接到我的节点</translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation>其他圈子</translation>
     </message>
@@ -12795,7 +11734,7 @@ p, li { white-space: pre-wrap; }
         <translation>我加入的圈子</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation>圈子ID</translation>
     </message>
@@ -12870,7 +11809,7 @@ p, li { white-space: pre-wrap; }
         <translation>不是会员(无权访问此圈子的数据)</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation>身份 ID ：</translation>
     </message>
@@ -12900,7 +11839,7 @@ p, li { white-space: pre-wrap; }
         <translation>未知</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation>被邀请</translation>
     </message>
@@ -12915,7 +11854,7 @@ p, li { white-space: pre-wrap; }
         <translation>成员</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation>编辑圈子</translation>
     </message>
@@ -12963,7 +11902,7 @@ p, li { white-space: pre-wrap; }
         <translation>授予会员资格 </translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -12974,7 +11913,7 @@ These identities will soon be not supported anymore.</source>
 此种身份将很快不再被支持。</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[未知节点]</translation>
@@ -13017,7 +11956,7 @@ These identities will soon be not supported anymore.</source>
         <translation>匿名身份</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13097,7 +12036,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13113,25 +12052,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">发送邀请？</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">你真的要以你的证书发送邀请吗 </translation>
-    </message>
-    <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation>已屏蔽</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;身份&lt;/h1&gt;    			&lt;p&gt;身份在此选项卡中，你可以创建/编辑伪匿名身份&lt;b&gt;, 和&lt;b&gt;圈子&lt;/b&gt;。&lt;/b&gt;                			&lt;p&gt;身份&lt;b&gt; 身份用于安全地识别你的数据：为聊天室，论坛和频道文章中的消息签名，				使用 RetroShare 内置电子邮件系统接收反馈，在频道发布文章后				发表评论，使用安全隧道聊天等。&lt;/p&gt; 			&lt;p&gt;身份可任意由&lt;b&gt;你 RetroShare 节点的证书&lt;/b&gt;签名。 			签名的身份更容易信任，但很容易链接到你节点的 IP 地址。&lt;/b&gt;  			&lt;p&gt;&lt;b&gt;匿名身份&lt;/b&gt;允许您与其他用户匿名交互。 他们不能			被欺骗，但是没有人可以证明谁真正拥有一个特定的身份。&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;圈子&lt;/b&gt;是通过网络远程共享的身份(匿名或签名)组，它们可                 		用于限制论坛，频道等的可见性等&lt;p&gt;。&lt;/p&gt;                     一个&lt;b&gt;圈子&lt;/b&gt;可以受限于另一个圈子，从而限制它对该圈子成员的可见性，甚至限制圈子本身的可见性，这意味着只有被邀请的成员可以看到。</translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation>正面的</translation>
     </message>
@@ -13175,19 +12101,11 @@ These identities will soon be not supported anymore.</source>
         <source>Forums</source>
         <translation>论坛</translation>
     </message>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">已发表</translation>
-    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="vanished">未知</translation>
-    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -13208,14 +12126,6 @@ These identities will soon be not supported anymore.</source>
         <source>Creation of author signature in service %1</source>
         <translation>使用中的作者签名%1</translation>
     </message>
-    <message>
-        <source>Message/vote/comment</source>
-        <translation type="vanished">信息/点赞/评论</translation>
-    </message>
-    <message>
-        <source>%1 in %2 tab</source>
-        <translation type="vanished">%1 在 %2 标签页</translation>
-    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -13236,19 +12146,11 @@ These identities will soon be not supported anymore.</source>
         <source>Signature in distant tunnel system.</source>
         <translation>在远程隧道系统中的签名</translation>
     </message>
-    <message>
-        <source>Update of identity data.</source>
-        <translation type="vanished">更新身份数据。</translation>
-    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>通用签名验证。</translation>
     </message>
-    <message>
-        <source>Generic signature.</source>
-        <translation type="vanished">通用签名。</translation>
-    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -13260,11 +12162,7 @@ These identities will soon be not supported anymore.</source>
         <translation>通用解密。</translation>
     </message>
     <message>
-        <source>Membership verification in circle %1.</source>
-        <translation type="vanished">圈子%1中的成员验证。</translation>
-    </message>
-    <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation>添加到通讯录</translation>
     </message>
@@ -13314,21 +12212,21 @@ These identities will soon be not supported anymore.</source>
         <translation>你好，&lt;br&gt;我想与你成为 RetroShare 上的好友。&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>人物</translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>你的头像</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation>链接到相邻节点</translation>
     </message>
@@ -13338,7 +12236,7 @@ These identities will soon be not supported anymore.</source>
         <translation>链接到远程节点</translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>链接到好友的RetroShare节点</translation>
     </message>
@@ -13353,7 +12251,7 @@ These identities will soon be not supported anymore.</source>
         <translation>链接到未知RetroShare节点</translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation>与此人聊天</translation>
     </message>
@@ -13368,12 +12266,12 @@ These identities will soon be not supported anymore.</source>
         <translation>远程聊天拒绝此人</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation>上次使用</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation>+50 已知 PGP</translation>
     </message>
@@ -13393,12 +12291,12 @@ These identities will soon be not supported anymore.</source>
         <translation>你真的要删除这个身份吗？</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation>拥有者</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation>节点名称：</translation>
     </message>
@@ -13408,7 +12306,7 @@ These identities will soon be not supported anymore.</source>
         <translation>节点Id：</translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation>真的要删除？</translation>
     </message>
@@ -13416,7 +12314,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation>昵称</translation>
     </message>
@@ -13446,7 +12344,7 @@ These identities will soon be not supported anymore.</source>
         <translation>笔名</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13456,12 +12354,19 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <location line="-34"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="-100"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation>新建身份</translation>
     </message>
@@ -13475,7 +12380,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -13485,7 +12390,12 @@ These identities will soon be not supported anymore.</source>
         <translation>不适用</translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>编辑身份</translation>
@@ -13496,27 +12406,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">更新</translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13536,7 +12446,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13546,11 +12456,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting key!</source>
-        <translation type="vanished">错误：密钥获取出错! </translation>
-    </message>
-    <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation>错误：密钥ID无效</translation>
     </message>
@@ -13565,7 +12471,7 @@ These identities will soon be not supported anymore.</source>
         <translation>未知真实姓名***</translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation>创建新身份</translation>
     </message>
@@ -13575,10 +12481,15 @@ These identities will soon be not supported anymore.</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">删除</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -13604,7 +12515,7 @@ These identities will soon be not supported anymore.</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished">创建</translation>
     </message>
@@ -13614,17 +12525,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>你的头像</translation>
     </message>
     <message>
-        <source>Set Avatar</source>
-        <translation type="vanished">设置头像</translation>
-    </message>
-    <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation>链接到你的用户档案</translation>
     </message>
@@ -13634,7 +12541,7 @@ These identities will soon be not supported anymore.</source>
         <translation>您可以拥有一个或多个身份。 当您在聊天大厅，论坛和频道中撰写评论时，会使用它们。 它们作为远程聊天和RetroShare远程邮件系统的接收地址。</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>63/5000
 昵称太短。 请输入至少%1个字符。</translation>
@@ -13694,10 +12601,6 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>PGP 用户名</translation>
     </message>
-    <message>
-        <source>GXS id:</source>
-        <translation type="vanished">GXS ID:</translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -13713,7 +12616,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
@@ -13723,12 +12626,12 @@ These identities will soon be not supported anymore.</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation>标记全部</translation>
     </message>
@@ -13747,26 +12650,38 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">引用</translation>
     </message>
-    <message>
-        <source>Send</source>
-        <translation type="vanished">发送</translation>
-    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation>保存图像</translation>
     </message>
     <message>
         <location line="-7"/>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>无法保存图片，无效的文件名</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation>不是一张图片</translation>
     </message>
@@ -13784,27 +12699,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished">端口:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished">状态:</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13825,7 +12745,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -13834,26 +12759,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation>打开文件</translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation>打开文件夹</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation>正在校验...</translation>
     </message>
@@ -13863,7 +12793,7 @@ These identities will soon be not supported anymore.</source>
         <translation>校验文件</translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13891,7 +12821,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation>添加好友</translation>
     </message>
@@ -13907,7 +12837,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>选项</translation>
     </message>
@@ -13928,7 +12859,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation>退出</translation>
     </message>
@@ -13939,12 +12870,12 @@ These identities will soon be not supported anymore.</source>
         <translation>快速入门向导</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 ― 一个分布式安全通信平台</translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation>未完成</translation>
     </message>
@@ -13973,11 +12904,12 @@ RetroShare 将暂停对此目录的访问。
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation>状态</translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation>提示</translation>
     </message>
@@ -13988,31 +12920,35 @@ RetroShare 将暂停对此目录的访问。
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation>打开邮件箱</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation>带宽图</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation>应用</translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation>最小化</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation>最大化</translation>
     </message>
@@ -14027,7 +12963,12 @@ RetroShare 将暂停对此目录的访问。
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation>%1 条新消息</translation>
     </message>
@@ -14057,7 +12998,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>%1 个好友已连接</translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>您确定要退出 RetroShare 吗?</translation>
     </message>
@@ -14077,7 +13018,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>显示</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>请确认此连接不是伪造，不是指向恶意网站。</translation>
     </message>
@@ -14122,12 +13063,13 @@ RetroShare 将暂停对此目录的访问。
         <translation>服务权限列表</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation>统计</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation>显示 Web 界面</translation>
     </message>
@@ -14142,7 +13084,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>目录运行很慢(现在的限制是</translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation>真的要退出吗？</translation>
     </message>
@@ -14151,17 +13093,17 @@ RetroShare 将暂停对此目录的访问。
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation>写信</translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation>联系人</translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation>段落</translation>
     </message>
@@ -14197,12 +13139,12 @@ RetroShare 将暂停对此目录的访问。
         <translation>六级标题</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation>字体大小</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation>增大字号</translation>
     </message>
@@ -14217,32 +13159,32 @@ RetroShare 将暂停对此目录的访问。
         <translation>粗体</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation>斜体</translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation>对齐方式</translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation>添加图片</translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation>设置文本为代码样式</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation>下划线</translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation>主题:</translation>
     </message>
@@ -14253,32 +13195,32 @@ RetroShare 将暂停对此目录的访问。
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation>标签</translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation>地址列表：</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation>推荐这个好友</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation>设置文本颜色</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation>设置文本背景颜色</translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation>推荐文件</translation>
     </message>
@@ -14348,7 +13290,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>添加大段引用</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation>发送至:</translation>
     </message>
@@ -14372,10 +13314,6 @@ RetroShare 将暂停对此目录的访问。
         <source>&amp;Justify</source>
         <translation>&amp;两端对齐</translation>
     </message>
-    <message>
-        <source>All addresses (mixed)</source>
-        <translation type="vanished">所有地址(混合)</translation>
-    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -14387,7 +13325,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>我的通讯录</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+309"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>你好,&lt;br&gt;我向你推荐我的一个好友；如果你信任我，也可以信任他们。&lt;br&gt;</translation>
     </message>
@@ -14407,18 +13345,18 @@ RetroShare 将暂停对此目录的访问。
         <translation>希望与您在 RetroShare 上成为好友</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>你好 %1,&lt;br&gt;&lt;br&gt;%2 希望加你为 RetroShare 好友。&lt;br&gt;&lt;br&gt;立即回应:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;谢谢,&lt;br&gt; RetroShare 软件小组</translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation>保存邮件</translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>邮件未发送。
@@ -14430,7 +13368,17 @@ Do you want to save message to draft box?</source>
         <translation>粘贴 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation>添加至&quot;收件人&quot;</translation>
     </message>
@@ -14450,7 +13398,7 @@ Do you want to save message to draft box?</source>
         <translation>添加为推荐</translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation>原始消息</translation>
     </message>
@@ -14460,21 +13408,21 @@ Do you want to save message to draft box?</source>
         <translation>发件人</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation>收件人</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation>抄送</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation>已发送</translation>
     </message>
@@ -14489,7 +13437,7 @@ Do you want to save message to draft box?</source>
         <translation>%1, %2 写道:</translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation>回复:</translation>
     </message>
@@ -14499,30 +13447,30 @@ Do you want to save message to draft box?</source>
         <translation>转发:</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>您确定要发送无主题的邮件吗?</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation>请输入至少一个收件人。</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation>密送</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -14637,13 +13585,13 @@ Do you want to save message to draft box?</source>
         <translation>详情</translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation>打开文件...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML 文件 (*.htm *.html);;所有文件 (*)</translation>
     </message>
@@ -14663,7 +13611,7 @@ Do you want to save message to draft box?</source>
         <translation>导出 PDF</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>邮件未发送。
@@ -14685,7 +13633,7 @@ Do you want to save message ?</source>
         <translation>添加额外文件</translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>你好，&lt;br&gt;我想与你成为 RetroShare 上的好友。&lt;br&gt;</translation>
     </message>
@@ -14709,28 +13657,24 @@ Do you want to save message ?</source>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have a friend invite</source>
-        <translation type="vanished">您有一条好友推荐</translation>
-    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>现在回应:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>发件人:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
         <source>Friend Nodes</source>
         <translation>好友节点</translation>
     </message>
@@ -14775,13 +13719,13 @@ Do you want to save message ?</source>
         <translation>排序(拉丁字母倒序)</translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>感谢, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation>远程身份</translation>
     </message>
@@ -14791,12 +13735,12 @@ Do you want to save message ?</source>
         <translation>[丢失]</translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>请创建一个身份以签署远程信息，或从目标列表中删除远处的节点。</translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation>节点名和id:</translation>
     </message>
@@ -14874,7 +13818,7 @@ Do you want to save message ?</source>
         <translation>默认</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation>新标签</translation>
     </message>
@@ -14884,7 +13828,7 @@ Do you want to save message ?</source>
         <translation>新窗口</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation>标记标签</translation>
     </message>
@@ -14907,7 +13851,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation>主题:</translation>
     </message>
@@ -14915,7 +13859,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation>邮件</translation>
     </message>
@@ -14943,7 +13887,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation>推荐的文件</translation>
     </message>
@@ -14953,37 +13897,37 @@ Do you want to save message ?</source>
         <translation>下载所有推荐文件</translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation>主题:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>发件人:</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>收件人:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation>抄送:</translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation>密送:</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation>标签:</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished">回复</translation>
     </message>
@@ -15005,7 +13949,7 @@ Do you want to save message ?</source>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">前进</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -15023,7 +13967,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation>发送邀请</translation>
     </message>
@@ -15075,7 +14019,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation>确认 %1 为好友</translation>
     </message>
@@ -15085,12 +14029,12 @@ Do you want to save message ?</source>
         <translation>添加 %1 为好友</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation>无主题</translation>
     </message>
@@ -15100,17 +14044,22 @@ Do you want to save message ?</source>
         <translation>下载</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15120,21 +14069,23 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Send invite?</source>
-        <translation type="vanished">发送邀请？</translation>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">你真的要以你的证书发送邀请吗 </translation>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation>下载全部</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation>打印文档</translation>
     </message>
@@ -15149,12 +14100,12 @@ Do you want to save message ?</source>
         <translation>HTML 文件 (*.htm *.html);;所有文件 (*)</translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation>此消息总是载入图像</translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation>隐藏附件窗格 </translation>
     </message>
@@ -15176,42 +14127,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>写信</translation>
     </message>
-    <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">回复选中的邮件</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">回复</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">回复所选邮件给其中的所有人</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">回复全部</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">转发所选邮件</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="vanished">转发</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">删除所选邮件</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">删除</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">打印所选邮件</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -15290,7 +14205,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation>新信息</translation>
     </message>
@@ -15300,60 +14215,16 @@ Do you want to save message ?</source>
         <translation>写信</translation>
     </message>
     <message>
-        <source>Reply to selected message</source>
-        <translation type="vanished">回复所选邮件</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="vanished">回复</translation>
-    </message>
-    <message>
-        <source>Reply all to selected message</source>
-        <translation type="vanished">向选中邮件中的所有人回复邮件</translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="vanished">回复全部</translation>
-    </message>
-    <message>
-        <source>Forward selected message</source>
-        <translation type="vanished">转发所选信息</translation>
-    </message>
-    <message>
-        <source>Foward</source>
-        <translation type="vanished">转发</translation>
-    </message>
-    <message>
-        <source>Remove selected message</source>
-        <translation type="vanished">删除所选消息</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">删除</translation>
-    </message>
-    <message>
-        <source>Print selected message</source>
-        <translation type="vanished">打印所选邮件</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="vanished">打印</translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="vanished">显示</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation>标签</translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>收件箱</translation>
@@ -15383,21 +14254,17 @@ Do you want to save message ?</source>
         <translation>回收站</translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation>收件箱总数:</translation>
     </message>
     <message>
-        <source>Folders</source>
-        <translation type="vanished">文件夹</translation>
-    </message>
-    <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation>快捷视图</translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>打印...</translation>
@@ -15407,26 +14274,6 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>打印预览</translation>
     </message>
-    <message>
-        <source>Buttons Icon Only</source>
-        <translation type="vanished">按钮显示图标</translation>
-    </message>
-    <message>
-        <source>Buttons Text Beside Icon</source>
-        <translation type="vanished">按钮显示文本和图标</translation>
-    </message>
-    <message>
-        <source>Buttons with Text</source>
-        <translation type="vanished">按钮显示文本</translation>
-    </message>
-    <message>
-        <source>Buttons Text Under Icon</source>
-        <translation type="vanished">按钮文本位于图标下方</translation>
-    </message>
-    <message>
-        <source>Set Text Under Icon</source>
-        <translation type="vanished">文本放置于图标下方</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -15448,7 +14295,7 @@ Do you want to save message ?</source>
         <translation>转发信件</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation>主题</translation>
     </message>
@@ -15458,7 +14305,7 @@ Do you want to save message ?</source>
         <translation>发件人</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
@@ -15468,39 +14315,7 @@ Do you want to save message ?</source>
         <translation>内容</translation>
     </message>
     <message>
-        <source>Click to sort by attachments</source>
-        <translation type="vanished">点击按附件排序</translation>
-    </message>
-    <message>
-        <source>Click to sort by subject</source>
-        <translation type="vanished">点击按主题排序</translation>
-    </message>
-    <message>
-        <source>Click to sort by read</source>
-        <translation type="vanished">点击按已读排序</translation>
-    </message>
-    <message>
-        <source>Click to sort by from</source>
-        <translation type="vanished">点击按发件人排序</translation>
-    </message>
-    <message>
-        <source>Click to sort by date</source>
-        <translation type="vanished">点击按日期排序</translation>
-    </message>
-    <message>
-        <source>Click to sort by tags</source>
-        <translation type="vanished">点击按标签排序</translation>
-    </message>
-    <message>
-        <source>Click to sort by star</source>
-        <translation type="vanished">点击按星标排序</translation>
-    </message>
-    <message>
-        <source>Forward selected Message</source>
-        <translation type="vanished">转发所选邮件</translation>
-    </message>
-    <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation>搜索主题</translation>
     </message>
@@ -15509,6 +14324,11 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>搜索发件人</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -15535,14 +14355,14 @@ Do you want to save message ?</source>
         <translation>搜索附件</translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
-        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;邮件&lt;/h1&gt;                          &lt;p&gt; RetroShare 有自己的内部邮件系统。你可以通过连接的好友节点发送/接收电子邮件。&lt;/p&gt;  &lt;p&gt;也可以使用全球路由系统向其他人的身份发送消息。 这些消息始终被加密和签名，并由中间节点中继，直到它们到达其最终目的地。 &lt;/p&gt;    &lt;p&gt;远程消息保留在发件箱中，直到收到确认。&lt;/p&gt; &lt;p&gt;通常，你可以使用邮件通过粘贴文件链接向好友推荐文件，或者将好友节点推荐给其他的好友节点，来加强你的网络，或向频道所有者发送反馈。&lt;/p&gt;                    </translation>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
-        <translation>加星</translation>
+        <location line="+249"/>
+        <source>Stared</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -15616,7 +14436,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -15630,7 +14450,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15645,38 +14465,33 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>草稿箱</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="vanished">暂无加星邮件。加星令邮件更容易。为邮件加星标，请点击邮件旁的灰色星标。</translation>
-    </message>
-    <message>
-        <source>No system messages available.</source>
-        <translation type="vanished">无系统消息。</translation>
-    </message>
-    <message>
+        <location line="-1463"/>
         <source>To</source>
-        <translation type="vanished">收件人</translation>
+        <translation>收件人</translation>
     </message>
     <message>
-        <source>Click to sort by to</source>
-        <translation type="vanished">点击按收件人排序</translation>
-    </message>
-    <message>
-        <source>This message goes to a distant person.</source>
-        <translation type="vanished">这条消息发送到了远程用户</translation>
-    </message>
-    <message>
-        <location line="-302"/>
+        <location line="+1160"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -15684,26 +14499,6 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>总计:</translation>
     </message>
-    <message>
-        <source>Messages</source>
-        <translation type="vanished">邮件</translation>
-    </message>
-    <message>
-        <source>Click to sort by signature</source>
-        <translation type="vanished">点击按签名排序</translation>
-    </message>
-    <message>
-        <source>This message was signed and the signature checks</source>
-        <translation type="vanished">此信息已签名，且签名已检查 </translation>
-    </message>
-    <message>
-        <source>This message was signed but the signature doesn&apos;t check</source>
-        <translation type="vanished">此信息已签名，但签名未检查 </translation>
-    </message>
-    <message>
-        <source>This message comes from a distant person.</source>
-        <translation type="vanished">这条消息来自于远程用户</translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -15731,7 +14526,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished">保存图像</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation>粘贴纯文本</translation>
     </message>
@@ -15785,7 +14590,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -15795,7 +14600,7 @@ Do you want to save message ?</source>
         <translation>删除项目</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation>来自</translation>
     </message>
@@ -15830,18 +14635,10 @@ Do you want to save message ?</source>
         <translation>待发送消息</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
-    <message>
-        <source>Send invite?</source>
-        <translation type="vanished">发送邀请？</translation>
-    </message>
-    <message>
-        <source>Do you really want send a invite with your Certificate?</source>
-        <translation type="vanished">你真的要以你的证书发送邀请吗</translation>
-    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -15979,7 +14776,7 @@ Do you want to save message ?</source>
         <translation>节点 ID</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation>移除未使用的密钥...</translation>
     </message>
@@ -15989,7 +14786,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation>清理钥匙环</translation>
     </message>
@@ -16007,7 +14804,13 @@ Notes: Your old keyring will be backed up.
 如果您在同一台电脑上同时运行多个RS实例，清理操作会失败。</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>钥匙环信息</translation>
@@ -16042,18 +14845,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>钥匙环中的数据不一致。可能是程序错误。请联系开发人员。</translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation>导出或者新建节点</translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>仅信任的节点</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation>搜索名称</translation>
     </message>
@@ -16063,12 +14861,12 @@ For security, your keyring was previously backed-up to file
         <translation>搜索节点 ID</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation>用户详情</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -16077,13 +14875,6 @@ Reported error:</source>
 报告错误：</translation>
     </message>
 </context>
-<context>
-    <name>NetworkPage</name>
-    <message>
-        <source>Network</source>
-        <translation type="vanished">网络</translation>
-    </message>
-</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -16110,7 +14901,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16131,7 +14922,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished">分组</translation>
     </message>
@@ -16161,19 +14952,19 @@ Reported error:</source>
         <translation type="unfinished">导出你的好友列表包括分组</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished">搜索 ID</translation>
     </message>
@@ -16183,12 +14974,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished">显示项目</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16198,7 +14989,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished">分组</translation>
     </message>
@@ -16313,7 +15104,7 @@ Reported error:</source>
         <translation type="unfinished">全部折叠</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">你想移除这个节点吗</translation>
     </message>
@@ -16323,7 +15114,7 @@ Reported error:</source>
         <translation type="unfinished">您是否要删除此好友?</translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">完成！</translation>
@@ -16435,11 +15226,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <source>Log entries</source>
-        <translation type="vanished">日志条目</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16454,11 +15241,7 @@ at least one peer was not added to a group</source>
         <translation>删除全部</translation>
     </message>
     <message>
-        <source>This is a test.</source>
-        <translation type="vanished">这是一个测试。</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation>新的在上面</translation>
     </message>
@@ -16468,27 +15251,12 @@ at least one peer was not added to a group</source>
         <translation>旧的在上面</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;事件中心&lt;/h1&gt;
-&lt;p&gt;事件中心显示网络上最近的事件，按您收到的时间排序。
-它为您提供了一份好友活动摘要。您可以点击&lt;b&gt;选项&lt;/b&gt;设置要显示的事件。&lt;/p&gt;
-&lt;p&gt;可显示的各种事件包括：
-&lt;ul&gt;&lt;li&gt;连接尝试(有助于结识新朋友，控制与您的连接)&lt;/li&gt;
-&lt;li&gt;频道/论坛消息&lt;/li&gt;
-&lt;li&gt;可订阅的新频道/论坛&lt;/li&gt;
-&lt;li&gt;好友发送的私人消息&lt;/li&gt;&lt;/ul&gt; &lt;/p&gt;                                                                                                       </translation>
-    </message>
-    <message>
-        <source>Log</source>
-        <translation type="vanished">日志</translation>
-    </message>
-    <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16543,10 +15311,6 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>博客</translation>
     </message>
-    <message>
-        <source>Security</source>
-        <translation type="vanished">安全</translation>
-    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -16568,10 +15332,6 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>邮件</translation>
     </message>
-    <message>
-        <source>Connect attempt</source>
-        <translation type="vanished">连接尝试</translation>
-    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -16588,10 +15348,6 @@ at least one peer was not added to a group</source>
         <source>Ip security</source>
         <translation>IP安全</translation>
     </message>
-    <message>
-        <source>Log</source>
-        <translation type="obsolete">日志</translation>
-    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -16602,10 +15358,6 @@ at least one peer was not added to a group</source>
         <source>Circles</source>
         <translation type="unfinished">圈子</translation>
     </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">链接</translation>
-    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -16658,14 +15410,6 @@ at least one peer was not added to a group</source>
         <source>Chat rooms</source>
         <translation>聊天室</translation>
     </message>
-    <message>
-        <source>Chat Rooms</source>
-        <translation type="vanished">聊天室</translation>
-    </message>
-    <message>
-        <source>Case sensitive</source>
-        <translation type="vanished">区分大小写</translation>
-    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -16741,24 +15485,16 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation>临时禁用所有弹出消息</translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">日志订阅</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>系统托盘</translation>
     </message>
-    <message>
-        <source>Count all unread messages</source>
-        <translation type="vanished">计数所有未读信息</translation>
-    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation>需要密码</translation>
     </message>
@@ -16778,12 +15514,12 @@ at least one peer was not added to a group</source>
         <translation>密码错误! </translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>请输入您的RetroShare密码</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation>未注册插件/可执行程序</translation>
     </message>
@@ -16798,19 +15534,7 @@ at least one peer was not added to a group</source>
         <translation>请检查您的系统时钟。</translation>
     </message>
     <message>
-        <source>Examining shared files...</source>
-        <translation type="vanished">正在检查共享文件...</translation>
-    </message>
-    <message>
-        <source>Hashing file</source>
-        <translation type="vanished">正在计算文件的校验散列值</translation>
-    </message>
-    <message>
-        <source>Saving file index...</source>
-        <translation type="vanished">正在保存文件索引...</translation>
-    </message>
-    <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>测试</translation>
     </message>
@@ -16821,17 +15545,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation>未知标题</translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>加密消息</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>为了正常使用聊天大厅，您的电脑时间一定要正确。如果出现下面状况请检查时间(侦测到您与好友之间可能存在几分钟的时间偏差)。</translation>
     </message>
@@ -16839,7 +15565,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation>好友在线</translation>
     </message>
@@ -16891,10 +15617,6 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>PGPKeyDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="vanished">对话</translation>
-    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -16960,10 +15682,6 @@ at least one peer was not added to a group</source>
         <source>This profile has signed your own profile key</source>
         <translation>节点是否对我的PGP密钥签名</translation>
     </message>
-    <message>
-        <source>Key signatures :</source>
-        <translation type="vanished">密钥签名。</translation>
-    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -16993,23 +15711,20 @@ p, li { white-space: pre-wrap; }
         <translation>PGP 密钥</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation>这些选项将应用到这个用户的所有节点</translation>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;签署好友的钥匙是表达你对这个好友，给你的其他好友的信任的一种方式。 它可以帮助他们决定是否允许基于您自己的信任的密钥进行连接。 签署密钥是绝对可选的，不能撤销，所以请做出明智的选择.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <location line="+6"/>
+        <source>These options apply to all nodes of the profile:</source>
+        <translation>这些选项将应用到这个用户的所有节点</translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Sign PGP key</source>
-        <translation type="vanished">签署PGP密钥</translation>
-    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17046,12 +15761,7 @@ p, li { white-space: pre-wrap; }
         <translation>包含签名</translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation>选项</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare会定期检查您的好友列表中的可浏览文件与您的传输匹配，以建立直接传输。 在这种情况下，您的好友知道您正在下载文件.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;要防止此行为（仅适用于此好友），请取消选中此框。 如果您明确要求，您仍然可以执行直接传输。 从你好友的文件列表下载。 此设置应用于同一节点的所有位置.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -17065,10 +15775,6 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;html&gt; &lt;head /&gt; &lt;body&gt; &lt;p&gt;此选项允许您自动下载来自此节点的消息中推荐的文件。 这可以用于例如在您自己的节点之间发送文件。 应用于同一节点的所有位置。&lt;/ p&gt; &lt;/ body&gt; &lt;/ html&gt;</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -17101,21 +15807,21 @@ p, li { white-space: pre-wrap; }
         <translation>kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>错误：无法获取节点详情。</translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>RetroShare 不支持此密钥算法
@@ -17136,7 +15842,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 警告:你在文件传输选项中关闭了直接下载。</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>信任级别是表达您对此密钥的信任的一种方式。 它不被软件使用，也不是共享的，仅用于方便记住好/坏的密钥。</translation>
     </message>
@@ -17205,10 +15911,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Maybe password is wrong</source>
-        <translation type="vanished">密码可能不对</translation>
-    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -17216,12 +15918,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation>RetroShare用户档案</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>这是你的密钥，签名人是：</translation>
     </message>
@@ -17247,7 +15949,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
@@ -17268,7 +15970,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>删除项目</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
@@ -17308,7 +16010,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation>撰写消息</translation>
     </message>
@@ -17322,10 +16024,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>好友已连接</translation>
     </message>
-    <message>
-        <source>Connect Attempt</source>
-        <translation type="vanished">连接尝试</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -17364,17 +16062,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
-    <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">未知节点</translation>
-    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation>发送消息</translation>
     </message>
@@ -17426,10 +16120,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Chat with this person as...</source>
         <translation>跟这个人聊天以 </translation>
     </message>
-    <message>
-        <source>Send message to this person</source>
-        <translation type="vanished">给这个人发送信息</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -17488,10 +16178,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; 如果没有设置你通讯录里的所有人都会自动获的正面的评价，这将自动增长使用过的节点的信誉点 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
-    <message>
-        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
-        <translation type="vanished">给我的联系人自动给出正面的评价</translation>
-    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -17549,13 +16235,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;为防止已删除的被屏蔽 ID 因为在论坛或频道中使用而被拒绝，被禁止的身份将被保留在列表中，一段时间后，它们会被从禁止列表中&quot;清除&quot; ，如果在论坛、聊天室等中使用，将会重新作为未被屏蔽的 ID 被下载。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">表格</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -17563,23 +16242,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>照片共享</translation>
     </message>
-    <message>
-        <source>Photo</source>
-        <translation type="vanished">照片</translation>
-    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>文字标签</translation>
     </message>
-    <message>
-        <source>Comment</source>
-        <translation type="vanished">评论</translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="vanished">概述</translation>
-    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -17640,14 +16307,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
-    <message>
-        <source>Add Comment</source>
-        <translation type="vanished">添加评论</translation>
-    </message>
-    <message>
-        <source>Write a comment...</source>
-        <translation type="vanished">写评论...</translation>
-    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -17718,10 +16377,6 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>创建相册</translation>
     </message>
-    <message>
-        <source>View Album</source>
-        <translation type="vanished">浏览相册</translation>
-    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -17743,17 +16398,17 @@ p, li { white-space: pre-wrap; }
         <translation>幻灯片放映</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation>我的相册</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation>已订阅相册</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation>已分享相册</translation>
     </message>
@@ -17782,7 +16437,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation>相册名称</translation>
     </message>
@@ -17841,19 +16496,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17889,12 +16544,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation>文本标签</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation>显示此插件的更多详情</translation>
     </message>
@@ -18040,60 +16695,6 @@ p, li { white-space：pre-wrap；}
         <source>Plugin look-up directories</source>
         <translation>插件查找目录</translation>
     </message>
-    <message>
-        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation type="vanished">插件已禁用，点击启用按钮重启 RetroShare 后启用。</translation>
-    </message>
-    <message>
-        <source>[disabled]</source>
-        <translation type="vanished">[禁用]</translation>
-    </message>
-    <message>
-        <source>No API number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">未提供 API 版本，请阅读插件开发手册。</translation>
-    </message>
-    <message>
-        <source>[loading problem]</source>
-        <translation type="vanished">[加载问题]</translation>
-    </message>
-    <message>
-        <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation type="vanished">未提供 SVN 版本。请阅读插件开发手册。</translation>
-    </message>
-    <message>
-        <source>Loading error.</source>
-        <translation type="vanished">载入错误。</translation>
-    </message>
-    <message>
-        <source>Missing symbol. Wrong version?</source>
-        <translation type="vanished">缺少符号,版本错误?</translation>
-    </message>
-    <message>
-        <source>No plugin object</source>
-        <translation type="vanished">无插件对象</translation>
-    </message>
-    <message>
-        <source>Plugins is loaded.</source>
-        <translation type="vanished">插件已载入。</translation>
-    </message>
-    <message>
-        <source>Unknown status.</source>
-        <translation type="vanished">未知状态。</translation>
-    </message>
-    <message>
-        <source>Check this for developing plugins. They will not
-be checked for the hash. However, in normal
-times, checking the hash protects you from
-malicious behavior of crafted plugins.</source>
-        <translation type="vanished">开发插件可选此项。不再校验插件的散列值。
-然而，通常情况下校验插件散列值可以保护您
-远离被修改的有害插件。
-</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;插件&lt;/h1&gt;                   &lt;p&gt;插件从下列列表中目录中加载。&lt;/p&gt;                       &lt;p&gt; 由于安全原因，接受的插件自动加载                              直到主RetroShare可执行文件或插件库更改。 在                                这种情况下，用户需要再次确认。                                               程序启动后，您可以通过单击“启用”按钮手动启用插件，               然后重新启动RetroShare。&lt;/p&gt;                                              &lt;p&gt;如果要开发自己的插件，请联系开发人员团队，                       他们将乐意帮助您!&lt;/p&gt;</translation>
-    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -18163,12 +16764,27 @@ malicious behavior of crafted plugins.</source>
         <translation>设置装口置顶</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished">屏蔽这个人 (给出负面评价)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished">给出中立评价</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished">给出正面评价</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -18202,14 +16818,6 @@ malicious behavior of crafted plugins.</source>
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
-        <translation type="vanished">关闭此窗口将结束会话，同时通知对方节点终止加密聊天通道。</translation>
-    </message>
-    <message>
-        <source>Kill the tunnel?</source>
-        <translation type="vanished">终止隧道?</translation>
-    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -18229,7 +16837,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished">赞</translation>
     </message>
@@ -18249,8 +16857,8 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18275,13 +16883,13 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18309,20 +16917,12 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <source>Signed by: </source>
-        <translation type="vanished">签名者：</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="vanished">备注</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation>RetroShare </translation>
     </message>
@@ -18337,12 +16937,22 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished">载入图片文件</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -18358,7 +16968,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18368,23 +16988,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Submit Post</source>
-        <translation type="vanished">提交贴文</translation>
-    </message>
-    <message>
-        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="vanished">您正在提交一个链接。 成功提交的关键是有趣的内容和描述性标题。</translation>
-    </message>
-    <message>
-        <source>Submit</source>
-        <translation type="vanished">提交</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">提交新贴文 </translation>
-    </message>
-    <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation>请添加标题</translation>
     </message>
@@ -18404,12 +17008,22 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18424,7 +17038,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">发表</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -18435,7 +17049,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">图像</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18445,7 +17059,7 @@ malicious behavior of crafted plugins.</source>
         <translation>标题</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation>链接:</translation>
     </message>
@@ -18453,44 +17067,12 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedDialog</name>
     <message>
-        <source>Posted Links</source>
-        <translation type="vanished">发布链接</translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;已发表&lt;/h1&gt;        &lt;p&gt;已发表服务允许你共享互联网链接，这些链接在 RetroShare 节点，如论坛和	 频道中传播&lt;/p&gt; 	 &lt;p&gt;链接可以被订阅的用户评论。 推广系统也给机会	 推荐重要的链接。&lt;/p&gt;      &lt;p&gt;链接被共享时没有限制。 点击它们时要小心。&lt;/p&gt;    &lt;p&gt;发布的链接保留%1天，并且会同步最近%2天的内容，除非你更改此设置。&lt;/p&gt;                </translation>
-    </message>
-    <message>
-        <source>Create Topic</source>
-        <translation type="vanished">创建话题</translation>
-    </message>
-    <message>
-        <source>My Topics</source>
-        <translation type="vanished">我的主题</translation>
-    </message>
-    <message>
-        <source>Subscribed Topics</source>
-        <translation type="vanished">订阅的主题</translation>
-    </message>
-    <message>
-        <source>Popular Topics</source>
-        <translation type="vanished">活跃主题</translation>
-    </message>
-    <message>
-        <source>Other Topics</source>
-        <translation type="vanished">其它主题</translation>
-    </message>
-    <message>
-        <source>Links</source>
-        <translation type="vanished">链接:</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -18524,31 +17106,7 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <source>Posted Topic</source>
-        <translation type="vanished">已发表主题</translation>
-    </message>
-    <message>
-        <source>Add Topic Admins</source>
-        <translation type="vanished">添加主题管理员</translation>
-    </message>
-    <message>
-        <source>Select Topic Admins</source>
-        <translation type="vanished">选择主题管理员</translation>
-    </message>
-    <message>
-        <source>Create New Topic</source>
-        <translation type="vanished">创建新话题</translation>
-    </message>
-    <message>
-        <source>Edit Topic</source>
-        <translation type="vanished">编辑话题</translation>
-    </message>
-    <message>
-        <source>Update Topic</source>
-        <translation type="vanished">更新主题</translation>
-    </message>
-    <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18586,7 +17144,17 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation>订阅已发布的</translation>
     </message>
@@ -18602,7 +17170,7 @@ malicious behavior of crafted plugins.</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -18617,24 +17185,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Posted Description</source>
-        <translation type="vanished">贴文描述</translation>
-    </message>
-    <message>
-        <source>Loading</source>
-        <translation type="vanished">正在载入</translation>
-    </message>
-    <message>
-        <source>New Posted</source>
-        <translation type="vanished">新建贴文</translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished">从不</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18647,22 +17208,18 @@ malicious behavior of crafted plugins.</source>
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <source>Site</source>
-        <translation type="vanished">站点</translation>
-    </message>
-    <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation>注释</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18673,12 +17230,12 @@ malicious behavior of crafted plugins.</source>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation>评论</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18688,7 +17245,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;此消息的作者(ID为%1)被禁止。&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18698,21 +17255,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation>赞</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation>踩</translation>
     </message>
     <message>
-        <source>\/</source>
-        <translation type="vanished">\/</translation>
-    </message>
-    <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>设置为已读并删除条目</translation>
     </message>
@@ -18722,7 +17275,7 @@ malicious behavior of crafted plugins.</source>
         <translation>新</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation>新评论：</translation>
     </message>
@@ -18732,7 +17285,7 @@ malicious behavior of crafted plugins.</source>
         <translation>评论值</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18773,77 +17326,10 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation>正在载入</translation>
     </message>
-    <message>
-        <source>By</source>
-        <translation type="vanished">作者</translation>
-    </message>
-</context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">表单</translation>
-    </message>
-    <message>
-        <source>Hot</source>
-        <translation type="vanished">人气</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">新</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="vanished">排名</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">今天</translation>
-    </message>
-    <message>
-        <source>Yesterday</source>
-        <translation type="vanished">昨天</translation>
-    </message>
-    <message>
-        <source>This Week</source>
-        <translation type="vanished">本周</translation>
-    </message>
-    <message>
-        <source>This Month</source>
-        <translation type="vanished">本月</translation>
-    </message>
-    <message>
-        <source>This Year</source>
-        <translation type="vanished">今年</translation>
-    </message>
-    <message>
-        <source>Submit a new Post</source>
-        <translation type="vanished">提交新贴文</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">下一条</translation>
-    </message>
-    <message>
-        <source>RetroShare</source>
-        <translation type="vanished">RetroShare</translation>
-    </message>
-    <message>
-        <source>Please create or choose a Signing Id before Voting</source>
-        <translation type="vanished">投票前请选择您的签名ID</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">上一条</translation>
-    </message>
-    <message>
-        <source>1-10</source>
-        <translation type="vanished">1-10</translation>
-    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -18863,7 +17349,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -18873,15 +17369,15 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">管理员：</translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished">传播范围</translation>
     </message>
@@ -18891,42 +17387,42 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished">贴文</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18943,10 +17439,10 @@ malicious behavior of crafted plugins.</source>
     <message>
         <location line="+9"/>
         <source>Hot</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">热门</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18976,17 +17472,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19001,12 +17497,17 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19016,27 +17517,31 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">编辑</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19051,7 +17556,7 @@ malicious behavior of crafted plugins.</source>
         <translation type="unfinished">订阅</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished">从不</translation>
     </message>
@@ -19103,17 +17608,17 @@ malicious behavior of crafted plugins.</source>
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">仅限于圈子的成员&quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">仅限于圈子的成员 </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your eyes only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">只有你能看见 </translation>
     </message>
     <message>
         <location line="+2"/>
@@ -19125,6 +17630,16 @@ malicious behavior of crafted plugins.</source>
         <source>No Channel Selected</source>
         <translation type="unfinished">未选择频道! </translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -19133,10 +17648,6 @@ malicious behavior of crafted plugins.</source>
         <source>Tabs</source>
         <translation>标签</translation>
     </message>
-    <message>
-        <source>Open each topic in a new tab</source>
-        <translation type="vanished">在新标签页打开每个话题</translation>
-    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -19150,10 +17661,6 @@ malicious behavior of crafted plugins.</source>
 </context>
 <context>
     <name>PostedUserNotify</name>
-    <message>
-        <source>Posted</source>
-        <translation type="vanished">已发表</translation>
-    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -19222,16 +17729,16 @@ malicious behavior of crafted plugins.</source>
         <translation>用户档案管理器</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -19343,7 +17850,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>编辑状态消息</translation>
@@ -19359,7 +17866,7 @@ and use the import button to load it</source>
         <translation>用户档案管理器</translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation>公开信息</translation>
     </message>
@@ -19394,12 +17901,12 @@ and use the import button to load it</source>
         <translation>在线始于:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation>其它信息</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation>我的地址</translation>
     </message>
@@ -19443,51 +17950,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <source>Post From:</source>
-        <translation type="vanished">贴文来自：</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">账户1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">账户2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">账户3</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation>添加至 Pulse</translation>
     </message>
     <message>
-        <source>filter</source>
-        <translation type="vanished">过滤</translation>
-    </message>
-    <message>
-        <source>URL Adder</source>
-        <translation type="vanished">URL 添加</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation>显示为</translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19497,12 +17980,12 @@ and use the import button to load it</source>
         <translation type="unfinished">发件人:</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19532,13 +18015,13 @@ and use the import button to load it</source>
         <translation type="unfinished">负面的</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -19550,12 +18033,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -19564,17 +18057,13 @@ and use the import button to load it</source>
         <source>Cancel</source>
         <translation>取消 </translation>
     </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">向wire发刺探包</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19589,34 +18078,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">发信人</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">日期</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished">载入图片文件</translation>
     </message>
 </context>
 <context>
@@ -19627,7 +18106,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -19646,7 +18125,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19656,7 +18135,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19683,7 +18162,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19693,7 +18172,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19713,7 +18192,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19829,7 +18308,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19837,37 +18316,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -19899,7 +18383,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19907,8 +18391,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation>确认</translation>
     </message>
@@ -20177,12 +18661,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>节点详情</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation>文件请求已取消</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>此版本的 RetroShare 正在使用 OpenPGP-SDK。因此没有使用系统中的共享PGP钥匙环，而是自有钥匙环，在所有RetroShare实例间共享。&lt;br&gt;&lt;br&gt;
 您似乎没有这种钥匙环，尽管现有 RetroShare 账户中引用了PGP密钥，也许您刚刚才升级至此新版本。</translation>
@@ -20217,7 +18701,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>发生意外错误。请报告错误&apos;RsInit::InitRetroShare unexpected return code %1&apos;。</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20251,7 +18735,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>多实例运行</translation>
@@ -20274,6 +18758,26 @@ The error reported is:&quot;</source>
  Lock 文件:
 </translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -20356,7 +18860,7 @@ Reported error is:
         <translation>数据转发</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>您似乎有与DSA密钥关联的节点： </translation>
     </message>
@@ -20366,7 +18870,7 @@ Reported error is:
         <translation>当前 RetroShare 的版本不支持 DSA 密钥。所有这些地点都将无法使用。我们很抱歉会这样。</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation>启用</translation>
     </message>
@@ -20376,7 +18880,7 @@ Reported error is:
         <translation>禁用</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation>添加%1至白名单</translation>
     </message>
@@ -20392,7 +18896,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation>%1 秒前</translation>
     </message>
@@ -20460,7 +18964,7 @@ Security: no anonymous IDs</source>
 安全:没有匿名ID</translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation>加入聊天室</translation>
     </message>
@@ -20489,7 +18993,7 @@ Security: no anonymous IDs</source>
         <translation>无法解析XML文件！</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation>无限期 </translation>
     </message>
@@ -20669,13 +19173,29 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished">节点</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished">地址</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">状态</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20868,10 +19388,6 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;p&gt;This certificate contains:</source>
-        <translation type="obsolete">&lt;p&gt;此证书包含：</translation>
-    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -20922,6 +19438,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -21084,7 +19612,7 @@ p, li { white-space：pre-wrap；}
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation>全网匿名可见</translation>
     </message>
@@ -21267,7 +19795,7 @@ p, li { white-space：pre-wrap；}
         <translation>表单</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>已阻止内置图像加载</translation>
     </message>
@@ -21280,7 +19808,7 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation>默认允许</translation>
     </message>
@@ -21453,12 +19981,22 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished">保存图像</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21466,12 +20004,12 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation>树状视图选项</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21501,14 +20039,6 @@ p, li { white-space：pre-wrap；}
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Show column...</source>
-        <translation type="vanished">显示列</translation>
-    </message>
-    <message>
-        <source>[no title]</source>
-        <translation type="vanished">[无标题]</translation>
-    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -22171,7 +20701,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -22292,7 +20822,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22312,7 +20842,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -22370,7 +20900,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished">信息将被转发给你的好友</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... 丢失消息 ... ]</translation>
     </message>
@@ -22384,11 +20914,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[未知]</translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished">[ ... 丢失消息 ... ]</translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -22402,6 +20927,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -22424,13 +20954,18 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
-        <translation type="unfinished">点击按已读排序</translation>
+        <source>Click to sort by read status</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
-        <translation type="unfinished">点击按发件人排序</translation>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22453,7 +20988,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22474,7 +21011,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>重设所有保存的RetroShare设置。</translation>
     </message>
@@ -22535,7 +21072,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>设置RetroShare语言</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>无法打开日志文件 &quot;%1&apos;:%2</translation>
     </message>
@@ -22556,11 +21093,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>无法创建目录:%1</translation>
     </message>
     <message>
-        <source>Revision</source>
-        <translation type="vanished">Revision</translation>
-    </message>
-    <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22590,7 +21123,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation>指定的语言代码无效: </translation>
     </message>
@@ -22608,7 +21141,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>注册表访问错误。也许你需要管理员权限。 </translation>
@@ -22625,12 +21158,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>在此输入关键词(至少3个字符长)</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation>开始搜索</translation>
     </message>
@@ -22692,7 +21225,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation>关键词</translation>
     </message>
@@ -22707,7 +21240,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>搜索 ID</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation>文件名</translation>
     </message>
@@ -22807,23 +21340,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>下载所选项目</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation>文件名称</translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>下载</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation>复制 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation>发送 RetroShare 链接</translation>
     </message>
@@ -22833,7 +21366,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>下载提示</translation>
     </message>
@@ -22870,7 +21403,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>删除全部</translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>文件夹</translation>
@@ -22881,17 +21414,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation>新建 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation>打开文件夹</translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation>创建资源集合</translation>
     </message>
@@ -22911,7 +21444,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>从集合文件中下载...</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation>资源集合</translation>
     </message>
@@ -22919,7 +21452,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation>节点详情</translation>
     </message>
@@ -22935,22 +21468,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>删除条目</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation>IP 地址：</translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation>节点 ID</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation>节点名称</translation>
     </message>
@@ -22967,7 +21500,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation>已报告</translation>
     </message>
@@ -22992,8 +21525,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;这是你的好友声称他连接到的IP。 如果你刚改变IP，这是只是一个错误警告。 如果没有，那意味着你与这个好友的连接是由一个中间的节点转发的，这是可疑的。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这个警告是为了保护你免受流量转发攻击。在这种情况下，你连接的好友不会看到你的外部 IP，而会看到攻击者的 IP。&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;但是，如果你只是因为某些原因(某些ISP经常强制更改IP)而更改了 IP，则此警告只会告诉你在 RetroShare 得知 IP 更改之前连接到新 IP 的好友。这种情况是正常的。&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;可以通过将你自己的 IP (例如你的 ISP 的范围)列入白名单，或通过在“选项” -&gt; “通知” -&gt;“事件中心”中完全禁用这些警告来简单地禁止虚假警告。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23001,7 +21534,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>希望成为您的 RetroShare 好友</translation>
     </message>
@@ -23032,7 +21565,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -23077,12 +21610,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>状态:</translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation>写邮件</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation>连接尝试</translation>
     </message>
@@ -23102,17 +21635,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>未知(出站)连接企图</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation>未知安全问题</translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
+        <location line="+68"/>
+        <source>SSL request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
@@ -23122,11 +21660,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unknown Peer</source>
-        <translation type="vanished">未知节点</translation>
-    </message>
-    <message>
-        <location line="+109"/>
+        <location line="+119"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
@@ -23136,7 +21670,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>您是否要删除此好友?</translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>证书有错误的签名！ 这个节点不是他自称的那样。</translation>
     </message>
@@ -23146,12 +21680,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>丢失/损坏的证书 。不是一个真是RetroShare用户</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation>证书导致了一个内部错误。</translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>节点不在好友列表里(PGP ID=</translation>
     </message>
@@ -23210,12 +21744,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation>本地地址</translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23236,22 +21770,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>端口:</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation>本地网络</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation>公网 IP 探测服务</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation>已知/先前的 IP</translation>
     </message>
@@ -23267,21 +21801,16 @@ behind a firewall or a VPN.</source>
 下连接的情况。</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation>允许 RetroShare 通过如下网站确定外网IP:</translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>可接受的端口范围从 10 到 65535 。正常情况下低于 1024 的端口被你的系统保留。</translation>
     </message>
@@ -23291,23 +21820,46 @@ behind a firewall or a VPN.</source>
         <translation>可接受的端口范围从 10 到 65535 。正常情况下低于 1024 的端口被你的系统保留。</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation>隐藏地址</translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation>节点探索开启(推荐)</translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation>节点探索关闭</translation>
     </message>
@@ -23317,7 +21869,7 @@ behind a firewall or a VPN.</source>
         <translation>隐藏 - 查看配置</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation>I2P 地址</translation>
     </message>
@@ -23342,37 +21894,95 @@ behind a firewall or a VPN.</source>
         <translation>传入正常</translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation>代理看起来正常工作</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P 代理没有启用</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation>客户端</translation>
     </message>
@@ -23387,71 +21997,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation>未知</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation>检查连接</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation>正在生成密钥</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation>启动中</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation>关闭中</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23461,22 +22007,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation>通过隐藏服务对你可达</translation>
     </message>
@@ -23490,12 +22021,12 @@ Also check your ports!</source>
 另外请检查您的端口！</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation>[隐身模式]</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这将清除已知地址列表。 如果由于某些原因您的地址列表包含无效/不相关/过期的地址，您希望避免传递给您的好友作为联系地址，此操作是有用的。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23505,7 +22036,7 @@ Also check your ports!</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation>下载速率 (KB/s)</translation>
     </message>
@@ -23520,23 +22051,23 @@ Also check your ports!</source>
         <translation>上传速率 (KB/s)</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;上传限制涉及整个软件。上传限制太小可能最终会阻止低优先级服务(论坛，频道)。 最小的建议值为50KB/s。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -23547,17 +22078,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation>启用高级设置</translation>
     </message>
@@ -23567,12 +22088,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>高级模式</translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23582,17 +22098,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation>I2P代理端口</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
@@ -23632,7 +22138,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation>开始</translation>
     </message>
@@ -23647,12 +22153,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>停止</translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished">接收</translation>
     </message>
@@ -23688,7 +22189,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished">中继</translation>
     </message>
@@ -23743,7 +22269,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">总计:</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23768,7 +22294,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -23780,7 +22306,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>网络</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation>IP过滤</translation>
     </message>
@@ -23803,7 +22329,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation>状态</translation>
     </message>
@@ -23863,17 +22389,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>添加到白名单</translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation>隐藏服务配置</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这是Tor代理的端口。你的RetroShare节点可以用这个端口连接到&lt;/p&gt;&lt;p&gt;隐藏节点。当你电脑上的端口激活后右边这个指示灯会变绿。&lt;/p&gt;&lt;p&gt;这并不意味着您的RetroShare流量通过Tor转发。只有你 &lt;/p&gt;&lt;p&gt;连接到隐藏节点 , 或者你自己运行一个隐藏节点才会正常工作。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果左边所示的监听端口在你的电脑上被成功激活，此LED灯会变绿，&lt;/p&gt;&lt;p&gt;这不意味着你的RetroShare流量通过Tor通信。只有连接到隐藏节点&lt;/p&gt;&lt;p&gt;或者您自己运行一个隐藏节点时才会通过Tor通信。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -23889,18 +22426,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P 传出代理正常</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation>服务地址</translation>
     </message>
@@ -23935,12 +22472,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>请填写服务地址</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation>IP 范围</translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>DHT报告IP伪装 </translation>
     </message>
@@ -23963,22 +22500,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>被你添加</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;从以下来源收集白名单的IP：来自手动交换的证书中的IP，您在此窗口中输入的IP范围或安全订阅项。&lt;/p&gt;&lt;p&gt;RetroShare的默认行为是(1)始终允许连接到 IP 的节点在白名单中，即使该 IP 也被列入黑名单; (2)可选地要求 IP 在白名单中。您可以在每个 RetroShare 节点的窗口“详情”中更改每个节点的这种行为。 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT允许您使用BitTorrent的DHT网络回应好友的连接请求。它可以极大地改善连通性。没有信息被实际存储在DHT中。它仅用作代理系统与其他RetroShare节点联系。&lt;/p&gt;&lt;p&gt;节点探索服务将您信任好友的节点名称和ID发送给已连接的节点，来帮助他们选择新朋友。 但节点永远不会自动建立好友关系，并且节点仍然需要相互添加信任才会允许连接。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果您启用了该操作，一旦RetroShare设法从下面列出的网站获取你的IP，则符号将变绿。RetroShare也会使用其他方法来查找你的IP。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;该列表将自动填充在多个来源收集的信息：DHT报告的伪装节点，您输入的IP范围以及您好友报告的IP范围。 默认设置应保护您免受大规模流量中继。&lt;/p&gt;&lt;p&gt;自动猜测伪装IP可以将您的好友的IP置于黑名单中，这时请使用上下文菜单将其列入白名单。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24013,7 +22550,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>自动屏蔽DHT伪装IP的范围</translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24023,12 +22560,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks 代理</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor 传出代理正常</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor 代理没有启用</translation>
     </message>
@@ -24108,7 +22645,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>选择您希望与之共享个人发帖密钥的节点</translation>
     </message>
@@ -24118,12 +22655,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>共享给好友</translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation>分享</translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>您可以通过分享让你的好友了解您的频道。 选择您的好友来分享频道。</translation>
@@ -24142,7 +22679,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>共享文件夹管理器</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation>共享文件目录</translation>
     </message>
@@ -24162,17 +22699,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>可见性</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation>添加新的共享文件夹</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation>添加共享目录</translation>
     </message>
@@ -24182,7 +22719,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation>应用并关闭</translation>
     </message>
@@ -24273,7 +22810,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>目录未找到或目录名称不可接受。</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>这是一个共享文件夹的列表。您可以使用底部的按钮添加和删除文件夹。当您添加新文件夹时，该文件夹中所有文件都会被共享。您可以单独设置每个共享文件夹的共享标志。</translation>
     </message>
@@ -24281,7 +22818,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation>共享</translation>
     </message>
@@ -24332,11 +22869,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation>校验文件</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation>下载所选项目</translation>
     </message>
@@ -24346,7 +22888,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>下载</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>复制 RetroShare 链接至剪切板</translation>
     </message>
@@ -24361,7 +22903,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>发送 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation>某些文件已被忽略 </translation>
     </message>
@@ -24377,7 +22919,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>推荐内容</translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation>创建资源集合</translation>
     </message>
@@ -24402,7 +22944,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>从集合文件中下载...</translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24545,12 +23087,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation>载入设置</translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation>创建界面</translation>
     </message>
@@ -24574,7 +23116,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>记住密码</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation>登录</translation>
     </message>
@@ -24929,7 +23471,7 @@ This choice can be reverted in settings.</source>
         <translation>个人状态消息</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation>消息:</translation>
     </message>
@@ -25176,7 +23718,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation>删除所有标签</translation>
     </message>
@@ -25212,12 +23754,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation>Tor状态:</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
@@ -25227,18 +23772,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
-        <translation>隐藏服务地址:</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25248,12 +23788,57 @@ p, li { white-space: pre-wrap; }
         <translation>Onion地址:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished">错误</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished">未连接</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation>[等待Tor就绪]</translation>
     </message>
@@ -25261,7 +23846,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
@@ -25271,7 +23856,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation>Tor现在离线</translation>
     </message>
@@ -25282,11 +23867,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25314,7 +23900,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>传输选项</translation>
@@ -25325,7 +23911,7 @@ p, li { white-space: pre-wrap; }
         <translation>最多同时下载任务:</translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation>共享文件目录</translation>
     </message>
@@ -25335,22 +23921,27 @@ p, li { white-space: pre-wrap; }
         <translation>自动共享接收文件目录(推荐)</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation>编辑分享</translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished">设置共享文件目录</translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation>自动检查共享目录,每隔</translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation> (分钟)</translation>
     </message>
@@ -25435,7 +24026,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -25444,7 +24035,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25469,7 +24065,12 @@ p, li { white-space: pre-wrap; }
         <translation>允许直接下载:</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation>顺序</translation>
     </message>
@@ -25528,37 +24129,13 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&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:9pt; 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;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;可以在非好友间传输数据和搜索请求。这些数据只会通过已连接的好友进行匿名传输。&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-size:8pt;&quot;&gt;你可以在共享文件对话框中对每个共享文件夹分别设置以下共享标记：&lt;/span&gt;&lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;好友可见：&lt;/span&gt;文件对好友可见。&lt;/li&gt;
-&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;匿名共享：&lt;/span&gt; 文件可以通过 F2F 隧道匿名访问。&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>每秒最多转发隧道请求数量</translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;顺序&lt;/span&gt; 让传输以递增的顺序请求 1MB 的文件块，便于下载时预览。&lt;span style=&quot; font-weight:600;&quot;&gt;&#xa0; 随机&lt;/span&gt;  是完全随机的，有利于swarm集群下载。 Progressivexis purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;渐进&lt;/span&gt; 是一个折中方法，在部分文件末尾不到50MB内随机选择下一个块。 这允许一些随机性，同时防止大量空文件的初始化时间。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果磁盘空间低于此限制，RetroShare将暂停所有传输并且保存配置文件。 这可以防止某些系统丢失信息。 当这种情况发生时，弹出窗口会提醒你。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -25568,7 +24145,17 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这个值控制您的节点每秒可以转发多少个隧道请求。&lt;/p&gt;&lt;p&gt;如果你网络带宽充裕，可以将其提高到 30-40，以允许更长的隧道通过。 要慎重，因为这会产生许多小数据包，可能会显著减慢你自己的文件传输速度。&lt;/p&gt;&lt;p&gt;默认值为20。如果你不确定，保持默认值。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished">警告</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation>设置文件接收目录</translation>
     </message>
@@ -25596,7 +24183,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation>下载完成</translation>
     </message>
@@ -25620,39 +24207,23 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You have %1 completed downloads</source>
-        <translation type="vanished">您有 %1 个下载任务已完成</translation>
-    </message>
-    <message>
-        <source>You have %1 completed download</source>
-        <translation type="vanished">您有 %1 个下载任务已完成</translation>
-    </message>
-    <message>
-        <source>%1 completed downloads</source>
-        <translation type="vanished">%1 个下载任务已完成</translation>
-    </message>
-    <message>
-        <source>%1 completed download</source>
-        <translation type="vanished">%1 个下载任务已完成</translation>
-    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation>下载</translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>上传</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>名称</translation>
@@ -25859,16 +24430,7 @@ p, li { white-space: pre-wrap; }
         <translation>指定...</translation>
     </message>
     <message>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
-        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/64px_help.png&quot;&gt;&amp;nbsp;&amp;nbsp;文件传输&lt;/h1&gt;
-&lt;p&gt;RetroShare 支持两种文件传输方式：来自好友的直接传输，及匿名远程隧道传输。
-此外文件传输支持多文件源及swarm集群(下载时可以作为文件源)。&lt;/p&gt;
-&lt;p&gt;你可以通过左侧的 &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=16 /&gt; 图标共享文件。
-这些文件将在我的文件标签中列出。&lt;p&gt;&lt;/p&gt;你可以在好友的文件标签中决定每个好友分组是否可以看到你的文件。&lt;/p&gt;
-&lt;p&gt;搜索标签列出来自好友文件列表中的文件，及通过多跳隧道系统匿名可见的远程文件。&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+253"/>
+        <location line="+262"/>
         <source>Move in Queue...</source>
         <translation>队列位置...</translation>
     </message>
@@ -25893,7 +24455,7 @@ p, li { white-space: pre-wrap; }
         <translation>选择目录</translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>匿名和端对端加密路由 0x</translation>
     </message>
@@ -25914,7 +24476,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -25947,7 +24509,17 @@ p, li { white-space: pre-wrap; }
         <translation>文件 %1 未完成。但如果是媒体文件，仍可尝试预览。</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished">警告</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation>修改文件名</translation>
     </message>
@@ -25962,7 +24534,7 @@ p, li { white-space: pre-wrap; }
         <translation>输入新的有效文件名</translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>全部展开</translation>
@@ -26089,23 +24661,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>列</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation>文件传输</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
@@ -26115,7 +24682,7 @@ p, li { white-space: pre-wrap; }
         <translation>显示路径栏</translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation>不能删除之前文件</translation>
     </message>
@@ -26125,7 +24692,7 @@ p, li { white-space: pre-wrap; }
         <translation>再试一次？</translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation>创建资源集合</translation>
     </message>
@@ -26140,7 +24707,12 @@ p, li { white-space: pre-wrap; }
         <translation>打开资源集合</translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+74"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+193"/>
         <source>Collection</source>
         <translation>资源集合</translation>
     </message>
@@ -26150,7 +24722,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation>匿名Turtle路由</translation>
     </message>
@@ -26371,10 +24943,6 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Anonymous tunnels</source>
-        <translation type="vanished">匿名Turtle路由</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -26568,12 +25136,17 @@ p, li { white-space: pre-wrap; }
         <translation>表单</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>启用RetroShare网页界面。</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished">状态:</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation>网页参数</translation>
     </message>
@@ -26607,31 +25180,33 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Port:</source>
-        <translation type="vanished">端口:</translation>
-    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Apply setting and start browser</source>
-        <translation type="vanished">应用设置并打开浏览器</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;网页界面&lt;/h1&gt;       &lt;p&gt;网页界面允许您从浏览器控制 RetroShare 。多个设备可以通过一个 RetroShare 实例共享控制。 所以，您可以在平板电脑上开始对话，然后使用台式电脑继续操作。&lt;/p&gt;     &lt;p&gt;警告：不要将网络接口暴露在互联网上，因为没有访问控制和加密。 如果要通过互联网使用网络接口，请使用SSH隧道或代理来保护连接。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation>不打开网页界面</translation>
     </message>
@@ -26641,12 +25216,12 @@ p, li { white-space: pre-wrap; }
         <translation>无法打开网页界面，请到设置 -&gt; 网络界面里进行设置</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation>无法打开网页界面</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation>网页界面</translation>
     </message>
@@ -26783,11 +25358,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki页面</translation>
     </message>
     <message>
-        <source>New Group</source>
-        <translation type="vanished">新建分组</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation>页面名称</translation>
     </message>
@@ -26802,7 +25373,7 @@ p, li { white-space: pre-wrap; }
         <translation>原始 ID</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -26890,7 +25461,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation>页面历史版本</translation>
     </message>
@@ -26925,7 +25496,7 @@ p, li { white-space: pre-wrap; }
         <translation>页面Id</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -26955,14 +25526,18 @@ p, li { white-space: pre-wrap; }
         <translation>标签</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished">历史</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>显示编辑历史</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation>状态</translation>
     </message>
@@ -26983,7 +25558,7 @@ p, li { white-space: pre-wrap; }
         <translation>撤销</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation>提交</translation>
     </message>
@@ -27055,10 +25630,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
-    <message>
-        <source>TimeRange</source>
-        <translation type="vanished">时间范围</translation>
-    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -27070,16 +25641,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished">刷新</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27094,7 +25656,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">其他</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27114,7 +25676,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27144,85 +25706,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Last Month</source>
-        <translation type="vanished">上月</translation>
-    </message>
-    <message>
-        <source>Last Week</source>
-        <translation type="vanished">上周</translation>
-    </message>
-    <message>
-        <source>Today</source>
-        <translation type="vanished">今天</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">新建</translation>
-    </message>
-    <message>
-        <source>from</source>
-        <translation type="vanished">自从</translation>
-    </message>
-    <message>
-        <source>until</source>
-        <translation type="vanished">直到</translation>
-    </message>
-    <message>
-        <source>Search/Filter</source>
-        <translation type="vanished">搜索/过滤</translation>
-    </message>
-    <message>
-        <source>Network Wide</source>
-        <translation type="vanished">全网匿名可见</translation>
-    </message>
-    <message>
-        <source>Manage Accounts</source>
-        <translation type="vanished">管理账户</translation>
-    </message>
-    <message>
-        <source>Showing:</source>
-        <translation type="vanished">当前显示:</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation>我自己</translation>
     </message>
-    <message>
-        <source>Friends</source>
-        <translation type="vanished">好友</translation>
-    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>以下</translation>
     </message>
     <message>
-        <source>Custom</source>
-        <translation type="vanished">自定义</translation>
-    </message>
-    <message>
-        <source>Account 1</source>
-        <translation type="vanished">账户1</translation>
-    </message>
-    <message>
-        <source>Account 2</source>
-        <translation type="vanished">账户2</translation>
-    </message>
-    <message>
-        <source>Account 3</source>
-        <translation type="vanished">账户3</translation>
-    </message>
-    <message>
-        <source>CheckBox</source>
-        <translation type="vanished">复选框</translation>
-    </message>
-    <message>
-        <source>Post Pulse to Wire</source>
-        <translation type="vanished">向wire发刺探包 </translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -27285,35 +25779,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">删除</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">位置:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -27358,11 +25859,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished">不适用</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished">以下</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>未知</translation>
@@ -27440,7 +25971,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 年 %2 天</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -27473,15 +26004,11 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
-        <translation type="vanished">图片 (*.png *.xpm *.jpg *.tiff *.gif *.jpeg)</translation>
-    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_zh_TW.ts b/retroshare-gui/src/lang/retroshare_zh_TW.ts
index 92a16dae4..d81166627 100644
--- a/retroshare-gui/src/lang/retroshare_zh_TW.ts
+++ b/retroshare-gui/src/lang/retroshare_zh_TW.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+40"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+32"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,13 +156,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AlbumCreateDialog</name>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">描述:</translation>
-    </message>
-</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -191,10 +184,6 @@
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">描述:</translation>
-    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -551,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -577,10 +566,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AspectRatioPixmapLabel</name>
+    <message>
+        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -623,7 +625,7 @@ p, li { white-space: pre-wrap; }
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -710,7 +712,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+256"/>
+        <location line="+264"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -729,10 +731,6 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="vanished">取消 </translation>
-    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
@@ -810,7 +808,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -840,12 +838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+27"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+12"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -853,7 +851,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -873,7 +871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+49"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -911,7 +909,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -931,7 +929,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+30"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -961,7 +959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+26"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -971,7 +969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">新建</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+66"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -979,12 +977,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+17"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1004,18 +1002,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
         <source>Expand</source>
         <translation type="unfinished">展開</translation>
     </message>
@@ -1030,12 +1028,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">刪除項目</translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+198"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1204,17 +1202,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="-16"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1224,7 +1222,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Maximum Auto Download Size (in GBs)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1232,7 +1240,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1255,7 +1263,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1280,18 +1288,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+49"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
         <source>Expand</source>
         <translation type="unfinished">展開</translation>
     </message>
@@ -1306,7 +1314,7 @@ into the image, so as to
         <translation type="unfinished">刪除項目</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1316,17 +1324,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Comments </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+176"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
         <source>Hide</source>
         <translation type="unfinished">隱藏</translation>
     </message>
@@ -1334,7 +1332,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1525,7 +1523,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1558,13 +1556,14 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+13"/>
+        <location line="+42"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
-        <location line="+42"/>
+        <location line="+30"/>
+        <location line="+46"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1572,13 +1571,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
-        <location line="+74"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
+        <location line="+71"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-73"/>
+        <location line="-70"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1588,29 +1587,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>Private Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+577"/>
-        <source>Public Subscribed chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-570"/>
-        <source>Private chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+565"/>
-        <source>Public chat rooms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-431"/>
+        <location line="+163"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1620,7 +1597,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+12"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1677,12 +1654,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+244"/>
+        <location line="+245"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+12"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1692,23 +1669,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-818"/>
+        <location line="-821"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+530"/>
+        <location line="-240"/>
+        <source>Private Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+571"/>
+        <source>Public Subscribed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-564"/>
+        <location line="+756"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-749"/>
+        <location line="+559"/>
+        <location line="+190"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-705"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+706"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1718,27 +1714,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
+        <location line="+2"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+162"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1753,47 +1744,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+85"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+34"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+30"/>
         <source>Type:</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+27"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-114"/>
-        <location line="+26"/>
-        <location line="+26"/>
-        <location line="+29"/>
-        <location line="+20"/>
-        <location line="+26"/>
+        <location line="-119"/>
+        <location line="+27"/>
+        <location line="+27"/>
+        <location line="+30"/>
+        <location line="+21"/>
+        <location line="+27"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1808,7 +1799,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-734"/>
+        <location line="-731"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">顯示</translation>
@@ -1828,7 +1819,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
         <source>Remove Item</source>
         <translation>刪除項目</translation>
     </message>
@@ -1873,7 +1864,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1102"/>
+        <location line="+1184"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1888,7 +1879,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-329"/>
+        <location line="-401"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1908,7 +1899,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-294"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1933,7 +1924,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+459"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1963,7 +1954,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-404"/>
+        <location line="-476"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1973,7 +1964,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+559"/>
+        <location line="+631"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1997,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2067,12 +2058,22 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-790"/>
+        <location line="-862"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="-13"/>
+        <source>When focus on text browser after showing chat room</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Shrink text edit field when not needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+175"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2082,7 +2083,17 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+37"/>
+        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>This next square is scaled accordingly to your system font size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+65"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2179,7 +2190,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-971"/>
+        <location line="-1043"/>
         <source>Case sensitive</source>
         <translation>區分大小寫</translation>
     </message>
@@ -2285,7 +2296,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2321,7 +2332,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2356,12 +2367,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-595"/>
+        <location line="-616"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+391"/>
+        <location line="+412"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2441,11 +2452,6 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2483,7 +2489,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2505,7 +2511,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+136"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2555,7 +2561,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2577,7 +2583,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2592,12 +2598,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+672"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2613,12 +2619,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1331"/>
+        <location line="+1350"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-848"/>
+        <location line="-867"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2629,12 +2635,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+468"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+356"/>
+        <location line="+351"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2654,7 +2660,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2680,7 +2686,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2702,7 +2708,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2728,7 +2734,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2788,7 +2794,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+447"/>
+        <location line="+445"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2804,7 +2810,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2856,45 +2862,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-232"/>
+        <location line="-239"/>
         <location line="+122"/>
-        <location line="+111"/>
+        <location line="+118"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-102"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+2"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+24"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location line="+11"/>
         <location line="+3"/>
-        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-9"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2904,7 +2910,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2986,12 +2992,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+132"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+24"/>
+        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3011,7 +3022,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3079,7 +3090,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3095,12 +3106,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+52"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
@@ -3110,17 +3121,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+149"/>
+        <location line="+159"/>
         <source>Options</source>
         <translation>選項</translation>
     </message>
     <message>
-        <location line="-593"/>
+        <location line="-643"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+577"/>
+        <location line="+627"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3130,7 +3141,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-644"/>
+        <location line="-694"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3155,12 +3166,22 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+545"/>
+        <location line="+501"/>
+        <source>Signers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Known IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+45"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-343"/>
+        <location line="-393"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3180,32 +3201,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+164"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+60"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
-        <source>Signers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-145"/>
+        <location line="-153"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+382"/>
+        <location line="+432"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3251,17 +3267,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+330"/>
+        <location line="+342"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+254"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-781"/>
+        <location line="-806"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3281,12 +3297,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+314"/>
+        <location line="+326"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-367"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3294,7 +3310,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+107"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3334,7 +3350,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+233"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3359,7 +3375,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+127"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3369,7 +3385,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+42"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3408,7 +3424,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3418,7 +3434,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3443,7 +3459,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3456,7 +3472,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-219"/>
+        <location line="-220"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3491,7 +3507,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3501,12 +3517,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+123"/>
-        <source>[Unknown]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+199"/>
+        <location line="+333"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3571,7 +3582,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3599,7 +3610,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3609,17 +3620,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+76"/>
+        <location line="+28"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-25"/>
+        <location line="+28"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3629,12 +3643,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-28"/>
+        <location line="+31"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-27"/>
+        <location line="+30"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3644,7 +3660,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-29"/>
+        <location line="+32"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3669,7 +3686,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+45"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3961,7 +3978,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-701"/>
+        <location line="-729"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3969,7 +3986,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+113"/>
+        <location line="+114"/>
+        <location line="+31"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3979,7 +3997,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+213"/>
+        <location line="+209"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4015,12 +4033,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+221"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4040,7 +4058,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+62"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4060,18 +4078,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+44"/>
         <source>Cancel</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="-100"/>
+        <location line="-107"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4086,11 +4104,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type</source>
-        <translation type="vanished">類型</translation>
-    </message>
-    <message>
-        <location line="-279"/>
+        <location line="-277"/>
         <source>Name:</source>
         <translation type="unfinished">名稱:</translation>
     </message>
@@ -4130,19 +4144,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
-        <location line="+126"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
+        <location line="+130"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-136"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
+        <location line="+130"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4152,12 +4166,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+289"/>
+        <location line="+55"/>
+        <source>Circle created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Your new circle has been created:
+   Name: %1
+   Id: %2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+247"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
@@ -4167,7 +4193,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4220,13 +4246,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4245,7 +4271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+35"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4280,7 +4306,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4290,7 +4316,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4435,17 +4461,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+240"/>
+        <location line="+242"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
+        <location line="-242"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+218"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4470,7 +4496,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+30"/>
+        <source>Cannot publish post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4485,18 +4516,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
-        <source>Do you really want to generate %1 messages ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-593"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4530,7 +4555,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4540,7 +4565,16 @@ p, li { white-space: pre-wrap; }
         <translation>論壇</translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+31"/>
+        <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;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,16 +4589,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <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;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+93"/>
+        <location line="+114"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4579,7 +4604,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+48"/>
+        <location line="+55"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4609,17 +4634,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+100"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+131"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>Title</source>
         <translation type="unfinished">標題</translation>
     </message>
@@ -4672,7 +4697,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+72"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4682,8 +4707,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4706,7 +4731,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4741,7 +4766,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+116"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4751,7 +4776,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="-113"/>
+        <location line="-120"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4766,7 +4791,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-159"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4787,7 +4812,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4795,17 +4820,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+206"/>
+        <location line="+208"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
-        <location line="-234"/>
+        <location line="-237"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4815,12 +4840,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+191"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,12 +4865,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+126"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
+        <location line="+130"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4855,7 +4875,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+35"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,17 +4885,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+73"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
-        <source>Certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,7 +4900,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4955,33 +4970,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+345"/>
+        <location line="+348"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-454"/>
+        <location line="-457"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
-        <source>Node information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+448"/>
+        <location line="+409"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-115"/>
+        <location line="-116"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+232"/>
+        <location line="-105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+335"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5071,7 +5086,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5739,7 +5754,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5747,38 +5762,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
         <location line="+13"/>
-        <location line="+115"/>
+        <location line="+136"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-82"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <location line="+61"/>
-        <source>dd.MM.yyyy</source>
+        <location line="+20"/>
+        <location line="+70"/>
+        <source>yyyy-MM-dd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <location line="+63"/>
+        <location line="-48"/>
+        <location line="+72"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
-        <location line="+63"/>
+        <location line="-71"/>
+        <location line="+72"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5786,12 +5801,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+25"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5953,7 +5968,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5963,7 +5978,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6023,11 +6038,21 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>APK </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>DLL </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6149,7 +6174,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+150"/>
+        <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6191,7 +6216,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+185"/>
+        <location filename="../gui/common/FriendList.cpp" line="+188"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6227,7 +6252,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-252"/>
+        <location line="-255"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6243,7 +6268,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+220"/>
+        <location line="+223"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6480,7 +6505,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6518,7 +6543,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+715"/>
+        <location line="+776"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6529,16 +6554,132 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FriendServerControl</name>
+    <message>
+        <location filename="../gui/FriendServerControl.ui" line="+19"/>
+        <source>Server onion address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Onion address of the friend server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Retroshare passphrase:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Your retroshare passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>On/Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Friends to request: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Auto accept received certificates as friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Auto-accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Node ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Make friend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Missing profile passphrase.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Trying to contact friend server
+This may take up to 1 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Friend server is currently reachable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The proxy is not enabled or broken.
+Are all services up and running fine??
+Also check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+174"/>
+        <location filename="../gui/FriendsDialog.ui" line="+181"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
+        <location line="+74"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6621,33 +6762,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-54"/>
+        <location line="-26"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-279"/>
-        <location filename="../gui/FriendsDialog.h" line="+55"/>
+        <location filename="../gui/FriendsDialog.ui" line="-286"/>
+        <location filename="../gui/FriendsDialog.h" line="+56"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
+        <source>Friend Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+33"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+130"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6665,7 +6811,17 @@ at least one peer was not added to a group</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location line="+403"/>
+        <location line="+163"/>
+        <source>SAMv3 support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>I2P instance address with SAMv3 enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+132"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6675,17 +6831,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+456"/>
+        <location filename="../gui/GenCertDialog.ui" line="+492"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <source>Use BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+159"/>
+        <location line="+202"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6706,38 +6857,38 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-485"/>
+        <location filename="../gui/GenCertDialog.ui" line="-535"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <location line="+172"/>
+        <location line="+57"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-150"/>
+        <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-154"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-198"/>
+        <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6757,12 +6908,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+203"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6772,38 +6923,43 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+73"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+45"/>
+        <source>Use I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+29"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-453"/>
-        <location line="+638"/>
+        <location line="-503"/>
+        <location line="+693"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-363"/>
+        <location filename="../gui/GenCertDialog.ui" line="-394"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+138"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6847,13 +7003,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-91"/>
+        <location filename="../gui/GenCertDialog.ui" line="-109"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6863,7 +7019,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-119"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6898,7 +7054,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+28"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6908,12 +7064,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>BOB support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
+        <location line="+26"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6923,12 +7074,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <source>I2P instance address with BOB enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
+        <location line="+87"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7154,27 +7300,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+52"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
+        <location line="+53"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7184,39 +7316,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="+53"/>
+        <source>Connect To Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="-107"/>
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+76"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Advanced: Open Firewall Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7224,49 +7374,45 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
-        <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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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;span style=&quot; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+121"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+90"/>
+        <location line="+42"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+6"/>
+        <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 Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+24"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7291,7 +7437,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7341,12 +7487,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+133"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-182"/>
+        <location line="-184"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7470,7 +7616,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7478,7 +7624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7648,7 +7794,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
         <source>Title</source>
         <translation>標題</translation>
     </message>
@@ -7661,12 +7807,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+318"/>
+        <location line="+319"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
+        <location line="-355"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7691,7 +7837,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+294"/>
+        <location line="+295"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7706,14 +7852,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
-        <location line="+338"/>
+        <location line="-354"/>
+        <location line="+339"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-351"/>
+        <location line="-352"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7724,13 +7870,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+306"/>
+        <location line="+307"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7743,7 +7889,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7879,7 +8025,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -7890,22 +8036,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+109"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-101"/>
+        <location line="-102"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
+        <location line="-61"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+63"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7925,12 +8071,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+31"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+10"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7965,22 +8111,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+55"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8000,17 +8146,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+82"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+22"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+49"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8020,21 +8166,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelFilesWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">表單</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">標題</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8072,8 +8207,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
-        <source>Subscribe to Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Subscribe this Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8088,7 +8233,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -8103,7 +8248,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8117,6 +8262,11 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8126,7 +8276,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8147,7 +8297,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8209,18 +8359,18 @@ p, li { white-space: pre-wrap; }
         <translation>隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
         <source>New</source>
         <translation>新建</translation>
     </message>
     <message>
-        <location line="+92"/>
+        <location line="+100"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
-        <location line="+141"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
+        <location line="+142"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8235,17 +8385,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+228"/>
+        <location line="+242"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+58"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8270,35 +8420,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsChannelPostsWidget</name>
-    <message>
-        <source>Title</source>
-        <translation type="vanished">標題</translation>
-    </message>
-    <message>
-        <source>Search Title</source>
-        <translation type="vanished">搜索標題</translation>
-    </message>
-    <message>
-        <source>Feeds</source>
-        <translation type="vanished">訂閱</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="vanished">描述:</translation>
-    </message>
-</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8368,7 +8499,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Posts (locally / at friends):</source>
+        <source>Items (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8404,7 +8535,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8419,13 +8550,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">訂閱</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
-        <location line="+230"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
+        <location line="+287"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="-282"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8440,7 +8571,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+24"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8455,7 +8586,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+139"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8515,12 +8646,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+221"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+47"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>No posts available in this channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+163"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8595,12 +8736,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+28"/>
+        <location line="+11"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8651,17 +8793,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+71"/>
+        <location line="+73"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8776,7 +8918,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8789,7 +8931,7 @@ p, li { white-space: pre-wrap; }
         <translation>表單</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8819,7 +8961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-138"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -8858,7 +9000,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8882,6 +9024,21 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Show Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+73"/>
+        <source>Cannot vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -8891,7 +9048,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+81"/>
         <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; }
@@ -8920,7 +9077,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+29"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8951,7 +9108,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9002,7 +9159,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9018,7 +9175,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -9037,6 +9194,11 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+21"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9066,13 +9228,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
-        <location line="+329"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
+        <location line="+331"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-284"/>
+        <location line="-286"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9083,7 +9245,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -9103,17 +9265,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+239"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+102"/>
+        <location line="+76"/>
         <source>Hide</source>
         <translation>隱藏</translation>
     </message>
@@ -9126,59 +9288,66 @@ before you can comment</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+90"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+97"/>
+        <source>Threaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+20"/>
+        <location line="+20"/>
+        <source>...</source>
+        <translation type="unfinished">...</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Latest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Search forums</source>
         <translation>搜索論壇</translation>
     </message>
     <message>
-        <location line="-103"/>
+        <location line="-154"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+90"/>
-        <source>Threaded View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Flat View</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+488"/>
+        <location line="+481"/>
         <source>Title</source>
         <translation>標題</translation>
     </message>
     <message>
-        <location line="-487"/>
-        <location line="+499"/>
+        <location line="-480"/>
+        <location line="+492"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location line="-498"/>
+        <location line="-491"/>
         <source>Author</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-369"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="-29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9188,12 +9357,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Lastest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+171"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9233,23 +9397,23 @@ before you can comment</source>
         <translation>搜索作者</translation>
     </message>
     <message>
-        <location line="+178"/>
+        <location line="+190"/>
         <source>No name</source>
         <translation>未命名</translation>
     </message>
     <message>
-        <location line="-207"/>
-        <location line="+326"/>
+        <location line="-220"/>
+        <location line="+339"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-257"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9292,16 +9456,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+153"/>
+        <location line="+134"/>
         <source>Hide</source>
         <translation>隱藏</translation>
     </message>
     <message>
-        <source>Expand</source>
-        <translation type="vanished">展開</translation>
-    </message>
-    <message>
-        <location line="+187"/>
+        <location line="+189"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9331,8 +9491,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-285"/>
-        <location line="+291"/>
+        <location line="-287"/>
+        <location line="+293"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9415,12 +9575,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1336"/>
+        <location line="-1332"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+331"/>
         <source>Edit</source>
         <translation type="unfinished">編輯</translation>
     </message>
@@ -9481,7 +9641,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+21"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9501,7 +9661,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+65"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9553,7 +9713,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+639"/>
+        <location line="+636"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9563,7 +9723,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+155"/>
+        <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9578,7 +9738,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-837"/>
+        <location line="-838"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9644,12 +9804,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+40"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>論壇</translation>
@@ -9684,12 +9844,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+484"/>
+        <location line="+481"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-432"/>
+        <location line="-429"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9700,12 +9860,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+583"/>
+        <location line="+582"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-335"/>
+        <location line="-334"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9713,7 +9873,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9773,7 +9933,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+287"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9796,7 +9956,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9812,12 +9972,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+254"/>
+        <location line="+253"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-248"/>
+        <location line="-247"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9834,23 +9994,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+393"/>
+        <location line="+386"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-392"/>
-        <location line="+395"/>
+        <location line="-385"/>
+        <location line="+387"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-281"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+39"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9866,22 +10026,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+106"/>
+        <location line="+4"/>
+        <location line="+169"/>
+        <source>[None]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-65"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-613"/>
+        <location line="-608"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9891,12 +10057,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+94"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9906,7 +10072,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-143"/>
+        <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9981,7 +10147,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
+        <location line="+201"/>
+        <source>Author:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+21"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9997,27 +10168,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+24"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+39"/>
         <source>Cancel</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-230"/>
-        <source>Author</source>
-        <translation>作者</translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="-173"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10025,7 +10191,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10085,7 +10251,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+11"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10142,12 +10308,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+722"/>
+        <location line="+761"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-717"/>
+        <location line="-756"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10170,7 +10336,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10183,14 +10349,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+56"/>
-        <location line="+24"/>
+        <location line="+55"/>
+        <location line="+27"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10200,7 +10366,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-130"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10210,7 +10376,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+74"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+29"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10230,6 +10401,14 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsIdLabel</name>
+    <message>
+        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
+        <source>[Nobody]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10241,7 +10420,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10289,7 +10468,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10676,7 +10855,7 @@ This message is missing. You should receive it later.</source>
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10692,7 +10871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+26"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10711,7 +10890,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10785,7 +10964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">表單</translation>
     </message>
     <message>
-        <location line="+279"/>
+        <location line="+288"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10795,7 +10974,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10823,7 +11002,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+87"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10833,7 +11012,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+152"/>
+        <location filename="../gui/HomePage.cpp" line="+172"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10843,7 +11022,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-86"/>
+        <location line="-109"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10863,13 +11042,37 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <location line="+90"/>
+        <location line="+21"/>
+        <source>Include current local IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include current external IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include my DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Include all IPs history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+70"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="-109"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10881,12 +11084,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+99"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+143"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10901,12 +11104,7 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-183"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+202"/>
+        <location line="+19"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11171,14 +11369,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
-        <location line="+99"/>
-        <location line="+1361"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
+        <location line="+103"/>
+        <location line="+1322"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1294"/>
+        <location line="-1255"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11188,12 +11386,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1415"/>
+        <location line="+1376"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1429"/>
+        <location line="-1390"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11203,7 +11401,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11218,27 +11416,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+212"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+263"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="-146"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-41"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-225"/>
+        <location line="+358"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11254,29 +11452,39 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="-291"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="-64"/>
+        <source>Auto-Ban profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+84"/>
+        <source>Edit Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+151"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+43"/>
+        <location line="+48"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+22"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11296,18 +11504,20 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+13"/>
         <location line="+3"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+5"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11317,78 +11527,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-523"/>
+        <location line="-407"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="-58"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-741"/>
+        <location line="-587"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+142"/>
+        <location line="+147"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+128"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+58"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-580"/>
+        <location line="-569"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+539"/>
+        <location line="+535"/>
         <source>Type:</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location line="-114"/>
+        <location line="+139"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="-156"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-7"/>
+        <location line="-41"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+116"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11399,17 +11609,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-283"/>
+        <location line="-144"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+23"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11424,24 +11634,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1128"/>
+        <location line="+1085"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1305"/>
-        <location line="+1465"/>
+        <location line="-1267"/>
+        <location line="+1431"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1457"/>
-        <location line="+1455"/>
+        <location line="-1421"/>
+        <location line="+1419"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1364"/>
+        <location line="-1325"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11456,7 +11666,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+359"/>
+        <location line="+93"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+268"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11466,7 +11681,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+40"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11541,7 +11756,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+105"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11571,7 +11786,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11586,7 +11801,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+187"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11634,7 +11849,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+269"/>
+        <location line="+231"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11642,7 +11857,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+39"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11685,7 +11900,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+120"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11765,7 +11980,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
+        <location line="+357"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11781,17 +11996,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1991"/>
+        <location line="-1957"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1472"/>
+        <location line="+1498"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11896,7 +12106,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+274"/>
+        <location line="+277"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11946,21 +12156,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
-        <location line="+227"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
+        <location line="+237"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+275"/>
+        <location line="+507"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11970,7 +12180,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1490"/>
+        <location line="+1451"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11985,7 +12195,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+455"/>
+        <location line="+460"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12000,12 +12210,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12025,12 +12235,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12040,7 +12250,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+605"/>
+        <location line="+607"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12048,7 +12258,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12078,7 +12288,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
+        <location line="+95"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-84"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12092,7 +12308,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+64"/>
+        <location line="+73"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12102,7 +12318,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-111"/>
+        <location line="-119"/>
+        <source>No avatar chosen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12113,27 +12334,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+354"/>
-        <location line="+72"/>
+        <location line="+353"/>
+        <location line="+74"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-67"/>
+        <location line="-69"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+53"/>
+        <location line="+55"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
-        <location line="+72"/>
+        <location line="-74"/>
+        <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-60"/>
+        <location line="-62"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12153,7 +12374,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+62"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12163,12 +12384,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-409"/>
+        <location line="-410"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-133"/>
+        <location line="-179"/>
+        <location line="+141"/>
+        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-107"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12178,12 +12405,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+216"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12193,7 +12415,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-273"/>
+        <location line="-293"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12203,10 +12425,15 @@ These identities will soon be not supported anymore.</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location line="+179"/>
+        <location line="+182"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+7"/>
+        <source>Remove</source>
+        <translation type="unfinished">刪除</translation>
+    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12232,7 +12459,7 @@ These identities will soon be not supported anymore.</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12242,13 +12469,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-210"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-156"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12258,7 +12485,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12332,7 +12559,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
@@ -12342,12 +12569,12 @@ These identities will soon be not supported anymore.</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+290"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12370,18 +12597,34 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+60"/>
-        <location line="+7"/>
+        <location filename="../util/imageutil.cpp" line="+123"/>
+        <location line="+15"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Cannot save the image, invalid filename</source>
+        <source>Save Picture File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Pictures (*.png *.xpm *.jpg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-48"/>
+        <location line="+48"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12399,27 +12642,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+59"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-18"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-21"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+35"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12440,7 +12688,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens</source>
+        <source>Authenticated Tokens:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Registered services:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12449,26 +12702,31 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
-        <location line="+1007"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
+        <location line="+1010"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1005"/>
+        <location line="-1008"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+234"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12478,7 +12736,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+651"/>
+        <location line="+650"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12506,7 +12764,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+138"/>
+        <location filename="../gui/MainWindow.ui" line="+143"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12522,7 +12780,8 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+641"/>
+        <location filename="../gui/MainWindow.cpp" line="+649"/>
+        <location line="+59"/>
         <source>Options</source>
         <translation>選項</translation>
     </message>
@@ -12543,7 +12802,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-119"/>
+        <location filename="../gui/MainWindow.cpp" line="-178"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12554,12 +12813,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-312"/>
+        <location filename="../gui/MainWindow.cpp" line="-316"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+298"/>
+        <location line="+302"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12584,11 +12843,12 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
+        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-83"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12599,31 +12859,35 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
+        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="-63"/>
+        <location line="+64"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-59"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
+        <location line="+59"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-57"/>
+        <location line="+34"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-33"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12638,7 +12902,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+32"/>
+        <source>Close window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12668,7 +12937,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+365"/>
+        <location line="+367"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12688,7 +12957,7 @@ These identities will soon be not supported anymore.</source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location line="+273"/>
+        <location line="+277"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12733,12 +13002,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-899"/>
+        <location filename="../gui/MainWindow.cpp" line="-970"/>
+        <location line="+64"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-68"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12753,7 +13023,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+568"/>
+        <location line="+635"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12762,17 +13032,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1328"/>
+        <location line="+1342"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-942"/>
+        <location line="-973"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12808,12 +13078,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+24"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+51"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12828,32 +13098,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+82"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+79"/>
+        <location line="+93"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+41"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-105"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="-70"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-513"/>
+        <location line="-372"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12864,32 +13134,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-135"/>
+        <location line="-129"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+103"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+296"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+16"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+399"/>
+        <location line="+776"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12959,7 +13229,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12999,7 +13269,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+280"/>
+        <location line="+307"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13019,18 +13289,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+16"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
-        <location line="+1760"/>
+        <location line="+12"/>
+        <location line="+1808"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1759"/>
+        <location line="-1807"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13041,7 +13311,17 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1334"/>
+        <location line="+492"/>
+        <source>Will not reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no point in replying to a notification message!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+887"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13061,7 +13341,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-922"/>
+        <location line="-958"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13071,21 +13351,21 @@ Do you want to save message to draft box?</source>
         <translation>來自</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+475"/>
+        <location line="+510"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
-        <location line="+473"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
+        <location line="+508"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13100,7 +13380,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+152"/>
+        <location line="+166"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13110,30 +13390,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <location line="+136"/>
-        <location line="+6"/>
+        <location line="+31"/>
+        <location line="+134"/>
+        <location line="+52"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-142"/>
+        <location line="-186"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+186"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -13248,13 +13528,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+282"/>
+        <location line="+283"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+23"/>
+        <location line="+24"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13274,7 +13554,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+50"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13295,7 +13575,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13325,18 +13605,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
-        <location line="+154"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
+        <location line="+181"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-856"/>
+        <location line="-882"/>
         <source>From:</source>
         <translation>從：</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13376,13 +13656,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+324"/>
-        <location line="+2263"/>
+        <location line="+351"/>
+        <location line="+2271"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1252"/>
+        <location line="-1257"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13392,12 +13672,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
+        <location line="-146"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
+        <location line="+148"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13475,7 +13755,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13485,7 +13765,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+161"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13508,7 +13788,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13516,7 +13796,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13544,7 +13824,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13554,37 +13834,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-534"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+184"/>
         <source>From:</source>
         <translation>從：</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-118"/>
         <source>To:</source>
         <translation>到：</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="-45"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="+24"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="-66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-131"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13624,7 +13904,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+446"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13676,7 +13956,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13686,12 +13966,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+78"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+150"/>
+        <location line="+191"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13701,17 +13981,22 @@ Do you want to save message ?</source>
         <translation>下載</translation>
     </message>
     <message>
-        <location line="+230"/>
+        <location line="+222"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+6"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+347"/>
+        <location line="+54"/>
+        <source>more</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+290"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13720,14 +14005,24 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Show less</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show more</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13742,12 +14037,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-600"/>
+        <location line="-635"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+167"/>
+        <location line="+211"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13769,10 +14064,6 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Delete</source>
-        <translation type="vanished">刪除</translation>
-    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -13851,7 +14142,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13861,20 +14152,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="vanished">刪除</translation>
-    </message>
-    <message>
-        <location line="+190"/>
+        <location line="+194"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
-        <location line="+42"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
+        <location line="+47"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
+        <location line="-152"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -13904,17 +14191,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+89"/>
+        <location line="+88"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-41"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+176"/>
+        <location line="+186"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -13945,7 +14232,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13955,7 +14242,7 @@ Do you want to save message ?</source>
         <translation>來自</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
@@ -13965,7 +14252,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-3"/>
+        <location line="-4"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13974,6 +14261,16 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Search To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14000,13 +14297,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <location line="+65"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+197"/>
-        <source>Starred</source>
+        <location line="+249"/>
+        <source>Stared</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14081,7 +14378,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show author in People</source>
+        <source>Show in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14095,7 +14392,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+68"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14110,18 +14407,28 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+451"/>
+        <location line="+204"/>
+        <source>Deletion is not recommended</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+239"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+223"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-302"/>
+        <location line="-303"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14156,7 +14463,17 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14210,7 +14527,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -14220,7 +14537,7 @@ Do you want to save message ?</source>
         <translation>刪除項目</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14255,7 +14572,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+91"/>
         <source>Hide</source>
         <translation>隱藏</translation>
     </message>
@@ -14396,7 +14713,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+30"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14406,7 +14723,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14420,7 +14737,13 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
+        <source>You have selected %1 accepted peers among others,
+ Are you sure you want to un-friend them?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+26"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14453,18 +14776,13 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="-84"/>
-        <source>Export/create a new node</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14474,12 +14792,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+28"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+108"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14512,7 +14830,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14533,7 +14851,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14563,19 +14881,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
-        <location line="+24"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+162"/>
+        <location line="+144"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-162"/>
+        <location line="-144"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14585,12 +14903,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+82"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+46"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14600,7 +14918,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+214"/>
+        <location line="+251"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14715,7 +15033,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+236"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14725,7 +15043,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+193"/>
+        <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -14832,7 +15150,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+72"/>
+        <location filename="../gui/NewsFeed.ui" line="+79"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14847,7 +15165,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+103"/>
+        <location filename="../gui/NewsFeed.cpp" line="+104"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14857,12 +15175,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <location line="+11"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+72"/>
+        <location filename="../gui/NewsFeed.h" line="+71"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15091,10 +15409,6 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Feed</source>
-        <translation type="vanished">訂閱</translation>
-    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15104,7 +15418,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+228"/>
+        <location filename="../gui/notifyqt.cpp" line="+229"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15124,12 +15438,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+45"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15144,7 +15458,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+452"/>
+        <location line="+440"/>
         <source>Test</source>
         <translation>測試</translation>
     </message>
@@ -15155,17 +15469,19 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
+        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-176"/>
+        <location line="-472"/>
         <location line="+176"/>
+        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-756"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15173,7 +15489,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15312,7 +15628,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+41"/>
+        <source>Friend options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15357,12 +15678,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Options</source>
-        <translation type="unfinished">選項</translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15408,21 +15724,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
-        <location line="+139"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-178"/>
-        <location line="+139"/>
+        <location line="-181"/>
+        <location line="+142"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-171"/>
+        <location line="-174"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15440,7 +15756,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+57"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15516,12 +15832,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15547,7 +15863,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15568,7 +15884,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>刪除項目</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+110"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
@@ -15608,7 +15924,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+111"/>
+        <location line="+119"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15666,7 +15982,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15833,13 +16149,6 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PhotoCommentItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">表單</translation>
-    </message>
-</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -15991,17 +16300,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+65"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16030,7 +16339,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16089,19 +16398,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <location line="+109"/>
+        <location line="+18"/>
+        <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-42"/>
+        <location line="-45"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+58"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16137,12 +16446,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+52"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16353,12 +16662,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
+        <source>Ban this person (Sets negative opinion)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give neutral opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Give positive opinion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16411,7 +16735,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">新建</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16431,8 +16755,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
+        <location line="+29"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16457,13 +16781,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
-        <location line="+253"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
+        <location line="+251"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-249"/>
+        <location line="-247"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16491,12 +16815,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16511,12 +16835,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+14"/>
+        <source>Error while creating post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>An error occurred while creating the post.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16532,7 +16866,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
+        <location line="+38"/>
+        <source>No clipboard image found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>There is no image data in the clipboard to paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+51"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16542,7 +16886,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-196"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16562,12 +16906,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+20"/>
+        <source>Paste image from clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Paste Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16582,7 +16936,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16593,7 +16947,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16603,7 +16957,7 @@ p, li { white-space: pre-wrap; }
         <translation>標題</translation>
     </message>
     <message>
-        <location line="-148"/>
+        <location line="-180"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16611,12 +16965,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+19"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -16650,7 +17004,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16688,7 +17042,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
+        <source>Last activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16704,7 +17068,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -16719,12 +17083,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+100"/>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16737,18 +17106,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+368"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
+        <location line="+371"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16759,12 +17128,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+155"/>
+        <location line="+157"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="-153"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16774,7 +17143,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+80"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16784,17 +17153,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+47"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+428"/>
+        <location line="+431"/>
         <source>Set as read and remove item</source>
         <translation>設置為已讀并刪除項目</translation>
     </message>
@@ -16804,7 +17173,7 @@ p, li { white-space: pre-wrap; }
         <translation>新建</translation>
     </message>
     <message>
-        <location line="-202"/>
+        <location line="-203"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16814,7 +17183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+38"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16855,30 +17224,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>PostedListWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">表單</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="vanished">新建</translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="vanished">下一個</translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="vanished">前一個</translation>
-    </message>
-</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -16897,7 +17247,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+49"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Items (at friends):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+118"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16907,15 +17267,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-121"/>
+        <location line="-124"/>
         <location line="+10"/>
-        <location line="+85"/>
+        <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="-69"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16925,42 +17285,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+98"/>
+        <location line="+101"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+91"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-134"/>
+        <location line="-137"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-95"/>
-        <source>Contributions:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="-29"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+26"/>
+        <source>Number of subscribed friend nodes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+166"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16980,7 +17340,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+12"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17010,17 +17370,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+80"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17035,12 +17395,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+67"/>
+        <location line="-65"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+8"/>
+        <source>Copy http Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17050,27 +17415,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">編輯</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+127"/>
+        <location line="+32"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="-28"/>
+        <location line="+32"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
+        <location line="-32"/>
+        <location line="+32"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+395"/>
+        <location line="+318"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17085,7 +17454,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17159,6 +17528,16 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+67"/>
+        <source>Could not vote</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Error occured while voting: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17248,16 +17627,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+40"/>
         <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;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; 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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17365,7 +17744,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17381,7 +17760,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
+        <location line="+85"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17416,12 +17795,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+70"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17465,27 +17844,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+17"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-17"/>
+        <location line="+7"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-262"/>
+        <location line="-308"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-20"/>
+        <location line="-25"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17495,12 +17874,12 @@ and use the import button to load it</source>
         <translation type="unfinished">從：</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+51"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+58"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17530,13 +17909,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
+        <location line="+35"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+34"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17548,12 +17927,22 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+10"/>
+        <source>Remove all images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+51"/>
+        <source>Add Picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+36"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17568,7 +17957,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17583,34 +17972,24 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+5"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+357"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+7"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PulseItem</name>
     <message>
-        <source>From</source>
-        <translation type="vanished">來自</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="vanished">日期</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="vanished">...</translation>
+        <location line="+8"/>
+        <source>Load Picture File</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17621,7 +18000,7 @@ and use the import button to load it</source>
         <translation type="unfinished">表單</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+77"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -17640,7 +18019,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17650,7 +18029,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+49"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17677,7 +18056,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+70"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17687,7 +18066,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17707,7 +18086,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17823,7 +18202,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+69"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17831,37 +18210,42 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+85"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+136"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="-38"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="-43"/>
+        <source>Edit profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+82"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -17893,7 +18277,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+83"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17901,8 +18285,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+321"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
+        <location filename="../gui/MainWindow.cpp" line="+325"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18170,12 +18554,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+271"/>
+        <location filename="../main.cpp" line="+269"/>
         <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>
     </message>
@@ -18206,7 +18590,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18240,7 +18624,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+953"/>
+        <location filename="../rshare.cpp" line="+962"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18259,6 +18643,26 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+5"/>
+        <source>Old certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tor error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18338,7 +18742,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-317"/>
+        <location filename="../main.cpp" line="-320"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18348,7 +18752,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18358,7 +18762,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18374,7 +18778,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18441,7 +18845,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+765"/>
+        <location line="+766"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18469,7 +18873,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18650,12 +19054,28 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Status</source>
+        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
+        <source>Node</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18898,6 +19318,18 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
+        <location line="+13"/>
+        <source>Missing channel post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
+        <location line="+17"/>
+        <source>[System]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19037,7 +19469,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19204,7 +19636,7 @@ p, li { white-space: pre-wrap; }
         <translation>表單</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+146"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19217,7 +19649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19390,12 +19822,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+8"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Copy image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+27"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19403,12 +19845,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20096,7 +20538,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20217,7 +20659,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20237,7 +20679,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+708"/>
+        <location line="+739"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20293,7 +20735,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+99"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20307,11 +20749,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+186"/>
-        <source>[ ... Missing Message ... ]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20325,6 +20762,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">來自</translation>
     </message>
+    <message>
+        <location line="+1"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20347,12 +20789,17 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read</source>
+        <source>Click to sort by read status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by from</source>
+        <source>Click to sort by author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Click to sort by destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20376,7 +20823,9 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+311"/>
+        <location line="+333"/>
+        <location line="+14"/>
+        <location line="+17"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20397,7 +20846,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-525"/>
+        <location filename="../rshare.cpp" line="-541"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20458,7 +20907,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+95"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20479,7 +20928,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-424"/>
+        <location line="-425"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20509,7 +20958,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20527,7 +20976,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20544,12 +20993,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+20"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20610,7 +21059,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+62"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20625,7 +21074,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20725,23 +21174,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+135"/>
+        <location line="+148"/>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+346"/>
+        <location line="+345"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-345"/>
+        <location line="-344"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20751,7 +21200,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>Download Notice</source>
         <translation>下載</translation>
     </message>
@@ -20788,7 +21237,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+369"/>
+        <location line="+370"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>文件夾</translation>
@@ -20799,17 +21248,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+192"/>
+        <location line="+194"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1163"/>
+        <location line="-1165"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-258"/>
+        <location line="-270"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20829,7 +21278,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+251"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20837,7 +21286,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20853,22 +21302,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>刪除項目</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="-196"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+96"/>
+        <location line="+221"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+52"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="-23"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20885,7 +21334,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20910,8 +21359,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
-        <location line="+214"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
+        <location line="+99"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20919,7 +21368,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20950,7 +21399,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -20995,12 +21444,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+115"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21020,17 +21469,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+28"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
-        <source>A unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+44"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
@@ -21040,7 +21484,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+24"/>
+        <source>SSL request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>An unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+88"/>
         <source>Hide</source>
         <translation>隱藏</translation>
     </message>
@@ -21050,7 +21504,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-201"/>
+        <location line="-212"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21060,12 +21514,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+6"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-15"/>
+        <location line="-16"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21124,12 +21578,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+705"/>
+        <location line="+955"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-712"/>
+        <location line="-962"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21150,22 +21604,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+137"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="-23"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+93"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+314"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21178,21 +21632,16 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Allow RetroShare to ask my ip to these websites:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-361"/>
-        <location line="+201"/>
-        <location line="+1476"/>
+        <location line="-608"/>
+        <location line="+219"/>
+        <location line="+1711"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1739"/>
+        <location line="-1992"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21202,23 +21651,46 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-89"/>
+        <location line="-90"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1013"/>
+        <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1013"/>
+        <location line="+825"/>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>external</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>
+
+List of found external IP:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21228,7 +21700,7 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+47"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21253,37 +21725,95 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
-        <location line="+14"/>
+        <location line="+119"/>
+        <location line="+18"/>
+        <location line="+15"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="-10"/>
+        <location line="+15"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>BOB is running and accessible</source>
+        <location line="+8"/>
+        <source>SAMv3 is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>BOB is not accessible! Is it running?</source>
+        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+319"/>
-        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
+        <location line="+318"/>
+        <source>Your key uses the following algorithms: %1 and %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+120"/>
+        <source>unkown key type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-94"/>
+        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
+(id: %4)
 
-When changing options (e.g. port) use the buttons at the bottom to restart BOB.
+When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+19"/>
+        <source>Offline, no SAM session is established yet.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM is trying to establish a session ... this can take some time.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>SAM session established! Now setting up a forward session ...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Online, SAM is working as exptected
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>You key uses %1 for signing and %2 for crypto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>stop SAM tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop SAM tunnel first to disable SAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-136"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21298,71 +21828,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <location line="+62"/>
-        <location line="+4"/>
-        <source>BOB is processing a request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-58"/>
-        <source>connectivity check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>generating key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>starting up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>shuting down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is processing a request: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB is broken
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB encountered an error:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>BOB tunnel is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is working fine: tunnel established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
-        <source>BOB tunnel is not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>BOB is inactive: tunnel closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
+        <location line="+118"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21372,22 +21838,7 @@ When changing options (e.g. port) use the buttons at the bottom to restart BOB.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>stop BOB tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop BOB tunnel first to disable BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
+        <location line="+22"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21399,12 +21850,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+267"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21414,7 +21865,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-625"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21429,23 +21880,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+239"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+124"/>
+        <location line="+127"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+130"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21456,17 +21907,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+225"/>
-        <source>Automatic I2P/BOB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+253"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21476,12 +21917,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>I2P Basic Open Bridge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
+        <location line="+23"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21491,17 +21927,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>I2P proxy port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>BOB accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+54"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21541,7 +21967,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+53"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21556,12 +21982,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>BOB status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-647"/>
+        <location line="-633"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21597,7 +22018,32 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+782"/>
+        <location line="+32"/>
+        <source>Automatic I2P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>I2P Simple Anonymous Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <source>SAM accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+350"/>
+        <source>SAM status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+301"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21652,7 +22098,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21677,7 +22123,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+240"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -21689,7 +22135,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21712,7 +22158,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21772,17 +22218,28 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1107"/>
+        <location line="-1104"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="-43"/>
+        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
+        <source>List of OpenDns servers used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+58"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21798,18 +22255,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+360"/>
+        <location line="+356"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-357"/>
+        <location line="-353"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21844,12 +22301,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+549"/>
+        <location line="+546"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21872,22 +22329,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1307"/>
+        <location line="-1560"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+60"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1142"/>
+        <location line="+1386"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21922,7 +22379,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-941"/>
+        <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21932,12 +22389,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+22"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22017,7 +22474,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22027,12 +22484,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
+        <location line="-72"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+145"/>
+        <location line="+160"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22051,7 +22508,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+37"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22071,17 +22528,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+24"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+34"/>
         <source>Cancel</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="-36"/>
+        <location line="-37"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22091,7 +22548,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+29"/>
+        <location filename="../gui/ShareManager.ui" line="+30"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22182,7 +22639,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+87"/>
+        <location filename="../gui/ShareManager.ui" line="+119"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22190,7 +22647,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22241,11 +22698,16 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+23"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22255,7 +22717,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>下載</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22270,7 +22732,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+441"/>
+        <location line="+444"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22286,7 +22748,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-628"/>
+        <location line="-631"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22311,7 +22773,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+429"/>
+        <location line="+432"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22454,12 +22916,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+310"/>
+        <location filename="../main.cpp" line="+313"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+43"/>
+        <location line="+42"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22483,7 +22945,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+17"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22822,7 +23284,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+25"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23059,7 +23521,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23095,12 +23557,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+39"/>
+        <location line="+46"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="-36"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
+        <location line="+6"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
@@ -23110,18 +23575,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>Hidden service address:</source>
+        <location line="+13"/>
+        <source>Hidden address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Tor bootstrap status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <location line="+17"/>
+        <location line="+26"/>
+        <location line="+23"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23131,12 +23591,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Socket connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Authenticated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Hidden service ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tor offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tor ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23144,7 +23649,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23154,7 +23659,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+78"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23165,11 +23670,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
+        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="-28"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23197,7 +23703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23208,7 +23714,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-307"/>
+        <location line="-344"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23218,22 +23724,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <source>Edit Share</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-12"/>
+        <location line="-22"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+12"/>
+        <source>Configure shared directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+28"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23318,7 +23829,7 @@ p, li { white-space: pre-wrap; }
         <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;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23327,7 +23838,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+17"/>
+        <source>Minimum font size for Shared Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23352,7 +23868,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+33"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23417,12 +23938,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+69"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23432,7 +23948,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23460,7 +23986,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23488,19 +24014,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+122"/>
+        <location line="+125"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -23707,7 +24233,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+88"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+174"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23732,7 +24263,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+301"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23753,7 +24284,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+304"/>
+        <location line="+293"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -23786,7 +24317,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+28"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+103"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23801,7 +24342,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1345"/>
+        <location line="-1344"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -23928,23 +24469,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+359"/>
+        <location line="+384"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23954,7 +24490,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1130"/>
+        <location line="+1125"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23964,7 +24500,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1175"/>
+        <location line="-1170"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23979,7 +24515,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+258"/>
+        <location line="+267"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23989,7 +24525,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+252"/>
+        <location line="+249"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24403,12 +24939,17 @@ p, li { white-space: pre-wrap; }
         <translation>表單</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+8"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+20"/>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24448,17 +24989,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+45"/>
+        <source>Missing passphrase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Please set a passphrase to proect the access to the WEB interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24468,12 +25019,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+17"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24610,7 +25161,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24625,7 +25176,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+56"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24713,7 +25264,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24748,7 +25299,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+25"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24778,14 +25329,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
+        <location line="+37"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24806,7 +25361,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+27"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24889,16 +25444,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
-        <location line="+27"/>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
+        <location line="+33"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24913,7 +25459,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24933,7 +25479,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+32"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24963,11 +25509,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="vanished">新建</translation>
-    </message>
-    <message>
-        <location line="-192"/>
+        <location line="-196"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24977,7 +25519,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25040,35 +25582,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">表單</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Masthead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location line="+86"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-32"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-37"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
+        <source>Remove</source>
+        <translation type="unfinished">刪除</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+24"/>
+        <source>Use the mouse to zoom and adjust the image for your background.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25113,11 +25662,41 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
+        <source>Own</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Unfollow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Follow</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+41"/>
+        <location filename="../util/misc.cpp" line="+44"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>未知</translation>
@@ -25195,7 +25774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+36"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25232,7 +25811,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>

From b7414c078aa94602d5ddda625e14dd6fcf4346f1 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 3 Feb 2024 22:37:04 +0100
Subject: [PATCH 443/503] update translation

---
 retroshare-gui/src/lang/retroshare_de.qm |  Bin 490182 -> 561420 bytes
 retroshare-gui/src/lang/retroshare_de.ts | 1200 +++++++++++-----------
 2 files changed, 604 insertions(+), 596 deletions(-)

diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index fc57cf06d6ccc52c4909dac76b364d79c1febdc2..6000946bff49feb05cdff34297dcdf13452f6ea6 100644
GIT binary patch
delta 78066
zcmXWjWk3{N7XaXMdn^pZzz*yrY%x(mQb5Ii?Zg5Dl~pkS6$|WE48#Nj#l{W{>_V|c
zM8U4_aOeB=%q}d<&fGZX+`D`3OS$=*DqC6{9$4zq$2BomE0sObZ{xAYZ2`hd0YE*F
zWdhL#03Ak}x^6c0cx2k^ua>TG(y|eaO()kkJ?X3E-v()gb(U$FP_!Wk@6G_0yaS&x
z_(Tg(FT7A^bTrxqsQQk!1+xFARwXY$JA(Rj7WDx2xi0DlDo3Cr&=>&P7F4z^x&zoG
zJTc}D>V6{n8~ANJAylO~1Mu?rcq;yXJWy!^@Ck1q&t{@afqmVEuEZBUM)w0r*kgLT
zrdA~<plJZUd5_T)JW-VPxTj?{%S{_EGYwDG@=^E(csh`iQ%rLzS@Z!PwNER%;w9mq
z@gF`gz1>x-lAoZtK&R~0%B~Z&>iaDKQ4B~TUV%JshiTQZd}wpvQ?6*$3A_Tr3s{rN
zS`~~ZfREJ)OQd=5D;XUH>=51?u?Hy2`vZG`m$+ftZmL!eSdX3rXm!)Hdz@C5s-#tM
zJ<yK;uA@vnHf#Bx{#x~{r|HMf0Ez*%%)(oz`U9O^4BZ3dPDOyK`|%!PW2*WY4FIq!
z2I{{|(`-C*yS#h67M+PEVOz2Sx}l%x$0#l97OdsTj#}a4qLmH20UWVWx9E%B01NT+
z189^6#BVl$%R_7fTd~Er0C<X*yyF%iF0on`*U|LkWYg;_wY&^oA^bh@3U6J<+dvKv
zHhtl#m17;WYUgEuPId6g{nL^T&GNJW3(2paPzCYc;V-Bc3()|OWB)_3G3MsI5KnOL
zJkw*twaVcG`W)2GpLn^41Fwb+(RDA-?3Ms-DIm*X<LjITq8Z+M_c5UQR!8ygwY9>|
zgAMpBUTF_Y0uWccl%7R_R=o@0H4x}6YzwHUb_NXrF}V+bPeXv_Z?vR5(Xxd1T6Low
zdJ$VSwuvs=K$gCSz4AO>Mf`c5o$>ckx&|A2p10m<`A>=cAD<8<Q}h#}CZ1W>C!jv!
zJ?|a~yihhkz#>r2fdD;5g7Ex=9s_8Nf1qbA;0?y3{eY%nZ$U*vY%{3ZF$nFC?|3^v
zulXSImj>v223U(yS`}iLp3K7jk3UfVasY-r#WTjng7W)#$%nQFI<q;@!C63#chWMa
zmp~KG1G&3R%d*x0Yuy?|S$klv_puFC1UAzSc=9%2F)x5VZwzc(-s8)_GN$3cwFday
z)xcU!1s;L7%<eUgKl8EGkJtfxK?JDAFMuzr3b4I_mgRoe$}$guuh{{rNlD=AW&!z7
zNXw>8*YY9HO!o$8#ekt&xeQ0St&@SB#?cRzWsd^imImzGW#HSfJ$1D#!Gl<!(~p_n
z;-;VKYkAW#TG?%#Y5z;WcMDMQJ%Ar{0dim#ian*}JJYUzw6f#}ty&lk{3r*yYKZBc
zucn{z-Q)ATZCO0Cyn|-Nw8E~tR;Aqnp2|UF<_CV=4*$SQt!#ZqtKuWk_Sl*mFC8T-
zSaN~i!NIkggO-j8GL8CYdMnKI^G_}7g{O(X&u*60@*De1Zw}ImYBNl|-kAQZt(D)_
zYSlTse)xLzzJjSGD;rx)Z=gA^wCrb^mN##zmHmGKe}uh13tI!q*W!si4gvNHPx#FW
zobA47=?uK__?Z39r{%T0w6bkyQ=f09lkmpl@2TkCz%v_wg+0O>fd}eDFW?_>$nqL(
z+Q(W;#<^-~^e5BRex~o1n|>gsxpTDa5nd7eJKWX$J-#0&1AHus&ND69NGliq$kPIH
z#TwvW1^_faV%quu@UKq5+GCT<vv)n<zwk!3o2eC(PiR#OUl2SMScw`S8gvFh@us7)
z@&FKxe}kA>2Sn?oK;A@XY5Q;x9cBZseG5b<oZ!8Cq82>xn`J)HSC|exXBtw<^z2eC
zaWj99oNK8cQ(4GVMVd~vGo3L^%WScO<3D1j25EWT42O?J$(5!p27|EVJu&URenNJ^
zGsVZUYmQbeBOu&!LDX~s;U5bm7XNXcIWM)Wc10}@4AqKIyb@hq0KNoj$p!p-_*i*X
z0WtVE0A9^J=~}8~W%ht2?+N8|8^qA<KxeGb$}Y#WYUO4SBTfTPz`-0<t0ahV5kME!
zH(hJdsxBQ&SK*jBAsXO*1ud<UfZ|jbw8}KxK}*-+mBZ(0`eFP7cpzjaQ;)fLH9BHo
zSHiRl9?#nY(hgrRpW|5gL93ijnVxt6VtFo*YkNSfI19Y+R;|Q2Qmko@v&0M2gHc*u
zbRFsk^iN+cFJ=id5893cv3>}^v>+{+fbSR|vsZXUHVO<TM{CKeR$4kUzm^xrD}q1g
z^)F~;M>kX7*QS=WTD5hV>7E%Nwob$0YX^vJ4M18x-ob;VI6eK-lDC;!;W!=50A75T
zX@w`IO$^g^*cR~TazH<=O2@ym6UWv{*k*S21AZ5Oj>->@K*VnWKIez&qS;!RrO;dq
zV<H>r16i#bhyxg|p8u+4HLbPE|EKA_42<6f0Xu?M0F^Va)uZYonu52e2EP8uap1?X
zEv3%}_3j&nHuFGrwKq*G2yzDlvE(vH9G9VIeUSHiTY!7uWx)O~b2@-(83nMV2dKP$
z>M#~xjIH_MTTrX9AujC)Djg^0N4>#txD9kxZOGR#30R^H<Qq^Ll<ENaVv>Nk--7%f
zbAjD|rd19#p<o@ndZVg9!9%qG*cB*v38%IWOTa4LG8Opy`(Sk!8^*|5P`JSl%o<8V
zk>Tq={yq=ZSKHt}{)avTvA7=;pZN|{4*|v3+Tt9r4Qy;TgUnwGY)?l4bzTo;SDpu6
z=aOloGo~%SL4`%taYVcTl|9FU+|UcE;u{vxkx<Pt+7@Ih0@d)+@T04s8vcN<+6*-u
z_k;Mc1pSPjg&I!9(C<*ge*lm}-=J3B<eXU^YT*<}?heqh%mApBf_?nUQmBQOm}O>b
zxx;#>T^lFwtRYYvdlUP30cz*<rh9L|q7OdK(@$_mYp9Lgh-J5d+IUY{b|}<NJ&zuP
z+Ua<y$9R}VpM^RYTSKEOTIIPD>a=|cGH@K!Y5x)@r2|?y(V|slS3uo5DIi+JKtu8!
z<n&!yRl?f>4m~ac9Z(4z?d^ak_Xfwm9N@!waMF)wf>XN}Ak)I3$zeQ!pjW0VXF!u=
z{6~JC(DbPTz`_~Od}1Y_Rdz%3uzJAUrbCNuH9=NQhPL;kffN*`hp#}pu{b1GDhutF
zx&Z5MiGvQ?Q-IlpLdOC-0E&Hqj>|Brgd6|&x0c~#k@q~iUs21S711jDuF$C_MwUh5
zO-mfm^5l=u>Bv7!3jDQl>?v@?$%$K{!PN=7wdEYRzDd9VYFu6OV1lD*#4IhJQ4ZW{
zYzA`V5V+OGna`hV<+wSf_xFNZqZoj=v0Bn`ftI!IX=;fv{Z>-TZ@&Pyk$xBgPcfZn
zfZN2jU{T)v!0r5YPzN4>+x`DQc`t^}1IGf%cGB_@m7w!n3`&}A1b3WP;X{;ZR)AJC
zc@6H^4Tar0t%|P=?koEP+0@50J5Ed6U=o4P)2OCeK4MLt7MwV&^%E)}72J;|0Nr~S
z+^=AAUba5C-^G4>@)Ni}pN?ZgCb(zh1@(2ogPsAp+SYXMPpvA_!gP#_>Czz6_#@!K
zF=A@_3p|D$17f+RrEeC2$4E<iOg}n-$FlqwQc*3hIaMp%^MPmNTi}~rz;oG2AfLNw
z`KYSk86OI4LP;&RX#igN?0~q{2k*wWF|I4G737MkcRBFxfQ{|hXYh8#_`3OE@M+u&
zXWgyfW4Vg&@RS{NiNxvEKL&ieWA(uHAoyOm4YEErZ5s}LVUYm$lxgl*Epa<!8e3S)
zr}Q&T@YD*Ig<84l0r*`x4Ror%Y0Od6M1g5k-VeTZ(N8ej(OOZ=d@O3*HXnx)t@<?|
z{Cf-p_HHBi4?hE<RAcDsyB8C;ztA;u1(4^b(O7_Q>$S4#9Oybf2H#i{)0MZNYiwyO
z;H)$CxoCl|yYZcWtOi|^aTYxLMN2MsgKop{p56Scm2ba5x8XR`c^pBpjU1k?W#y-6
zMIATjw#W}y^-o$}$HlZ!lvXru0^OG3(0(}*x}S~!a^(|rKZhrpXgRJAc%cO7e!eNt
zA6Z&%_1LuTaOi#!#{*|it^69JRn}I}{W9LFlSQC=?l2&iT0%hEbwHfULqLb!AZ8we
zfQ~28YzWvo8#B!<5b)?NP~Ywl@Mbn9_WMjNo$u)bI=Z@+-&=3`D?%$u&(_NC#i2+4
zT#V(spvSP4ID|Suj}eI={d#ECw#%mblQ83L52~CS^a#aVsrU!e2KLZndo(uA!&>=a
z8uU16msdvf)CbBl6nYlGRvc2-G_s$ThVIca7^M~Yo@!-4bLiOvGtYk%dJfLP$mu2Y
z96lAt{)(pEi$c%v6~Nm!gkBOGZ};}5p`Kbcp?98G#@KQidU=Q7FN}v?0V%+DT!CIc
zPXNhyrIj-dK=1r7fX$x;y-VbPd^;R^W8-66ze4Xg0nGk4^v<*euz3xAEq#F)Ct+X}
z3_5Ezgn>CYLZ0jjgX&<Q^3Vnb?Q{b5_8SadhOuJ(elWDN1>-&It}rxQ06FszhUY&6
zB>f!>&l_5q4~($22Z*+Y5fx`)qp1iZwiN;hwZO>4Dj=thfl)XRLC--jrVNHvyd{je
z7YFdGB8t7Dn;nb|ZVPnO0T|c7323ErFs>V>yj#Oz+?8aUE$=~)1-l=)nE}DE(I9g@
zA^5%nKz%<5e()D~&#EvfE(Un3i>7WF5Q6ti27ZSrc&XK)H!yV#W;lC&A=JkXnDaRZ
zojx95ss*N}Ie?m60jA&00vUWks|t5BU3e1axH<r>fMtw1mr4WK-VO2;Ej=LO78cj`
z6orTn*y_JMf`z57fdY3}IyM)0uc;7SHVbH}6o`(-D^j@?#EijgCs%3ZyIfcv%`wKy
zfmKH_l<T<x)?8W$;`?=2R~jR%0Uu!9&hl8sC<W_B1p>Lh(gN$ptpjFt88%|b#q23;
zS{H<k<}hpycLTD>2VxzZfi8Umu?PG?R7r-dgTsI=C$K%!22UUdw*UAD>boE8*s=h4
z=~RfXfNi5xEr|DZ13Bmo?Aqjs(>cIyEMLh(Hn8W`C6G(KVQ&V$0cxqD4@AfJu&?SZ
zAZZ;T!7U2p$O&+;RtAtV0uDCW479%;9Ja=g{7otxt`!B`>l7TWjjj4a2}t^IACpcS
zI9fD6sKEDdtO^!`o|V<gI@96UcFeFcf5Guyc#H12Xw@-CIB^hDc*|&j6n|_~lO&ug
z)DB3Nvz8AlZ@T6LoNJ5~V$V)+F1Qeoh2P*JjRd+aMJp<9f{SAd1Lu)&$u|qsx(RUQ
zEM~snec)Qrfgt}&g4CyY$tQb3noBc~x6eb`#Vml8!{Nc*Xw3i16@n*Dn6oYZ2~V~>
z1@f(*mXFJTr}tN3JYN=`&vFEE!wNENw*dQG3^F=mQo67iWc0WMWa|}p(P##!`Offq
z{ab*sE#P&06(H9Q$n2E@v|cI5yygqSY8rgB#eY1*A3g>p0e^NFvb#L60EwFlpRrZ5
zaev`!2P+^AIQ%%Y8*97%@aw^GU>l~upTXCGg-5`jr`X*}w1$5k)&S?~Xyw;-@b7Cd
zu+=jNIkW}jq(g-IcLP@1hlqN&0QOuVM)^L#Xc8%Kt}@UCwMc=N*d2R)M=}3r&5DqM
z`*#EHF@h9og(+1*gA~F<LT1?$t6g<L?H)pkxMEqQL?>c>Z4i*3KebdYC&j<D0aAX3
zX^IcAnfwW8^PR*dEg!I1lGxnIv#aS|LQ3?)fv477QX;54$YJ?ONlP7!%gYWWrPfsi
z>eHXtz6}IgwiPLpoP>!+H&S*8zN40or2K3K<nI(M4{;#nlX8Ik`A^FyTayYN0|7Gk
zkP4TJ1N`tKl{#bN-Pe#*y6Oos#vqlx+5<0klvFPM64;^$QY9h_YX+x@rRI&>z(&p_
z+9~5ny{Um9hYTe3LUG8g<w5E<`3oe_(6Sb8q+#?x;BAf(dsiH?i##Nb7p;Lj@FGt9
zKES*oq)~KDpgYf#rjtD|9+*g)=Hfq$+D@7|W5RNFE@{?20m$gRq*-byfLdu5(!5kv
zV0V|07Ax_Eht`r7PZ-u_3Yhju(9+e}q*bd#fJ3E7YkwTu_Z=W@a!2Dme?Zy_7a(3Y
zNxNH^<9$sd?PIXwxT`Yh@bfHCk0jD@4Gvtdo{^3}f^lRlLOQMb0>q;t>6|qj+n%Kk
zabM~NFvp3w?;H-I*L&jr2Jg-ET;ehE1CX#v#A{FzCK`W<w+&{tqB!w>=LA4c6Q5%l
zAl#c0pI>PpA08!L8e;n0E|zrZUKZ&3f5f+1Eas5*#Bbz9kX6o;u0OGN#BI~k0`8>S
z4NssJXIB!?Dh>Fw5v0e{%D9-+o%9U43+zcl(sN}l)^aM7e&2cl4R1*X`r$j+_F7A(
zZqdpzi^w3+16V&n2Ib-q+xQz9QV8Eb^U`G4TbzsnTa#fwUtrd3OU5?Ep?%;aGIrkq
zfS?H^sLCI(&{Hk-fv{giLISY+EsrBp0<ld@h%!BLgiM);b3m*onSv+8H>40tm9wDE
zbs`pD9OH)#BbKL_(ah{XrVow+GP97DK8@9K=A@OCYLKw<?SUk(Bw<d^0E`zTY`TL5
z)Sc2~*4|W5%Nml|*D*aF`-#kHl@F*LCvywMff~`1%zbzt==X;tq8j#wkM<<un=7ar
zZ%HH;Dd^~aByyiO@TvRB{6eX~1J;lQ1+bgGP9+O|;p_5ekcAB&09~_3D@taPg+mqs
zna;?f+ZHT7{ToH17mom$evd3KhgGSw{$$0W&lr48B5Pfr;H2V1)+YS~@_U$;PqHDK
z4=|A94wJ1r(g4<`kR55WK#VCv;=*uJ@l7T1kN~p3Gl?&B6Nlj1WLM!YAp3H%D<l}>
zj2UG2S}agi`%U&(oN+RFIffjn7mJZlCOI553uM0D<cRnSa+DQGZi3aV%}ceS`5uxy
zi2>sdB>7AXP`^Utcojd8wQiA<VOWr^(S)2{a1ChZ_T+s3;y}G~$fYWH>z-^Tmv#-q
z{J%Q6>Jf)^#2~HcU`s4lhwsHzftMstKJ+xXI)68?w2@lr-I835#pyG)Ai3tpLD@@k
zeNjoEh1QX@X;@s$*{GH8s*pQy5#Y=+a;H8HwRi2w9c&A*FNEBgg}tP9KXPyRLtrzW
zY5C!D<Q~?EcoAoddC<5IdFbE@qUl8PaCIcG#&yUe|9TjomnDxvD+0aKnLL_a9$?dH
z^7!d^V8IhiSLHW7-IF}Y2?pNTg`~H!0hSPo%W+>oHSb7X-o6S@vKo2$btO(lAIPhQ
zKY)E%LSEM?kLxa$gXDD%p6UL5<efE!Ot<!ucTU*9?=K|pKV8CtVsVnW1!ud$708Et
zSmE$!Pd@a;5X_|x$*vXzw4=3Fd>crzW3B>y{fOjTDFCeNE0Q~NI6!J&@_jW<V(W9r
zkCM1TRsK2o)gTQQh8~e$IOkAHr<LSaCN`EgAIYDY4nSVc)T-ST$iIO(APOy|P%#06
zgf&|Ev?3*ctN>07qEtWMn#v8Oak6?ujon_r9yX_ir~Lr>d@n5$UK~`JinQpDsv!E8
zqa`-9$Hl&X)b<NTR=)GK7Il3yt-A9XMyuDU-PkY;j|HthBNk}IEwn~4Tm!J0Wm?yo
z*6h+0m`e#-C(setAVuq*+=5Bz4Xx^NgxasU2x^}}9R_a!)$KiXSd9ZuVkT{590Hnb
zPaAJ|0MczZZQ?u-8+DyLG5>Ggo;JIMWBY<mw51cS1+<z<TYAR;>FBCumfF<0K8DkG
zzEbC>{eXqOrL8JsNLDk5wvNgM*5^5GHxF;!wX3w<EgT{DrqK2wj-al7qAordIn@oI
zt_P|D{7s==PGLaboTpyxv5}s;NWBhVF@UrwO1+Xfu%x%tTVPRXTQe;gw$gOUdoBCa
zh5AH{0@>>Y^~bUt^cYM1L-XNc{u=6^gZK8#HQF81GWqN|?Y=b{_}pbQU<qyxa9B$F
zt!NL>7_`ds5gjrs4Ga-Whgv?Z1Gw~p4iC8nG~zcMQ8*YINdz776BCbwi*%$FPRCpK
z(~%oofsNQ?8nTg&X%~iV#ZIesRiWb|+X8#JQmYzy(4fX{z)qK=LHo}Esq>o#7jVKg
zw}V>tBUj67{H2z>AIORAXs{hltHTw#9b}vCH24{2t?d%&gjme$pVX%lE~cWvbYk8g
zdUA|T%)*T6DWj7L;ZS?O8=aK*&Y$<AlL4dRTQ_Nlbvn=_8`GarT2Z$g4Z)!s?ljht
z&F?ID1{8RUAJnq^FQ_Hm=uE79L8&G*jA8dW|A)@%{}O2LQ#9Ne>%SROXm~U(&`v2x
zBe1T==k=nIvAEDzb|;-jivqdYh0b$~1@a?U%Yzc=yi?_XzTHZrF4Y7mzK<@<#@<lG
zkuFNWu)LM!9F1wy4kw{B8nfaBh)IX&@>pzK4iR*vAI^qOS#<TtK;T`M(>32PSL{EJ
zuAPhnOvRpbT?7^)wg=PoU5n%Ey3-BeegKjC=_Y;~qu&I&C3F@}Ql03w>o|#xUP<FH
zrxc9_(Ky!(U`@`@_+rgKSuXdbyS8FR^K%m2i^U`M;UL|I0fzdNK@;oX2~9|$2eG8W
zJ{F{hvdRGODCproSToAbN0ah70uQTAlg<YMTX&WoEAs$EpO*Ak1m=$JrRlMhS^(WP
z(Bt{>=V?c@vQ%eN=l)uY9A8@>s0H=u@del|DlefYy5fj8VG=#r34_Q>Xdj$3I$hAx
z-Bq>B`j1xFDSG-k0QvG*%g1)0XP#jB?$t_~;u(o$yzBIQU0g>$zM7t&G#2Q{i}Vu1
zK&0modZ}5{yp{cZ^wJ?5)A<y7rGEtw?^|dUv7%RQVkM*aO?r*j0@11%z1A@W<miet
zwL&n^1`TLxwE*mX-t?A%BdB{#dUsS!5Fhty<ttnIU~(ex4%_I1Ijex>jH8d6Rt0i)
z7=64l5#MN2n%=^48`Oh#G<{@#oTYxyXSW5WNNwr!JscorIL$bD0NAU`^u<^k5XMmY
za{d9_XHk;Ax|9vV?mm6Jvp>k{1?d~x@}O+G(#*G*A$9bopPXEP77Wyi_QmO^-k2kn
z&8A;2VPaCF4*lgF1v23e<CY08fZUqEMBeV9-Vd4Z&BVlD0TU583y%L~y26?n*JlCS
z+l}Rm4Z}I%0V{}6GHW`GSrx{S?_~lj=7P6weJy6){v}pUe3;E$T=2j1j+HFc8({e*
zR&vh~fR6?%TcHogQW>o5>5?FQ`Y}uSq!%Cu_GOg}X8?O&Ry6|q@wfJ@)*M_=uKbYI
zPO1VVcrvRSgN<s@Zq~5Y03b)Fv4&maF>Yw0rP-skd}v{<n*WU1Py7k+c@?vN>JO9$
zXyy7NtkLKppt?6_jh0r&6E`g8LDnJG_}5IJ8(wHdna`%(QdyHPR>0%7v8GFxVlC$`
zbMEU4P-i`Bm5bIr&ssaQ2h#ZzYrQiY$k(N;O$AI=fB)0+NxNB_$Xg(L|6y$hI|Hd*
zmv#Ie0IE<X>-6Coz;DY>eL($AG1uFRfrM6OZj1W>_vp$x``Lhc|A2Kq)eh6|v&^$w
zH13H>XP%d^5Yc5C8VoASiTM@BaQpca)-7Z<5W7UyZEs235Y$jhV`iCtvC*<>lePRu
znpRj!j?f1xxfkncxPaPvf%USK2Nu7b^?Gv%)Y4k4cPhT4zooT&@-^1ycSE3U7O{SH
zF;H2xoeivm3Ca*ZHl!d%NSiOPVOGJo@Nkvo#r<T*S~jwc3qX?;E!+Q@jmp3_&@PaT
zEm9sVh8oR+2CcwLzeX#{>@n@Ojs*?D4Fy$>v!IDt0BK*fe61}D{+b1HUJEt>7p>^V
z<62Snn`!p}Xcb^pkFZH6^8-CrO)KhOVw3xB0Gg7^rVhsL`q+w1t6CE4e-E<Q^ip%N
z>}F`C?*^?}=fI}l!x3%qdlqKF`d#UPEG(iP5Yds%3cx7&c{w)g5(XTP?y<;T*1-Oo
z#OB?=ZZ&i~n|I3!)VMutK}{T*r`fVaUDjaD*orOri3`vbf3oPu%|U+7Wy=>>@CEO}
z*s5_kSWvjEWvlJkx<0r7*~rDT#U9gH7ug1{c0g+MVq0A?tS*_v;&#pi_WmN<Im`{{
zzMEQ6eFWR36Ou7(S29jIdup-0Epe8Vu3EmM8{7N56=0=`?Xyh&0;<|Lw%>U=&=1Yo
z{^eO<&}l3Iw<d}9!R){W9Pw(ovxA@OfneL%!LK-$i}EZfZzEP(U#)yNo*l7i2Vk>+
z9es&GW%X2c%)K7K+~Vw5nm@=oA6ZJ30odJsvXoBGfV`N-&ez4CkBw#)eX#x;JKyXE
zkfb;4{N)`0N%`5O<+Fh;`KINSuA0tTtW~zJ*wt?gRKjwW+Vl$;Qn1vXcY!b;cEiU7
z*w-8ECf0+<7b`6vGnS>5#om%Rn%&M9htqmhcIOTzHpN<5*uAESK<@^#dx^Hd2hL*m
z-{U(82-Wg(huPy?jBH2{ORqNu*KCWjbXP2|_xa48T`B<NP(Jo79q02xl0AD@0F<>4
z%fQuBHR&A7c(Djr{VD7P?wb<PC)rEfZN}J0_R16Eh|~?HX_j#F;MphkI_WKte5cqO
z<38?)@n>(ow*%JKpS`6IfQ)L--YVQeWBZZ4JC6}e6FV*2@5?fGV?Dpx6_)ug3Sjg|
z_MtKcpT&l=4^Fdyx4y!%9Pa_t-_NoxSc5FFjAbt_2mEGP_Gt_@YKzBe_GxW8url>n
zj>6VFu{p~*jRVhWPnP@lDaavD**6yqHg{NS`IJgp<^F+v>$wBe*iiP}5f>mQwq)O5
zU;(4mA@=h@VSu8`+3yhocz6f)*NFkKx@UUyI{Oz{7YrkmljX~C|HrW6oH~Yq+CPG`
z-Z)lQ+s$RgdRR>M;W7%_f`5OmToXWLKjel@5U_wOZdAzv_U8l7f1(KRag-N0g^SZ+
z6}Zh9TU@TM$4iWG!hM$^ywv>Zz#``GQVVb?XVehW2xngE#6o<0ke4nOY{5XlnwNft
z<uyl7Zu{RJOdzgs+q_?hxWjF~a%?0qTJG_em&yCRYBs!l7i>I*FY`(@bFi|xU&{|Z
z=2e!o$JRfBSNpFXre;rh^+=qCE4Sy>f8vO`<`l1a<_nOjCwc9a(b(7<@w$!{tZr3{
z;SGE326%LjH@u96hoMz?!^aG`pB1++{{?u_#@z9IF<>_qbH_JXKpoSx!nqZ1<l_(Q
zQ!;Pj69}Y#W!`M~EFcYQ@fKJMX2qtU4RDL3MN3zX(()g*wW35H-pVo;PvDLRZ=3%m
z@FVqj+uDIxj5^9Y1zrO7eG_*phhzKc3*2oK=K0T8bGO+TTsA$y-3wx`VF$Hx?J@4&
z5W8#kSMEOPK9ENVS~YJT_a?_dEPTm*YG5^d@gnZ;VhgnKG#-$P(e;7J+>&=7YG(7k
zU2!^{Ka}@<7X;jHHXl&*InbFy_`o69ir+f&K?H-&wuAT}kI}eB6we0*wg8x3oDW@z
zD<LAB4_jo7BWSRet+>dCowyCO(qKNE;y7`wFCXEV0c>GwJ~9P2A1w&tqrn&Cm>w2=
zpqzg5F-3ZU>YK{P=ACJQ-hAwlZdkqg&c{v1@|yQGty&Pr^Cm0N?GK-5Zv`Uj0-u<S
zBjWA#T3NaopVS1S<OXl~q|E!Edfnrb>mLD#%HWgN1OcSuW0a=!MK^=|W$CRC)Xo?l
zviB^I#1UH2J%xuPH2^X-mrwKg3$SqopLPT%nW|0sv}7zgZLFykWk;HJZ@{MqJpoy7
zy=j|OeCG8W?B^@^%x}RU+6D4(KMXpjuHg}QWw`%UK5vR6uK(vu;q$iPG@ILj&(DXY
z(eeBF{K%QuXryWHT3Y_`lvZUC-1pfZ=*`8Z*<35T4d+o;ivfLV!xvS@-BA8b`Jz7q
zfz9*di<gW8^5!gG5{7Lny)a*L9lLkIxqPWtUj6^>J088!6Ii#^JbD|ZQnhFD7=m^G
z9R`mHPrx(2sucyFnmSxF?Q@;SJYqQX`tW5(dxMI&!B@B@1ITbwODQesFw%5nUDIik
zOcyrG6Z`*@oB9b>jF`q*v^*qBD>~QL%6fxMTV62z9i>%~v8Ko0m_9K0iVe6GUe4ny
z17olPa?&)glIihyzG}`EOw$|j)h-sC=Qn-ht2d_LfMD=7LAcN`yp8Fk?tJanF+gLo
z`1(6o|NE7u<rAmzjUV~|8RM^IEuFQBFXWr9L;-tVmv64;3@qJ+Z|QIv8>g36POYU?
zE7tI>%{u}tn#Z?V@IbzN#<z`g0Ql?0w}n!GT^7FG4abFnm-+U?vAE*#R!cfnH(i*d
zrArE%zFwnc#eSLY8K@Oj&$Q}o55A+o8LTht;X9+g0&7zZ{f>6$miU^3fVUsT<Lkr%
zJL9C~Wha_eAH?Im5<z`^#CMH}!a_oRz9+03P;k(yfE9f2ye(MGn#}jl?*g*;6~2E}
z2Ck3{<NHso!$f8uPY7&}%kpJ;Vo}`6=RL~QC&skP6$?K!3X{ZVHvI6k1l(kDpC@(v
zi$iP~p5)pTFS)mtPx#7{i=V~1-v!fkj#^$X%(U}5er$DVP(M2GV+l2IFa2Vza@fg_
zy~O;%emp;(za*%D0Dfx!JK)`C@YADf0Xt=R$xn~@j5|@Q@Y7>g0^gXApZ=ABiNyeZ
zreq2zuciFV!Ze(O-trVX+z~f5hNn!n1OB`>KktAAi{_d9{6k!z+#>h|nh4~?ZLRd#
z#V@pO3iQ9ZT6Mh<zYvE@y$KbyYH>k+u_+clEVhaKqThLJrBnIE9=J(tN+iE{8SD1X
zYw*jj9%8BWnO43j!LJ;y18i)4)0mZ7;epSe4Z$?KKfg8!<NBFx`L&aeaXs-aPwj`(
z_JN{26?deA+d)&W2By7lYArN+pFW_gwwmJA$$J6KoUP@q6;1bb(u$&9rX~Jq<-+5p
zD+ch?tvHE2Yr#{`6bE(XKYqO#zGK&c{JJ*|*_mzl%_toE9dh`sia63f8qRMAe8&EN
z*N)%rzX{mu7x=jv+|2zkh~NJ56PHx)@jJCn<9eP4zvF;OV^$cy(_|a&6*<W7OvfVA
zd^@d5&B7hkL7>Lu=Xcg%c>d~|ma!wIvof@N=5MVC{?6~<(9BpCzjw?cFz9sS_kOp>
zu=tbdr_WkGGTU_DG_A62V;cXF-yetb{(z4Be&Rq7j(hlnQ?bBf&htkzaT(7jr)Bru
zwY*C!t+Eg2kM?5%GqfvzyuCb-L1Fxfg$Cf($wmBWL7YCL!g)Hb-9S<_Pmjk!<kwOB
znG@E4aA0}9>ISZE72z301s135_{+jeF`gg9UwL1|?Ui%2^3G=dDttUZr<SJf!%clI
znf9BirRy7L`R@R3$$NpYoxxu{NCQ}r#ou_h1p0R~e`|9Rlgx(vZId&gZV%*dM~=rG
zP;<3>R5$+47n9Xh=lJ_(m|UKoq9v}yv@Gm6e;<PP{&`29St=Bu{3$KJJd<ZWe+Tq(
z9M61(Bjbek7V}_RHPaK#_~*|F0C$gS<*VELOE_Mt3UB%E@wgRhy$AmrwF01KLH-Yy
z>($Xr{;w-uu|t7^bjON@T_-_uF{N{uFKD$)pkZqSJ?aBMM+;_k5_e87)bc<(!911&
zIcTXT1g>h6W)p;Jk%;Si5h9-}b|cqyBH#Y1K#C@b{4;ZKeZXGJ*=Mb+^js92$AQ?_
z!rWsw$Ph!TidHd=el4t4V}KF5L|8`)AXPew;{7lP-BU~y|1<_jW_2yM45=?{e3OAM
z^AIH!cAw0nqGYE*K)=n=vWDTJ)FF&?0xF5poBCk&d#sip+9+(VV+durBFZMF;fhBq
zQ9j%TSc<!-=z{A354MR)_PAs6biAna85?QPJW+LH6lO?UMAgJ9ppLf^c2>ClM|=+G
z1NvV+EvwVkw80P4?bEcf_Yu>9<%C_4Ke(JeR@5lxj~gq(Oi4{q1M>!TbTED#=RDqu
z!=l!9j4gwlMI9Cba_}2bHzE$itZJg}3p)^Qk3_>RSpO$yQ-u9*f4oHRh2z?2VAb{t
zr)V5nt6dgN!aXsADTHE4W^S5jItQP>5G|VJh23X6ixy3=5iPb8Ed@@;gZGJ+SEGPC
z6&B8(S)kUx6|LKD!p~u4h;~+XKrT9pcIlX+eM%M`K4Z8qFN%&8vH!#ON223ZytGOA
zM5o5haKFz$E#I(MbUuc;TmloF({T<cY;T&}Ppg`E3-_uR6(1ZV+{ab{XeG4jWQ=hC
z>I~vjap6I6Hhf{NRXckKuQNkI&D|xuzPbWEnqT->?3_Wy-xNNb@E=qdF1iGG0=0S~
zd^<C&a(xs2O)z!pGDY~~h6IRSs^#T}i>`a_W1uld%V&Ft?pC{T?dOIFs6GqCubv{H
z_Xl9LZ<^M*CjwG`;PPBO(F>mA7LEy`@4Rb3OI8q;|123G-}e)P8eo5J@j(p2Z5PTm
zNDQ7F4XS5;F*x!pK#SsH$ad^jE5C>#_j7SUv7Q)`H3*B=4q92Eml*O7yVJb4V(3Lo
zOct8TE}z8EKYww{mXjD>bvCFjXT)%aFSr`sMGVhe3UKz6MIWeFL&b=5xj-&g5F;)Q
z2MCE5BZt@lTQN$@kA#^Xy&y)e!dtasl^D4Lw^Ft|ECSte^}9^E7~MWUkYks`=n(?|
zoPxw?td!7+gT<Ja7&jCN5@SzckQ-V^%MUdbL0<T}la>S#eB>JN0v*J}vg?3&M~F!u
z6G6U?7n5BJ0ei7aOdfp+Pb^!6+`xE!?kp|MS6zgB!0{s6UrfQ>PB0}{OFSL5^za4K
zA3L?ILJ8AVzqF#xZLPB0*d;72*8}-jQOk!*G4tAF94OX`S%0Sksk~LpeQ%H5$VP-$
z_XARVx(Lq;JX)3);hiz;o-osN?H|*d|B3Law{R{gF2XnBR_mXBB7AR09O+U;ghO#$
zjOr*N+#N6*t}Y_p_+kGq|3E}yy^hbVD&|cM0dli}m=}p7;QK#f-r>18J3bWiYv2{Q
zI#0~6iG_r#N5%XO*e045HEr8a%MQhwrW7{4Wzq5nPFj)sNGqpRHO;J(C$9gC&-w|K
z=_uyMJA#-#1jPcvx@%(o6>Nl0_lfy;Y=B;>E23)RG+n5&So9l*Y%6cE_!*9TJzt3>
zX}I@eS5>j}&t}|7aaTmovBtv17ZLOG0LXPYVwp9*zTjQ4Y{?8DFE5GZZLENSjac5@
zau1`@G(14NP_g`5E<op&Vud@NK(Fm$#m+zwzC^4zej0dAf3f1#CXi_@#cJHy2*wW6
z5#>!+oX`@lE~a1KYgvbWrfa8Z`M9B4QO{4Tw%{L<)6(@5YQ3lF-2-B+eQ6BG4~ey*
z_>Vu85bIwg;x3nYVgm^R*fdpaaK#9y)qi61D4b>!8)(%wLu~1a`Tmp%V#^jRWXvfg
zVy*o^`8kT%znFxMj}%)k!~jXXC$<%-3jEzPVcGT!yUoH$B2OCFSIdeW6Wcyvwp(tJ
z*gg*flxkDO_LP^H3;Kw-d1vr5BB!;aR=k#~<68DQLCYsh(2AKowbH-7>4%+KwLRN3
zeW*pmoel$XBvizme}Nm3=V+PjTCsDH4Zz{^VrMi5mA+QQ<E}SY<u2k`1gIQ;5#Ra+
z1{g)PGH8Q{UyL8+Nctgm%gvaO6cl@KS{F|J#Gdo`_<S3&Hx8?0t0rrCJ45UX#}(C8
z7JsoH7nS(TU0OBey-27Tfg1#ViiEt+=)6kTs!@YQqCXDFPW7~6a+p>*t`!H%+5)?k
zDGvJPb<5e};AkAcLQ9E*+kOIX_fsoBZWaf(I{<X8Ar4WThWmCBhvz3_{qI(&NcO{n
zxCSD5B$nZV(na!k+)nR%OeC+yX)?-69B(}k6NOxHqFH(1@B51r?x7%~hl(>#)&U(c
zK%BL41`b)`-1b-;z}lLI3^a|5(Xyk(#d%{L4(U1Ke6jVQ!uN{{1p;vYfBzEV!e$JI
z+s2DakGBAQ(NJ6-g((;u5LbH4#9Ho9akYUBPEK*A7dL9Tx1CnCNJ5=}+$t!ph2rn8
zwH4QXy~K}VbQ0I6WdUhdQQUSJhM&3bEbfo}3+%A1cu*<`r~4J+acVo9|G(DAI{-d5
zT0FUc_qc?OmY*Qv>1Rh=NOTr2IWDUW+A3b&#T0GEVez`*0f1B2MCMN`5FfsakIP2_
z?Xpf}|HF#t`dQ-B1Dw_uofcmT1%le#Uwp;31;d|-?`{`>7~jPA_%Qr@VJY#ey`?xd
zx>WJ|z;~dn{)j&V@IxaZgCvx~0cG}mNhdi1%UGlpxs$cZsgI;L@K$6bNSZzXsPBHs
z@;?FQN~EZ>5}?K<DF*Jsm6N%qbqYz<9Dh%?lWJE}0PD?C{a6a}UTJAqY8Anc+Fg=H
z6vv$k2V}ksUr<SJrPUSeeoGf?xr~%n*YI)aud;A`Tw2-JR+dP{#@5O~mUx06&)JwL
zZJjUyp^s&`1~`Bn=&hwz17!J@mv9J|vNFd7&DTD%@_+3?{I^?HS&u>Mh)U8@<q)3n
z`3lmm9yYSMJ!Q>7xQuqUn5?}NhtRg0W!>c)fsB1^I-`%Qo3a}#o$q8l-!DLKFOv;}
z@B`cz4oC-y<@Vw`rPF^{ElXY@8#ll}=3by|{2D{Av)^TtS^>a~Ua~0^$6Gi}Hft0J
zq|q6RY&O6SGZ|;udbux_%g4&LBb|WF+OFkEM`YV2*l$bDmhDDjq~sT?RojQlcBk+J
zJFGW#8=@tNYqfM`Ez_Now5(VQEkCx?^n0dOl(1Bh?M~kU5_D6xOD_)a8-L+BdjGTR
zSOeFBy~CxecUj!!-blLMJO=cQvvhs<6Ci?1H;<D*y11HV57F`wU8TE248W1v(jx;y
zvBDPVITx2~r_`68Cl6zQvRHbRz!CS{TIpQ|Z>c4y7allZ?Ke?+JNLuwG9j{y_iW%r
z7RoN8@Z)$zAIdJbaWZ<{O8RnKh`5wr`X=ITn7Zwx|HRoqA|}YL`>@_$WRUE7APIP>
zZ?fx+*#IL_wLGyNisQnMT3WVls+J%1kO6ye|3ACGTpuX=`?5z!4%U1($sVD2X5SWS
zd09jDz)Q_qf0jLo4X6_pWv?#y4$kM7y+fTrHQg=yc;IFg`)#r>!&UBIOJrZ~G!RW1
z%f2tOfRaA4Un?wfW$uyvqL$*f7TC*v7ybf?A1(Vm^~d%9fA(?!Zl9Lrzu=BoY&<Tb
z<?sssa68>DIlLWioh;fzj%b6kmwYHkS|10Nbw!S9RTZOK9~qcC9(dLsIhtb_-l&S4
zun$kvHeF6ChC8XAZkLm5V|QEYBPZk6VzAL3rVA>`kgT1+@1B%Xqy@+HZ&mPsVL$Jo
z<x_LD%BixPVs{CXQBOG)UjXfon|hu#?LEkJ!Uipkb}?O<U>a}tf7h61pVl(F16uxL
zl$>h8KP-y8)=!8M<}ZrM@AP9iez;b7)i+&`Bc}yz!ObfD<g`aP4F~6%Ms(Kl>Ca`T
z;}cLF3>k*w1HAW?vxe;lX){jFU9t+qyB0Fs>j^GAK9J!96EVQ?m6q_;l>j@gjF^W>
zVb^$>SCyv9Nh_wh%Z0u6<E33I7e?bhzMUZ#@5i(|qmW$EDi_4))mphcQZ8AIg~cD+
zW%PLrP}V2PnBRp!`MS$xetm#$@|4Siv3u9ME|*(yn_m4gaz)WBkbP%b<jQA10M?z6
zt0%Mv)y+z-vB7)W@qt{^4hN<&#pU|ZI4kbiCpYY@2YmJ{x#7S8U_tSwD?PQs!&7b^
zIt!?O6}kB!=7z6p$h^`kT^KF5^xcBtc?G%UnG2A&K3ZPERc`r^hTYh*S8i?LjPvz#
zxpfpSjil$ut!r?^`Z8V1$GnnT4;}y&`Alv<gY*2v2BzBv${lZT#QZlx#=XO#bxMNV
z{Q|Gl-0O00t<4~Q4wiY9P#*k3?!RXPe9vN;u-O-9$$c`hP-PG;{+U`j{FaIMNksAY
zn>^Gb1L#Rlt!Q{aCiPtiTm;Iz$|pZcWO9|2!0ODD$?a$1X7zgVm@O_O{F$c}Zmr~L
z_6~@zi#)y28A#YqdHTvofN=x0d|C~yoYq^O8PXW{f)|tL$|U3d--F)r!m1z;1B%EC
zhaIqFQdM4DR}J%keOmSAfxNgCd&f#!dAU&m>@EG}m1FoB|68TyH8=bYfD*stwHMof
zH}jCG??QphUn_4+E)QyB6?yZ*4-DsT$y=N7gA3nXw0!(!dF$0GT)4E7X~%Bk{=adp
zWnS5g1;olH3vmbI_Z*pC7DK4dKV<r)j-d7qlh2Ohr1XA}mJc2-pZ&&3=bf#V4=OD)
z2I4qyaH!0<gOgHPDfzNt3hwiNZMv$wmRHZ!%2F|=LHAKh3aG+`^%JUeoT=Ak`LbIR
z{5m5i`Fgh_5F2ax*8Tv9*X!k5w{^IWZ>fB@BpArFgEG^nJ_x@=`7!qhh|u-&<F|I0
zY?hSS+p#fv$I4t649_1M^6N_6@f?^We<t6?p!K6xPCbb0PlfOU1eXsfvTiBBnx%@>
z#z>`MsN!L`n!R+V5?8~3wL7DXlue*yZI!<PHqON-RRJelC2K2Gfo8aEH)FgiSR2Ru
zQ-f8Z$de$~G*?y!aFOarS5-I(cSLXOtct9|RL*OxDw>Y9VIO<bzR#5<?+LnYg?@r&
zmC^E_U$mkWnuBY=c0E<GV%T4YpI61&9sx4RMOlw>1GpEatOIfOd^K9xIN{h{<d-Tj
z1Q(euII0rE!hrT#rDb)Cnl|09Rf!3v2OnBgiE&Xt?p0JJQU~B4qN?ogVZigbs|t-B
zG1YphD*VI3#M@=6qC+gmah+AAE9HT0|EH?w{r-c(s>Wg*^Bc5PH3P9Rw)9nXcoh(x
zhpT!C93+#f{@LXqD!Zx%O&a39;xnoNjw|d-4drkgOFhAsZK{zqZp=)MSB(~A16|fq
zHSHP$wEia5ymcn<x|>z=bcU0Rlh#o6R7=tvcRtO~@}WIdtAS(igpyRNong4|&rP-Z
zaSh~X7v&O(_5VmO)gfR!j(|)n$~8te<ND!vt+15cr#kfe3$jOo>M(gcE--#UH=~nP
zry|FJc73Yc8m|Htb6I)Z$3jKxipsMV?qnX+PI)E=;a1H8%IkY=tP%ZEK2`CP^N-&v
zzc4$X=LRXi-J$q#+YqhtKB)qh&H^%Wl<JYP4%p5Is%O<;jQ>k#sNT1+EcW`9>VI_|
z&?d#zfRJcR7Tc<!Mb`qI_eBkDjgidw8){hBD3FaFsbTnGMCIRK4G+L|!i+|0_+V@U
z;ZL<fhN%&IFm-D*Ma#~)X?aJBRu*?wBXh7V&3Kt7=Km$T=_gd&DK!e;AslR@CEK5B
z*#OY;A}>wrIjB(|v7p%Dtr~q{H>e|1)#!^S(N9X(dUF1%v5jzTXIT+7cJXW=mLN6u
zFm}iADAQfr)i^KQh)8Fu@hO&<prU%J;FMn=?|Y~T^RP&?c(t1Nvof&R{nX?OI9+Bh
zR+Ddq;wF+`Dumbq)ZVBpzO{hXnxJ&4rsf9I>E3GgG`zH>veoR5xb3$3WEI|h2JWug
zr6N*rujhmVDk2S|;*_;2lBR)L^IOfgq+;tds;T*?dNNE!ecl0d*bTMl!WXQ9z0nen
zlWNIf{Mv-q<<t`VmIV3WKee>)ZJ;~usp#Sug01POqAOy}sM0YNJ*N!FtWXs*1*>0U
z{Z-6$9H=~gnr>aCRew6Fm^XESWRz8wyaPG)om#g17_Q&VQOirdzzsu1)v9~DK^~i^
zR{OjI82DPP-j@r!NrYNE6iY9i>#2>-6!-Tgn*OSy6?G4(twD1!2Fy}h@8iJs&p~aw
z9}B8LX%)8tyW`!~D()l>OhX2!xSzX$mtSX5J16?#a(H94b3V>~^1D`a&(_M@OVw`o
zrXb7usom!@K)AT7J);wFCu1kISIq$SyPZ~6SchWr`8!f8D?CSW<ota@D=St*X94?D
zN-HZ4M`z<>OJ6*gg9lsH{*f_QhF_`@@ykSjOjHL?V`IE_Tpikjt$t^WI$YvDW-#e0
zsT>9*?>ecZ|8hVTOf(JbqmshAgSz{l>C>L-RLN^Vug+1YFz;vYE34C$VsKU+qgBq!
zR7yYy2uqI<>TETP*;*}B=kxgjc*UFc>7u2p7pwCNqkvZt>f#3c1}W=f>I!~O9t$h0
zu0&zv<oiWkdDsd>*N5ur?@OS@A5hocCxLXCt5Sb_!CiG-RNBil;GS;kPKA=dJAF`h
zemn;;!$aLmzJ~qZ`JQ^<C~(WfI`srguzcSSl}>Vi_9(1nPAgUV3NMiLb4@$<ROuJf
zFsCCbgVe%3T}RZ5%J_+=<#W^v@3%nfjZiOBG2&V5rd~G-1is~zdX1lqmg$w$>%UlQ
zPG6zk>}!P|bX=Y%e*ed?5dDN)eowvcft8G^r_}rLU+`mcIVy8J#&VnLst@jYbHWAn
z>C`|VwY*f$Gz=yu)K*_gd<5P<R(&~uUt_iGw))zBI<ReV>gy2!;!A1ut?6xydS|Mi
z|8U=*ZwvKnTM<mlf2&`=@p}Nm2B_cXu>Q|F?N-14VlcSomijvw_khKHH=qdi(|67W
zoOuh(CDtIFFi*Js+#qgMfHp5@(CWB}q?(OE8@|M~oLgGeIL@F;Zi4#u%;1H;01F&x
z8i|WTJ~*x<A2Q?`TP*3UG?Zgi+{CuZFf4^|1Y6j_C<OIDZrf>Comm1f{(({C_b!mD
zml#E@a6dqU(uQ^S=eQQ^V_4_ST70fiyd_?#g6E9lH!A?0-_0mJ4e#~sy+(zVo*>7k
zYL(SC)2MW#qH9}_aL1_l9lz+!KEbFIw+gplMi`dLbFq|Ct&veVZ8Fdc<Bh7*{{acT
zU{sA6i-m$xM)e`MIOXMJRR4@u<V-)K`X9`QmMk`EVu_Y-oNv^rgyVsA8>9Z8SfFQ9
zj0S(df-KR{u=hTTCDvHOeg-b@2lX)=Mq!Fpw2R?b0<Z9*B*W<^2B~A~So8sFxyfk!
z7-K-|gGRH1IJ?Ev*NUQNjb`{AYVuzhqh(htCPhBf(v0$2Uh=(G)_7sGZkq(`rnk{{
zhdYq$2U_}hr<RXM)v86OjrN7MfCz49wEu~->orR&!{tR5@ILWIr@+I&US8L#Mv+D*
z{Av#FI>&IGH4ICsCk)TMxN;G=&G6ihLv!t+h8La?99?X9Ex@JOUnz#S5d_f1$LLZB
zgIFIg!#|}8unN9L_l!i`Q?kr-(pDoNdk3%~=Z(JAZUI<^P&~ly)}^!2pJAhLDrxkW
zd+`NtOeeiI2D;#e!|gq_G~Y;L;HN=YKp0{SI*YO3xjV+7$H#zAk28kMd=08duo3tN
zr*F$SWAvQ1_~EvP#&{P`;Mp4ty>qJjVq-!L{JM`%#f(X%z47z^fBG7euJ{6rO*TSm
z?7|<kHl_e3haNADDS0K=Vh4>W?b0x|J77$iwi^c;4`W(yYfvE#jL@ZLKrKl#Lh+*&
zwEt)$^vN6G`L`IMzc8oFsAhz9h{lSjk1^YG6sGITjX6`B0V|(iL=?svQsdc1M27^N
z|EGi)5%`TZq*f8r)L0|p71nxE+8YtsIDbE@s+D6G7!iNk<C3a1>Wx+GYAB8e-^yy)
z+ITG=x5kLfkN5USvJqK&K9CW&jd?XNdHob<%zL{E;8CQpU;qwSA`rEd#WH)K5k=eq
za;|In`hrGO1&q<g+%XnTKZ4^zFJoam)`Vv)H5MIj2{8Gn5kv5Mfxa)*ssaOz6;>%g
z$~zjXFlgobyBn*{I)a$o)L4`I7pVJeW33GqxhAwVU3<h>ySon%r{2aU%eL!y>DwBy
zWd;I_N;hIJV>g+aZESVJ*>GtgW7~!(5akaVJFM~Rl3F<%I~Fwn@urRumxO^!v#&<n
zh4Mg@G~!ZS@v)l`_XJC=&DI)m883j=-l0`B2OB%5;F9dqea5~wxK|`(g|Yu4UfHX~
z4NKx;T*-Jg&q!P;fG!HwsxDKFL%55bS14s19{df|q)5{p)r`Y?9su2CZ5;Wt5?3~l
zXvI6Kl|lB#vH2G;1?!_#cPkkuX)_?v(l{;f*4>LUQbtw;;u&n5^>)CIdR4R-XNRoD
zRLRe{6z+`ab7AAs8Jr}hZ80u=#ZYU`JS{7F8NCI}d#-V1ZVW(c2QAruSgRtUj4PXQ
ztL53wTDG{mag`;2sI$Ph`XLt!lpT%KEB$dJQk0SUxje3}U(l+emf1$y3jD`&b{Kd3
z=K$IJ*SPaB5Wgzrf^oO{S!^W9#@*l_p#E5ldj_7+nzF{@eqC_9=x983h{KZXUL(WN
z55%NGMn(q*P|@7T$R3Z|Zblj}#vBJSVZZVED-ONY;*B@<KY+GgZoFwz3Kt?i8E*pH
zV>g|6+<0q`_k2Vj(~yD2+f`U9Rd<YcefnT6c!=?#DBjC$1B~nrPQac`Gd@|c-(P)i
zd`hSc(7d&gv)K<|Xg?!&FwUAZ%=qyRr`Jij#;*xYadX@MD0>gUD5~{+_)OVdrY>oO
zo(-WSKoWYF-a83MFH5q4g=7=5o5Ucnpdbi{K!8E%NJpBKC?FjXMT&p|A|Qg`6%eF|
z)c<qNq@mZ}cfZRu&t_-loHOUV=Y5~I%w%q{7mjhHnC-MgA{)Xum63!&aBwO-kSqhn
zA^!J!d-g%B{VhXFz2%Z6a~u(ywveod^>Bael!|=;>3#Z}BsCC;`1W`cw|p!q<*}A~
z<0a)es^so$mejQqLCt0`6gD4ZC@!upX`_x4Zne(P(yoJK@7)LNd508|IUDu=W7kTh
zu4fRTswkDk>r+UrJ5srRc>Cwo#Zp*L=>D{yrSR4fc*k2!slu;|Nih;8RV?lx*1Mck
z@i<~Uo`q7SLFb9kv4&K|*M<n`y`?IfP)q8JmZEzgzR)v+q3w|(#pnV;vL~e27tn}P
z7E85UewfjXUa8jCYlt}Dd#O%itkJ+0424F0rTWX@Vr3*t^*;h;wqt0s{~$Hm)0%MK
z?T{J|#Y@UQeNSp^3?kNce(AN=h@QzY(rbgkqz2ZMUOSF<2mU5C3rrx^duya-I8N3M
zkXrP%5L@RZQcM5s#l&V?E43L>h1hO>D7D{%Ak@auQu}?=Pz&0Ip(y`oV%ruBZ67p}
z+W(A!pZ|lQrFI>ug9>2^oFH{htP6h7#KgMmOg!I}A=gbaF|&?|@79w1^a5^m3j2b8
zx{IN3EsddQPc(5k$Iw#DJZ@>X-u!+12Mldd_f1@)ns{TX)Oi7-W<zAD%WGo^|6736
zWf(N!n{E^DB{39&()?1F33&ASk7ZJ~bLSD~YbbS}i1ZjgSBlGkd9C(LiZ8i`2s=(m
z@eNancs5Xq9}$2le<H;n7KrVK-BPc*5eT!@kor2R5^>Eush_PY9#}pm^~Y`y9&6G-
z%T^*9t))Tlo`$EiQyLtZh*Zs|(%|}s3HQXmRdUu52^l|-p|~xJp>^RgX=p1Lk(D>3
zgrt>tFUXIQtL%q_-!w)V{se(Z?v6C_YtU{oUP^Y<L4<UKl-y+s@GmL79a1sx<VfDx
z;|Te+j^sN%iSWgHNtwymMMHK;Z<fdN!xl*z6MLG7{_na<V;&%!-np|huF4$3?Vl_8
zYb-*2KGtUQ3c~*tFTHJtnSCQdnwWzu*|-zZ#05)<?L<Xs@&Kq%M`>yDX6%}Paty`K
zJ<{YI6|pU6N>h@83D+Q6n(`wYknX#rsadB8dAMAfnv2lQ{gw><+=|QWgSgef(9)&^
zL+h+ECVmjY(DvIZX?i9`9DPfg{wRhBH#bQ$EMQLe*GO{~{)bqzcS&<y$BFP(XNKaZ
z(<P($H8>zk8QRv)mp<6t52~0*9}e1z*LL=nK0I3&^?ybS`T^xIIVS$LmZ1=NoS`Ks
z#KhRT3~fD=q=n-Uwi{XA#7FVc!sW+_SYMTv#v%_mag($HwH~5vinJ1xj@L^|t8B=m
zj_WC{DghOJ<Sl8{WGvx<ra=D(h+<!pRvk|uBqmH+b>cYTgU?H=*LTI!ERUrP@f9(!
zpBV~`&NH;cj%R4=xn9~*%nLUfIAjU2^co{=!TSP9+6igvpYZM4?31<&2vp8`P1<oX
zomfLoNjsAews%?>@{LDHyZm8@`-Ps7c7+`TQz^+%Y;Zu@^;!ZE7c`f4wTDYJAXwV<
zpHIM6A4|I%pbD<{b!qQ2O!ck#(!Q?C2|s8LL!ogZL+k7`hPKV?P0XDp?aRDRY+Kt%
z``^5V8?GoFz;)vGK9c{yd)o<@K3O{0WhfX+ap~YUj|oXVBptjDA(GwFp_0RhrGB#X
z1zn;gxhCHEouLrbo1v}e@6wT0V8shAOGo}f#PidN(wEWL6=lPuFSmY#?Kw_5isO8p
z+0xfLf)G#qLppII6xOeTUpm>kK8($H>Dwl2;W*rpPM3o<dm1mDoq_#1#Vvh5Ybp^O
zJEb4$Y$W2fk<yO~;DF3IB>mJ`B%HcU`l%1>J2yu9Wkh$>h`6PjJ)aSN)*0!y9!|pj
zzKNkYV!rfSpRI`bRFZ!CW+UOVt4O!Rv(N{An{=x@N-S<{lWt}9LcM=)hQfpK(rsxY
zDJD*m?r<B4&}WZyAL(-L!fomP2n_7hchbZ2+lV!1q4X#n6^+L}mmXJvzL?gJp>6e8
z>B(uhWW}7)voI`W%V6nQ9n4_=!_u=jI6D5L((~e#2=9N^k9`nZgiFtzKN7LUDCs5H
zPRN+6(#r$22^Y{^CNYriz0op<@5TN%WNxjGaBUyU+!5SKYfToCUl4L;y<BYh+l174
zXyX2w3<bZ7p*W!vLyLR9ERBL{K6Xl$-YgFLKSE$1gsf+>`X2V>l%cY=tOF6bqq45@
zL=37U+gBkI+Wa-S_-6P8YXaqfmO3FxRT%OQN--4g^^*e!Tt^<@cR8p^3nF|mgQ0cl
zR5|!H#C+N|l1t3{idbD;<dP*J^w)+`#QT5mua`^S4<@Ah3=;=8l1rC;LB!d^<g#rB
z5Po(Kx$GENwMKX3a)+y;3@=MA{}fYO_PAWZ-IQ2tmF0+`SSrCKR~iNnDod54zJhuE
z&tkc1>~$hE`&f>CG7ibDL2}I6ZN!pUQI2f}b6vWY9J|_o1{VyMYq@R^ZpRF{);y5I
z6TRfRlfePYzb4mPUXt*Ak1`bMDsuhw$EfS;CfEOM5)tb5kQ-enPpqFkl$)%JC;Zq)
za?`74Ffgy&>^TNfv7+33AQ)8J^>T~AVuY{WSZ<w^L&V#c<u=P*MEI_j+{VB2ED`^B
zD!18*?bEQM+_rp2Vrlrh+%8<k14l7(yCIlr=PtRsV;$k{O=Ku0`{lTacZjW=SMGfg
zLN_r*?mN6A5hfLv`(HRq_+nqm1N0a|PQ8=|;L$EJZLK`u0<2%KTOOQzh!D#=^5Acs
zM97Jj{X@p0*u;HAPQW`KZCz>t(}78H!XfO_%wY^|?~RfZ@vu2*`KO!+4hSKU6PsYk
zT4$QrwHZTx{z4PK{eq$Rcr!yw$V!IR^H=1=%(KWX$1xP^p7NU?8oZEQt)Xh)yueTh
zy&}679wC;yitPG0n1~G<$*zqk({IpLc725@-rrSrokx;tzeP?u)RNd9zmSK~>mMAJ
zhb^c>Y)?G0yL}L`eX~$beix+{J<FLmK8vAkb!*u(a}cpC^_P}C52g}+OLIB(P!y8H
z=S`f`M^1YU357Ea<g{t~i6}<OY3r__Qeu=mDyubu$<IvO+(Pz7>hSj`$-cKoAS2RH
z_MJja$+lJuEm4!@3<XQ{{TVq6NZNm6V&~@!MgOyl?1QBYk+XtapvCp&td<gzOs~st
zRtq8A<iYZI_m>D7)sWvB8b!#kZ{>*_D#D?Nktc60O~lm!^1EARU^~9gP`r0Qe)rm5
zu-?Y<)OvS_#q+B?wf=bM{6u-$RQMS|^%z<z`sHc+K7{{&;l4cW;1D7#tH@Bi_EMf+
z5xe1dmOOnb9tK#nRemo6na*D?$vNGQ5`NzWh5}!np`}(MIp=6R>VEFXbHR8lw+_q3
zxlNdn!}13m|AWe?aQTBDN)bNcu)N?7jL=UL<%Q*WI5MA7g#TaXs=RQyfdTZD7oM#G
zBa$qylDlGi9GBM=zf8E)VhqKXXXP~uW)i;LVtLJO1QJf?G8DJ%U}#-rXK4FMlGp5c
zmynNw<@I>i3u!mR#7+|#is#JV#V1bu?nj2Qq+9;@$yH*r&X+efeFB2eLEcp25;CEE
z<xO3BVt^y%%|Z;q?H%RK)v>liHprXL93|qLw@vi-m$x>Z1TyNBxBrFkTSHaeF&Uii
zWd}KT3vTF1dHFNt0e*j<p%~o2#Fi)J&-^%GO^B2~8_|J?&Y$GZo?Rlsk{R;OszJo^
zyqUavx{r|84>1(WHfLxn^F-c#8BXi$&hj1yxLiO#hPD$<c~8GHM6Axq`;(3nOTDY|
ze!Ll%f4z;o|3PcS37*LZ8`eQWGhIG7>H*<uUy%KWio@YJ+fzO?I+Kv7WckpYXu|)#
zPd;2a5x;*SAASSLsH>mLhtI&+jK3p)(I}3Pst);!v};7v%gJ9J0o7{vg?tp{cBJZP
z`Dol|ybH1>LvD7meAI_htetZiilM_8TB~f6k4}gFc)h=0KKffPVtw93{%X7zR;&s`
zZhIGoe82f7ZWv<XktBw~V>d(b^BW8;6%WZ@?Sh$JWtWf7vk+m_8u`SK#e}~<j-jpi
z9{J?%XM}Ud$Y-=mgp_<=K3iA7lK8)ozia=3SVl+5-{q{p>o+RN=jOgkxF%cVAIn1Z
z+P29*)<$7MV3>UA;$MWjF+{%1!T7ALE?*wri;$)><jYww*E!AP%X>ko{-`Ej=`s^#
zy2s?}PhJpV+XwQEVjhsw4f2f%P@Jo8$~R^gBcxcgd^5&}<doV)zIDq5Ygb;ry{i?m
zbh#_vx$-Oa^^fx1F(HKSR$0Ec4w;X-m*xABpwp)Y$oHGVD!%oDeE(c&VjEame)KNx
z^z#$)BfJIEI`ez^(H-c8Pp&ew&Oa?b{tUufca{9tv7?0a{Yrik@sw~6oDA{&<sSLj
zXvAoajFq2H_To(?@$&O$px6ChS4fo?$OH6Oh!f=W+-!y0F^=#Ho13_`lZpR1ZQ|`2
zCO+)KP^fyt#F{M`S^`Tbd>R~;7DE)_%x8o<)?X1{`v~<vUJw0%M=Wb9V)~cF)@P<-
zS-1^L@gK!H=m-(Z)lsaAYoLPZccs`)40O+0MassE{WMyU)3FWfsfxTNm{@(o75P)7
zXx<@;I%y&yA6!+mk3l-0RAnf3oUZ8Wvk^&M!;qKuDRzq=G1?nG#g2FX+P2<OiZ4Ya
z!?_Ad&<|^gc(aL8qWEDVt_x&nefW`5;!WiH<#tMF+G4^D8?BTq-W=qVC}qCE8b9i%
zl=D_a+`p8GQ)84$TjwHvP*$lTBfQ^wuu|pbbz*D0K#9ctT7L*ss`(>^psYq#s!_bU
zQK@dZMEHB3D6xk?EMBZrYI~67sy#=k-*pACM*pGIUyD1fHbSX?A`(<<iPG4C?RQ>d
zXsO{=8o$;GiHcbatv~**G^qzGr!-cYEP%(e;jGeP?e9oXE>v2VoCquaO!2qJJKt>L
zW2IB(Nn-o?w9<JpINY8ACVqQP>Gm0hI?G_l{ql^VSYA}R9ezNF@0!y6*cp`Xv{!l@
zbQ1DljS{~IMB{vh(vyQ`&AzSl+K)`?AIFqlKO+2gKTLW3OQc>G?Pe%;c<xtvhr;Sr
z|4He+!wdSnK<R@go2@sTN}n}YtEUeca;w)d6r3-Wz6-Y!a-o7UaE*&t?GKefKd(b#
zVX87D5S0+A-4quKI)AFT2Vn{O?N!{95zP9moHBAYW@`N<CAnH@FsU$xU{aw<@~oA}
zR##^z9F`c0ZJsf-1}#xikVv%6{mjIT_m%Y4XJFsADj6~;o4>n~arOe?R;*GocOk~3
zdzGv?C|U^(R7Uq+N67q|%D5pFi7jfe;<rZNvAjWwe>tq^)E||%%0t8Yr-dqS>(JrB
zZzyjU-$=y6amwV%FsCa<C{rs36Wh0QmFaD-6Yl$q%Jd<<5QeLxyeFXJO52t9x_2X7
z?q+4Cr6&~7R)*ZoNM$DeDuNh1%EZ{m3@vZHtIT|ShX{MeD6=YEB3yW`GW)e`;<r|q
zspL#V5V=$%WzG-%@TBq=%7;lFkkPx!!qqd0xa}rG>!LQwk~MB(jgMt$Thv8a@+BC}
zgObY9&%u%hUt}o6I+Tx2ZX{&0Pgz-J7~$8&D65u1<z_ciHq5R`xH@ktTa~Va?|og_
znlT6VKklir^@HOu65lIZe{V``D-SBUyTM%c-&Q{DSeMwoc&_ZOy@%LV)KqqlyF&O+
z>N2!cIjZctitJcTN!c%-C1l=pW&dyvshU(}|7}S7-lfU`E6Vlf6ju&Z1OFd*Lpjh5
z`eDff<-mS$$e82G!7l!xu<vD*gV$OU@t1JrP<yD(t!o)t+U{m(oz>061+sFeBUG#s
zs2n-kirB^uQ@-qS2m#79%F)*+A`dv4p*U=ka<un-BAh(Q(02Hia`YsESkrea-|SwC
z^4#+bdHa8q<NmfQh&aBEa`NYIac4&vS|a->r#5_qN2I1H-_~~_IQ56}?Ww86GW|>C
z^dWdIadjEm<`~MEm2j`;Ny>L?v8J=PDCf8rC|G!?oZAiuC3T63b1E^kbpBB}_qYLS
zzk4e`Y#2(cDeDyfMJt4E+D_$SNe>iGxN>p)17b;-sa%oq#)FH$C|8ESc#IvdTv-M>
z{b-JI<<uo&?XpDqY05alH9o3beJT-K);8tmZ**wDua)Zu4ie$q9EP^f-&TG(=Z0H;
zT)8nBiHVF=%8lD=QKT|fxtS9|#K@_B<<}_}2wqXE+)3&{Y?q%Ych&nu44<IfEeAe-
zYrk@D9~jGoV1|MauH5@#CE|c9m3x060lB=n@`o*v@Zaq*@uw!r{n;yF_v<SU+w>-u
z@NUYZx`@{Gc&hw4UPL@GQh7Y}4!q_sl*bRCN51pVXCJr~?HG!S*DFstVhV>wDo=}N
z5wYh=<>}=)FsrqcXCsyoe(!4KS#A^&Cw5Vu&%pNl?RDk(oeIR(WTNtN1n%r&4V6T|
zCal`3@=+Otyth#0ufoRUoK=Mk%&_M*Rh-cgWxQXh;)iYE|1YY~J_u(8hPHBwiE$Pa
z=l51Ebs^0^Z&WS+xq|T8dDV&s4fr0Ps8-s*`>oVsFX|$hL{#ZH0*gJ$Ftp8VsmhD6
zd%A0?)_(+^n%M!wAF;@JOVxjd4awT62L46)|Hz(dkO&?A%N{l8+g?aQO;tk<Z-D1B
zN-fQ`h4Fc)mL3fa`TVw8_BDh~caBiYHN=cWk5kLN0h@8IiCS)Kap?T=YFJtaB3_-R
zI<mkG-#(!_#;1Tw)=?dkHy{RlOAXg0Lef7`!%L4NM5?ETPdo+xztiVx_>;55+WD+n
zfnGRKS0i=|Cd4&bt$6z!V!zeZiuXqoZdGx$QY+*McFb2R<9A}jsZj$F5t;cyje@gk
z+wqnfz1B;t+Eg|AII7&bUovs<bQApsLw?>Z6BoAz`ceIM)I5>@?RE3O?XMV$9b1{W
z^_q!KRx-2%9x}1yT87ry4iguSQ)8^q?PDgIIN=CGp?m`q8`fed-bq$tudE<kxy5P?
z|NV)?TDF*4uj(Wsme$pJhXaThlBw1Yz?$u<p*9!{X`X+Pp(W%;wc&UN@&v`yhKmM4
z^Bqtd&4x-Y_pRFW1ia&+acYYfkZ$itwPkD;v7Y`xZS_ekcF!KQ?U0>B4ER=UyYpSb
zyRB+FxeJQcs;d5Wvk?Kwsiw9&ww%~9IkiipG(4MKQSIKY3QDAt)gD<`+p8_q9;Z`@
zFd$ovLk$>rY6(Mr&}b9)@eGB=4u)drMibZ0HgR)=iQ6kMwAA#N_`b!@K3J=LXJRk6
ziHqK5XdBqk#QU@XB#louW61CSiJ`DAfT5-KWQNwDz9!!Hsy!zxB4U}k>gzphMC^23
z?Wf%*HetFtpbUt}&zd@LL=GGuzpf6c2A=+7O?AjKY^$2PRp+i5gx~Q{b+0W?$kZ}w
z>OK&YK~>eXHxY*45v-=4P9S8|B@>r6QN3*^V*iJ!-rheG+qx;L_c@BzTOL<^#!6y~
zzpZ9A#0)<gr)KsAZ)kf!%{*`%k6vt5vsXcQ{jW!><Gw`syt9=$VX24Ms^3-Lid{<h
zE(z+yFsRy7vFgNTz;7q1Q!AnvB`I2+#>1?xIi*hX2cdGil{(!z2Y$kv>dcnk5i7FS
zGkXRTZrcy)tVuD1T%XHOSobMIals;Wc5B?&$-e6BFC5tak*}*cTizzZFRwAQKKhZN
zt=@BWZVL#@{`VPLYTZ!h4xJ0Kx<)lRI|yI<oI1Z#Q$l_iug?Dr=C{{w^@AfY<4wcW
z54j7((tfh~p%YI|^g5s}_`Ez3AM)zLXUL%TKCdqR1=KCJHAU?IRu$F7H-9E#g>-dk
z>#m?$?bM||bpW&Jqb}=>@L9<^>avXTMEJFvx@-d7HZkh5-vWu1>!hxz43Fq&qPjBl
zDymz0sVmDOSRKAWUAg-KvGsmOU3s|`5z>A%ac)-=_s>z+Mxnpk<J7fp_;(VXq~gO)
z<l~&c`@}Nlin@N(AymDEsO#rodp>TduD^Yo2rt{JA3qXMj+>xvs2GDsDBocy?)sCV
zWqh={u|NF%x#!hQ{kIWObDCIvw7N~h(hcmbZeP=Zko6ivUfHhh@DKN(YJHrV8&QXl
zDeKkTdgTycXv$EiF-y(uh=<VH?^i!71A<a_oVtti65EX<>aIYPROGf)KkrtT2;(=a
zpZ{KmSZ5zr_e91M+n68JJt=TP!z!zLR=o-R&|KZ~Yz`4$2B>=p%6Y;YsC#F&Ac)7S
z{(bA<SZD$2fgOv9t!hp6i|GkOsBljGVlODuw$|#GlTmy+YPg9;8}(=@WHd(hRgca{
zB-X`!)T2uwWF$`gil0Qt`(+u5<=#=h#$QgbJ=vpvef2F2sJnWs^hRQ<GF<&8B@qv;
ze8-S~(ZH{s=!i8fGhRInq2Z36QBUs#QBa<!XZbn^CcVSZdTG7-eNSx919#PPWDlIt
zpVV`m5!bWcR?n?KdVStw^#UTG-11-4ANC`jaIc?w@oHZfv&!m^2LxjM^SFAsF}CAn
zqF!-)L#zW6O-%5Ass8*FbbDrb^~PxAeCAwGZ@M+G*)j};=;7*r5NaW|X!Ta(>V$8z
zP`%RuQycf5dMD*0WW9Xq{kjsEQZ4m<lWf9Q+Mxcm=4a%R{!*VS;}H*7tZ`GJ4;&jc
z?zf#F98Wc&Ya2om_G-e1tKt9G+NKE~!z0-j!cgqfk)idCP)&@#1aG#xW+?{#->{@+
ziNe~J3e{{~PZR4;t2Nm^j_}v*nl}F<B3u}#1%I}JSVkpjB|hFxY|n;kq2GH5w_yfD
zOY=Tj=<SDuOg_X=Xm&#@xeD+9v1x6!(rH=5^4<omLYEhWTlpzNOIxQFv3?F5g@#(i
zfR)73^>wWh1|XaX)G7_Z?zmM#s{#*(tGPvsybc!Ku&fsO%XngIa9WGJF%!SLw8-C4
z$mFb{MgEb7@26_jPAn#ta$~jX<N&b_ny5w3Y~v?f=rAqz`;El9^pI8~Tq2eRZ)i2v
zfYS*LwVKKjV!OXps}nh!@XvUy&JT5nIH0OlfBy)W?G9RlbuzL3lBzY%jw06bQCf>q
z+X(k#U#&$ytoaZ{Yx(P3yeHtH)+z=w)!{F#eH{qtCkYI>w~hhv{vQk9n0;aCJdL3>
zg4a6D0*9N|OY2tm1+n&dSBrCEW)=<6;;o2WEY-F6UeI)F*J!=Qfo6|<V&dpOv_2Db
z!gt!L^|=d$bSpvYD~}`A5w)~_H8Az#moOB!FJow3lBD(X4-Uav-P8ugA!{`|R~wiu
z6TGrg8$1S%i1n;Cqz(Q`VZ;D!C}q7>7BI91T{p4(A}#UACx{iF*Ai*sVe==N%OxTB
z)KYVuYl>$>E^Dq^U5T~hT5VWoY`^8bwBa4LVrCX<?zXK6@BB>jyU!hhMysw-6r&nz
zBQg+TJy%g1ku{T$4h|E$#4{A1S72x<(^5;`il}+Lt6ECweuQiHwU%O3BVywfTB<de
z@DFD&6dV7kWdydt155L@%=ht%_feO%H=1~mfOw$2;W|(F5!?LQoBLr_zy4ku6O9Y6
zxV14IFy(g#Xyb0zL45y==6}bB?DbP^d_4rA=Je3UqcDk|70S@sYn?X9?;*m5^V+-J
z@qVA0r%cTL*2MMU+PiP;BZB*|iCG7=ck#@qaB03ay*q9^%)eWkz6N)0zoNaz0aMO1
zw7&ik5XR+xTkSpN1tIr(YBMIjOROKX)80SS2v*Duyidp>i6IwX+{8a381l|P7>e8P
zF|=N~#n5&#S)28V1<q=5EvLyHV)IWGv=5wzk?Hta`(ObQi$``dwBB5&eHfWQ_{r0?
z1$GxyC#NmAcM3tIAGJjTU=`P1)E0dULeb!wwixg8v?O2GmWFRf&6lh#@BSeoBy+UY
zj!Hxfny#%2@DlO#O>JGL&4fR)h@mh!Lt8huKK%cR(b~uL;)wN96Yb--F~!9%Xd6mC
z#3K}&w2g~lw=bk<TXWtfd|D}O+e#lHOKNMmk%(+$ysqv1crg(po@%==K)wpE?I)v&
zxcM!H)_F^`gMIH1>;5q9P<f4rAD-3@jf5K?o1h)~;4raW_*gsiWfR2z`nI7TU_3f8
z<hI{u$hYdi(0VyrJ5sGF5hfJVj;sTR`=+;c^bVf&uApjP{qT?oA^WtiCm>S#*vC+m
zTWZHE4kETym9%f;z?^2x)9|u1!X2oteP60P9!&a6`#$ysaEW$)u0Mv@K02lS5CB^J
z{V&?ZV-HaCC1{tL*Cdu9IoeON1`%ObFYWromdFoW)2@GBirA7zX}=VYCAPIcX#ZJ=
z?NwvEc56QL!txmmEe*?Pw^l%rHIcR3*-eRUX`FVa6PCE^2ios3=y>T-?cVU7Fj}3o
z`~FRME!Lk8v<IKfMu$<_!$|Dg${rKztkoXvZim{gN7|q5U?rEG)c%|fb6aJk_UE^Q
ziKSaP?J?f*Dt5iB{Y9(jdM0Rp?cGGg2g|j;euIimXrw)@cnZ}r6?M|{D$4G*>tf;_
zBF4R^TX%i{_q~?xx9*1yKlY(+6M_lHAJpYw1R8!#)|I;$`BzQgi;X8jgWkG!dJIx2
z6&Z?8YU%cc6^S)sj2`@L91-42)=LzlNvDT;i3VR0a%ZMq0y98PzpIC8@x=PDqF%ZT
z%y;p9dg+sc2p`Z+FMA*Hf(>{4de|4x{a@A6Bi3!jJD`v16&<~ZFhkNSt>_Ak^+2y2
z0wLQZ>rq4gBG#rh6Q6&<&^E2U9`!*5Vw-<mukj%Q5?lN0wa7<=f7hkg@uU9l{h4}Q
zsTJXNm)Gld_?hsH4(s*lfF5ko>kr3_9`~QuUkk?tr|auY2fYn%_I<tSbHwMH{H!;#
zA+JBFncgfDs&(HIz1>6T{Es^69jD;Dv~0ao!e2x%#_3&pH6_;NkM!<$Aqy)`>v5f+
z@jm}vk6Qtu?bSn%FUt{Yv-`l)5O$fNZRXp0PaBHX{j<K&d(K=;gzYEvo=bd0oMhK~
z?nTb#&oKS<zdj;d$R)i`r6ELUK3gBG=Me64Cw(yXKR-B&p%8OGAN<BuVyi#M#N3AZ
z;CGG_AwEeTvJ?3Py^8Lfw})8zFV&rYZY6wDXFcIh#05$$)Dv4qVE^B)t0(pZq2P|_
zNdXa1t$p<2k??pX2kIlr;B{P^zt=~GYN%>S(MNs{k{Y*0PyPy1xh7mszE+!vZ8G(g
zJ!sh3K~L-Z9|STR>7zz_iBLIQ_kMsf`yPGtjO&#Mse6Z^?Ph|WePuZz$zc>x|MPqy
z`$BwrkfEj2cKyu;cwqRC0s5Ob(GoL9pU^u5^?~#Cw`R?N<1od<wpsebPhb^4FRxGP
zjv#fP?-=q^M25oHZVbioSqv>hujub=6N$xlMxQpfC!QZX4)pgVqU)qSBlj>NtC#4r
zC*Z|_B|7UlQNN(pW0^juCDv?odws4OcKyI;eSYQZ#3G6M2gN=h)?PpBORlydmK)dg
zrEzH3KSW>t@-yU$cIhkdN4q(xroJ+)A>qee)mK)&fk@~HedPuS@ta<KRoqa_TnT-Z
z|40fE$5hnUw8j8BoM&k1mJCEkA=UKFbEgu)yWB+MbA3BpGNDpEeMkKy6cm-!bLSy_
z-#bFj#qJT$9MC^oTY-?=hx*R4-xL15Mf%R#M+pfD(RY`}ZhA0I-#uV0f=)N}&yRIP
zAoEk*zZVV!*FH%<I10(;oxkV@--a(2Dd~rPZcVu8UHTE*Uxe&_t{;&Rg!=rbessiE
zywmL){pft?iv#2JuUbt+h2#7BS3j;Kq{ck`o3c5?GWK2ln>yuTjDFU?X^xum4deBb
ztH;6&zhPq5SRgdv{t&-@dR#*y{O5vxrc@sY#SZ-ps@1vDG5Xnd7l;u3xqdzn3}<t=
zem)#NUBD^*LLgEsHBab2u1AJ*ic7z=VmYzBd`G|Xq8PDp=k%Yvpj>@D`p*mN5+U{{
z{pJtXh^>)L|FtrL+as3gcTa62+~=BpuQI6HZT}$se&hC_&x`dxD}qQ!W%MT_%Mh~h
zYyEjQ2iEGM{$kixLINZ7mtolVrz`3&ua!oWypmmPHjY?|&#+r^!HOI2w_96)z?}WV
zUTpLsVySw-E}b7o1ZzpVyyH9}Gy5{MU0iCHFKi-Q%0h;s|HX2<HXD)2rSC8lC+)K9
z>NO(td&{nO#b1d}*lD-Z<Hlrr;JbM5_oQ5VP;Z#eW996@-Y6nGO<*WSt+$s5Jxhdg
z7wn~~3vfUt+Dml+bK0`UUb;BU`hzbRifNVYWqS-Fwy?(b@+nnO|I>biy~5FL#CGj7
zdqnLgMC`uS9x)QG)2vW?1bu^9;6i(qo$HBhh{s+HY}mrjwO2m^(i*?m9=!^xd3rs2
z^kD=nijB0#R;x-Zt-rL#W+PPd+6a4%J@6HOm~5|ca3bN-4%=%7V%xp535X@#5^b-2
zG6?qn{Y&;bbuSa)S_ONZF_#d%4z|}@17TaIGvwv5_68&N5L=JB_J&`SC!|#yhT@;o
z7+Qjh+gn=SBi1qsLz}Y5-m33N!krk*Q0%|R-u@RX&DMD)KD^CPY|`D{u`)`jEx&HX
z2ZT;9l(cu;30;1(v%PbM6M=~r_U@0GpbUSiy;mqSTI6VZ?}{4<U*l7I{{Te8`bXRQ
zySftL_-K3ojc`JnuC@<&%Y(eYYWvV9M~Us^O}i`XFG6aC+TDGQ5Zk_9_K{=n5S#0O
zedOL?V&R(G)BJcDjIexxJ?(Y)?@_nyS?PAX|NFdsbhwTHgx5a0D+tN_!S*-rUn5-d
zV}|^JX!{rx8VEPL*vEdI24gkNKCYP$WqiNdC%nKmb{w})<SG&2{hjuA!rXY%$t3%f
zXCD)>%U1i;%lLz41E<)h1z8Xq;_R{0Nffck-`N>%u4JEH0>U%>zI}Qx3(E42+Ghko
zw?DVpXRN7<5N&$S?d(whHv8-fU<1wOnAq+Q6FZkRaqKD+_bp(^RlRBAx;+f}8gH67
z^O%W-c|HI61oQW=Q%wBno{6_wGZZ2^nCQ>F#6F07J~Z*v&nBKbW8(FC3@t&MOf22b
z#2OBU)+%q<XTOa&%C~3jv#*vX*0mk&^NeF)lCRt6cYudEuC0AR=^>~v{nEbRojZhY
z*3G^M6=s$vo9&D44us9TSIoZTd^|Q)S%#wLQ~R>r@q|2{&d@UM5<}~(vnDR+U|){V
zHP`VrLt)z>`|_WDA+~Za>?>2w!y9nfSA{$w)}&PXszsRh%ysrvs5s{~CNi|NsAXTZ
z=WRkh9co`a2Y)k_44p+k5b^gv?W=DuAXa}9`)V*j&R4;{CZ#8_ymsEc{^D<h?D*XN
z@r2XJC_lA-JR5&<@{cO^&8<LVyfzb;p0IBj9Yr`L$iC(0^Te9@k$uZU1a6M5vTxN8
zf!<rfzD@iPvG;cNZ6}5haYrTlj?etq1APwJb1h(qE9TjAdp#iBp~d#y-Ioylr<L|S
zNAZYB{}uKFZ^IoK8)M?L&Gv&gAX)1V+D|-2L}@~t{baC8gux%%Pg4#)tG)e91@NuM
zp$tV^4f~n6*2I#r(*9jnIQLZ^+t0a?Z~3r^{k%V+I}rwruwT@>628f3`^6D3RR?+d
z#qAQY9hU7^);uAWNzLt71F#ozlI_=yJs})d!+zZdeRzMD{g*oMi`p-<|8f8XZqhdU
z?X!ar<eO!`JEJ$@ir2K?`xVdR#5A)%s<eVw($Cu;9j`-d)6U!foGcJNxt+c2v%wx>
z9oNbJY{(WOBue&|-5U_{+AKG!woe-a!}+pXUyS*#me7?rjHTNxVOt+;dKk?G8jE6W
zWwr{J!ZfZ%PQ-6DjP=ENY3rch+SlPK8&XX!Hup>z=dWn2nkVQ1PU3+x<sxn}3_lwY
zM{ZhcF1j<<)L1-|Ynpp$CO1;x(v6ODxb)mTbGV*7Ua{E02-wL78H#2NG#VLP52K;o
zrWkV!?zl3Wv?1xlOME2L*x!K*GRDv6GIIZ%&jkrVfut+C@S(dbU^*FzVV7CRZRXxG
zjxFTI^CTv>^CGUN$bD!mTZSLw;{++U?Q(9ujT>QHUW*@{)^R<#kBz14@FNX3mD_tg
z*GlBt8!Zg3obl-<u3GN(O<cB(OEL!M;>XEeoRoVqmun#4DbNYk@NS_ym&KAnZglTu
zLvY{^j=Je^jZ+(hAfxsJYw4QLFf<2A#BmR>CD4sQr?a0vd^4J4;7`;#NGE(pk9m!S
z_l2-Bk+>uSUnP*?IM@Ogdx#UCQ;5q5n<iAL8%1JpARbq^fOG<e<Ah|iO?zrWVo4fl
z3Zy?rvX(u#bkjJYZ+LZFFqC!$^yW2?$dG>HBN>=$YfbKw5zxw7!r#S}GSrpsb)+Ua
ze8b&dN3z@Nb7Z-blO01{4rhihHO1+3CpeRnvmI&ascETRSE9q0>KKvg_TU1SBf*`X
zknD0q4$XEr6B1l$KDTF>BgJfVxH~N>#?f=QE1R|0BsQ&SleDIuRG%Z=mEdw`x*Uo1
zojxbparzwSJKg2=rMnY+W*2NYdCg~deC}l0U$!GL)!|KzG4>y|gwFe%E0Js4#o2kD
zTg8?vyfvFEM}c6uFlWhm-_iN^7^8mULp!i##B7+0LYFQTQ|ZGAsca>Z+4Q$zbC`eb
z2sD$3<K~(r5w`Tkga{#I-W<VhaBqr1ZRp%5Vxdyd5?y|C-l^cYu-<g>9FS+)A{8kQ
zq37qHOXZx3ir2WiScnMsq8Tp+<-+=!7Y@Z|`VAd424R%{-5O?`>|m|HeM;A|q#vu1
z?sEE4)9GqD^Opt_o0gI8!UCpZby7Xf<QPW>Hs8Zjvs{_3bVr8Qm6Va}NWz6_8AFrZ
z33-=#G1KPaq`6Ylu*xGnsaaS`-*89P@YED42Z?TPLWbANR@@Fb!je0j-ZWQ&&ugyH
zj?cLf99P!p-;^t3B>y1FcD<D;GHk4_M1$MImCYTohifi{rI8MhbGoA-&6qGM_eJ*(
zH<J(YQ+;7Bs}Cwj#tG)Xu58|!S|XK5%_2uSkk(XL;oDjy25vM#T85AYeN!{i9UfO!
z{zMITdLi^Kk2#C3#745i;ppm2aW!&Os!2b0NW>?;R*X61bw{|jT5&I!+#wHQj<o~n
zPNE6^wlhYai~(hkBxCOYOBG{IDQmFt*6&=2a5r1!&gMa!XsQo-qy6w3<i=RmfeQ_y
z`<<@1hlyfu`pK9u%ofCXb9&^IFkW8bEJpVod<kQxhYPeYO<~Mz%!OB>;_hZrO6Q5T
zOMjY@PGvW*Nuxy@F6cEnLaG*8qc?iG2fxvisIZQPmQRP6dmzU2$UioT@l#7{EVtEE
zBptdtpg$md*>o#Y)xcB<BoRllQ!}WPB~l%co(g&Kxl>#aLr+3-Mk3W1Y_q4hhYj~R
zhP#r}=mqJHq;$8-lSuV~GhsOWiYgN{j{oP2vMIFb?o7p*kWEkYrh2@_$yjSi<8?c)
z^TGqRJ^}G;Cz;bir^9EA8_I<mf$d=dU(DcTqjHQ`Hh}6}IuixT*;tk)mda`NpqTN&
zZ(?ynt8LLk^L9Sl=jJ|6rVC|Es3le~4(;Xxg7VdNzShOIHJnLY2<s_;2?bjfs3S~l
zim_!jU&#oG=0afAjF*0Eh;e2QU(z^T8zKXfXf@RFVlfNd8XhBNy0w&ru10m^)D12~
zz(=FT18bSTot-n~s%~(#EhVc_6+?{+T~)e{RK?^EFyA~-WrUkB%7<FZ2IKgvvWJe1
znJa}*W84mFq;Wvw1MO6|WuVzavoT}KBTK1({Jq;5N^%%P&|`3)Sc4Qg0MiJ%jPtd`
za3k#$SKgS>%vy!#K4P-dAl{kj@|tT7Ba`H&ss^e)&FM~exIIuaP6z!mZ~0-2QnT3U
z#)KJsh@Z&-6*w>UDz#Gd-0BWkBzH<$YC5w>Ouh=*O!c6}M0Zk>E8XSsITBJ+(lUIm
z^cY9mJc)yPb2yVBPKo(u4JUa#P-{@2UI-?%AC+lpDE)sklcpK`=lRUaQFY@<O@wJp
zLWiskXCf@>a2IPZ-RnwDigEO%(oaVVNq4<L?*UuK<w;1-PNSckp2ULQ9iCVhzGC|&
zIdvGUa+=fY%}PyYX4=%TxLMk7-pmx)9o$Ki=$veBEoOWfV+|}t7b*$TLIs;HGUXgp
zp*V~QUNJP(Tw-d598h%WSm-1ybg~hEKSHf|nWpLmvGC<Adq1d}sWYgInS$aeP)n2-
zQ8VaaJQ7EZt`5F*TV@Wu%mh<OO~-L6yObzVC1!3H2kAl{;kx9!)=c)}W7o3b88@=U
zawy-Vr&A_GM@ubx3jX<wyJPu~AXDp6ZkC9)pJ8u|G-fri*5>w7c`V~MwF^X#swYS$
zB+lV=5A!&EFr<ttvH30{t1*uF!sE_#7Z%y)NWnr;bDRxf%<wr<J+Q$}N0u|2T28Dh
z+RBr9UwQ^;7Z%T(3K0%Wb3$qpGLoGz$fh_KE?RCig>Pi#DjG=vd<C8~GNuIZL!wI*
zT@L6vx`v6QQGv13y65eyG^cO4vA;MUl6y0Nf1fv=^x?wP_~8&Sx{W~gj2;1e3C%P`
zl;uNP7$<89<#M{-vC3W_*q|3<^BO(ue6W!f%y$<`nr8%;DAJ!2Uw9_#?MN{Hhboi@
z(?7{uD&?LJ=buSjb>q8gd=*PCaQ$}1i)wr|F4Cx4osTfT$?aO5Pg2UNBo4!%#uU7%
z;D)Smu4HGn5l{i6cv7D)ZtTkt#N03I^L7DqbFL8|me<JRM*L-qP!_(*x#s+Et#Tl=
zUmBBZlU0E#6f`QeN=?p4@xa_0_qy_-xy`%sfn1n57i<?$Vo`9mH4bbj|J3f?_?o3k
z&0}2NK}@b_ZU83Am@XmA7?WsGjeAb9r19+tKGHBAaX}pmnrq&I(&E&V6xck>GIUf5
z<ik141&IL@ql$`(4K;;~tb^?h2Oan1o5^rv%LqO!cfxQ!D1hgO(w!Y^Jh%a~<;%h(
zmCoUdmom2rWt!CEC^Q6aqgydP#0cIfG|74JJfJh%$*+1D`8I=E5L3SLcW*2<7;P}0
zCD7ePtqo=2(WHy<+zm^6Vv)sa9NQ?!hJMi^heZFwy@TyFns?zsLSF4QZ`&KQ+QL7)
z`IIYZqjL*#ViZq6vje^q)%y8%mijws<Qk5eya&DxhDGhqKkpc7iCV2tW7tJ5n&)(8
zh~y55m}a-n?eZGUHwocldTMHlF>I6I@aH)%J*f-gOa?E`b75k!0?^GVPWUIOluT1Y
z6zB4R<qT(fz~zH79?5jNBf*(ZF7ujmGPMHz?KV5khTh1k?f?;oo8$I5lAY8_Kom-5
z4aZ7TlQYc4<iJC<zS|dLwBW>0qr?<GfafwzuG115#m6SWRDW5<ehD7<YhQ@Pj5)(>
z!C=s-n3GJLM)wuvouH|hH>&EXYoD)DO<#qofRtBMuIbj&*`}Tjd{$g%(p1_KB^Yg>
zRttH$xexMfN4ky^I^lv;HbxIK9ujSh844qO8ehs*i`2kbm6%;HY34?@Ldo5e!SP&<
z6wI}0^ionmEFI4D)C{ZxG$<?|U4>K_;N)Z&Y`7zilniW|bZFz$6c5$8_zIq^*FBVS
ziWZI(x5u55kwUjsts0f6(WSEs*W}a~KEwh$3}2>TnmNw6*U=iowKD>yVOArH@x?WB
z@FuxVH|!(C(4c&S1+fODWI+UWAe5d<&wPfvAC3PUrq5%XD$SKL=DP%ykx~x3xh)sX
zjbeA*p*zfn(*f@|6<oQ%zz+v~$>T%?-@#t^sP|<~P8ygoM98EZxRLO}`{4QROkBcS
z=k1mv_8f~tSC+248^-x=tS!`*r!0(pi!7CbV*VC_z<L|bH^dO*`e5+HnfT*;Oy5YR
zzJW{_Cu>_n3(2fRg@KY^k1^;iY~#yyt$_kq2jklj|4n-G)ejvNTtuVWXMC9P{#ah0
ztJ;bgOPhctPjv~p@#uYCw=jxr)QqwO<$V7_H+q-ib)&}@mSAI-j40HYws4sxI<Y0Y
z7w|=ghmuEg8zy1@v%OZZp*?xKIB(mU?lW^}z%m&Z$n#Z<WfR1*etZ*?cWPg3*}`oP
zNlf;+sViMnMSu@_O}84#Bk#JRT$U<;f3j6?eiu!KrpGpAm&FcEP0ViEBxl9~*%<#O
zADBBQn}5OaTybU$Y^H17$%wr!galDyWXAHSG}5*38G|#q2qWz?US(c`sa9WA$NA2S
zd5r4)6l4Evm<~~~1Y;9ZR+kQuVV<F%32$#q0sL%Adf6P~W*Jq&J^xKtx;@|*o&*=Z
zclz??frX;dGqA5|ya`*gfUFmYa$s)Gn|uk2G=Q|H;)>p9xrC62NYWE3CLN)&4)FWC
z6Ne)R@|*(6rj(NEtYoA7XIz<jQ3WQrT6=dQ6tOwj$eyX`u^no4cSJk7I6WCG1O_J{
z$vq4tFfqyqn8JrjHD2knb|khnomfg(&E5+eFY!v_OtjF0*-o|Yd4r4wQXkyMhB+EP
zDMO_cmd-T`78zVSTZv})&Gh72fDdPq+6DJeg$}u3CgEH#mdS!P@h!S!)`lP99GYxw
znE($nZ6a^U-7ua%Bt!)lRmtc+8<w<?KFVF`^7*pUT#eX$=Z>1lPvW@d#-Ee;=D7{u
z;YaaYqH*sUA8It8!bcfF^|<I7u}sF}nHkKZvCNJ0IwGsaIK2r`jT^TBv8LV{{mPt)
z+;vm<6G~oO+Q^y1-{QgND3?+4=Y=j@i+CZ#m^lCr^2OyA*-!#3s;fI@i<&MUSV!S3
zn*K{VqXE=7y(-VK5Ctz25-)avlg)K3Fb)4q4}-=<%&?#rqLglgcNT)|F^ueZS!fQC
zLsM5zW8$9Bfl4v%tH|B6*>^&5Cyb<gj;#)i6Ejn==Xs(Yo8e85Wvn6AnU;ny9Akmr
z*z^K65re%m(wCZ+vt?Nc<M3QQAb0#+zO5i~wMYx&cC;96B)%aAhMCTjBQFePavvJf
zpo9(4Cga|0OSxFnDAUlhX}}9lpm8V4{L?WHW=seaigL41JGIeN45|Bu$ugGpLkO8o
zZJzbUF*9sMcR;?fpvO!?nD0)Sz8USLkR|v?c!3ZPYYPhGbtPn^yL|;=9i}ca7$c_f
zO~j_7smI&ILoGH9L_*JCdK0TN-A$D)6LrkDkNIEF%HRnus!8w>v?|LJZtS1ShvY<k
z7nOT=KHrlI7!LwZ$xwdi)@%IK7x9?jsa%PgJ(y&Tgi@gl*p!Q*kP>sd$79QwHv>15
z&0V%Js-6&J#MI>E`t`b|I(qn`sq(_Af_FH)*<K%<eqTD=K}ztG7=g*xa^_KlP%*sR
z)*te%c+O|+8z__urO}lH^iGLeJnK7?{xoKSJNIvaj)&m}=#s(>$IpDOMh96mg-{p=
zt=tRzsdFk~{Em26I-{_ujAhc8firzr1{@L=&BaiHt`ZiBMB{}sw5*93<aaQUp~2~A
zm_ABt@=O7f4zqX4FzJzeDWXP)YGN8opj*%69Qo`$lC?mO#^DN@dhuYt(I8~LeADmS
z;(IKC9|_~akQAE{HVM=oP>oO+QT}h86;8&W-jru240k1rq=LjOPJuGbqx_T}BAVh%
z2V(#|hwe&tR~ZSD?(OXMjHKi}&f6ABEs6zdoSCWaM0Q20$7L=kcfq*w0{W}ZUcPuG
z4<?Lm1T#iLU0u3W=p<0;*cL}A-I*}J8UYGMm)&bDUC5UM!KB;ETcFqI#y-{97H-UZ
z*BYGT*doXEpxh%d)l&sARRq`^-i)LqcLGAH$iL7?t2f3G2g6!KPeBY@B!Uey`aIm}
zfv#dR;C1<E6fJM`b=c@zn}hz>!58f1GISXKG5{vu#^i<kx7tjmv-8=o^KGFVH6_+k
zGzM+D8I+9D9hN6~#@$fl@fJc08WUDqN*WDUS(MlqbcXq-8q+j9Lo?jTiRd1rKVM-`
zGUbI0bS38PufB_TH3S*JF0-vwjP28`#f`GMC>z;}ETsohX{C%43si7NRhZdgp+ZI#
zKuVx&yso_2N_0a|XxPVwEJN{j@J!O$COe0Dd%F{%>^TA7_G4jYuTf)<rA)|3+@I-=
zQ=|!~Y_O{E@}Sd}nqtXzm0IUF$ofHE&g*ifLq=&NFx8VyJ)q?OqqC$Uof)UDawUwa
zUBHwpmKOtA2OT3{>3~MA{(tw8i9V<n!VQ%wLw9Pvt|?qJ7B@GX@nVoMe704E#^{PA
zZv_I?6HA(JBYZGE&;<o^U8Bg@QawH@ywLVtyY+Nrx|st<Wz{6#=34ywq^~f?h|VZG
zPzpzwXv{oeDQhhK!)ifM^8YpBzl{>-MzWEc5>k*L##ETOMRO~ANg)et{$KCsU+%>b
zNrj5#QIH|6!gg)czu(|S(|8%9>Iy-&JgG8%PqLJ=uvon@ShO`XYTmI1Yjp3@jpc@}
zPBMN<;L1d{rYg&nWSaR!F4s#FHW^-;o+*$sM`dH5Xe(R6`|qRh{L3h+1<-)&KYQ*F
z{lE3>%Rm4=`Tyv6im^Az5~dX0L_MBcf{d!eEX6I6kgB1Evl@P%R89;Od?d=4P~H;C
z*K2E}rC356M$!;1mHqt9Mb-EJu)8w<k6s1LyU~0#SJJT76hrwMW>>Xo{64>z|E-h%
za%)sSz`v#vSa4@OpIeI4+toSq=HlwTGPMPL7TjwhI8bt`6S0o}@op2@-5QR%h*K~v
zlHX++<Nfj$$zQpk!#p)o*u(#Jr!$}xD91GYG@4)fuj&!s=d;T~SJXj_uw(EB_D;20
zX_iThpfXM)h)MWKDa%mCT&ZC#xQZ&;l1AUDywas6NE(bZ)3Qa@K5sK1(nqx}WuYKU
zNp!cw{QE9wY1|zL;+PgMicH-Znb#0xyt2hwtk>UFT$!$rx_{9C|K7m>Oq7`!`KMwv
z>2*8Yd<OGm%$xta@-kE6h4JjF-Dra1Uj{-$Ys081^U`eizYnW8F$S)*gy&BAgr88d
zMoGA))S%^cg?W!;S@=SIsL@;+ZPF20sTQR6E53>$ea&~TUIGjJe_g2fQeV9+x9`_{
z&0@yE%Y39rSH}oH%~#5udYbQNtyP+Zn+ppHXw#HSVO#~4M(YYz*9xo$TBec1a9-fc
zaf6JsZG41>(pNK^KNJ^I7UF<NnYBNi*f>o-{&$jHwE3v+w6wxI+>z!=PjMso2&$h)
zC=*!*GvSr44f&+l#Bf~T2bGF}-C_a6JRvUV(RjW}3=1t0pE1;%knV=oW@Ihz7IJX|
zizTC8WudfGtTqCs9^Y_eZEhm(@bYKAjq$c<!GU^34j>;}f`tURPDYP+A-pl~SOarf
zpD!Lx6?YLL^v~=7b4@zLgPc+SqZ&dICOM_lE%9$IH*JiDF8V<-s4GQ<GZqnJ>aUD8
zzcZ6@hzz4bsckEG!Xv4b&vaATo$B?)IPyGZ>bbP?r6*T2gTRQ9yOQ&d;eyeK-p6Km
zD8w+Axz|m;BDco8$2P`^BRq}MwqzQDj{F+4PSp*6dt0d%%w%GiEub_g>ogOH^jnko
zQYBKjF7$S20atRqIB_;MdcRrX0K-Z{0(9`+>NJGKd@5+fL`Np#wP4~sX>7}rL5r~{
z!9l!a7!BN@ND6y0BMliL7-N<Mpw34g;mONM)2l%fm<yMQw!jtg!jX<4`Ef%;)l%ST
zx;=?Bu0TZvXTc42WTj?+Ak(ZuYBG(SvoW&dIr7bjwVTx$)L-=^3`hLgJ=#o8L5$t0
ziACo18k<)Gxnwz<u5i&b@_(P>x~5$H{UBA;`Lj<&%A9#qhv5pkJfX&%Ce|99i_USG
z1_gQAzt1mZz`UJ;i8d1h=JXei-Pqx@RoB!O$iy?(4$EZjl=>IMhQ`=ykeZS?&9|2{
zt~|9$R*BJnW62G^x>g!tvwUR|ZEU{7hsyT64d_TTCS2!Zlv;(S7^5~>${90n3Be)3
z`DeL3NvX&{V5vRBSf@(Mzg^Inc0h$L3A+QqReVAL3pOGC<%=6B^-6o`u2C5%rb7y&
z>rK9zR-&*)f<K*jkPp(e{PU6Sg07@`fr~Rv-LjObLRW=`Z{l!gRPt$ebO?p^g9R0G
zzS>sCkbko%fe3F=yNIYkI$T}4O<8+FKT@bj<br0YCvP@Ob@2bvEF-`L%^Iu9^VN)F
zbWzG16CexasZFU_gkx*1@;6vyrJ7OZO5VN3XBqg>MmF<u$#B)pBbM*@;vpy{E11e+
ztswW9yGHDI?y&28X|7y*C;~H-ScE%Zl4#G-MokBJW#xI+l2r<uDcd@aTsf$`n5+S2
zju8j5X|Aey;p@*W4n;3GJ&B1HSI6jo!BWboIL}(Td||6W1*b7(Pg^q^GwNOxtK_cv
zg^%Dyw8UVkh`3oiltzjonIWdD+KnA?K;@d*K{v21zN4X-{2Xpnk=ZEM0bwc{<DlvV
zx+u1YdWp*G`s*8fg48xYMq>>5-O{vT!E}~kQ4s{^pl0$&VP5GUV#&YpQCt&a)_F?^
z5@Y#so%~o&G|eL#ceaS7f`iOP=)zFL=}J#eO*fY><|h9*q$&iQ@;s_K3N|FoxtB1y
z{mQqoC7Q=k{K*9yCtg}CvD5+;oXLVHg>fY_|M}nBl4`_)C9*}Nl!#_95=_I*(zYJt
z9nD|C@M-!HTafN8+vvZIz-|oeilUnz?{In$!mHTX`FGEH&uMl(6cubj03E+nt?H|N
zQUd`UmER-%{Azb)x|`i$LZ~bHiiR~hceR!>KK+zejZ<Nk(h(KVcAl2ZL>8L{M$9`y
zFM0REZlO%v|I(&J2_FkJ8vDbzpoob7q4n-J`KWT$3tFeC6Bl^{@@ob!u~bItmqMwa
zK(ys^y}|O|2;rpB0uVa6xpRKyH}W=G*@4OfV@ok>h)s%TY@O*pTXT~u8{=>Cv|`R-
zj2~*NkW*v51oDI;SVxA3mU`vQ0xi=qMXTO3zPjPL#d{;_z`UDEu^pt$Os@Y;DN=P9
z92EaAy0AzK|EmA~-omSDuXb77UN#mq0qKprN>NNS<yk33wyPQsJ54zzjC0=ZyzrA)
z)lhEp5y@N=(u;Agd{v$w9i}mR%F`*irRts<TPl@BEe_oe@$9&Hl?Qx@#y6-g&)11X
z_7t;qVN}7>hUnI$0&eE4%p?N7Giv^VlApOvIJ=+fCfad+^pkd%Pa|nI%rqH=ZXd1F
zq_&BkM|=7EP)9;t)3gKKPAE<&P)F{bsfdK;G3M&n$?4cU>8?0tFpKVIYyz_)iYgqW
zd0F%&I)SoL%8BAk6YFSAE7<ciL7s;Q;)XP@*PwEZWow5Kn57avgtSfL{deC>?U{<C
z5!$6bjVXOYu8NUH@7sJutvQG$CE!d!8$JA}_Ee)p6_vny{UIew(fBGQIAC+>`OFaM
zR%00miex&8a8``*xA{I*OOXCW_E}fV93|ib3uZ^^k3B}yv;)mS+^;N@R~4{ER}zXO
zeEB=$CB`=I4nHci35NAbR2FwibHd?IxggGMT)r)qDOHk%U+EJAps>tpnN|HU#tHBx
zTLUyPoH&hu9jNfRG)_=+_FgI*T7q4a>`KCJXK7znG;UrJvJjV;4t$|Vx{Q1KxS)`t
z#jB>^L2wLD5ULL<KIMx0%|}-#+ox%Pd^xA0SyaBw1Om-*(Tv5b0@MOD+zq}%$+O#&
z>4u80{x5e(&#8iplamJ3Q8$<Fw3u;pdgI2ZJA6}`+w>q6P$gX`85q!lJwai%$_yQy
zq54%v!queP#~gcM96F#C&6Xz@dEA1{D40XQR3Rvo?g}##MbmzC|4_~B$qC;YRJznZ
zF2x>TTYxp8^g)c2mJ3j2iN?wrUAtOCI~P2~g7*GxP*w6;X3|*rAP5ALJ~2SO4s-Qc
zKln@N`Tbz}^Ll!Vv(+sex9LdcuQ!t}^j>r%uiROU*njCi@Am%tI24-xrgsZjHb(Wa
z1!-#DQwnr1G-6{lHr?S3kQH+}Fi2b8AdQaW1xR^26d3u6ti`Jn`W90IS<soojnHXA
zZ6m&`H87~4(>!g9kb?2sn}WlzAL69iwf@m0IChcU0PTfj6Z;~+evFM2e?bexiQUaG
z$bcEIV1XFpUNj$yzkBuS1X7iR9atdig={k-&U{b@6>ga{^v)JB!$Y3~@i@#GGAAeJ
zz&A~d(|7owO2Nnwnprpc&;iY*V*3>67nE&grjB&6VRE(1xoleBYBL_sr5nIJT4WO0
ziAukM@IZ!9ZkkZdVurj5W~w5_Nt-QlVcyh0+zO^9_IG4>H?!nbUU{&&>01=;6Jx(3
zlrfr(7xeljnKVhIX}8Q!mYJbqwM&@Bzbgu#k(w=p_WAF#*`hC0MnTNSS#-4d(pm7-
z&ObB<RUGDAb8ndG!!?>%OEJ}8q0;T_Mi3=~?fZNMSGb(9uMPl-bE>~gN)6G<d#H=@
zKBjHW?l9TdqsFogLMaRLcMN$jCW+ElsX%_|!wBKEYNCCFFY;>{;q4&r#vZ9Li{hdG
znWZe~!PMuL#J~6OW3(7LyvVKnLtv?9qml)EhEIjoz4kvwQ1DbwIujAZ+Dt|Cw=o!R
z|IQEKQ76lu{Cnd|OJ(EAG1!Y}><hCP#0B2vEt2G~4q8nq2F*%SqLRS)8C6D9T-q`|
zMeE<<@%u3RMu~VY+-P-VylC|i6&>oL(PVyg=CHZh9<0vD0`-g0A1!t@(=_yy{DC--
zHcLelRG-sg%M^SXfu{c1+5gv3N-0wq`AarVt+tl)*Fh(5kj7{>p`eRKBmxywb?{$9
z{O4jvX_k(XD;i->HJJ&<`|35wEfxH0Oe)|}MOt}kI;Qlt%<V^`0F?C6!W?f-?$kOw
zC$QL=(c+jj$Y|EVQp_Js3u0W+W>rM>mehIg;!KEVB@}HD*{mM#8kXvE^y*N(y(>A>
zMW0x#-Xh)YOs?*Adc4tI(BY)&Eod7Klz2mFwn<4H;V!u9@4v=prwmO^uF@Dv#N&(h
zx*LslHL6)B?TyB?s5CXbQADjewHnrPHFgX|MGuXNdlFIF!Hy)c|23}A)Jse1hh`f~
zjv(ao@Gc(Is&vf~mizK|Ud5lrgAAbjH8=PkKZ^^YDid}A3rc5&7BAs>HRIDi_-G-L
zbjqoDB?J|Xh(a1$mIxuL0s}|=Xc{;)V(#<hsptk9XJ+#O^Lq1=MQxRumTgqN&sXN^
zG0(bLp=bTyf|*5w)WL12V@(MTW(plJLTYxB^oZ|b)Vj}?mdZjBsfI~4?(G&US~7fi
zdLS1ADZ%k#)!Zv77DEtfl3F<}ri2^g+jA;7s9ERXp`p7Fd%o7p3lJL4bs%RohFV19
z%4sfw=k2*OzOo+UU>^3h7fJ*nm;?6|#e+0FZw7YEN!|Jg_ddgdAb;`${s|XFpMgk)
zh!uJTD3&PV8WrnK{bZ-Nk+JC!?=WyfZUnqfJ;&0-KIUX4&Xty&O{u*vm7b9#G{RE}
ztjHIo)2i`Sds|?+yt3W`dluXiHE~p_L0_jES03|`LY*R46{}%B-AjqTDfxeIz|I<=
zSHm)(e>S$<kU#k#jvHr0J?6(5YajE2WNslg2z}bOu<kg}=<|fD{F-T^DA!HIPRf6p
zl#)L)qCoXdTdV+mdNqI7n!$XWVQije4Jnf!ZKYg`Zbb(O=TIh$4rA6pTaa<<5guIF
z6Dt-Aqk4^+b;==3<40|AK}ejIiG>fN`4QS>GP*Q9HnUYK;8esNIAT6yWU7Gt{^<>v
z*A{j{ZzQiKqM*w>Vs32c&xIB{if4*xeYCOU8CSxO#|J^UVayP$f@hzK01Ya1@H?y1
zPeNTc-LuSJVrBfSFeL@mjp^*cS+g+4EH*`wFEu?Q#Vp;Y!E+e1EEi&VC_zU#4db#X
z6-HQVXtEQ9Khy_{9_ezW;ZWYS_^u#@T*M22%fO0vjkG6xM6Ui9Ux_O>k(ms0YN<Xq
z7mxb5m<zT{_E*9<^oheULWz-3`gA%UVdCf{n-iLUx#=3yZ)r^yjui-QZB*Ey<h|g|
z&CI_m(d~;(MBvKjicNESGSc!VkOhe7aLeV^e!|ZcxC%zVW3IeNGibTLKIh{&Jh4y5
zM>#R=Er}iJ{F3iqf?H_JYHX`%VJmNhm$ZaQv{HgTB$#T9O~P}*l`nDCxyDTC2Nk4y
z=yP#S6s8SJWx1P&WrQG}dt%z>p;>%oqxo&Fn2m}DB;Tlc0qxv<DTo0*(Lb#TGc!w&
zOrwSy#Y9Q7t-A5vyF#%tbRy^pG=yI0KT_FrL&i~g|Hd^=H5Qbz$OFy2Rk)XERU7?|
zHer^OQj3<q)96TOZ86Pb<=ZwhYE;C@Vb`<$!pfA}P})sp-n_(gDd<>eW9`w{P`1G4
zhNEE{x}7P*%in(NZj1@dtaZ6x%#>3X<c&}VNlVHhtn8^X<OUHi!^8C`a-dE)bt7mQ
zkr|<6@erB-N@8jZ42eE>YnIcn+>-hHK8xOBOJq6maADrFN&m05FM*G%Ecfo2b7m%K
zn>72rOwy)JX_h9m1yZ^%G|(lqDP=E7Gf6|UHIvYmi=_Bny{<rw_Pr{bifmq`C@@}s
zqM(SMUfH}ZD4Q&bekf&8RJ<4N|NlH^nMqq*zVD+y+GOUOcYWSxfBvtVx2{!5JZlZH
z6@IN73p0eX(OS@|#{{-?7c7ZUWE<`t@8(E?fpJi7q)v7_wA$b82ID-1{QZx<2bEq;
zAFv|}f=yJ;rwgO|#U;|?L;4>uEmztF#`=X*W)3Wc@8rQAJ8wc4csF)05EvdC3fQ2k
zpmao$d$JF1%kjKrBqc8(A1JQ0v;0CAJh2DolwP*Dx&OnFa3R%pJ+dDAMxM8M<<C~x
znNWs;X2>xEXLaf~q#P2{h(8f7OfX>3jk)BJaG}|9YNR>j1trrdB!NOict5)kBBom_
zC|v?q1nZ>9jzTlmFCurAFcEQ2#b=!ay_6s+@J2QEy+_o95T>Zrw5XYK{cd>@s;0Hp
z)8Ew;W7>f^R2D8gO?=P7t6lagwykjCX4e(nOiqOU<Xsd|qIX0*Q#izxKF!R{^$x2q
z&&-`eU=w5o?Q|4TdH4JaD$Kftedz($;uRinN-GV)k+781He#K5)Z^yp*FuF0xG7VG
z7e7;qNi!Wy$7rNza@o&Hv(lWd40_K;DG}~>$A3g9(CTPFbflhVcehwY+8sYIe5~Iu
zjtDb$V}QGfe_iMX-{t8Yes4W>b=_6PX{EnP;xo{ML`Y5E^O-z@^H^a0P?z@AWe8lH
zah+YTiYut{e2=UU4+nXZdU-kZsS7Yg5fP|^usB7{HK&7x?H~&)Y4j=VfXee-$gc#^
zNX5-mS*~GR8DImol~QxXk3$t^;&m%LJrHl^wQ{?pz5uGL7sc~8&|mNA4AgZH>cVu*
zwo8+@7TQ<a_L6Dmn6p0?DwV*&-g0DRzH(}GX3ng2em(ZwO^LpQbkNufH&1HT4TTWB
z*CY;}Os)_!$jJo8%-$E_@@%Y+luXWeJ_{VgA4%<cL}HXtcR(%d!k$PTX>3z`tcxCJ
zB&cvg$;GAik3!a|=Fw-JYI8v&lAkV~h|Dt2v^$w4#T)wv>7C?`3mbNm0+M*M!9r3R
z7OS`@@D9w_<f%bWk=eRw|A>83WDRVfu3hG}O1sQdR@$#bSG&;^Kb6z`<c3Jj$*B_$
zW>Ue^?Mf6RI0#FDx-6+g?i^-R*;x*%h>?-e8YwdO?{YGo%&qacre%&@wWe0A4QAx0
zvQnCzUT#y+S<%)2K}O_FYBwddc6ZjSl|ljB3NqCmv-2&hbSdMb>hIZsz46qj)F^04
zyXVwk0Y^P%urD6plRyCUiiLKywc7mrefI2?sd3hA*l!gm+;y~-vc1I{yTDI{n(KE%
z^@mjK8=j9nWn*UW&d?fjU$cE#)=8<c1JiQ7T^37gCr_dVDcsm=V(bPxr!@wtK;t~9
z6QHvp?h{$=cB!R6tO%OG=w<!8;?n;@CQGRj!}0e)Kr%UBsMmjYhQ7;+poETk(Gl2(
z2N&9}OuU2tf(Oqycbn2~qK#Q&`Dg4;Y>tn0YBJ|qnCQcOk`jFw)|*-fZfpcIy%4>s
z=bER7+3xyXE2LxHw39_M(r2hKX+34!?0F%aSLHsrDCHSCX;j#c8tXky;e<A}IK_Q*
zdPh7y$`DLjCW?5*#+mHa+FW;XLo9QETZV)ioP{xbx(FX_!bey<)K%hx#gYto!s%^3
zc6#RjEQ%~JZ(Ql*n(JSRWKPujo#ULqrUYju_!6Q|U0z`JU03iV2~wsO@=_D%6t1Iu
z_;Pnuf}FouTVb`pF~7RMYr@a$JK-cg>t;OBIYsatO@Hu{`rHz`R7No5xijQh-Lb7W
zYdm9PV8uLjlp$!V7F(*@#iNtH;fvMEF<mc&D<<5Im-sZck##E|Uv8YF5yl!_cG<ob
zpPk&0iO??McHAcJo4>V-kKNZL@4Cc!SO9b7+bCuKrxyEkL=Dz@eBC_0Aykkl!N5fS
z<w!nkg%>~BVt;5}HnxRR9MGlkN1eSE%&H%l65QeTwS1$pDDCWID9_jLVn~oU-pV$c
z=Z=Q*^K!jsk)W|kTrwwYaP{zh8Qz&>FZ;2TjUW;)noUKLhdq_SA`R0Ybs^4gtP`P*
z1Yt?MlP!JaqzyiVVSlF8uFa&SNA+O9Jo3d*O@5x18gY@RDk8D1i*IkYn#|*`qm=!r
z=R$e4A}IYn^EYc=93J=04w(U5L>GS{RBB=;M>87ek|!HbyASNje?PAS<_sM>><ral
z@j>(4BD=<1)@pAkNgMQZFG;g=TM~nZ#vC(`-R8uYD=>5BIZQz8fduX!kOq>EEwaBg
zY#lVOy#%d5Dl1k@peE&;FIwSC*I^Oqr=W)JMM%{|Coxc-QE%6*(q8<O8l!G>U3{7+
z<MH<c02u*12y|jhWgo*a`&bX&WNJQV7g-M-ZxpBe1Eavmo-+5p9w~4b?l)I-Tl1F(
z4)!zuuAw2H7L`=yQWO}NgE!lG)*~sSJhH@gOvc60JagnltKk3NP&Iq<udU+Lp_;S)
zj2fWO`y#bD$mkoU2eN+<!oR6W7QDn{MM8DSf4|vITJ~z_F1gpD3VQXQ;7knPf`IPZ
zcR875rM}jn8Z{1jVq7XKWY6r2r>!+Bud_=nz)idrDwZ;hK6AqaoExuPV`UZ=`R}`P
z=q2f`{5L3mBe&S=L-yC{9=^BGY(=J14NcH<aM-A0dJYFFIXoCleMUYlVpAsj3Oj;g
zU4lkctG!GGfgG3WIz>JGgmjSfnA<)M_>=RH60iy|0$roX2f{iG5i<b^0bNLP&^1v{
z0~GXhz(6-g2O6lvTto+@7uO3ADdpP8{P89MI~D0pxjE<&GB4;+mdo6GoBes{x*zDa
zs?FK4Q1P4;$z9Un1KhaqM~dN~o0Yuic00!jO?#Dz%GKuDzUWDl70C-SusUlo;r}v+
zs;vC-byxw0m1vBs5yQj{F=@=9Q=B66yThSO>+H#^l1qzX8&Flc7QuHY*Q0TPqaYdw
zj$&bQ@Qe0Cp{y(YO~4kIOBTQfbxlcVj@i>=%~Cnn4<Sfz8MkXK{`S}ea|(kK=i}6w
z8;?3AB?mlsx(0Bv1Ox}uh3i^$EzL`N?Y!i=Blb&n?tT$Y96td;xSNkW4~U7_vzB8P
zei@nFKRl8*OEtXz!q*H%^_efe1iRp)Z-+CNFpkeKLqdI>F7>0+q05k{f-QxC!r(aN
zWoA21#&%#dnwx5!Q_ar1?X!@DaO(id5q~le&08Ae`&V=T;89SNPy{{#Ms`xu{*gia
zed$P_lr{xziCQ?<?7hX#H}fyFD{^y*6BctDh^<F&hwrvOHW6L~*Z6L%838ewEX;HV
zR-g7@QoE-uL*$9kt6F@@Qtw^zNgGs1sv$fsEbOKmW&jHF&S^{VY!iN>>dTnbT>Qio
z@DaqlQh(loH+W9UNi;Mk7|(!yErBc@PR#t*lUDgQRbkmam)S!G;l7`VleY!xb|b73
zLI9}w%tL#Q+a!JKx=Cq%F7xP+RoJhP9Te4CAt_>0UQ7pUQBQ^!8lcySdKX0{ttyV4
zJVU*TTHib<oidgz7QVUv>i}Bw+>b;y(6p*X5n`%TYjp*ef{x2h{2>(LDm2|I0~DVp
zz9XNZ^MzS-z!<>VH)CDAqGrz{*M>wTPZzle&!dl(Xj+YT$Vz-P^-n794HW^-lU+fI
z$)NhpJHH3u&owh6)0Z~laBvbl=6p&OPObAN$JCG{mz;#eDS55*n8sCzlcxK5eZL-F
z<<LBk0sh3G4QYiYf6xroUR8p%3k7)a(27)T@VX3ejMNzgDyonMgXVNm)i;$eGd9_k
zi+S>2M4##jW#5B{)Oh`Hl<9xga-wGE8PRIoMMnxD$#d@XPpc;lD{8LmaY{`Kux~dh
z`%-e&%~f_8kVjA@qa!<(;C;WRdHUW^rFrJUaE7_z600JYbi^_HjZOaQo$6{n?rjd|
zrH&@uAaqVVg8T^{F(zPe7TgYRGknKd=%Ukiw=6%se-LU^f6v(NWwot~YGaAfUCV0Q
zn)_knC7KCBxpT=Pa;VznbBDSUBTMz~9r11;62?b+yLJJp1<e2#l>Z?J<+@HM=&eEh
z#$^z5ba$V*ZOi7^s*ZMzNKto_pcJ6qddJ{Or;C+fMT3LmLt2_4Xc6S?yN1z{7GRDc
zyJZM5W_ZpCYt$3l(AnAHWf(~dyT`^x+M1gOh9{7xO@D3M1=P?lYSQuHZx=dgG!EE9
z&kLC1?(G@gC8hpqkihta*LNSEqZ?lxvB<s#>(=rcuUSld`w(j36fp;xK@)(8b&E^r
zOYA}3U!OuUB;e~9=wUs&pjUC)$d!garEBPbYPImINKYeFw7ecV;c(s;?}p@Y*IjaZ
z{HlD3a-=986Yw{U#{1}&9u*PE=!2}EH)(%IG?7mlfb!y1zIpx1VBGRsm>%c?*Z@o|
zP@ft$1l#MwIQm!<<>ED^Se$Vt&`4K}^mkx36lT_lI8brBhsQs8M*TDGQoI)snmcVT
z*b}k@Aa@v93pmawxF!)3c$U4ma_ZA+TBxzX<Ppj#Jx$_io&4F6tkZ_&GbaDDf40K>
z15FiA?MWgic!vK<a2R=-h!}H_BXY|4FnK6Dk}l1^{5)I<uokvVG2?;(T|>`qaWCl@
zXm&ygF#rX_;|eGB+`Z$&V@pA3qir6Nm43vMClFCLjtuE=RN@KVBZB79H827q0_6fZ
znh05-wuHKbOYX66fmPY^{ZQR<Z^2UxSz5`#es;>h#6>lA+oqj4`P}D<D?M4wh`!3|
zZ8B{M9FX%=*Ve2fwvG$#r1%3qt<gsjA2qk%W3TT|vpF-oM~)?#wC84d&$%!i$36~{
ztB@iL706(e=GFH*#W}M!@-Pem+d;s9+RW4U*lX>RrfoGh^*F^%ULBiyb>NHf4d;Tb
z?l}U(!Q#`$0^xG6eK0?5WD!}s<o<i@*CPlF|Mv^{>yrI;CXy%zXgBRc{_yZVV|~*u
zNM3p$9;&WKu$xK?H8rXwl!WB$%E|Yc+y|`uNZw|mQ=66FuxpYR0-`9g^jt`7K0<Qz
z;6?bF23fs|OjioxIhBv}3yzx$?~YUjC`t1>nN;kZeCoJ88Yv~;6Bd+U_1*9gz@9Pe
z{1=by+1$Al?uyHP4b%UdcSXW$wu?0KI%hJw0E=Rdl)?nW<!n{S8pPZ^H#23LE16C1
zK7^m|?69X7H{pBgrgRjj3L<jc9QtykZp)VAj2>=W;EjTy2jC|-4{;ovET7FHV<8pj
zqX~ipfjn9+SmCkc$oK8;qVj`K+jy?2j5R=NG8VQRN+||v&VJUe36lf#nyc=!OU>2K
z+VhHiIyq%Se*;j+mbU}RW@yZ`|Iw}sH}L~=)x(IR{O}hD9+{gSw=>KKhEO>Et4jf#
zcmJ>L%xHGIBv6|xj=~-DtLN-Da9&@%5J<`N0@b(<M!%aJHxdS{RU~9FQC^z=+4J^?
zrk_IH!t()ZB>~Bc)S`)I0aedLlwgE`Gi0&0NfYM%zqJ~Z*Z$7_W%#tqkWWYYq6R@t
zLdtQl5z0WRl2MW4rpa>PUsszp*M1VnrD`pH#&QbR)c6BG6(S5=3={{)?g#{;V7*Gd
z5A^|TL>Imp>jylGN?+H_RihIef5W~rWY<sIVQw0Y7MkmF?Xv9b9SrW%Kw~qe<q^9q
zIp<CLUoxk-5Iv8mIb=J<*2hHvC7*i7{>Ulj(tXaH$savjX8ya}$;c3*hbudI_9+f7
zQFxI#rsd{GFIfepJV>5%o=Zb}L`)v@_z+P!TdV@qFcFEJDma-B!=&Tpycyxj3H*Rx
zDGJz33Mu0^t|<*}?hqSQFEx+Dn{qtZ37cEtujB=wY$V$g&BjY!V3w)m&Ep7<z<m#)
zERk$Y{aMg3J+=yK59b4XFYXVdQm*>=P@|jc08ucw!aUyO6eoYP-1+CsV||%tuf}&H
z8=Q%#+5R@N5FU(0D`rfW@*$~^GxEUEEe=9!Rpvcyq0;isY3EJr@P|Hg`{uJYZ`rXq
z)_GpXI(gdM&=VR<UURl%MJAR=C7~Cx8N(5zA;!a~B&<uJ$eJWLH?iAqeHNAhp%lPh
zX{t7*0~qMO#CoJWZ3pw-O!_(?Hub5;_I1%QogLE^b|P@8=1l2MU^!0I-<d*7%^HpR
zo2O=8J2hG~|8JesM(JbEyY=zzGm<hIp{&1gY9{L(rz!dGJDlh9DncuLLyrzLN+hy;
zGO%{J|73FD3uSeIhevHPS~q-9J=ZEZh7Nzss@N(<Bx4IaZdBg*f@B-uG?4euQAhPJ
zumHWYv(`O=v<QiWw?;XcDThrM<-i~gC7sM<EQ`)Guda(YOBorXi-=Y+$xSr@&C>HC
zfU4sKa@V!1%+<e*6rXlJ+T}rIr%d@v70xQ@IApcgHp^7>=~1)y*G^fzOi2?kXh?cC
zYA`v~iHA*2n^l;fK5tr~L+0ywk<tm(a%((;&p#XQz((28H97=d+opx~TOcjLX~BD$
zA>iRb!H$Bdp*S=A&Q*Ds0tMDR2pOtI4zm$x6ftv&oCH?P7+CQHl1o$4{h;y)wu)OU
z%IrWkFG#^|%Yg!dTt(o|yRZh*9fMR<oxtT`o2Z7O)&@*Qct%nEiHsV+1XBh;Yw3%(
zfTy{Jmupz{!2YRWqvQrNw~R2rzfIzr!Uu{>)u2<9{K}=ypUbQ^Q}b^?V!f|2k`Z;8
zz4^fnR;5*TxGGZQkh7Xkz0dh}`9i<?P<M>sVX9czVe{N)LPZt+y63IeM6ym?_7L0B
z+Y1=6<XP``J{vNx&yF;h;tx7&Cl4PjG6&~G9P?~hBqwX;cDJ^K-6h*U=v-~1D*cI%
zI32tiq5h-JH}dC5lv6!dlp7E@rsK1r^4uKNCCJycGQ~XbVa)DVA9a3encL<>vvR^M
z3m3-fL~ricJ&Y{ho909dbHc61`E-`E_}E9o&MAvyb!NpOr+D)E$qMt#HBRo*DwqSj
z0D@LfBV1WbkR^|!n*wJhSd3Kz-AK4>j!D;YuLxTzG)J#-zJwHT?>+iq$?O46Vvbzv
z+?<&K?-9?{P;%!X=lK%zlOIRULe|yL9!?}vT4P{JchqafG@D3q>2&RjU#CAjx#Gda
z(}Q<S{@p04-+PC%A%6rcfGQKq|EW$Pfnf5`8-?boPuuNg=`G>R?1fNfV&XR-vZuNA
zI(xRc<qoIKDl=9d!XJOh31zWl&<|fHAHKsmI}@qa4?Ges2q9ne<hz}5%RKc-d!Bjt
z9_KH)0~j?E;pntu&-G?=+$qhMoCzo%16W(RPXdMZyMG#4Xdb)VMsbv;sv{Kxr(s|~
z^d_WGj0}wP5(Iju84d0kjwk4FkVG+a-&b*m!NIA$$&C9=N8Bl1rG3&TN<EKiPtd!X
zDyrOgtW4`C@no!uLN!)lUW<jx^IF`&!KI_an{U3FbWX80nzNI@KYQw4XKdDWY2$z*
z`UKMSb{z!}*@w!JZvG&UJm=M?4?sF;jRDL)g~Nicn%BPS6rKS{E1%lhWB_e328^H*
zh^j9^3U6WR{h^W5xvMs>u65pgS*7-i(?^FM+p!=XkH=~ECX8=_<S$QIj=4o(;N~W0
zmsNE5W(!5^?wEYf&Ahsnc?4U+{<x9OE-*ZT<jEM49ZBc=nVBDQQy+)SD^DPHbAMKN
z=4td<^x}U;s;OL3WT^o3gkzw%r%73$GC9R40_8-45X(BmIxq-H5qDK@1hyo_a18h>
zxV|C2tBV{T4BXe_RZaxC8Iu1|)G<6VKC)H?!y0holnj?zH=Ad~!MI;EpTEzpUW#;Q
zTF9`+V2CAzh*$8azFRxbs5@D112S*EV4al9Ne3bqiiG)SWw=@(p1qaPWarK1>NgRJ
zZTTb4>BWBlX7;nqR`!JQarGok4MlI^07)WZAE+g-Qi&<T6lkeqZ;EXn!YYmhae7aH
z_2BZb5v08zXL40(tF%xU4>RD&1skVrGw*3|swPr)3t3)+sC|L6hZ#Ch;-wt%crB+j
zd?qNE@iq?tbPP13{Khl&RH<T`1$7Xrk}rxG0u_wRFl8zIb5;j?1eiGx$3t*V?c!!0
zXH||f>8>&J)Lw)H8y;{9zB2#*T+96OL8l<O@&RYUDogXO%ya`@8@syW$UAt@DVbdR
z;6iy^sxIIEZKuFQzU_S6l-!NLu{86kZ#xyC#Y5sZWJF9=UlM%~LQ##3DkQy&6guLO
zF_-)VeCX*37<Q+g2W-t(f9FhJaMCIlb0apq3!uEfzjkYcyi8G{1SXL-nIjK5G4s1C
zVIsZ#g0;qEKIBvgz78N~1Xl&NZU-Ke=b}vrenGQEHf*u^-(Ar%bKL<uV>+y1go*v9
zOx;7y7p$Jii=Hnv2Y+T|Og?>0Nt{>Nao7|Z<kV_EdRg&aVIIE=tjCtMk_jnZ3i3pS
zf}v(cc`9=lMg<6xat1W8ZSH&s7Z$B<L+ay-FGXUlX)Bd-8%e41d##)D*M#fAY5vB#
z!Q6E<ME%A;*cp}T0b<Z@c-pfPo}i<JfGo>_;=JlV?853d@kMZv88_&F%vRA}2Pg0P
zN%?Mdj<m}5dEW*ct=)5#Kye)#9>zryP!Q>oi8U`r0vpiGar1;aQBb4?1gZuoru*d<
z1o!h+{ap96G{F8)BVQ|fAR|rFQve&RbL_IRQbg?mk1*0b%mM*PmVjc4+Bj_^vrOCr
z3`AEoS>=(e4yMnUtH0ya=dSd=!gM4d+uSuHRAX|+t&;LGdCqH(#hZR7LPN<<e%JY~
zwV)`ai69$($UmvmNlxyrl0-8<<r+IN@i?suwpL-l0%Ohd^PG$@GUKJI@i$EkZXxN5
zw>YTS={H>+aBa=|2ue-tC+va^sX}I{3_$XpuqgvUZtlsgv9ne;#74ZpxX&_SKqL^%
zAx`be?>XHlymKS@laD`KX_`0UQZQL%J#wEqf-5T@{hm`1K1f-u8*@uCoDDvp4jA>a
zdNP{s7`Ht!CwZLsB<T|z!yFv5N?WMx`4UgJRFkL>QX%j6w;QJkZh7pd9RHWU=d5+?
z?V|(ot97juEYIemsmeYE{^~o<q}Pq2aP2WGZj6-8be)fKCgjw2bVZ$WI5;*yaZiII
z{cN8`&yas-7hwEZJ;Y<}QvH;pPp=t5c(H!-B^>dY)=WRZJ8D*a7?|M8e^wM0EzsP*
zC|qqe_gWd5@;mw+G)L~R$|qO;tYC%b@6xYGG_G$9kI_(7GhF2iH7Lp&%>odHWuD9o
z)d}`Vr?6nM=in3%%ABzN$lgaPw-~H|ktdrK$Tzs_$i}+7tRmjxD32<<AjnK&W|C*v
zM?o$4x#V|UNZ=u8AZ~=bEFQ&md;kHHV_Hd5DLc9F`_6Y~33y<J2Oendf6|#l?7$jR
z@^fUH6F@M-0}zxit#65Y5tr?Go&e1zYGl$^zKQ*_JyU3aQ739^<a)=cNHx6wFzV_v
z3at+(3ZMXM)_O@tUNSaxG8Yw3i&YgE|4FCH;O2{FYm+fIM5^a`)faTAD3x=Wslt<l
zJi4zp59~nV){MT;^!%yJ01jV)oda4oPx^5NElthGcc`2+j}Ibcg%B;}ydogA07z?2
z7>4VUJ2FgfbELR)lgoNt{69A>QZf~RyruAVqNZc#Q}6>D6g+S~{GW2EVp`pnw-nU|
zAa>`@AoCr@{E^*dy4s`VVPVqdYfm~SmCgZE^9nLa&l;J)G);?%6f%l~E9DSf69~2k
zo^)ozCQn0(J4+hYg(Sh#+sj6%oP(Vl2PtkBMTFm;dF;30viW2@B#E;yP(|41&8H`5
zFIMdr3MPEaB}CD2#{$7r0YS%s67g-D`OcG0b><uy4^mD{#}lEtS=p?TjxlH++XyBh
zPcswEJg@~g2TUH&a%(>5A(u(TwKPk-z+~f-&Ihdp7h_?0_}`VJ@h$xnk4+$-lv>q%
zNN-;<RjBeHnw5|<ZCAheTKjv-`KPm*KzB5FQc>N=QrY*rA-Ls>e>zqVCzV?Pf~z*3
z!dV7v+X^%CG!`cvyRFV2+Ph%4#bn9;aqu?ID|yY+PPz4ehmAJpZ^1@02cL0H`m3O5
zsBDoVVjidsSJ%X#&XCn2p5Ue5gPlU`fvt*)qYH4Rq%BY8|0&lbdcuVY%2ZPmq%8ZD
zS4@NS3oC_TChvI0`E<zCW!q!ZrS1q8W>>dTu7Hn`a?Q2RIcK*1{per1#{mCo{|B8q
z+#w(pFk4~7EPUSCm$lp%k`P`ddm&88%I{h;m@P+XCKna^v~wa{D%3tgkYvr#Dk9LX
z3r>Y=1)g`R{~m-YIU2_zRPo~zI-_)PfnT-OymuTWPVpC<9I&&^39Gn}U>lT6Y7@EK
za&q9OH48eyhPwTkRlt1=dx$sjxw<Y&G{j`#?sdHYd#r66uBT$#S*>ocg~sN%*>cn>
zwqcQ(`|l1Fo{|d>6)hcYg~UcnF^7ucF+rPD2L4F7T{?IAYGL7g_{49mq~<jnFiX_+
zJpM1Qmr=Ly;vFX(g!y$Sy1@M9ZQR@Uy)B_Uf9Ng2tq#Y`K_S|wP9iz-f^$ipGwp5U
zJRe#FvVP+a&eP_~UAUP2$v2(XY;(z5PDYU{jQyn!vl(1I`W7&{fAE&mYx1W%6_M<%
z0+kT^lT#C(OAFGpd@WRK-Z?LtIcpZabCH%i#s?DS;9JO7YyFGUa7u+ZQn|SrWT1p%
zw1aXgun}{1z-yDh%D`R0h`|c!JbCe7oSxe=FGUk9s2ZHy`F!!@tM{S~a(}eMTz!RA
zbT%0=ho72!7BqV@E*60z2Y>wmth*P0l=Y_~jhg8(xmi}y50F2Glp*t+3703ob#u5i
zwDk9gN{>P+rrvx?>8dUb^+u-F#{~zn!R-BNsAje%e^SJ9jGo!7jw5PASd7V|cNR`~
z#*Wu81v2woyt(lwhJ<)ZxPYq7QXy9xgMK)+>Y3xTCHOS04tih4{H;A7)t2r(zV7v4
zP-WM{-zGWLSfx=<T+!Env*ra&;B}56r4GsT@=yYKb`6pj#Qc;-@uQjNZV%V2wOH;M
zphpm<hP$tTHI$>ANE1Fe2ZI}h2aW0=82~5aW|Np}7b1!I(%(d~Cp`6$Dw3o^;mHR4
z@iHYekA_Yb>MWNBu{T+e)VLhK^I~qnQcZn=S`|SSsj4<li$~BfupiBhInYu=eUZG0
zeXG21Qw$h1v<~2Zqecw0Lh<vW%zh|=Y(I!F==}1LLKI52Mq2!;!T(JHRD3=qyd^g;
zG{?t~VFh?evYV2v+sv<T50`f?f{WU_^oJYI#Ip2s0p7~R)xHd$yD4El5fn;+2<((z
zFLplwgM`~xoBaJP;qyb~Kf)e*!A1T{qNA4w5f(G@d$5J<#gS;##Vave-X9^r3@Ofy
zb)wAnxwj)#*|G^evfaB8OXBqjhyRS5Nc92_w(8>Y<JI}*@l2=GUcPR>$@yTUXfEsA
z8PEWk?dghjkAiHO=T+}!49?dOpNtw8!jocJNLD*!6y&{38zE;<*&^Cy+UcQvfvd*r
z%>I|HEc3;AaD>$yjz9-VBVe_d&c|}l^`Lim>|F}WYQvAiSrh)64y~sG>FqskSr=G`
z*dB%wQMAyg97yg3V#x**)^PHAyqnmhR>Rd)#6gDo`hd{%Vh}i8hq`cmHt}s!sljZ%
zJ$&g!Z71F`tU)^nrV$D&c@TLKq4jyBg!TKAD8a4qAXw&b5@8^L2#zL;>MH+4P09=M
zL(@wcX`4zRTz;u1E(Ri`ml#G~#lr+;-0U5&@^h&@6LMb31tep>_}S2W<hhfO8IV&4
z4}X)ZY|#-%%_ED<OMk50ewmK=M!b<WAxgG)9C!D~fkceTD|`VtHICx?V&;+djt{w)
ziVySyz>cBh0+@IRo{bNRQ?7rYA%=q|9IXi`Kqov67*=3-OK3zOSZC-}+j4NsB{zhN
z7jSJh$V7Uv=<3S~oWv?9xEZ+A)eNpc$faZzxF0PTI+E985xiye4C@{Nrd9AE&wM1=
zbE^|6{Ba9T8TBCL1Kz*nxxo?Pv8B-Q1kqZIwG-~Bb>~}!014*Wa~NceG`aL#sdDu|
z2W}zf#}so20GUH)gz_hDWx=5oS@H<`bcC4B7;3ov>yw*efDRj>w-j_o4~cq7y$ckf
z`S0Szv$V|*pza0caC=9BIc_`p0e}VkAsj6c?L1~G*O^~8F#iB0)!Gf6L4F|uT;j^<
zMI?VWV1Xnn6PcCddfSJ5$)NHnJtu>EM+#6b=n*!Tfut%5xGYRBe3iX{1mZoqvs+s?
zAsR?Of}hy1N^dfDsg${oJ#yDnthcq7v}hi`B|JO+UJQvRlxH+pbCM9tdjkQs)y;VH
ziW=#nqu#&`p*ts?G~5edz4xi6RGCL|qM2={ZNj|+QX@pwXscX|*9l)$OcDvaedA(N
zOr>fHvV`UbZ#eVJv$uyIwQeyp?g^D%Kw&@yI1mbCJ1VKQuAGE*IfTPac#3Px_`Svu
zDC0?P-J&0Op++CD+gx}#?o55?8<CPzmT1N=d{U!cY)Z~F5O@H63)un84&DTxAe;{J
znO$RC#$0{6uY{;ZMg58SqOPCJbUhcYD)l)|&Nd`S^zedt=!v*XLiTCm{g60v{VLuI
zj^<R-SP#-zACLx?ffGzuK2)<)FRiD^t-;}?|Ey84o4T<eyztNqxIlR_Uu?HBR{CRH
z;;AAoNv&^PFYGPQG|22^3+0D_;qGp5Mp=%DSN!GRo_RW%H>vc&`Z-R=naJO+XK~pP
zZ4^$n%iNk{XXSFXUP+J~HFIbiaM^~;!CAP0;?>^pJX6sU&D`A=%oH(6Hz6pPCKW1G
zP^W5CqD_(4`_fuVl&4<0rJ-hBn!aBhXO~kKggX={m#Hj*3|C{lmy036LqJBaH-Pgv
zkm)nw0klUiY|(VNGgq8U=KdQ{;2Nz*9!K`exb@R3YUfEH+?RJ+#M70c=5L+4IHF$)
zt6?Dur6T~xp!AI%h&AHepymb4*LPJx_Xm$gzLVTg(%Z|UM2*Az^7e35-?#pbwIHod
zU5(T{0!3Fo{#xJ?wFTzpcB^2bUUK%hZqy_i5v-<J!Ic|LNx#^3!b$sS1;MOOu-mbE
z6x+ZpFS>nvREi@@%&%?_SDw`)lAiKdUD(I!KQRoAGIc}-rfN*{wC(tvXNbdfm&0_u
z1z*XLkJy=w4d?JGnm|A{0^Sm(P~#)?d-8(P(U_~~c*ivPr8~ln*7h=Vb%9uTlnBhX
zP-}4@1z3DW>;mLIOPt{%?%&L<+d4<%@g2dPi1b3k(}X<|xnVl85J#SMpA)X!0C=kS
z=<(m0Yra_?t=f!UoA}4)KC>h<7oeQugF~_B58iV8w@(sb+AE@fvPu=f9+Ue!WG)wM
zBf`O|1n|lPJzxuOmOoKD+c0)g1@#d^(<t{=O`pr{x9yLxP?`q_#0lD;ow_)!@N#&G
zl-yMn61e~7ci{qpwWd!#Pnw1m_}Au-+x)JN6eVB(LU;+G4w`=$Dl^LtM`mTt@U9s#
z|N5oy98>;PdtdU#FNMEmWvAsPSmw~ZD5-q&b?Y?qi6h|^OH@1I7Al~rE<{4OgD@C>
z`ZHFKqmXS(w0m>tNVup4ml$K=-sN4)vmP|vi9>e=E}3dH%YJN^M%Q$1-MFA}zO-R}
zbR@jEt=6R^-3t}|sV}ZcIjOiS262FTX=IHy0+VnZ_KP|tsd=OPyvKATLX{~w3}8f1
zFfnc*7p*e$ZwysC_L}iA`Dm5W6*VSGQnsX!*laI#B<H4#WG3Er2Xd|sBx{K~5bCpi
zho7)ZPMh+6L(2P=Yvas3fR0MIe&E!I&Z{$PaF-|ZuJE~)tq}I<wXZBRQ`Rq_lGV|I
zbpV2l^(2?w6~4?WJl!3JSJ5JyI=L!Yx+HZjO{rtSwO1z^OOrbmlzZG}F8E4#-KkaB
zFDm_X4$w)E+G=}BtFzj9N5U?5k=mu567$)wgcsm~H+P$+yuLBz^{kCd^3Vm@C@<$1
zr%`jJJg|N1#x^CUhrbfulwMAexoLQ4IDr_Gx%No77<v8+U$U!;e43sqECTY2Cabhz
zE#xD!8v?3bmNKHk)aTuiEz{+Je|!~#P@-~OZthxwyHsS|{mu$Ha07AQXx9idNkIyt
zO`!v?ygR&PX|20!lzGb6(pUDJl!0Vxj)ktxIXVIe`a2)BtHaLLc+ar3JDY~RXZxvn
zJSgK!VR|OE4nCPzOCp&?h0N1Jr3NkEDI=WK<|YyIc;J}H{CHdD<f9K)SCqRiLM<GH
z83uJa{q_9xP02t?^H2{0iX3EqUfPyAowzSXKCevsd=@{C)ej^7J&bH0opEy8-QkUv
z)nG2XCtTJvg_5?XELYxkoUl=<BJQSb*9K-6fHfUc_2uuFgV%H=m(M-kgHw7uKc&Yk
zzUp>%zB}3*?+HJ+IFme+`NpGW;N|e_lHwpNssPkdw~EV>=Di#~Y|i>^cutn5xv7tU
zZ}A$hygA4S00{}(pp?trnsAedm^MBj`Nb0Von3e)`ee9=`ZB$pVna#)+R~-S$#YGh
z6SdUA2=eU7?x%~)@XO(tyf;H|C^fAw`T3W_KMpTg37v(a)JLcQwWuY>bT!hQo)L&%
zQ?uVGj0I(0HOL1Sq>ACxWPfw<tKo`ES7Q17yTj3-Iz4=&4xg|dmVBE6jdvQxpfOX;
zRjCl@88L|k>4o2F)<I38c}JH3v{rM~>*4%D_7*TGw>Pu*Q@}1d_4H^?SWpnmH$N9D
zuAk>ND7;AQMAVXx4MUQ{o8Vz{qR`v?;P>Gw^MTjGA2cobp&~(tBD{Q~#MPwckt=6D
z^Ip4do#tz+eR{_Bc6f<lH^$n79Bpn>WUILQEIaL_Wa_o%;EGA>_3%L}{~XMO$xrGF
z5E(hS=L_ZL@vTUZWBMrNe6T<@+v4!vNxr!BKQ9qW+mPh&8{x-8016LP<Y&-D4d;qz
z_&S`)4YyUF40z?fag6xHqYMwAl5rsAdlUO{q~xT;*nxp}d270SpTM<|W66bYhHsr|
zp7~=q(z;um?g~#v2Ia$trUdP?wsZpriZ|L^*54INJ`jrRzR|pr=gdvEe>UQDPegtW
zzt_8ik`U&l7LEVE1SO#%&+}-^!f08P$OjmMsrgML-()>yO<zoJA5RTcQqM6%<%Ec_
zsj($Z65~^JP4hx&UZ@+XasBLgSCU2LduAf`pbharnUSVwh55xYfXrkbbY_@e?gZq}
zwcSqCtgu5xHFPyl7%8L$50g59=~txUEVgwSfPL^BIUDmJ^~ys!{nSnDIz`MAuS6>0
z>rYW$@cLutLM3!vQlDtE%CokK3dW095I-{&-w9P`YSIK66or>V;u7d-KO3F8st`V>
zyNBP*$7VJ|?Otx$Hd&RQsE=lu>+iK^nE$vwJRLpwcPOCAo30AaL(!uy$1Y5iZ1w;)
zr3Zg@3KGqJ`Fkf?r$?m+Pwc~lJ;WJJ<?g|o#IC8svzi;q=~I7nJwl>VlL@Pq8pP<}
zxSAuwR)ao0PnPRSX8}&BIr1Ug@%j|6C4S-tBrKNx)TxNpf(|fcxhStnsFSv3uk6_X
z-qSWEnVeAX#pb7-ksRZ6h4Pvilkg!qWmNPZset#iU#_(Vh!SSz4{$MpT-EG%kGk<2
z=SAzMyT<|%L#b4oH|$S3fKBmGJrrO?=44i8+tsDD5K3NnZb({EKV+ZTdlX5{-&`Ke
zsMb~FY6d~QV0uG>7!G^r#zw@B@A?ofOsBh<gXhK~f#Lda;kr%eg~Zzrmdo25M(}TH
zJzwfwA?mNDQ<0>iX^cEB{fAqSEKqwiQsRei?2M`4By}x+D>w;}D<t?M0DbVT2tr8!
zO~S}&w;&|M#`X;(3Vi^~7=_>n6HYKr$geb()#f>Z(V`bgf(wAzx2gWtbhnmY{pQxt
zvGOGKeT1TrDA5Dc0!kNR9I0Wd306lB0#U5LF@ex8GBfGh#edKq86{2tDg~El^~LJx
z_hkhhV^=7FlV>&Y+N-$3WAoioy7SzJMY8GCJVX_^mhqpUzySKi+<quLV?te(!=nc<
z%AKu?_O~wDi8s-%0Kq`66D_8$6-m^1l}ItVBy>~DRb`At!)r1s>6x&^IK=>Fz=g_2
zC;|WRolOU1yAsU$VbT7C&a5ZCi|x?iB1tB0Fiyd2;Sa;BquK&2e5?eXV-a8?jzC^;
zIk_e)#rsEN>m}_d5%lHP8M2I8FE#J#hI%nU#29R|jQW_(o~Jt|;kX9$pBf|9SM+)>
z-5cm~yLQu+=f$XbkFkH7FkaWq-aU-#5(Equ>U0)D6LP1E-j2|f5iLz_cB20)d!scf
z;(%xf^l{TAOs+}nO0r*NOX>_utw-tsf2E^Kg@Bwmrf1#|DV)uahF;`IiNu@$l{Kt-
zRUF#58D4A`7P1WuDAAHq#5M%RejP5JO{WiIXvBGB<AH-w#Ri-{=FrJV=x0udqChCO
z?v_saA&iBUGRGO&BoXsaQ>4H=f7HsOvoXhf^*(#%#I;+7Vmkyu1E)Y%2XVoDqc}u3
z4U&+CqSF4J9(W3ImL<_Y79SiL(;NUCDj<auW=AN_1053LN)Y{_3n{~KP;w8#yi;<d
z$3ekkxy*M{I|+Mv06fDSniDNfKAIPOYzgWXX{9P^x@*g!!0*fL(Ps+m9Q<_X;^@Jd
z>BaPRtRorT6V0?|Q2|*62}b@r0tJ56HoI{0;PXZ1iO<>D=Hu(J0<TOs70ZGwnpSU!
zTJg`6<{<>3!A`I?{e4u&;PsLeJ!s7&$`z)0I9ghORFDADflM5OHJ`r3s>UU5O@J<t
zi;9bvd3Jy&W4WoEmMTJ2k|+*IZKNxH8brVLnY%6t6@+3{=AC+{+^oOX$_=3&u(<@~
zG#BK<V@^wVR7go*RZAKORlb4PiH$<8Mj9{;*j-a>`quuw-D7(Bq?|iNKZwm6>_X63
z`NKShE>i;f?%GIQRL)4>h&g3AnwQKTiso41%OJ73%q1Uoikms6AdiS5k+kba#PK`x
zJ4ojYeK(p1E&;;nGZW4%Gf{12HY`{REI>K;EZLP!PzgcQC3g>E9cOe9C7D}Mmc>Zd
zn`nyiw$Eh!GEz5>IXQ04vA-61>){{7UXG448BVf8<o)P+jvc4C=^?DL$;GV@7)?%f
zKqLhlu!t@-h_FJ}LI!1~YB-w6zaK1w@|<%Oc@AADRv0Qb9lg+6pM9TQ1+8))_E{BA
zcumaLzYr=R1qF%-IRX~WY{~)Pe5??#W&e3{q+oMUfw^WQ0i(xQ`YiOwT>X6*7!FlW
ztlqx`jt?}DgJbi+FL5<ZK-2SO!X~mHlxJRkAMOIadpO!SqYc9+7x7lFf%`Xg^@=ya
z_GBH?@s@D%p+9Gvqr=hLt>xU#ax-$P9d@`HD31)4Rww*TDC5qZg^{-d9*0*yATTpx
zuGt%nCI59KT7+9$rorS)Sx6yq4LrCmYBcMm^6!n?`I$^C6C;}TdZ}6UUZ-Fw&jYng
z9w+V$sn1o~@J(>URCV-{X?RG1X?lfI4IZrljZ{)im_zG<B=es)TX{P#?j#p;z2V@c
z0^$X+3mGf~2I&p+QR4UBx0GB`TOiVwN{35QeCc?EZSLF~U1V0g*C~q8X&jeO+kn56
nGdfAh+L7!lHgYpIQP_(dgW1R1$n5Qae4BCvk}vFyzL4=hP*6TY

delta 34187
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
WrfpejUYk;Jp<V~gX{Gry^Zx^ROV0BE

diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index c2a832a1e..968132e8b 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -556,7 +556,7 @@ p, li { white-space: pre-wrap; }
         <location line="+140"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
-        <translation>Warnung: Diese Dienste sind experimentell. Bitte hilf uns sie zu testen.
+        <translation> Warnung: Diese Dienste sind experimentell. Bitte hilf uns sie zu testen.
 Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Protokolle ändern.</translation>
     </message>
     <message>
@@ -1415,12 +1415,12 @@ in das Bild hinein, um es für
     <message>
         <location line="+1"/>
         <source>This participant is not active since:</source>
-        <translation>Teilnehmer inaktiv seit: </translation>
+        <translation>Teilnehmer inaktiv seit:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source> seconds</source>
-        <translation>Sekunden</translation>
+        <translation> Sekunden</translation>
     </message>
     <message>
         <location line="-555"/>
@@ -2661,7 +2661,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     <message>
         <location line="+351"/>
         <source> items found.</source>
-        <translation>Elemente gefunden.</translation>
+        <translation> Elemente gefunden.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2707,7 +2707,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
         <source>Showing details: </source>
-        <translation>Detailanzeige:</translation>
+        <translation>Detailanzeige: </translation>
     </message>
     <message>
         <location line="+9"/>
@@ -3563,7 +3563,7 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
     <message>
         <location line="-145"/>
         <source>Network </source>
-        <translation>Netzwerk</translation>
+        <translation>Netzwerk </translation>
     </message>
     <message>
         <location line="+152"/>
@@ -3755,12 +3755,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Initial connections can take a while, please be patient</source>
-        <translation>Erstverbindungen können etwas Zeit in Anspruch nehmen. Bitte gedulde dich.</translation>
+        <translation>Erstverbindungen können etwas Zeit in Anspruch nehmen. Bitte gedulde dich</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>If an error is detected it will be displayed here</source>
-        <translation>Wenn ein Fehler festgestellt wird, wird er hier angezeigt.</translation>
+        <translation>Wenn ein Fehler festgestellt wird, wird er hier angezeigt</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3812,7 +3812,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>DHT Lookup has taken too long</source>
-        <translation>DHT-Suche hat zu lange gedauert.</translation>
+        <translation>DHT-Suche hat zu lange gedauert</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -3822,7 +3822,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>UDP Connection has taken too long</source>
-        <translation>UDP-Verbindung hat zu lange gedauert.</translation>
+        <translation>UDP-Verbindung hat zu lange gedauert</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -3837,7 +3837,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>In this case the UDP connection attempt has failed.</source>
-        <translation>In diesem Fall ist der UDP-Verbindungsversuch fehlgeschlagen</translation>
+        <translation>In diesem Fall ist der UDP-Verbindungsversuch fehlgeschlagen.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3941,7 +3941,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+4"/>
         <source>Please contact them to add your Full Certificate</source>
-        <translation>Bitte kontaktiere ihn/sie, damit sie dein vollständiges Zertifikat hinzufügen.</translation>
+        <translation>Bitte kontaktiere ihn/sie, damit sie dein vollständiges Zertifikat hinzufügen</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -3951,7 +3951,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>They are either offline or their DHT is Off</source>
-        <translation>Er/Sie ist entweder offline oder sein/ihr DHT ist aus.</translation>
+        <translation>Er/Sie ist entweder offline oder sein/ihr DHT ist aus</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -3966,7 +3966,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>You have previously connected to this Friend</source>
-        <translation>Du warst vorher bereits mit diesem Freund verbunden.</translation>
+        <translation>Du warst vorher bereits mit diesem Freund verbunden</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4030,7 +4030,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+192"/>
         <source>Only Advanced Retroshare users should switch off the DHT.</source>
-        <translation>Nur fortgeschrittene RetroShare-Benutzer sollten DHT ausschalten</translation>
+        <translation>Nur fortgeschrittene RetroShare-Benutzer sollten DHT ausschalten.</translation>
     </message>
     <message>
         <location line="+76"/>
@@ -4040,7 +4040,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-45"/>
         <source>They need a Certificate + Node for UDP connections to succeed</source>
-        <translation>Für eine erfolgreiche UDP-Verbindung benötigen sie ein Zertifikat und einen Netzknoten.</translation>
+        <translation>Für eine erfolgreiche UDP-Verbindung benötigen sie ein Zertifikat und einen Netzknoten</translation>
     </message>
 </context>
 <context>
@@ -4066,7 +4066,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The creator of a circle is purely optional. It is however useful for public circles so that people know with whom to discuss membership aspects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Ersteller eines Kreises ist rein optional. Es ist jedoch für öffentliche Kreise nützlich, damit die Leute wissen, mit wem sie Mitgliedschaftsaspekte besprechen können.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+70"/>
@@ -4117,7 +4117,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Members of this list will be automatically proposed to join the circle (by accepting membership). They will&lt;/p&gt;&lt;p&gt;not receive data that is restricted to this circle until they do so.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mitglieder dieser Liste werden automatisch für den Beitritt zum Kreis vorgeschlagen (durch Annahme der Mitgliedschaft). Sie erhalten&lt;/p&gt;&lt;p&gt;keine Daten, die auf diesen Kreis beschränkt sind, bis sie dies tun.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+81"/>
@@ -4189,19 +4189,21 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+55"/>
         <source>Circle created</source>
-        <translation type="unfinished"></translation>
+        <translation>Kreis erstellt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Your new circle has been created:
    Name: %1
    Id: %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihr neuer Kreis wurde erstellt:
+    Name: %1
+    ID: %2.</translation>
     </message>
     <message>
         <location line="+247"/>
         <source>[Unknown]</source>
-        <translation type="unfinished">[Unbekannt]</translation>
+        <translation>[Unbekannt]</translation>
     </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
@@ -4885,7 +4887,7 @@ Möchten Sie diese Nachricht verwerfen?</translation>
     <message>
         <location line="+7"/>
         <source>Statistics:</source>
-        <translation type="unfinished"></translation>
+        <translation>Statistiken:</translation>
     </message>
     <message>
         <location line="+87"/>
@@ -4900,7 +4902,7 @@ Möchten Sie diese Nachricht verwerfen?</translation>
     <message>
         <location line="+26"/>
         <source>Show statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige Statistiken</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -4910,17 +4912,17 @@ Möchten Sie diese Nachricht verwerfen?</translation>
     <message>
         <location line="+22"/>
         <source>Profile path:</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilpfad:</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>Profile</source>
-        <translation type="unfinished">Profil</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <location line="+166"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Diese Option umfasst alle Signaturen Ihres Profilschlüssels. Unterschriften sind nicht zwingend erforderlich, sondern nur eine Möglichkeit, Ihr Vertrauen in ein bestimmtes Profil auszudrücken.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4930,17 +4932,17 @@ Möchten Sie diese Nachricht verwerfen?</translation>
     <message>
         <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
         <source>Export Identity</source>
-        <translation type="unfinished">Identität exportieren</translation>
+        <translation>Identität exportieren</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>RetroShare Identity files (*.asc)</source>
-        <translation type="unfinished">RetroShare-Identitätsdateien (*.asc)</translation>
+        <translation>RetroShare-Identitätsdateien (*.asc)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Identity saved</source>
-        <translation type="unfinished">Identität gespeichert</translation>
+        <translation>Identität gespeichert</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -4949,7 +4951,7 @@ It is encrypted
 
 You can now copy it to another computer
 and use the import button to load it</source>
-        <translation type="unfinished">Deine Identität wurde erfolgreich gespeichert
+        <translation>Deine Identität wurde erfolgreich gespeichert
 Sie ist verschlüsselt
 
 Du kannst die Identität nun auf einen anderen Computer kopieren
@@ -4958,12 +4960,12 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source>Identity not saved</source>
-        <translation type="unfinished">Identität nicht gespeichert</translation>
+        <translation>Identität nicht gespeichert</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Your identity was not saved. An error occurred.</source>
-        <translation type="unfinished">Deine Identität wurde nicht gespeichert. Ein Fehler ist aufgetreten.</translation>
+        <translation>Deine Identität wurde nicht gespeichert. Ein Fehler ist aufgetreten.</translation>
     </message>
     <message>
         <location line="+92"/>
@@ -5010,7 +5012,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="-457"/>
         <source>PGP fingerprint:</source>
-        <translation>PGP-Fingerabdruck</translation>
+        <translation>PGP-Fingerabdruck:</translation>
     </message>
     <message>
         <location line="+409"/>
@@ -5035,17 +5037,17 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>Short format</source>
-        <translation type="unfinished"></translation>
+        <translation>Kurzformat</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;IP history is the list of IP you used accross time. Including this might help your friends reach you. This is optional for privacy reasons.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der IP-Verlauf ist die Liste der IP-Adressen, die Sie im Laufe der Zeit verwendet haben. Wenn Sie dies hinzufügen, können Ihre Freunde Sie möglicherweise leichter erreichen. Dies ist aus Datenschutzgründen optional.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Include IP history</source>
-        <translation type="unfinished">IP-Verlauf einbeziehen</translation>
+        <translation>IP-Verlauf einbeziehen</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -5055,7 +5057,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saves your profile key pair into a file. This allows you to create a new node for the same profile, by importing this key pair on a different computer. Friends who already accept connections from you will automatically accept connections from that new node after you add them yourself. Your key is exported encrypted and you will need your login password to create a new profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Speichert Ihr Profilschlüsselpaar in einer Datei. Dadurch können Sie einen neuen Knoten für dasselbe Profil erstellen, indem Sie dieses Schlüsselpaar auf einem anderen Computer importieren. Freunde, die bereits Verbindungen von Ihnen akzeptieren, akzeptieren automatisch Verbindungen von diesem neuen Knoten, nachdem Sie sie selbst hinzugefügt haben. Ihr Schlüssel wird verschlüsselt exportiert und Sie benötigen Ihr Login-Passwort, um ein neues Profil zu erstellen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5462,17 +5464,17 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>UPNP FORWARD</source>
-        <translation>UPNP WEITERLEIT.</translation>
+        <translation>UPNP WEITERLEITUNG</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>NATPMP FORWARD</source>
-        <translation>NATPMP WEITERLEIT.</translation>
+        <translation>NATPMP WEITERLEITUNG</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>MANUAL FORWARD</source>
-        <translation>MANUELLE WEITERLEIT.</translation>
+        <translation>MANUELLE WEITERLEITUNG</translation>
     </message>
     <message>
         <location line="+37"/>
@@ -5633,7 +5635,7 @@ und den Import zum Laden verwenden</translation>
         <location line="+9"/>
         <location line="+3"/>
         <source>%1 secs ago</source>
-        <translation>vor %1 Sek.</translation>
+        <translation>vor %1 Sekunden</translation>
     </message>
     <message>
         <location line="-92"/>
@@ -5643,7 +5645,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+14"/>
         <source>Relays</source>
-        <translation type="unfinished"></translation>
+        <translation>Relais</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -5883,7 +5885,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+188"/>
         <source> Friend Help</source>
-        <translation>Freunde-Hilfe</translation>
+        <translation> Freunde-Hilfe</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6126,12 +6128,12 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source>Column %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Spalte %1</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Row %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeile %1</translation>
     </message>
 </context>
 <context>
@@ -6523,12 +6525,12 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+34"/>
         <source>Please select at least one friend for recommendation.</source>
-        <translation type="unfinished">Bitte mindestens einen Freund als Empfehlung wählen.</translation>
+        <translation>Bitte mindestens einen Freund als Empfehlung wählen.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Please select at least one friend as recipient.</source>
-        <translation type="unfinished">Bitte mindestens einen Empfänger wählen.</translation>
+        <translation>Bitte mindestens einen Empfänger wählen.</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -6538,7 +6540,7 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+0"/>
         <source>A recommendation message was sent to each of the chosen friends!</source>
-        <translation type="unfinished"></translation>
+        <translation>An jeden der ausgewählten Freunde wurde eine Empfehlungsnachricht gesendet!</translation>
     </message>
 </context>
 <context>
@@ -6857,7 +6859,7 @@ Also check your ports!</source>
     <message>
         <location line="+100"/>
         <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>I2P-Instanzadresse mit aktiviertem SAMv3</translation>
     </message>
     <message>
         <location line="+132"/>
@@ -6867,7 +6869,7 @@ Also check your ports!</source>
     <message>
         <location line="+9"/>
         <source>Passwords do not match</source>
-        <translation>Passwörter stimmen nicht überein.</translation>
+        <translation>Passwörter stimmen nicht überein</translation>
     </message>
     <message>
         <location filename="../gui/GenCertDialog.ui" line="+492"/>
@@ -6904,12 +6906,12 @@ Also check your ports!</source>
         <location line="+57"/>
         <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Geben Sie hier ein sicheres Passwort ein. Dieses Passwort schützt Ihren privaten Knotenschlüssel!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="-174"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitte bewegen Sie Ihre Maus, um so viel Zufälligkeit wie möglich zu sammeln. Zum Erstellen Ihrer Knotenschlüssel sind mindestens 20 % erforderlich.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="-154"/>
@@ -6919,7 +6921,7 @@ Also check your ports!</source>
     <message>
         <location line="+196"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ihr Knotenname bezeichnet die Retroshare-Instanz, die&lt;/p&gt;&lt;p&gt;auf diesem Computer ausgeführt wird.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../gui/GenCertDialog.cpp" line="-499"/>
@@ -6929,17 +6931,17 @@ Also check your ports!</source>
     <message>
         <location filename="../gui/GenCertDialog.ui" line="-210"/>
         <source>Node type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Knotentyp:</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Hidden node (over Tor)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hidden Knoten (über Tor)</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hidden node (Tor/I2P - Manually configured)</source>
-        <translation type="unfinished"></translation>
+        <translation>Hidden Knoten (Tor/I2P – manuell konfiguriert)</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -6949,7 +6951,7 @@ Also check your ports!</source>
     <message>
         <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Profilname identifiziert Sie über das Netzwerk.&lt;/p&gt;&lt;p&gt;Er wird von Ihren Freunden verwendet, um Verbindungen von Ihnen anzunehmen.&lt;/p&gt;&lt;p&gt;Das können Sie Erstellen Sie mehrere Retroshare-Knoten mit demselben Profil auf verschiedenen Computern.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -6974,7 +6976,7 @@ Also check your ports!</source>
     <message>
         <location line="+21"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identitäten werden verwendet, wenn Sie in Chatrooms, Foren und Kanalkommentaren schreiben. &lt;/p&gt;&lt;p&gt;Sie empfangen/senden auch E-Mails über das Retroshare-Netzwerk. Sie können&lt;/p&gt;&lt;p&gt;eine signierte Identität jetzt erstellen oder dies später tun, wenn Sie sie benötigen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -6985,7 +6987,7 @@ Also check your ports!</source>
         <location line="-503"/>
         <location line="+693"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location filename="../gui/GenCertDialog.cpp" line="+273"/>
@@ -7129,7 +7131,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+10"/>
         <source>RetroShare profile files (*.asc);;All files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare-Profildateien (*.asc);;Alle Dateien (*)</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -7250,17 +7252,17 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+12"/>
         <source>When checked, this instance receives new parameters (like RsLink or RsFile) and avoid new one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn diese Instanz geprüft wird, erhält sie neue Parameter (wie RsLink oder RsFile) und vermeidet neue Parameter.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use Local Server to get new arguments.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwenden Sie Local Server, um neue Argumente zu erhalten.</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Installieren Sie RetroShare mit einem Paket-Installer, um&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -7280,32 +7282,32 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+7"/>
         <source> seconds</source>
-        <translation>Sekunden</translation>
+        <translation> Sekunden</translation>
     </message>
     <message>
         <location filename="../gui/settings/GeneralPage.cpp" line="+60"/>
         <source>You have sufficient rights.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben genügend Rechte.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>You don&apos;t have sufficient rights. Run RetroShare as Admin to change this setting.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben nicht genügend Rechte. Führen Sie RetroShare als Administrator aus, um diese Einstellung zu ändern.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>For security reasons the usage of auto-login is discouraged, you can enable it but you are on your own!</source>
-        <translation type="unfinished"></translation>
+        <translation>Aus Sicherheitsgründen wird von der Verwendung der automatischen Anmeldung abgeraten, Sie können sie zwar aktivieren, sind aber auf sich allein gestellt!</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your RetroShare build has auto-login disabled.</source>
-        <translation type="unfinished"></translation>
+        <translation>In Ihrem RetroShare-Programm ist die automatische Anmeldung deaktiviert.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>No Qt-compatible system tray was found on this system.</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf diesem System wurde kein Qt-kompatibler Systemtray gefunden.</translation>
     </message>
     <message>
         <location line="+63"/>
@@ -7705,72 +7707,72 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/common/GroupFlagsWidget.cpp" line="+121"/>
         <source>Directory content is visible to friend nodes (see list at right)</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Inhalt des Verzeichnisses ist für Freundesknoten sichtbar (siehe Liste rechts)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Directory content is NOT visible to friend nodes</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Verzeichnisinhalt ist für Freundesknoten NICHT sichtbar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Directory can be searched anonymously</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Verzeichnis kann anonym durchsucht werden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Directory cannot be searched anonymously</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Verzeichnis kann nicht anonym durchsucht werden</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Files can be accessed using anonymous tunnels</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Dateien kann über anonyme Tunnel zugegriffen werden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Files can be accessed using anonymous &amp; end-to-end encrypted tunnels</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Dateien kann über anonyme und Ende-zu-Ende-verschlüsselte Tunnel zugegriffen werden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Files cannot be downloaded anonymously</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien können nicht anonym heruntergeladen werden</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>All friend nodes can see this directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Freundesknoten können dieses Verzeichnis sehen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Only visible to friend nodes in groups: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur für Freundesknoten in Gruppen sichtbar: %1</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Not visible to friend nodes</source>
-        <translation type="unfinished"></translation>
+        <translation>Für Freundesknoten nicht sichtbar</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Files can be downloaded (but not searched) anonymously</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien können anonym heruntergeladen (aber nicht durchsucht) werden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Files can be downloaded and searched anonymously</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien können anonym heruntergeladen und durchsucht werden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Files can be searched (but not downloaded) anonymously</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien können anonym durchsucht (aber nicht heruntergeladen) werden</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>No one can anonymously access/search these files.</source>
-        <translation type="unfinished"></translation>
+        <translation>Niemand kann anonym auf diese Dateien zugreifen bzw. diese durchsuchen.</translation>
     </message>
 </context>
 <context>
@@ -8032,37 +8034,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="+418"/>
         <source>Authenticated tunnels:</source>
-        <translation type="unfinished">Authentifizierte Tunnel:</translation>
+        <translation>Authentifizierte Tunnel:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Tunnel ID: %1</source>
-        <translation type="unfinished">Tunnelkennung: %1</translation>
+        <translation>Tunnelkennung: %1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>from: %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>von: %1 (%2)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>to: %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>an: %1 (%2)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>status: %1</source>
-        <translation type="unfinished">Status: %1</translation>
+        <translation>Status: %1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>total sent: %1 bytes</source>
-        <translation type="unfinished">Gesendet gesamt: %1 bytes</translation>
+        <translation>Gesendet gesamt: %1 bytes</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>total recv: %1 bytes</source>
-        <translation type="unfinished">Empfangen gesamt: %1 bytes</translation>
+        <translation>Empfangen gesamt: %1 bytes</translation>
     </message>
 </context>
 <context>
@@ -8156,7 +8158,7 @@ p, li { white-space: pre-wrap; }
         <location line="+49"/>
         <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
         <source>Play</source>
-        <translation type="unfinished">Abspielen</translation>
+        <translation>Abspielen</translation>
     </message>
     <message>
         <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
@@ -8166,7 +8168,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+45"/>
         <source>Open file</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
         <location line="+55"/>
@@ -8201,12 +8203,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+49"/>
         <source>Play File</source>
-        <translation type="unfinished">Datei abspielen</translation>
+        <translation>Datei abspielen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File %1 does not exist at location.</source>
-        <translation type="unfinished">Datei %1 existiert nicht.</translation>
+        <translation>Datei %1 existiert nicht.</translation>
     </message>
 </context>
 <context>
@@ -8252,27 +8254,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
         <source>Last activity</source>
-        <translation type="unfinished">Letzte Aktivität</translation>
+        <translation>Letzte Aktivität</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Diesen Kanal abonnieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Subscribe</source>
-        <translation type="unfinished">Abonnieren</translation>
+        <translation>Abonnieren</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -8298,17 +8300,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+97"/>
         <source>Publish permission received for channel: </source>
-        <translation type="unfinished"></translation>
+        <translation>Veröffentlichungserlaubnis für Kanal erhalten: </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New Channel: </source>
-        <translation type="unfinished"></translation>
+        <translation>Neuer Kanal: </translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Never</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8468,34 +8470,34 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
         <source>Post to Channel</source>
-        <translation type="unfinished">In Kanal veröffentlichen</translation>
+        <translation>In Kanal veröffentlichen</translation>
     </message>
     <message>
         <location line="+3"/>
         <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
         <source>Add new post</source>
-        <translation type="unfinished"></translation>
+        <translation>Beitrag erstellen</translation>
     </message>
     <message>
         <location line="+39"/>
         <location line="+10"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation>...</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Search channels</source>
-        <translation type="unfinished">Kanäle durchsuchen</translation>
+        <translation>Kanäle durchsuchen</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Channel details</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal-Details</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Channel title</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal-Titel</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -8503,18 +8505,18 @@ p, li { white-space: pre-wrap; }
         <location line="+16"/>
         <location line="+42"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="-302"/>
         <source>Distribution:</source>
-        <translation type="unfinished">Verteilung:</translation>
+        <translation>Verteilung:</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+84"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Includes all posts, comments and votes. This number is progressively updated when new friend connect. The local vs. at friends difference may indicate that you would get older posts by increasing the synchronization period.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enthält alle Beiträge, Kommentare und Abstimmungen. Diese Zahl</translation>
     </message>
     <message>
         <location line="-74"/>
@@ -8522,307 +8524,307 @@ p, li { white-space: pre-wrap; }
         <location line="+64"/>
         <location line="+33"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location line="-107"/>
         <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This includes posts, comments to posts and votes to comments.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dies umfasst Beiträge, Kommentare zu Beiträgen und Stimmen zu Kommentaren.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Last activity:</source>
-        <translation type="unfinished">Letzte Aktivität:</translation>
+        <translation>Letzte Aktivität:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Administrator:</source>
-        <translation type="unfinished">Administrator:</translation>
+        <translation>Administrator:</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Items (locally / at friends):</source>
-        <translation type="unfinished"></translation>
+        <translation>Artikel (vor Ort / bei Freunden):</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Created:</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellt:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Sync period:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sync-Zeitraum:</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>Posts</source>
-        <translation type="unfinished">Beiträge</translation>
+        <translation>Beiträge</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click to view post. &lt;/p&gt;&lt;p&gt;Use Ctrl+mouse wheel &lt;/p&gt;&lt;p&gt;to zoom/unzoom.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Klicken Sie, um den Beitrag zu sehen. &lt;/p&gt;&lt;p&gt;Verwenden Sie Strg+Mausrad&lt;/p&gt;&lt;p&gt;zum Zoomen/Entzoomen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Details</source>
-        <translation type="unfinished">Details</translation>
+        <translation>Details</translation>
     </message>
     <message>
         <location line="+83"/>
         <location line="+87"/>
         <source>Files</source>
-        <translation type="unfinished">Dateien</translation>
+        <translation>Dateien</translation>
     </message>
     <message>
         <location line="-61"/>
         <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
         <source>Comments</source>
-        <translation type="unfinished">Kommentare</translation>
+        <translation>Kommentare</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Feeds</source>
-        <translation type="unfinished">Feeds</translation>
+        <translation>Feeds</translation>
     </message>
     <message>
         <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
         <location line="+287"/>
         <source>Click to switch to list view</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken Sie, um zur Listenansicht zu wechseln</translation>
     </message>
     <message>
         <location line="-282"/>
         <source>Show unread posts only</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur ungelesene Beiträge anzeigen</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>No files in this post, or no post selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Dateien in diesem Beitrag, oder kein Beitrag ausgewählt</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>No files in the channel, or no channel selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Dateien im Kanal, oder kein Kanal ausgewählt</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>No text to display</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Text zum Anzeigen</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Search...</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchen...</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>No posts available in this channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Beiträge in diesem Kanal vorhanden</translation>
     </message>
     <message>
         <location line="+139"/>
         <source>Switch to list view</source>
-        <translation type="unfinished"></translation>
+        <translation>Zur Listenansicht wechseln</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Switch to grid view</source>
-        <translation type="unfinished"></translation>
+        <translation>Zur Gitteransicht wechseln</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Download files</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien herunterladen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Mark as unread</source>
-        <translation type="unfinished">Als ungelesen markieren</translation>
+        <translation>Als ungelesen markieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Edit</source>
-        <translation type="unfinished">Bearbeiten</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Click to switch to grid view</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um zur Rasteransicht zu wechseln</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Link creation error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler bei der Link-Erstellung</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Link could not be created: </source>
-        <translation type="unfinished"></translation>
+        <translation>Link konnte nicht erstellt werden: </translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Download this file:</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Datei herunterladen:</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Download All these %1 files:</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle diese %1-Dateien herunterladen:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Totaling: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesamtwert: %1</translation>
     </message>
     <message>
         <location line="+221"/>
         <source>Comments (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommentare (%1)</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Loading...</source>
-        <translation type="unfinished">Lade...</translation>
+        <translation>Lade...</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Beiträge in diesem Kanal vorhanden.</translation>
     </message>
     <message>
         <location line="+163"/>
         <source>[No name]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Kein Name]</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Never</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>5 days</source>
-        <translation type="unfinished">5 Tage</translation>
+        <translation>5 Tage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>2 weeks</source>
-        <translation type="unfinished">2 Wochen</translation>
+        <translation>2 Wochen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1 month</source>
-        <translation type="unfinished">1 Monat</translation>
+        <translation>1 Monat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3 months</source>
-        <translation type="unfinished"></translation>
+        <translation>3 Monate</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>6 months</source>
-        <translation type="unfinished"></translation>
+        <translation>6 Monate</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1 year</source>
-        <translation type="unfinished">1 Jahr</translation>
+        <translation>1 Jahr</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>indefinitly</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbegrenzt</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Unknown</source>
-        <translation type="unfinished">Unbekannt</translation>
+        <translation>Unbekannt</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Public</source>
-        <translation type="unfinished">Öffentlich</translation>
+        <translation>Öffentlich</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished">Beschränkt auf Mitglieder des Kreises &quot;</translation>
+        <translation>Beschränkt auf Mitglieder des Kreises &quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished">Beschränkt auf Mitglieder des Kreises </translation>
+        <translation>Beschränkt auf Mitglieder des Kreises </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your eyes only</source>
-        <translation type="unfinished">Nur Ihre Augen</translation>
+        <translation>Nurfür Ihre Augen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You and your friend nodes</source>
-        <translation type="unfinished"></translation>
+        <translation>Du und deine Freundschaftsknoten</translation>
     </message>
     <message>
         <location line="+28"/>
         <location line="+11"/>
         <source>Copy Retroshare link</source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Subscribed</source>
-        <translation type="unfinished">Abonniert</translation>
+        <translation>Abonniert</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Subscribe</source>
-        <translation type="unfinished">Abonnieren</translation>
+        <translation>Abonnieren</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Channel info missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalinformationen fehlen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>To subscribe, first request the channel information by right-clicking Request Data in the search results.</source>
-        <translation type="unfinished"></translation>
+        <translation>Um sich zu abonnieren, fordern Sie zunächst die Kanalinformationen an, indem Sie in den Suchergebnissen mit der rechten Maustaste auf Daten anfordern klicken.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Channel info requested...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalinformationen angefordert...</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>No Channel Selected</source>
-        <translation type="unfinished">Keinen Kanal gewählt</translation>
+        <translation>Kein Kanal ausgewählt</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Disable Auto-Download</source>
-        <translation type="unfinished">Auto-Download deaktivieren</translation>
+        <translation>Auto-Download deaktivieren</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Enable Auto-Download</source>
-        <translation type="unfinished">Auto-Download aktivieren</translation>
+        <translation>Auto-Download aktivieren</translation>
     </message>
 </context>
 <context>
@@ -8838,124 +8840,124 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>Circle name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kreisname:</translation>
     </message>
     <message>
         <location line="+51"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
-        <translation type="unfinished">Akzeptieren</translation>
+        <translation>Akzeptieren</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Revoke</source>
-        <translation type="unfinished"></translation>
+        <translation>Widerrufen</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Details</source>
-        <translation type="unfinished">Details</translation>
+        <translation>Details</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Remove Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Eintrag entfernen</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
-        <translation type="unfinished"></translation>
+        <translation>Mitgliedschaftsantrag gewähren</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
         <source>Revoke membership</source>
-        <translation type="unfinished"></translation>
+        <translation>Mitgliedschaft widerrufen</translation>
     </message>
     <message>
         <location line="-39"/>
         <source>You received a membership request a circle you&apos;re administrating:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben einen Antrag auf Mitgliedschaft in einem von Ihnen verwalteten Kreis erhalten:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Grant membership</source>
-        <translation type="unfinished">Mitgliedschaft gewähren</translation>
+        <translation>Mitgliedschaft gewähren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Grant membership to this circle, for this identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewährung der Mitgliedschaft in diesem Kreis, für diese Identität</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>You received an invitation to join this circle:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben eine Einladung erhalten, diesem Kreis beizutreten:</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Accept invitation</source>
-        <translation type="unfinished"></translation>
+        <translation>Einladung annehmen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source> has left this circle.</source>
-        <translation type="unfinished"></translation>
+        <translation> hat diesen Kreis verlassen.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source> which you invited, has joined this circle you&apos;re administrating.</source>
-        <translation type="unfinished"></translation>
+        <translation> die Sie eingeladen haben, ist zu diesem Kreis beigetreten, den Sie verwalten.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Revoke membership for that identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Entzug der Mitgliedschaft für diese Identität</translation>
     </message>
     <message>
         <location line="+6"/>
         <source> has joined this circle.</source>
-        <translation type="unfinished"></translation>
+        <translation> ist diesem Kreis beigetreten.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Your identity %1 has been revoked from this circle.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihre Identität %1 wurde aus diesem Kreis entfernt.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Cancel membership request</source>
-        <translation type="unfinished"></translation>
+        <translation>Mitgliedsantrag stornieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel your membership request from that circle</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihren Mitgliedschaftsantrag aus diesem Kreis stornieren</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Your identity %1 as been accepted in this circle.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihre Identität %1 wurde in diesem Kreis akzeptiert.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Cancel membership</source>
-        <translation type="unfinished"></translation>
+        <translation>Mitgliedschaft kündigen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel your membership from that circle</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihre Mitgliedschaft in diesem Kreis kündigen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Received event from unknown Circle:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ereignis von unbekanntem Kreis erhalten:</translation>
     </message>
 </context>
 <context>
@@ -8976,12 +8978,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+88"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sortieren nach&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Hot</source>
-        <translation>Heiß</translation>
+        <translation>Hot</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -8996,7 +8998,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+25"/>
         <source>Voter ID:</source>
-        <translation>Wähler-ID</translation>
+        <translation>Wähler-ID:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -9055,7 +9057,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Copy Comment</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommentar kopieren</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -9070,17 +9072,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Show Author</source>
-        <translation type="unfinished"></translation>
+        <translation>Autor anzeigen</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann nicht abstimmen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler bei der Abstimmung: </translation>
     </message>
 </context>
 <context>
@@ -9097,47 +9099,51 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Compose new Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&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;MS Shell Dlg 2&apos;; font-size:8.25pt; 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;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Neuen Kommentar verfassen&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>Type in your comment</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie Ihren Kommentar ein</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Post as:</source>
-        <translation type="unfinished"></translation>
+        <translation>Posten als:</translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Post</source>
-        <translation type="unfinished">Posten</translation>
+        <translation>Posten</translation>
     </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
-        <translation type="unfinished">Auf Kommentar antworten</translation>
+        <translation>Auf Kommentar antworten</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Replying to</source>
-        <translation type="unfinished"></translation>
+        <translation>Antwort auf</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Type your reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie Ihre Antwort ein</translation>
     </message>
     <message>
         <location line="+41"/>
@@ -9149,17 +9155,17 @@ p, li { white-space: pre-wrap; }
         <source>You need to create an Identity
 before you can comment</source>
         <translation>Du musst eine Identität erstellen,
-bevor du kommentieren kannst.</translation>
+bevor du kommentieren kannst</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation type="unfinished">Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
+        <translation>Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation type="unfinished">Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
+        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
     </message>
 </context>
 <context>
@@ -9167,7 +9173,7 @@ bevor du kommentieren kannst.</translation>
     <message>
         <location filename="../gui/gxsforums/GxsForumGroupDialog.cpp" line="+66"/>
         <source>&lt;p&gt;Put one of your identities here to allow others to send feedback and also have moderator rights on the forum. You may as well leave that field blank and keep the forum anonymously administrated.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Geben Sie hier eine Ihrer Identitäten ein, damit andere Feedback senden können und auch über Moderatorrechte im Forum verfügen. Sie können dieses Feld auch leer lassen und das Forum anonym verwalten.&lt;/p&gt;</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -9192,7 +9198,7 @@ bevor du kommentieren kannst.</translation>
     <message>
         <location line="+4"/>
         <source>Forum moderators can edit/delete/pinup others posts</source>
-        <translation type="unfinished"></translation>
+        <translation>Forummoderatoren können Beiträge bearbeiten, löschen oder anheften</translation>
     </message>
     <message>
         <location line="-11"/>
@@ -9275,7 +9281,7 @@ bevor du kommentieren kannst.</translation>
         <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
         <location line="+331"/>
         <source>Subject: </source>
-        <translation>Betreff:</translation>
+        <translation>Betreff: </translation>
     </message>
     <message>
         <location line="-286"/>
@@ -9306,7 +9312,7 @@ bevor du kommentieren kannst.</translation>
     <message>
         <location line="+68"/>
         <source>In Reply to: </source>
-        <translation>Als Antwort auf:</translation>
+        <translation>Als Antwort auf: </translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
@@ -9987,7 +9993,7 @@ This message is missing. You should receive it later.</source>
         <location line="+60"/>
         <location line="+47"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="-28"/>
@@ -10002,12 +10008,12 @@ This message is missing. You should receive it later.</source>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
         <source>All People</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Leute</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>My Contacts</source>
-        <translation type="unfinished"></translation>
+        <translation>Meine Kontakte</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -10023,7 +10029,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="-247"/>
         <source>Limited to your friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschränkt auf deine Freunde</translation>
     </message>
     <message>
         <location line="+57"/>
@@ -10056,13 +10062,13 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+39"/>
         <source>Only friends nodes in group </source>
-        <translation type="unfinished"></translation>
+        <translation>Nur Freundesknoten in der Gruppe </translation>
     </message>
     <message>
         <location line="+83"/>
         <location line="+85"/>
         <source>Failed to Prepare Group MetaData: </source>
-        <translation type="unfinished"></translation>
+        <translation>Gruppenmetadaten konnten nicht vorbereitet werden: </translation>
     </message>
     <message>
         <location line="-9"/>
@@ -10078,7 +10084,7 @@ This message is missing. You should receive it later.</source>
         <location line="+4"/>
         <location line="+169"/>
         <source>[None]</source>
-        <translation type="unfinished">[Keine]</translation>
+        <translation>[Keine]</translation>
     </message>
     <message>
         <location line="-65"/>
@@ -10118,12 +10124,12 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="-140"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nachrichten werden weit über Ihre Freundesknoten hinaus verbreitet, solange die Leute den Kanal/das Forum/den von Ihnen erstellten Beitrag abonnieren.&lt;/p&gt;&lt;/body&gt;&lt;/html &gt;</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread among Retroshare nodes that host one of the identities listed as member of the circle and who also subscribe the media. Only these nodes will be able to see that this forum/channel/posted media exists. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nachrichten werden an Retroshare-Knoten verteilt, die eine der als Mitglied des Kreises aufgeführten Identitäten hosten und auch die Medien abonnieren. Nur diese Knoten können sehen, dass dieses Forum/dieser Kanal/dieses gepostete Medium existiert. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -10133,12 +10139,12 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+33"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will only be distributed to the selected subset of your friend nodes. They will not forward messages with each other, but only use your own node as a central hub to distribute them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nachrichten werden nur an die ausgewählte Teilmenge Ihrer Freundesknoten verteilt. Sie leiten Nachrichten nicht untereinander weiter, sondern nutzen nur Ihren eigenen Knoten als zentralen Hub, um sie zu verteilen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Restricted node group </source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Knotengruppe </translation>
     </message>
     <message>
         <location line="-154"/>
@@ -10148,27 +10154,27 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="-272"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click to add a Logo&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hier klicken, um ein Logo hinzuzufügen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+52"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The identity here can be used to send feedback.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Die Identität hier kann zum Senden von Feedback verwendet werden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Add moderators</source>
-        <translation type="unfinished"></translation>
+        <translation>Moderatoren hinzufügen</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Re&amp;quired</source>
-        <translation type="unfinished"></translation>
+        <translation>Erforderlich</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Encrypted &amp;Msgs</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschlüsselte &amp;Nachrichten</translation>
     </message>
     <message>
         <location line="+130"/>
@@ -10193,7 +10199,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+201"/>
         <source>Author:</source>
-        <translation type="unfinished">Autor:</translation>
+        <translation>Autor:</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -10209,22 +10215,22 @@ This message is missing. You should receive it later.</source>
         <location line="+59"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-12"/>
         <source>Moderators:</source>
-        <translation type="unfinished"></translation>
+        <translation>Moderatoren:</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Created</source>
-        <translation type="unfinished">Erstellt</translation>
+        <translation>Erstellt</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Create</source>
-        <translation type="unfinished">Erstellen</translation>
+        <translation>Erstellen</translation>
     </message>
     <message>
         <location line="-173"/>
@@ -10466,47 +10472,47 @@ This message is missing. You should receive it later.</source>
     <message>
         <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
         <source>Total identities: </source>
-        <translation type="unfinished"></translation>
+        <translation>Gesamte Identitäten: </translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Usage types</source>
-        <translation type="unfinished"></translation>
+        <translation>Nutzungsarten</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Usage per service</source>
-        <translation type="unfinished"></translation>
+        <translation>Nutzung pro Service</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Identity age (in weeks):</source>
-        <translation type="unfinished"></translation>
+        <translation>Alter der Identität (in Wochen):</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Last used (hours ago): </source>
-        <translation type="unfinished"></translation>
+        <translation>Zuletzt verwendet (vor Stunden): </translation>
     </message>
     <message>
         <location line="+104"/>
         <source>Managed keys</source>
-        <translation type="unfinished">Verwaltete Schlüssel</translation>
+        <translation>Verwaltete Schlüssel</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> : Service ID =</source>
-        <translation type="unfinished"> : Dienst-ID =</translation>
+        <translation> : Dienst-ID =</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Routing matrix  (</source>
-        <translation type="unfinished">Routingmatrix  (</translation>
+        <translation>Routingmatrix  (</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>[Unknown identity]</source>
-        <translation type="unfinished">[Unbekannte Identität]</translation>
+        <translation>[Unbekannte Identität]</translation>
     </message>
 </context>
 <context>
@@ -10535,27 +10541,27 @@ This message is missing. You should receive it later.</source>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="+161"/>
         <source>Random Bias: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zufällige Tendenz: %1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS Groups:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Service: %1 (%2) - Group ID: %3,	 policy: %4, 	status: %5, 	last contact: %6</source>
-        <translation type="unfinished"></translation>
+        <translation>Dienst: %1 (%2) – Gruppen-ID: %3, Richtlinie: %4, Status: %5, letzter Kontakt: %6</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Peer: %1:	status: %2/%3, 	last contact: %4, 	Master key: %5.</source>
-        <translation type="unfinished"></translation>
+        <translation>Peer: %1:\t status: %2/%3, \t letzter Kontakt: %4, \t Master-Schlüssel: %5.</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Peer: %1: no information available</source>
-        <translation type="unfinished"></translation>
+        <translation>Peer: %1: keine Informationen verfügbar</translation>
     </message>
 </context>
 <context>
@@ -10563,108 +10569,108 @@ This message is missing. You should receive it later.</source>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.ui" line="+14"/>
         <source>Router Statistics</source>
-        <translation type="unfinished">Routerstatistiken</translation>
+        <translation>Routerstatistiken</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>GroupBox</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+22"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Destination</source>
-        <translation type="unfinished">Ziel</translation>
+        <translation>Ziel</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Data status</source>
-        <translation type="unfinished">Datenstatus</translation>
+        <translation>Datenstatus</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Data size</source>
-        <translation type="unfinished"></translation>
+        <translation>Datengröße</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Data hash</source>
-        <translation type="unfinished">Datenhash</translation>
+        <translation>Datenhash</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Sending time</source>
-        <translation type="unfinished">Sendezeit</translation>
+        <translation>Sendezeit</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Sending time (secs ago)</source>
-        <translation type="unfinished">Sendezeit (vergangene Sekunden)</translation>
+        <translation>Sendezeit (vergangene Sekunden)</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Publish TS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Number of messages </source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der Nachrichten </translation>
     </message>
     <message>
         <location line="-51"/>
         <source>Group ID</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Destination ID</source>
-        <translation type="unfinished"></translation>
+        <translation>Ziel-ID</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Gxs Transport Groups:</source>
-        <translation type="unfinished"></translation>
+        <translation>Gxs-Transportgruppen:</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Group ID / Author</source>
-        <translation type="unfinished"></translation>
+        <translation>Gruppen-ID/Autor</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale Datengröße</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Subscribed</source>
-        <translation type="unfinished">Abonniert</translation>
+        <translation>Abonniert</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Popularity</source>
-        <translation type="unfinished">Beliebtheit</translation>
+        <translation>Beliebtheit</translation>
     </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
         <source>View details</source>
-        <translation type="unfinished"></translation>
+        <translation>Details anzeigen</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished">Unbekannter Nachbar</translation>
+        <translation>Unbekannter Nachbar</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Pending data items</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausstehende Datenelemente</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -10706,17 +10712,17 @@ This message is missing. You should receive it later.</source>
     <message>
         <location filename="../gui/statusbar/hashingstatus.cpp" line="+78"/>
         <source>Examining shared files...</source>
-        <translation type="unfinished">Prüfe freigegebene Dateien...</translation>
+        <translation>Prüfe freigegebene Dateien...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hashing file</source>
-        <translation type="unfinished">Erstelle Prüfsumme</translation>
+        <translation>Erstelle Prüfsumme</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Saving file index...</source>
-        <translation type="unfinished">Speichere Dateiindex...</translation>
+        <translation>Speichere Dateiindex...</translation>
     </message>
 </context>
 <context>
@@ -12339,24 +12345,24 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
         <source>Import image</source>
-        <translation type="unfinished">Bild importieren</translation>
+        <translation>Bild importieren</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Image files (*.jpg *.png);;All files (*)</source>
-        <translation type="unfinished">Bilddateien (*.jpg *.png);;Alle Dateien (*)</translation>
+        <translation>Bilddateien (*.jpg *.png);;Alle Dateien (*)</translation>
     </message>
     <message>
         <location line="-34"/>
         <location line="+141"/>
         <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Avatar ausgewählt. Von Ihrer neuen Identität wird automatisch ein Standardbild angezeigt.</translation>
     </message>
     <message>
         <location line="-100"/>
         <location line="+95"/>
         <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwenden Sie die Maus, um das Bild für Ihren Avatar zu vergrößern und anzupassen. Drücken Sie Entf, um es zu entfernen.</translation>
     </message>
     <message>
         <location line="-84"/>
@@ -12385,7 +12391,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="-119"/>
         <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Avatar ausgewählt</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -12396,13 +12402,13 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+1"/>
         <source>Update</source>
-        <translation type="unfinished">Aktualisieren</translation>
+        <translation>Aktualisieren</translation>
     </message>
     <message>
         <location line="+353"/>
         <location line="+74"/>
         <source>Profile password needed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilpasswort erforderlich.</translation>
     </message>
     <message>
         <location line="-69"/>
@@ -12410,43 +12416,43 @@ These identities will soon be not supported anymore.</source>
         <location line="+3"/>
         <location line="+55"/>
         <source>Identity creation failed</source>
-        <translation type="unfinished">Identitätserstellung fehlgeschlagen</translation>
+        <translation>Identitätserstellung fehlgeschlagen</translation>
     </message>
     <message>
         <location line="-74"/>
         <location line="+74"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
-        <translation type="unfinished">Ohne Ihr Profilpasswort können Sie keine mit Ihrem Profil verknüpfte Identität erstellen.</translation>
+        <translation>Ohne Ihr Profilpasswort können Sie keine mit Ihrem Profil verknüpfte Identität erstellen.</translation>
     </message>
     <message>
         <location line="-62"/>
         <source>Identity creation success</source>
-        <translation type="unfinished"></translation>
+        <translation>Erfolgreiche Identitätserstellung</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Your new identity was successfuly created, its ID is %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihre neue Identität wurde erfolgreich erstellt, ihre ID ist %1.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Cannot create identity. Something went wrong.</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität kann nicht erstellt werden. Etwas ist schief gelaufen.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cannot create identity. Something went wrong. Check your profile password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität kann nicht erstellt werden. Etwas ist schief gelaufen. Überprüfen Sie Ihr Profilpasswort.</translation>
     </message>
     <message>
         <location line="+62"/>
         <source>Identity update failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Identitätsaktualisierung ist fehlgeschlagen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot update identity. Something went wrong. Check your profile password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität kann nicht aktualisiert werden. Etwas ist schief gelaufen. Überprüfen Sie Ihr Profilpasswort.</translation>
     </message>
     <message>
         <location line="-410"/>
@@ -12476,12 +12482,12 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+182"/>
         <source>Choose image...</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild auswählen...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Remove</source>
-        <translation type="unfinished">Entfernen</translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -12510,12 +12516,12 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+61"/>
         <source>Create</source>
-        <translation type="unfinished">Erstellen</translation>
+        <translation>Erstellen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation type="unfinished">Abbrechen</translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="-210"/>
@@ -12654,22 +12660,22 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="-7"/>
         <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilddatei speichern</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilder (*.png *.xpm *.jpg)</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Bild kann nicht gespeichert werden, ungültiger Dateiname</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Copy image</source>
-        <translation type="unfinished">Bild kopieren</translation>
+        <translation>Bild kopieren</translation>
     </message>
     <message>
         <location line="-48"/>
@@ -12683,82 +12689,82 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location filename="../gui/settings/JsonApiPage.ui" line="+14"/>
         <source>Form</source>
-        <translation type="unfinished">Formular</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>JSON API Server</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Enable RetroShare JSON API Server</source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare JSON API Server aktivieren</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Port:</source>
-        <translation type="unfinished">Port:</translation>
+        <translation>Port:</translation>
     </message>
     <message>
         <location line="-18"/>
         <source>Listen Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Listenadresse:</translation>
     </message>
     <message>
         <location line="-21"/>
         <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>127.0.0.1</source>
-        <translation type="unfinished">127.0.0.1</translation>
+        <translation>127.0.0.1</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Token:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tokens should spell as &amp;quot;user:password&amp;quot; where both user and password are alphanumeric strings.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tokens sollten als &amp;quot;Benutzer:Passwort&amp;quot; geschrieben werden, wobei sowohl Benutzer als auch Passwort alphanumerische Zeichenfolgen sind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Add</source>
-        <translation type="unfinished">Hinzufügen</translation>
+        <translation>Hinzufügen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Remove</source>
-        <translation type="unfinished">Entfernen</translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
+        <translation>Authentifizierte Token:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Registered services:</source>
-        <translation type="unfinished"></translation>
+        <translation>Registrierte Dienste:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Apply settings</source>
-        <translation type="unfinished">Einstellungen übernehmen</translation>
+        <translation>Einstellungen übernehmen</translation>
     </message>
     <message>
         <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
         <source>JSON API</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt; &lt;p&gt;Retroshare stellt eine JSON-API zur Verfügung, die es anderen Programmen ermöglicht, mit seinem Kern zu kommunizieren, indem sie Token-gesteuerte HTTP-Anfragen an http://localhost:[port] stellen.         Bitte lesen Sie in der Retroshare-Dokumentation nach, wie Sie diese Funktion nutzen können. &lt;/p&gt; &lt;p&gt;Wenn Sie nicht wissen, was Sie tun, sollten Sie an dieser Seite nichts ändern müssen.        Die Weboberfläche beispielsweise registriert automatisch ihr eigenes Token für die JSON-API, das in der Liste der authentifizierten Token angezeigt wird, nachdem Sie es aktiviert haben.&lt;/p&gt;&gt;</translation>
     </message>
 </context>
 <context>
@@ -12957,7 +12963,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     <message>
         <location line="+32"/>
         <source>Close window</source>
-        <translation type="unfinished"></translation>
+        <translation>Fenster schließen</translation>
     </message>
     <message>
         <location line="+127"/>
@@ -13022,17 +13028,17 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     <message>
         <location line="+1"/>
         <source>Never ask me again</source>
-        <translation type="unfinished"></translation>
+        <translation>Frag mich nie wieder</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This will be saved only for this session.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies wird nur für diese Sitzung gespeichert.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This will be saved permanently. You&apos;ll need to clean RetroShare.conf to revert.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies wird dauerhaft gespeichert. Um dies rückgängig zu machen, müssen Sie die RetroShare.conf wieder zurücksetzen.</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -13362,12 +13368,12 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
     <message>
         <location line="+492"/>
         <source>Will not reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Wird nicht antworten</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
+        <translation>Es hat keinen Sinn, auf eine Benachrichtigung zu antworten!</translation>
     </message>
     <message>
         <location line="+887"/>
@@ -13627,32 +13633,32 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+243"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Hallo,&lt;br&gt;Ich möchte mit dir auf RetroShare befreundet sein.&lt;br&gt;</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Invite message</source>
-        <translation type="unfinished"></translation>
+        <translation>Einladungsnachricht</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Respond now:</source>
-        <translation type="unfinished"></translation>
+        <translation>Jetzt reagieren:</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Message Size: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Größe der Nachricht: %1</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation type="unfinished">Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
+        <translation>Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation type="unfinished">Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
+        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
@@ -14058,7 +14064,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+17"/>
         <source>%1 (%2) </source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+9"/>
@@ -14775,7 +14781,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+1"/>
         <source>Remove this key</source>
-        <translation type="unfinished"></translation>
+        <translation>Diesen Schlüssel entfernen</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -14799,7 +14805,8 @@ Anmerkungen: Dein alter Schlüsselbund wird gesichert.
         <location line="+28"/>
         <source>You have selected %1 accepted peers among others,
  Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 akzeptierte Peers unter anderen ausgewählt,
+ Bist du sicher, dass du sie wieder entfreunden möchtest?</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -14954,12 +14961,12 @@ Reported error:</source>
         <location line="+1"/>
         <location line="+144"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="-144"/>
         <source>Search ID</source>
-        <translation type="unfinished">Kennung suchen</translation>
+        <translation>Kennung suchen</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -14969,7 +14976,7 @@ Reported error:</source>
     <message>
         <location line="+82"/>
         <source>Show Items</source>
-        <translation type="unfinished"></translation>
+        <translation>Elemente anzeigen</translation>
     </message>
     <message>
         <location line="+46"/>
@@ -14999,7 +15006,7 @@ Reported error:</source>
     <message>
         <location line="+3"/>
         <source>UNKNOWN TYPE</source>
-        <translation type="unfinished"></translation>
+        <translation>UNBEKANNTER TYP</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -15261,22 +15268,22 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location filename="../gui/feeds/NewsFeedUserNotify.cpp" line="+52"/>
         <source>You have %1 logged events</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 protokollierte Ereignisse</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 logged event</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 protokolliertes Ereignis</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 logged events</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 protokollierte Ereignisse</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 logged event</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 protokolliertes Ereignis</translation>
     </message>
 </context>
 <context>
@@ -15601,7 +15608,7 @@ Minimalmodus: 10% vom Standarddatenaufkommen und (unfertig) pausiert alle Datei
     <message>
         <location line="+44"/>
         <source>&lt;p&gt;Warning: This Operating mode disables the tunneling service. This means you can use distant chat not anonymously download files and the mail service will be slower.&lt;/p&gt;&lt;p&gt;This state will be saved after restart, so do not forget that you changed it!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Warnung: In diesem Betriebsmodus ist der Tunneldienst deaktiviert. Das bedeutet, dass Sie den Distant-Chat nicht anonym nutzen können und der Mail-Dienst langsamer wird.&lt;/p&gt;&lt;p&gt;Dieser Zustand wird nach dem Neustart gespeichert, vergessen Sie also nicht, dass Sie ihn geändert haben!&lt;/p&gt;</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -15971,7 +15978,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+19"/>
         <source>Trust: </source>
-        <translation>Vertrauen:</translation>
+        <translation>Vertrauen: </translation>
     </message>
     <message>
         <location line="+13"/>
@@ -16016,7 +16023,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung von Peer abgelehnt</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -16026,7 +16033,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+3"/>
         <source>Friend Time Offset</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitversatz des Freundes</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -16037,7 +16044,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+26"/>
         <location line="+2"/>
         <source>Unknown peer</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannter Peer</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -16049,7 +16056,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+1"/>
         <location line="+1"/>
         <source>Unknown</source>
-        <translation type="unfinished">Unbekannt</translation>
+        <translation>Unbekannt</translation>
     </message>
     <message>
         <location line="+106"/>
@@ -16092,7 +16099,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+41"/>
         <location line="+69"/>
         <source>Drag your circles or people to each other.</source>
-        <translation>Ziehe deine Kreise oder Leute zueinander</translation>
+        <translation>Ziehe deine Kreise oder Leute zueinander.</translation>
     </message>
     <message>
         <location line="-41"/>
@@ -16112,7 +16119,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
-        <translation type="unfinished"></translation>
+        <translation>Zum Kreis einladen</translation>
     </message>
     <message>
         <location line="+45"/>
@@ -16239,37 +16246,37 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Album-/Fotoname</translation>
     </message>
     <message>
         <location line="+99"/>
         <source>Details</source>
-        <translation type="unfinished">Details</translation>
+        <translation>Details</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>50 %</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>75 %</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>100 %</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>200 %</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Comments</source>
-        <translation type="unfinished">Kommentare</translation>
+        <translation>Kommentare</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -16284,12 +16291,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+33"/>
         <source>Photo Title:</source>
-        <translation>Fototitel</translation>
+        <translation>Fototitel:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>When</source>
-        <translation>Wann:</translation>
+        <translation>Wann</translation>
     </message>
     <message>
         <location line="-151"/>
@@ -16299,7 +16306,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
-        <translation type="unfinished">Album</translation>
+        <translation>Album</translation>
     </message>
 </context>
 <context>
@@ -16483,44 +16490,44 @@ kannst musst du eines auswählen!</translation>
     <message>
         <location filename="../gui/Posted/PhotoView.ui" line="+14"/>
         <source>Photo View</source>
-        <translation type="unfinished"></translation>
+        <translation>Fotoansicht</translation>
     </message>
     <message>
         <location line="+18"/>
         <location line="+112"/>
         <location line="+13"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="-45"/>
         <source>Posted by</source>
-        <translation type="unfinished">Gepostet von</translation>
+        <translation>Gepostet von</translation>
     </message>
     <message>
         <location line="+58"/>
         <source>ago</source>
-        <translation type="unfinished">vor</translation>
+        <translation>vor</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Copy RetroShare link</source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation>Verteilen</translation>
     </message>
     <message>
         <location filename="../gui/Posted/PhotoView.cpp" line="+101"/>
         <source>information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informationen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Retrohare-Link wurde in Ihre Zwischenablage kopiert.</translation>
     </message>
 </context>
 <context>
@@ -16594,7 +16601,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+24"/>
         <source>File name: </source>
-        <translation>Dateiname:</translation>
+        <translation>Dateiname: </translation>
     </message>
     <message>
         <location line="+23"/>
@@ -16604,7 +16611,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+23"/>
         <source>Status: </source>
-        <translation>Status:</translation>
+        <translation>Status: </translation>
     </message>
     <message>
         <location filename="../gui/settings/PluginItem.cpp" line="+37"/>
@@ -16622,22 +16629,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+141"/>
         <source>Error: instance &apos;%1&apos; can&apos;t create a widget</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler: Instanz „%1“ kann kein Widget erstellen</translation>
     </message>
     <message>
         <location line="+83"/>
         <source>Error: failed to remove file %1 (uninstalling plugin &apos;%2&apos;)</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler: Datei %1 konnte nicht entfernt werden (Plugin „%2“ wird deinstalliert)</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Error (uninstall): no plugin with name &apos;%1&apos; found</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler (Deinstallation): Kein Plugin mit dem Namen „%1“ gefunden</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Error (installation): plugin file %1 doesn&apos;t exist</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler (Installation): Plugin-Datei %1 existiert nicht</translation>
     </message>
     <message>
         <location line="-98"/>
@@ -16785,28 +16792,28 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="+118"/>
         <source>Remote status unknown.</source>
-        <translation type="unfinished"></translation>
+        <translation>Remote-Status unbekannt.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Can&apos;t send message immediately, because there is no tunnel available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann die Nachricht nicht sofort senden, da kein Tunnel verfügbar ist.</translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+1"/>
         <source>Your partner closed the conversation.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihr Partner hat das Gespräch beendet.</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Closing this window will end the conversation. Unsent messages will be dropped.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn Sie dieses Fenster schließen, wird die Konversation beendet. Nicht gesendete Nachrichten werden verworfen.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Close conversation?</source>
-        <translation type="unfinished"></translation>
+        <translation>Gespräch beenden?</translation>
     </message>
 </context>
 <context>
@@ -16814,94 +16821,94 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/Posted/PostedCardView.ui" line="+146"/>
         <source>Posted by</source>
-        <translation type="unfinished">Gepostet von</translation>
+        <translation>Gepostet von</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Toggle Message Read Status</source>
-        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
+        <translation>Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <location line="+61"/>
         <source>Vote up</source>
-        <translation type="unfinished">Daumen hoch</translation>
+        <translation>Daumen hoch</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Vote down</source>
-        <translation type="unfinished">Daumen runter</translation>
+        <translation>Daumen runter</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>\/</source>
-        <translation type="unfinished">\/</translation>
+        <translation>\/</translation>
     </message>
     <message>
         <location line="+29"/>
         <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
         <source>Comments</source>
-        <translation type="unfinished">Kommentare</translation>
+        <translation>Kommentare</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation>Verteilen</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Set as read and remove item</source>
-        <translation type="unfinished">Als gelesen markieren und Eintrag entfernen</translation>
+        <translation>Als gelesen markieren und Eintrag entfernen</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Remove Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Eintrag entfernen</translation>
     </message>
     <message>
         <location line="+44"/>
         <source>PictureLabel</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
         <location line="+251"/>
         <source>Comment</source>
-        <translation type="unfinished">Kommentar</translation>
+        <translation>Kommentar</translation>
     </message>
     <message>
         <location line="-247"/>
         <source>Comments </source>
-        <translation type="unfinished">Kommentare </translation>
+        <translation>Kommentare </translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Loading</source>
-        <translation type="unfinished">Lade</translation>
+        <translation>Lade</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show author in people tab</source>
-        <translation type="unfinished">Autor auf der Registerkarte Personen anzeigen</translation>
+        <translation>Autor auf der Registerkarte Personen anzeigen</translation>
     </message>
     <message>
         <location line="+39"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Der Autor dieser Nachricht (mit der ID %1) ist gesperrt.&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -16909,7 +16916,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
         <source>Create a new Post</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuen Beitrag erstellen</translation>
     </message>
     <message>
         <location line="+86"/>
@@ -16924,58 +16931,58 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+26"/>
         <source>Message is too large.&lt;br /&gt;actual size: %1 bytes, maximum size: %2 bytes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht ist zu groß.&lt;br /&gt;Aktuelle Größe: %1 Bytes, maximale Größe: %2 Bytes.</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Erstellen eines Beitrags</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
+        <translation>Beim Erstellen des Beitrags ist ein Fehler aufgetreten.</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Load Picture File</source>
-        <translation type="unfinished">Bilddatei laden</translation>
+        <translation>Bilddatei laden</translation>
     </message>
     <message>
         <location line="+22"/>
         <location line="+3"/>
         <source>Post image</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild posten</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Do you want to share and link the original image?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie das Originalbild teilen und verlinken?</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>You already added a link.&lt;br /&gt;Do you want to replace it?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben bereits einen Link hinzugefügt.&lt;br /&gt;Möchten Sie ihn ersetzen?</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Bild in der Zwischenablage gefunden.</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
+        <translation>In der Zwischenablage befinden sich keine Bilddaten zum Einfügen</translation>
     </message>
     <message>
         <location line="+51"/>
         <source>Close this window?</source>
-        <translation type="unfinished">Dieses Fenster schließen?</translation>
+        <translation>Dieses Fenster schließen?</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Do you really want to discard your post?</source>
-        <translation type="unfinished">Wollen Sie Ihren Beitrag wirklich verwerfen?</translation>
+        <translation>Wollen Sie Ihren Beitrag wirklich verwerfen?</translation>
     </message>
     <message>
         <location line="-196"/>
@@ -16985,63 +16992,63 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/Posted/PostedCreatePostDialog.ui" line="+14"/>
         <source>Create a Post</source>
-        <translation type="unfinished"></translation>
+        <translation>Beitrag erstellen</translation>
     </message>
     <message>
         <location line="+91"/>
         <source>Preview</source>
-        <translation type="unfinished">Vorschau</translation>
+        <translation>Vorschau</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Add Picture</source>
-        <translation type="unfinished">Bild hinzufügen</translation>
+        <translation>Bild hinzufügen</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Größe der Beiträge ist auf 32 KB begrenzt, die Bilder werden verkleinert.</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild aus Zwischenablage einfügen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild einfügen</translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Remove image</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild entfernen</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>Url</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Post as</source>
-        <translation type="unfinished">Veröffentlichen als</translation>
+        <translation>Veröffentlichen als</translation>
     </message>
     <message>
         <location line="+35"/>
         <location line="+28"/>
         <source>Post</source>
-        <translation type="unfinished">Posten</translation>
+        <translation>Posten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Image</source>
-        <translation type="unfinished">Bild</translation>
+        <translation>Bild</translation>
     </message>
     <message>
         <location line="+166"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie reichen einen Beitrag ein. Der Schlüssel zu einem erfolgreichen Beitrag ist ein interessanter Inhalt und ein beschreibender Titel.</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -17326,37 +17333,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/Posted/PostedListWidgetWithModel.ui" line="+14"/>
         <source>Form</source>
-        <translation type="unfinished">Formular</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Details</source>
-        <translation type="unfinished">Details</translation>
+        <translation>Details</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Board Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Board Details</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximale Anzahl von Datenelementen (einschließlich Beiträgen, Kommentaren, Abstimmungen) über Freundschaftsknoten hinweg.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
+        <translation>Artikel (bei Freunden):</translation>
     </message>
     <message>
         <location line="+118"/>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Administrator:</source>
-        <translation type="unfinished">Administrator:</translation>
+        <translation>Administrator:</translation>
     </message>
     <message>
         <location line="-124"/>
@@ -17364,12 +17371,12 @@ p, li { white-space: pre-wrap; }
         <location line="+88"/>
         <location line="+46"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location line="-69"/>
         <source>Distribution:</source>
-        <translation type="unfinished">Verteilung:</translation>
+        <translation>Verteilung:</translation>
     </message>
     <message>
         <location line="-39"/>
@@ -17384,7 +17391,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+91"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location line="-137"/>
@@ -17394,12 +17401,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-29"/>
         <source>Sync period:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sync-Zeitraum:</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der abonnierten Freundesknoten</translation>
     </message>
     <message>
         <location line="+166"/>
@@ -17419,17 +17426,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+16"/>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Top</source>
-        <translation type="unfinished">Anfang</translation>
+        <translation>Top</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Hot</source>
-        <translation type="unfinished">Heiß</translation>
+        <translation>Heiß</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -17439,7 +17446,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+17"/>
         <source>Classic view</source>
-        <translation type="unfinished"></translation>
+        <translation>Klassische Ansicht</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -17449,186 +17456,186 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+14"/>
         <source>1-10</source>
-        <translation type="unfinished">1-10</translation>
+        <translation>1-10</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Next</source>
-        <translation type="unfinished">Nächstes</translation>
+        <translation>Nächstes</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Default identity used when voting&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Standard-Identität, die bei der Abstimmung verwendet wird&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
         <source>No files in this post, or no post selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Dateien in diesem Beitrag, oder kein Beitrag ausgewählt</translation>
     </message>
     <message>
         <location line="+28"/>
         <source>No posts available in this board</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Beiträge in diesem Board vorhanden</translation>
     </message>
     <message>
         <location line="+80"/>
         <source>Click to switch to card view</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um zur Kartenansicht zu wechseln</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Click to switch to compact view</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um zur Kompaktansicht zu wechseln</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Empty</source>
-        <translation type="unfinished">Leer</translation>
+        <translation>Leer</translation>
     </message>
     <message>
         <location line="-65"/>
         <source>Copy RetroShare Link</source>
-        <translation type="unfinished">RetroShare-Link kopieren</translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
+        <translation>http-Link kopieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Show author in People tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Autor auf der Registerkarte Personen anzeigen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Edit</source>
-        <translation type="unfinished">Bearbeiten</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <location line="+127"/>
         <location line="+32"/>
         <source>information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informationen</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+32"/>
         <source>The Retrohare link was copied to your clipboard.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Retrohare-Link wurde in Ihre Zwischenablage kopiert.</translation>
     </message>
     <message>
         <location line="-28"/>
         <location line="+32"/>
         <source>Link creation error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler bei der Link-Erstellung</translation>
     </message>
     <message>
         <location line="-32"/>
         <location line="+32"/>
         <source>Link could not be created: </source>
-        <translation type="unfinished"></translation>
+        <translation>Link konnte nicht erstellt werden: </translation>
     </message>
     <message>
         <location line="+318"/>
         <source>[No name]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Kein Name]</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Subscribed</source>
-        <translation type="unfinished">Abonniert</translation>
+        <translation>Abonniert</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Subscribe</source>
-        <translation type="unfinished">Abonnieren</translation>
+        <translation>Abonnieren</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Never</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>5 days</source>
-        <translation type="unfinished">5 Tage</translation>
+        <translation>5 Tage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>2 weeks</source>
-        <translation type="unfinished">2 Wochen</translation>
+        <translation>2 Wochen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1 month</source>
-        <translation type="unfinished">1 Monat</translation>
+        <translation>1 Monat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3 months</source>
-        <translation type="unfinished"></translation>
+        <translation>3 Monate</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>6 months</source>
-        <translation type="unfinished"></translation>
+        <translation>6 Monate</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1 year</source>
-        <translation type="unfinished">1 Jahr</translation>
+        <translation>1 Jahr</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>indefinitly</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbegrenzt</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Unknown</source>
-        <translation type="unfinished">Unbekannt</translation>
+        <translation>Unbekannt</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Public</source>
-        <translation type="unfinished">Öffentlich</translation>
+        <translation>Öffentlich</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished">Beschränkt auf Mitglieder des Kreises &quot;</translation>
+        <translation>Beschränkt auf Mitglieder des Kreises &quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished">Beschränkt auf Mitglieder des Kreises </translation>
+        <translation>Beschränkt auf Mitglieder des Kreises </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your eyes only</source>
-        <translation type="unfinished">Nur Ihre Augen</translation>
+        <translation>Nur für Ihre Augen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You and your friend nodes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie und Ihr Freund Knotenpunkte</translation>
     </message>
     <message>
         <location line="+181"/>
         <source>No Channel Selected</source>
-        <translation type="unfinished">Keinen Kanal gewählt</translation>
+        <translation>Keinen Kanal gewählt</translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Could not vote</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte nicht abstimmen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
+        <translation>Bei der Abstimmung ist ein Fehler aufgetreten: </translation>
     </message>
 </context>
 <context>
@@ -17641,12 +17648,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnen Sie jedes Board in einem neuen Tab</translation>
     </message>
     <message>
         <location filename="../gui/settings/PostedPage.h" line="+43"/>
         <source>Boards</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -17654,22 +17661,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
-        <translation type="unfinished"></translation>
+        <translation>Board Beitrag</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>You have %1 new board posts</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 neue Beiträge im Board</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 new board post</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben %1 neuen Board Beitrag</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 new board post</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 neuer Beitrag im Board</translation>
     </message>
 </context>
 <context>
@@ -17934,7 +17941,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+10"/>
         <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation>Dein Zertifikat ist in die Zwischenablage kopiert worden. Du kannst es per E-Mail oder auf andere Weise an deinen Freund senden.</translation>
+        <translation>Dein Zertifikat ist in die Zwischenablage kopiert worden. Du kannst es per E-Mail oder auf andere Weise an deinen Freund senden</translation>
     </message>
 </context>
 <context>
@@ -17967,7 +17974,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="-7"/>
         <source>From:</source>
-        <translation type="unfinished">Von:</translation>
+        <translation>Von:</translation>
     </message>
     <message>
         <location line="+51"/>
@@ -17992,23 +17999,23 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+5"/>
         <source>Positive</source>
-        <translation type="unfinished">Positiv</translation>
+        <translation>Positiv</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Neutral</source>
-        <translation type="unfinished">Neutral</translation>
+        <translation>Neutral</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Negative</source>
-        <translation type="unfinished">Negativ</translation>
+        <translation>Negativ</translation>
     </message>
     <message>
         <location line="+35"/>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
         <source>Whats happening?</source>
-        <translation type="unfinished"></translation>
+        <translation>Was geschieht?</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -18040,7 +18047,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+36"/>
         <source>Post </source>
-        <translation type="unfinished"></translation>
+        <translation>Posten </translation>
     </message>
     <message>
         <location line="+7"/>
@@ -18050,12 +18057,12 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
-        <translation type="unfinished">Posten</translation>
+        <translation>Posten</translation>
     </message>
     <message>
         <location line="+64"/>
         <source>Reply to Pulse</source>
-        <translation type="unfinished"></translation>
+        <translation>Antworten</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -18065,7 +18072,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+9"/>
         <source>Republish Pulse</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu veröffentlichen</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -19636,7 +19643,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+6"/>
         <source>Where do you want to have the buttons for the page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wo möchten Sie die Schaltflächen für die Seite haben?</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -19837,72 +19844,72 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+176"/>
         <source>Location info exchange between friends. Helps to find actual address in case of dynamic IPs&lt;br&gt;Without it you will have to rely on DHT only for getting fresh addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Austausch von Standortinformationen zwischen Freunden. Hilft beim Ermitteln der aktuellen Adresse im Falle von dynamischen IPs&lt;br&gt; Ohne sie sind Sie nur auf DHT angewiesen, um an die neue Adressen zu kommen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Used by direct F2F chat, distant chat and chat lobbies</source>
-        <translation type="unfinished"></translation>
+        <translation>Wird von direkten F2F-Chats, Distanzchats und Chat-Lobbys verwendet</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mailing service. Also required for direct f2f chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Mailing-Dienst. Auch für direkten f2f-Chat erforderlich</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Anonymous routing. Used by file transfers and file search,&lt;br&gt; distant chat, distant mail and distant channels/etc sync</source>
-        <translation type="unfinished"></translation>
+        <translation>Anonymous routing. Verwendet für Dateiübertragungen und Dateisuche,,&lt;br&gt; Distanz-Chat, Distanz-Mail und Distanz-Kanäle/etc-Synchronisation</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checks if peers alive</source>
-        <translation type="unfinished"></translation>
+        <translation>Prüft, ob Peers aktiv sind</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File transfer. If you kill it - you won&apos;t be able to dl files from friend shares. Anonymous access unnaffected</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateiübertragung. Wenn Sie es abschalten, können Sie keine Dateien von Freunden herunterladen. Anonymer Zugriff nicht betroffen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Used by distant mail for immediate delivery using anonymous tunnels (turtle router)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wird von Distant-Mails für die sofortige Zustellung über anonyme Tunnel verwendet (Turtle-Router)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Exchange shared directories info, aka browsable(visible) files</source>
-        <translation type="unfinished"></translation>
+        <translation>Austausch von Informationen über gemeinsam genutzte Verzeichnisse, d. h. durchsuchbare (sichtbare) Dateien</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Allows your node to tell to your friends which service are ON on your side, and vice-versa</source>
-        <translation type="unfinished"></translation>
+        <translation>Ermöglicht Ihrem Knotenpunkt, Ihren Freunden mitzuteilen, welche Dienste auf Ihrer Seite eingeschaltet sind, und umgekehrt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Speed management</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwaltung der Geschwindigkeit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Used by distant chat, distant mail, and distant channels sync for transfer data using anonymous tunnels</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwendet von Distanz-Chat, Distanz-Mail und Distanz-Kanal-Synchronisation für die Datenübertragung über anonyme Tunnel</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>IP filter lists exchange</source>
-        <translation type="unfinished"></translation>
+        <translation>Austausch von IP-Filterlisten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Share user status like online, away, busy with friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Teilen Sie den Benutzerstatus, z.&#xa0;B. online, abwesend oder mit Freunden beschäftigt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Identity data exchange. Required by all identities-related functions like chats, forums, mail, etc</source>
-        <translation type="unfinished"></translation>
+        <translation>Identitätsdatenaustausch. Erforderlich für alle identitätsbezogenen Funktionen wie Chats, Foren, E-Mail usw</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19937,22 +19944,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Votes exchange - bans/upvotes for Identities</source>
-        <translation type="unfinished"></translation>
+        <translation>Stimmenaustausch - Sperren/Upvotes für Identitäten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Used by distant mail for deferred delivery - stored at friends when target offline</source>
-        <translation type="unfinished"></translation>
+        <translation>Wird von Distant-Mail für die verzögerte Zustellung verwendet – bei Freunden gespeichert, wenn das Ziel offline ist</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Measures the Round Trip Time between you and your friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Misst die Hin- und Rücklaufzeit zwischen Ihnen und Ihren Freunden</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location line="-217"/>
@@ -20003,33 +20010,33 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+15"/>
         <source>Show Header</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopfzeile anzeigen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Sort by column …</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach Spalte sortieren ...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Sort Descending Order</source>
-        <translation type="unfinished"></translation>
+        <translation>Sortierung absteigend</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Sort Ascending Order</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufsteigend sortieren</translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+25"/>
         <source> [no title]</source>
-        <translation type="unfinished"></translation>
+        <translation> [kein Titel]</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Show column …</source>
-        <translation type="unfinished"></translation>
+        <translation>Spalte anzeigen ...</translation>
     </message>
 </context>
 <context>
@@ -20055,7 +20062,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-589"/>
         <source>Download...</source>
-        <translation type="unfinished"></translation>
+        <translation>Herunterladen...</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -20101,7 +20108,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../util/RichTextEdit.ui" line="+56"/>
         <source>Paragraph formatting</source>
-        <translation type="unfinished"></translation>
+        <translation>Absatzformatierung</translation>
     </message>
     <message>
         <location line="+19"/>
@@ -20117,7 +20124,7 @@ p, li { white-space: pre-wrap; }
         <location line="+3"/>
         <location line="+19"/>
         <source>.</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="-3"/>
@@ -20127,33 +20134,33 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+29"/>
         <source>Undo (CTRL+Z)</source>
-        <translation type="unfinished"></translation>
+        <translation>Rückgängig (STRG+Z)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>Rückgängig</translation>
     </message>
     <message>
         <location line="+23"/>
         <location line="+3"/>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederholen</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Cut (CTRL+X)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausschneiden (STRG+X)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausschneiden</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Copy (CTRL+C)</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieren (STRG+C)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -20163,7 +20170,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+20"/>
         <source>Paste (CTRL+V)</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfügen (STRG+V)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -20173,12 +20180,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+27"/>
         <source>Link (CTRL+L)</source>
-        <translation type="unfinished"></translation>
+        <translation>Link (STRG+L)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Link</source>
-        <translation type="unfinished">Link</translation>
+        <translation>Link</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -20188,7 +20195,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+23"/>
         <source>Italic (CTRL+I)</source>
-        <translation type="unfinished"></translation>
+        <translation>Kursiv (STRG+I)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -20198,137 +20205,137 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+23"/>
         <source>Underline (CTRL+U)</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterstrichen (STRG+U)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Underline</source>
-        <translation type="unfinished">Unterstrichen</translation>
+        <translation>Unterstrichen</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Bullet list (CTRL+-)</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufzählungsliste (STRG+-)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Bullet list</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufzählungsliste</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Ordered list (CTRL+=)</source>
-        <translation type="unfinished"></translation>
+        <translation>Geordnete Liste (STRG+=)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ordered list</source>
-        <translation type="unfinished"></translation>
+        <translation>Geordnete Liste</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Decrease indentation (CTRL+,)</source>
-        <translation type="unfinished"></translation>
+        <translation>Einzug verkleinern (STRG+,)</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Increase indentation (CTRL+.)</source>
-        <translation type="unfinished"></translation>
+        <translation>Einrückung vergrößern (STRG+.)</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Attach a Picture</source>
-        <translation type="unfinished">Bild anhängen</translation>
+        <translation>Bild anhängen</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location filename="../util/RichTextEdit.cpp" line="+65"/>
         <source>Standard</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heading 1</source>
-        <translation type="unfinished">Überschrift 1</translation>
+        <translation>Überschrift 1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heading 2</source>
-        <translation type="unfinished">Überschrift 2</translation>
+        <translation>Überschrift 2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heading 3</source>
-        <translation type="unfinished">Überschrift 3</translation>
+        <translation>Überschrift 3</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heading 4</source>
-        <translation type="unfinished">Überschrift 4</translation>
+        <translation>Überschrift 4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Monospace</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Remove character formatting</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeichenformatierung entfernen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove all formatting</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Formatierungen entfernen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Edit document source</source>
-        <translation type="unfinished"></translation>
+        <translation>Dokumentquelle bearbeiten</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>Document source</source>
-        <translation type="unfinished">Quelle des Dokuments</translation>
+        <translation>Quelle des Dokuments</translation>
     </message>
     <message>
         <location line="+93"/>
         <source>Create a link</source>
-        <translation type="unfinished"></translation>
+        <translation>Einen Link erstellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Link URL:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+287"/>
         <source>Load Picture File</source>
-        <translation type="unfinished">Bilddatei laden</translation>
+        <translation>Bilddatei laden</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation type="unfinished">Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
+        <translation>Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation type="unfinished">Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
+        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Text (optional)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -20913,84 +20920,84 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location filename="../gui/msgs/MessageModel.cpp" line="+168"/>
         <source>Date</source>
-        <translation type="unfinished">Datum</translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>From</source>
-        <translation type="unfinished">Von</translation>
+        <translation>Von</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>To</source>
-        <translation type="unfinished">An</translation>
+        <translation>An</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
-        <translation type="unfinished">Betreff</translation>
+        <translation>Betreff</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Tags</source>
-        <translation type="unfinished">Schlagwörter</translation>
+        <translation>Schlagwörter</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Click to sort by attachments</source>
-        <translation type="unfinished">Klicken, um nach Anhang zu sortieren</translation>
+        <translation>Klicken, um nach Anhang zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by subject</source>
-        <translation type="unfinished">Klicken, um nach Betreff zu sortieren</translation>
+        <translation>Klicken, um nach Betreff zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um nach Lesestatus zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um nach Autor zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um nach Zielort zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by date</source>
-        <translation type="unfinished">Klicken, um nach Datum zu sortieren</translation>
+        <translation>Klicken, um nach Datum zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by tags</source>
-        <translation type="unfinished">Klicken, um nach Schlagwörter zu sortieren</translation>
+        <translation>Klicken, um nach Schlagwörter zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by star</source>
-        <translation type="unfinished">Klicken, um nach Kennzeichnung zu sortieren</translation>
+        <translation>Klicken, um nach Kennzeichnung zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by junk status</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um nach Junk-Status zu sortieren</translation>
     </message>
     <message>
         <location line="+333"/>
         <location line="+14"/>
         <location line="+17"/>
         <source>[Notification]</source>
-        <translation type="unfinished">[Benachrichtigung]</translation>
+        <translation>[Benachrichtigung]</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>[Unknown]</source>
-        <translation type="unfinished">[Unbekannt]</translation>
+        <translation>[Unbekannt]</translation>
     </message>
 </context>
 <context>
@@ -21017,7 +21024,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <location line="+1"/>
         <location line="+18"/>
         <source>filename</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateiname</translation>
     </message>
     <message>
         <location line="-17"/>
@@ -21027,7 +21034,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+1"/>
         <source>level</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21037,7 +21044,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+2"/>
         <source>style</source>
-        <translation type="unfinished"></translation>
+        <translation>Stil</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21047,7 +21054,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+2"/>
         <source>stylesheet</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21057,7 +21064,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+1"/>
         <source>language</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprache</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21073,7 +21080,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <location line="+27"/>
         <location line="+6"/>
         <source>Invalid operating mode specified:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültige Betriebsart angegeben:</translation>
     </message>
     <message>
         <location line="+212"/>
@@ -21093,27 +21100,27 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+1"/>
         <source>Sets RetroShare&apos;s operating mode.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt den Betriebsmodus von RetroShare fest.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>RsLinkURL</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open RsLink with protocol retroshare://</source>
-        <translation type="unfinished"></translation>
+        <translation>RsLink mit Protokoll retroshare:// öffnen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Open RsFile with or without arg.</source>
-        <translation type="unfinished"></translation>
+        <translation>RsFile mit oder ohne Arg öffnen.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>RetroShare GUI Usage Information</source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare GUI-Nutzungsinformationen</translation>
     </message>
     <message>
         <location line="+104"/>
@@ -21404,7 +21411,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+209"/>
         <source>Obtained via </source>
-        <translation type="unfinished"></translation>
+        <translation>Erhältlich über </translation>
     </message>
     <message>
         <location line="+194"/>
@@ -22991,7 +22998,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+0"/>
         <source>New Msg</source>
-        <translation>Neue Nachr.</translation>
+        <translation>Neue Nachricht</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -24424,7 +24431,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+88"/>
         <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp; Dateiübertragung&lt;/h1&gt;&lt;p&gt;Retroshare bietet zwei Möglichkeiten, Dateien zu übertragen: direkte Übertragungen von Ihren Freunden und anonyme, getunnelte Fernübertragungen. Außerdem ist der Dateitransfer quellenübergreifend und erlaubt das Schwärmen (Sie können beim Herunterladen eine Quelle sein)&lt;/p&gt;&lt;p&gt;Sie können Dateien über das Symbol &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; in der linken Seitenleiste teilen. Diese Dateien werden in der Registerkarte &quot;Meine Dateien&quot; aufgelistet. Sie können für jede Freundesgruppe entscheiden, ob sie diese Dateien in der Registerkarte &quot;Dateien von Freunden&quot; sehen können oder nicht&lt;/p&gt;&lt;p&gt;Die Registerkarte &quot;Suchen&quot; zeigt Dateien aus den Dateilisten Ihrer Freunde und entfernte Dateien an, die über das Multi-Hop-Tunnelsystem anonym erreicht werden können.&lt;/p&gt;</translation>
     </message>
     <message>
         <location line="+174"/>
@@ -24513,7 +24520,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Windows-Systemen kann das Schreiben in der Mitte großer leerer Dateien dazu führen, dass die Software für einige Sekunden hängen bleibt. Möchten Sie diese Option trotzdem verwenden?</translation>
     </message>
     <message>
         <location line="+103"/>
@@ -25334,7 +25341,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+33"/>
         <source>Cancel </source>
-        <translation>Abbrechen</translation>
+        <translation>Abbrechen </translation>
     </message>
     <message>
         <location line="+20"/>
@@ -25680,7 +25687,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+14"/>
         <source> All Time</source>
-        <translation>Allzeit</translation>
+        <translation> Allzeit</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -25925,7 +25932,7 @@ p, li { white-space: pre-wrap; }
         <location line="-7"/>
         <source> PB</source>
         <comment>petabytes (1024 terabytes)</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+145"/>
@@ -26002,7 +26009,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
         <source> Do you accept connections signed by this profile?</source>
-        <translation type="unfinished"></translation>
+        <translation> Akzeptieren Sie von diesem Profil signierte Verbindungen?</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -26012,22 +26019,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>In dieser Spalte wird die von Ihnen angegebene Vertrauensstufe angezeigt und ob Sie den PGP-Schlüssel des Profils signiert haben</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Did that peer sign your own profile PGP key</source>
-        <translation type="unfinished"></translation>
+        <translation>Hat dieser Peer Ihren eigenen Profil-PGP-Schlüssel signiert</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>PGP Key Id of that profile</source>
-        <translation type="unfinished"></translation>
+        <translation>PGP-Schlüssel-ID dieses Profils</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Last time this key was used (received time, or to check connection)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wann dieser Schlüssel zuletzt verwendet wurde (Empfangszeit oder zur Überprüfung der Verbindung)</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -26042,12 +26049,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Trust level</source>
-        <translation type="unfinished"></translation>
+        <translation>Vertrauens Level</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Has signed your key?</source>
-        <translation type="unfinished"></translation>
+        <translation>Haben Sie Ihren Schlüssel signiert?</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -26067,17 +26074,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Marginally trusted peer</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenig vertrauenswürdiger Peer</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Fully trusted peer</source>
-        <translation type="unfinished"></translation>
+        <translation>Völlig vertrauenswürdige rPeer</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Untrusted peer</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht vertrauenswürdiger Peer</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -26128,7 +26135,8 @@ p, li { white-space: pre-wrap; }
         <location line="+7"/>
         <source> has authenticated you. 
 Right-click and select &apos;make friend&apos; to be able to connect.</source>
-        <translation type="unfinished"></translation>
+        <translation> hat dich authentifiziert.
+Klicken Sie mit der rechten Maustaste und wählen Sie „Freundschaft schließen“, um eine Verbindung herzustellen.</translation>
     </message>
 </context>
 <context>

From ae24db1da0e087f86f23cb2e5fdde00e3c5f95f8 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 3 Feb 2024 23:26:25 +0100
Subject: [PATCH 444/503] Fixed iconsize issue with fontmetrics on macos

---
 retroshare-gui/src/gui/common/LineEditClear.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/retroshare-gui/src/gui/common/LineEditClear.cpp b/retroshare-gui/src/gui/common/LineEditClear.cpp
index c3d68b512..a6ba67bfa 100644
--- a/retroshare-gui/src/gui/common/LineEditClear.cpp
+++ b/retroshare-gui/src/gui/common/LineEditClear.cpp
@@ -234,8 +234,10 @@ void LineEditClear::setFilterButtonIcon(const QIcon &icon)
 		mFilterButton->setIcon(icon);
 
 	ensurePolished();
+#if !defined(Q_OS_DARWIN)
 	QFontMetrics fm(this->font());
 	QSize size(fm.width("___"), fm.height());
 	mFilterButton->setFixedSize(size);
 	mFilterButton->setIconSize(size);
+#endif
 }

From 8db6076ce10dadf7db8ece4169178bb591ce0e93 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 4 Feb 2024 16:10:35 +0100
Subject: [PATCH 445/503] update translation

---
 retroshare-gui/src/lang/retroshare_de.qm | Bin 561420 -> 602639 bytes
 retroshare-gui/src/lang/retroshare_de.ts | 499 ++++++++++++-----------
 2 files changed, 266 insertions(+), 233 deletions(-)

diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index 6000946bff49feb05cdff34297dcdf13452f6ea6..f33befdf962f2319635cb70dbac1fd9e53897484 100644
GIT binary patch
delta 63250
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
R`nJ{`azC<fe`s|q{x|HR_d5Up

delta 35898
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
L=}Ejr%h>+`TjI`)

diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index 968132e8b..b2b9f2ea3 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -1049,7 +1049,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+24"/>
         <source>Comm value</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="-116"/>
@@ -1200,7 +1200,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+8"/>
         <source>Log scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Log skalieren</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1337,7 +1337,7 @@ in das Bild hinein, um es für
     <message>
         <location line="+22"/>
         <source>Comm value</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
@@ -2061,7 +2061,7 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+0"/>
         <source>/me is sending a message with /me</source>
-        <translation type="unfinished"></translation>
+        <translation>/me sendet eine Nachricht mit /me</translation>
     </message>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+237"/>
@@ -2081,17 +2081,17 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="-13"/>
         <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn Sie sich auf den Textbrowser konzentrieren, nachdem Sie den Chatraum angezeigt haben</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
+        <translation>Textbearbeitungsfeld verkleinern, wenn es nicht benötigt wird</translation>
     </message>
     <message>
         <location line="+175"/>
         <source>Fonts</source>
-        <translation type="unfinished"></translation>
+        <translation>Schriftarten</translation>
     </message>
     <message>
         <location line="+97"/>
@@ -2101,12 +2101,12 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+37"/>
         <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenn Ihr System richtig eingerichtet ist, sollte dieses nächste Quadrat 1 cm messen.</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieses nächste Quadrat wird entsprechend der Schriftgröße Ihres Systems skaliert.</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -2117,7 +2117,7 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="-470"/>
         <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
-        <translation type="unfinished"></translation>
+        <translation>Überprüft, ob die Identität und der Text über den Vorkommen in derselben Groß-/Kleinschreibung vorliegen müssen, um die Zählung auszulösen.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2127,22 +2127,22 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+7"/>
         <source>Default identity for chat rooms:</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardidentität für Chatrooms:</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Count all unread messages</source>
-        <translation type="unfinished">Alle ungelesenen Nachrichten zählen</translation>
+        <translation>Alle ungelesenen Nachrichten zählen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Count occurrences of my current identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Zähle Vorkommen meiner aktuellen Identität</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Count occurrences of any of the following texts (separate by newlines):</source>
-        <translation type="unfinished"></translation>
+        <translation>Zählen Sie das Vorkommen eines der folgenden Texte (getrennt durch Zeilenumbrüche):</translation>
     </message>
     <message>
         <location line="+66"/>
@@ -2178,17 +2178,17 @@ Double click a chat room to enter and chat.</source>
         <location line="-6"/>
         <location line="+107"/>
         <source>Broadcast</source>
-        <translation type="unfinished">Rundschreiben</translation>
+        <translation>Rundschreiben</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>Node-to-node chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Knoten-Chat</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Saved messages (0 = unlimited):</source>
-        <translation>Gespeicherte Nachrichten (0 = unbegrenzt)</translation>
+        <translation>Gespeicherte Nachrichten (0 = unbegrenzt):</translation>
     </message>
     <message>
         <location line="+62"/>
@@ -2198,12 +2198,12 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+74"/>
         <source>Distant chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Distant-Chat</translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Maximum storage period, in days (0=keep all):</source>
-        <translation>Maximale Speicherzeit in Tagen (0 = alle behalten)</translation>
+        <translation>Maximale Speicherzeit in Tagen (0 = alle behalten):</translation>
     </message>
     <message>
         <location line="-1043"/>
@@ -4061,7 +4061,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Kreisname, der Kontaktautor und die Liste der eingeladenen Mitglieder sind für alle eingeladenen Mitglieder sichtbar. Wenn der Kreis nicht privat ist, ist er auch für Nachbarknoten der Knoten sichtbar, die die eingeladenen Mitglieder hosten.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -4152,7 +4152,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+20"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Private (a.k.a. self-restricted) circles  are only visible to the invited members of these circles. In practice the circle uses its own list of invited members to limit its own distribution. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Private (auch bekannt als selbstbeschränkte) Kreise sind nur für die eingeladenen Mitglieder dieser Kreise sichtbar. In der Praxis verwendet der Kreis seine eigene Liste eingeladener Mitglieder, um seine eigene Verteilung einzuschränken. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4162,7 +4162,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+17"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Circles can be restricted to the members of another circle. Only the members of that second circle will be allowed to see the new circle and its content (list of members, etc).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kreise können auf die Mitglieder eines anderen Kreises beschränkt werden. Nur die Mitglieder dieses zweiten Kreises dürfen den neuen Kreis und seinen Inhalt (Liste der Mitglieder usw.) sehen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
@@ -4240,7 +4240,7 @@ p, li { white-space: pre-wrap; }
         <location line="+145"/>
         <location line="+61"/>
         <source>[Anonymous Id]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Anonymous ID]</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -4615,7 +4615,7 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+93"/>
@@ -6199,7 +6199,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location filename="../gui/common/FriendList.ui" line="+84"/>
         <source>Friends</source>
-        <translation type="unfinished">Freunde</translation>
+        <translation>Freunde</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -6210,7 +6210,7 @@ und den Import zum Laden verwenden</translation>
         <location line="+10"/>
         <location filename="../gui/common/FriendList.cpp" line="+151"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+11"/>
@@ -6294,7 +6294,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+1"/>
         <source>Search ID</source>
-        <translation type="unfinished">Kennung suchen</translation>
+        <translation>Kennung suchen</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6403,25 +6403,25 @@ und den Import zum Laden verwenden</translation>
         <location line="+2"/>
         <source>
 at least one peer was not added</source>
-        <translation type="unfinished">
+        <translation>
 Mindestens ein Peer wurde nicht hinzugefügt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 at least one peer was not added to a group</source>
-        <translation type="unfinished">
+        <translation>
 Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Select file for importing your friendlist from</source>
-        <translation type="unfinished">Wählen Sie die Datei aus, aus der Sie Ihre Freundesliste importieren möchten</translation>
+        <translation>Wählen Sie die Datei aus, aus der Sie Ihre Freundesliste importieren möchten</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Select a file for exporting your friendlist to</source>
-        <translation type="unfinished">Wählen Sie eine Datei aus, in die Sie Ihre Freundesliste exportieren möchten</translation>
+        <translation>Wählen Sie eine Datei aus, in die Sie Ihre Freundesliste exportieren möchten</translation>
     </message>
     <message>
         <location line="-6"/>
@@ -6452,7 +6452,7 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+285"/>
         <source>Show Items</source>
-        <translation type="unfinished"></translation>
+        <translation>Elemente anzeigen</translation>
     </message>
     <message>
         <location filename="../gui/common/FriendList.ui" line="-38"/>
@@ -7612,7 +7612,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+15"/>
         <source>Branching factor</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzweigungsfaktor</translation>
     </message>
     <message>
         <location filename="../gui/statistics/GlobalRouterStatistics.cpp" line="+132"/>
@@ -9216,12 +9216,12 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+3"/>
         <source>Subscribe</source>
-        <translation type="unfinished">Abonnieren</translation>
+        <translation>Abonnieren</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Copy RetroShare link</source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -9242,27 +9242,27 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+36"/>
         <source>Moderator list</source>
-        <translation type="unfinished"></translation>
+        <translation>Moderatorenliste</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>TextLabel</source>
-        <translation type="unfinished">TextLabel</translation>
+        <translation>TextLabel</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
-        <translation type="unfinished">Lade...</translation>
+        <translation>Lade...</translation>
     </message>
     <message>
         <location line="+103"/>
         <source>Moderator list changed</source>
-        <translation type="unfinished"></translation>
+        <translation>Moderatorenliste geändert</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Forum updated</source>
-        <translation type="unfinished"></translation>
+        <translation>Forum aktualisiert</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -9372,7 +9372,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="-154"/>
         <source>New Thread</source>
-        <translation type="unfinished">Neues Thema</translation>
+        <translation>Neues Thema</translation>
     </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
@@ -9424,7 +9424,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+23"/>
         <source>Next unread message</source>
-        <translation type="unfinished"></translation>
+        <translation>Nächste ungelesene Nachricht</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -9465,7 +9465,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+128"/>
         <source>Loading...</source>
-        <translation type="unfinished">Lade...</translation>
+        <translation>Lade...</translation>
     </message>
     <message>
         <location line="+150"/>
@@ -9533,7 +9533,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+5"/>
         <source>Only friends nodes in group </source>
-        <translation type="unfinished"></translation>
+        <translation>Nur Freundesknoten in der Gruppe </translation>
     </message>
     <message>
         <location line="+11"/>
@@ -9549,7 +9549,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+1"/>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Eigentümer</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -9632,7 +9632,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+331"/>
         <source>Edit</source>
-        <translation type="unfinished">Bearbeiten</translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9693,7 +9693,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+21"/>
         <source>Show column</source>
-        <translation type="unfinished"></translation>
+        <translation>Spalte anzeigen</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -9708,7 +9708,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+156"/>
         <source>&lt;b&gt;Loading...&lt;b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Lade...&lt;b&gt;</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -9749,53 +9749,54 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+5"/>
         <source>Last seen at friends:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuletzt bei Freunden gesehen:</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Moderators</source>
-        <translation type="unfinished"></translation>
+        <translation>Moderatoren</translation>
     </message>
     <message>
         <location line="+116"/>
         <source>Missing Message:
 This message is missing. You should receive it later.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlende Nachricht:
+Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     </message>
     <message>
         <location line="+636"/>
         <source>No result.</source>
-        <translation type="unfinished">Kein Ergebnis.</translation>
+        <translation>Kein Ergebnis.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Found %1 results.</source>
-        <translation type="unfinished">%1 Ergebnisse gefunden.</translation>
+        <translation>%1 Ergebnisse gefunden.</translation>
     </message>
     <message>
         <location line="+159"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Nachricht konnte nicht abgerufen werden. Ist die Datenbank derzeit überlastet?</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>No data for this message. Is the database corrupted?</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Daten für diese Nachricht. Ist die Datenbank beschädigt?</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>More than one entry for this message. Is the database corrupted?</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr als ein Eintrag für diese Nachricht. Ist die Datenbank beschädigt?</translation>
     </message>
     <message>
         <location line="-838"/>
         <source>(Latest) </source>
-        <translation type="unfinished"></translation>
+        <translation>(Neueste) </translation>
     </message>
     <message>
         <location line="+0"/>
         <source>(Old) </source>
-        <translation type="unfinished"></translation>
+        <translation>(Alt) </translation>
     </message>
     <message>
         <location line="+403"/>
@@ -10278,17 +10279,17 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="-24"/>
         <source>Remove this search</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen Sie diese Suche</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove all searches</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Suchanfragen entfernen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Request data</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten anfordern</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -10303,7 +10304,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+11"/>
         <source>Synchronise posts of last...</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronisieren Sie die Beiträge der letzten...</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10350,17 +10351,17 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="-7"/>
         <source>Store posts for at most...</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichern Sie Beiträge höchstens...</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Share publish permissions...</source>
-        <translation type="unfinished"></translation>
+        <translation>Veröffentlichungsberechtigungen teilen...</translation>
     </message>
     <message>
         <location line="+761"/>
         <source>Search for</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchen nach</translation>
     </message>
     <message>
         <location line="-756"/>
@@ -14360,7 +14361,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+249"/>
         <source>Stared</source>
-        <translation type="unfinished"></translation>
+        <translation>Markiert</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14435,7 +14436,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+20"/>
         <source>Show in People</source>
-        <translation type="unfinished"></translation>
+        <translation>In Personen anzeigen</translation>
     </message>
     <message>
         <location line="+43"/>
@@ -14445,32 +14446,32 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+94"/>
         <source>No message available in your %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>In Ihrem %1 ist keine Nachricht verfügbar.</translation>
     </message>
     <message>
         <location line="+68"/>
         <source>No message using %1 tag available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Nachricht mit %1-Tag verfügbar.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>No %1 message available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine %1-Nachricht verfügbar.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>No starred message available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine markierte Nachricht verfügbar. Mithilfe von Sternen können Sie Nachrichten einen besonderen Status zuweisen, um sie leichter auffindbar zu machen. Um eine Nachricht zu markieren, klicken Sie auf den hellgrauen Stern neben einer Nachricht.</translation>
     </message>
     <message>
         <location line="+204"/>
         <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
+        <translation>Eine Löschung wird nicht empfohlen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachrichten in diesem Feld werden beim Empfang automatisch gelöscht. Das manuelle Löschen einer Nachricht garantiert nicht, dass die Nachricht nicht zugestellt wird. Nachrichten, die nicht zugestellt werden können, bleiben jedoch auf unbestimmte Zeit hier. Möchten Sie fortfahren und löschen?</translation>
     </message>
     <message>
         <location line="+239"/>
@@ -14481,7 +14482,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+223"/>
         <source>No Box selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Box ausgewählt.</translation>
     </message>
     <message>
         <location line="-1463"/>
@@ -14500,7 +14501,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -14541,7 +14542,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+1"/>
         <source>Spoiler</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -14820,8 +14821,8 @@ Anmerkungen: Dein alter Schlüsselbund wird gesichert.
 For security, your keyring was previously backed-up to file 
 
 </source>
-        <translation>%1 Schlüssel wurden aus dem Schlüsselbund entfernt.
-Der Schlüsselbund wurde aus Sicherheitsgründen zuvor in einer Datei gesichert.
+        <translation>%1 Schlüssel wurden aus dem Schlüsselbund entfernt. 
+Der Schlüsselbund wurde aus Sicherheitsgründen zuvor in einer Datei gesichert. 
 
 </translation>
     </message>
@@ -15503,12 +15504,12 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+2"/>
         <source>You need to sign your node&apos;s certificate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen das Zertifikat Ihres Knotens signieren.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You need to sign your forum/chatrooms identity.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen Ihre Forum-/Chatroom-Identität unterschreiben.</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -15518,7 +15519,7 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+2"/>
         <source>Please enter your Retroshare passphrase</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte geben Sie Ihr Retroshare-Passwort ein</translation>
     </message>
     <message>
         <location line="+45"/>
@@ -15556,7 +15557,7 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <location line="+176"/>
         <location line="+296"/>
         <source>Encrypted message</source>
-        <translation>Verschlüsselte Nachr.</translation>
+        <translation>Verschlüsselte Nachricht</translation>
     </message>
     <message>
         <location line="-756"/>
@@ -16003,7 +16004,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+20"/>
         <source>Time offset:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitdifferenz:</translation>
     </message>
     <message>
         <location line="+119"/>
@@ -16172,52 +16173,52 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+6"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Jeder in Ihrer Kontaktliste hat automatisch eine positive Meinung, wenn dies nicht festgelegt ist. Dadurch kann die Reputation verwendeter Knoten automatisch erhöht werden. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
-        <translation type="unfinished"></translation>
+        <translation>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Automatically add identities owned by friend nodes to my contacts</source>
-        <translation type="unfinished"></translation>
+        <translation>Füge automatisch Identitäten von Freundesknoten zu meinen Kontakten hinzu</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Difference in votes (+/-) to rate an ID negatively:</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterschied in den Stimmen (+/-), um eine ID negativ zu bewerten:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When an identity receives more negative votes than positive votes, it switches from &amp;quot;Neutral&amp;quot; to &amp;quot;Negative (according to your friends)&amp;quot;. By default, a one-vote difference is enough, but you can make this harder to happen by selecting a higher number here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wenn eine Identität mehr negative als positive Stimmen erhält, wechselt sie von „Neutral“ zu „Neutral“. zu „Negativ (laut deinen Freunden)“. Standardmäßig reicht ein Unterschied von einer Stimme aus, aber Sie können dies erschweren, indem Sie hier eine höhere Zahl auswählen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When an identity receives more positive votes than negative votes, it switches from &amp;quot;Neutral&amp;quot; to &amp;quot;Positive (according to your friends)&amp;quot;. By default, a one-vote difference is enough, but you can make this harder to happen by selecting a higher number here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wenn eine Identität mehr positive als negative Stimmen erhält, wechselt sie von „Neutral“ zu „Neutral“. zu „Positiv (laut deinen Freunden)“. Standardmäßig reicht ein Unterschied von einer Stimme aus, aber Sie können dies erschweren, indem Sie hier eine höhere Zahl auswählen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Difference in votes (+/-) to rate an ID positively:</source>
-        <translation type="unfinished"></translation>
+        <translation>Differenz in den Stimmen (+/-), um eine ID positiv zu bewerten:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Delete banned identities after (0 means indefinitely):</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesperrte Identitäten löschen nach (0 bedeutet auf unbestimmte Zeit):</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Reset reputation of banned identities after (0 means never):</source>
-        <translation type="unfinished"></translation>
+        <translation>Reputation gesperrter Identitäten zurücksetzen nach (0 bedeutet nie):</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Banned identities are not stamped and therefore lose activity. They get deleted automatically after a finit period of time.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gesperrte Identitäten werden nicht gestempelt und verlieren daher ihre Aktivität. Sie werden nach einer bestimmten Zeitspanne automatisch gelöscht.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -16228,7 +16229,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="-3"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In order to prevent deleted banned IDs to come back because they are used in e.g. forums or channels, banned identities are kept in a list for some time. After that, they are &amp;quot;cleared&amp;quot; from the banning list, and will be downloaded again as unbanned if used in forus, chat rooms, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Um zu verhindern, dass gelöschte gesperrte IDs zurückkommen, weil sie z. B. in In Foren oder Kanälen werden gesperrte Identitäten für einige Zeit in einer Liste gespeichert. Danach werden sie „gelöscht“. aus der Sperrliste entfernt und bei Verwendung in Foren, Chatrooms usw. erneut als nicht gesperrt heruntergeladen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
 <context>
@@ -16784,7 +16785,7 @@ p, li { white-space: pre-wrap; }
         <location line="+36"/>
         <location line="+2"/>
         <source>Dock window</source>
-        <translation type="unfinished"></translation>
+        <translation>Fenster andocken</translation>
     </message>
 </context>
 <context>
@@ -17421,7 +17422,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot;font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI-Symbol&apos;; Schriftgröße: 14pt; Farbe: #24292e; Hintergrundfarbe: #ffffff;&quot;&gt;Sortierung auswählen&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -18410,32 +18411,32 @@ hinzufügen und den Assistent zum Hinzufügen von Freunden zu starten.
     <message>
         <location line="+733"/>
         <source>Warning: Retroshare is about to ask your system to open this file. </source>
-        <translation type="unfinished"></translation>
+        <translation>Warnung: Retroshare fordert Ihr System auf, diese Datei zu öffnen. </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Before you do so, please make sure that this file does not contain malicious executable code.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bevor Sie dies tun, stellen Sie bitte sicher, dass diese Datei keinen schädlichen ausführbaren Code enthält.</translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Identity added to People</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität zu Personen hinzugefügt</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The identity was added to people. You can now chat with it, send messages to it, etc.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Identität wurde zu Personen hinzugefügt. Sie können jetzt mit ihm chatten, Nachrichten an ihn senden usw.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Identity cannot be added to People</source>
-        <translation type="unfinished"></translation>
+        <translation>Identität kann nicht zu Personen hinzugefügt werden</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The identity was not added to people. Some error occured. The link is probably corrupted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Identität war nicht an Personen gebunden. Es ist ein Fehler aufgetreten. Der Link ist wahrscheinlich beschädigt.</translation>
     </message>
     <message>
         <location line="+85"/>
@@ -18550,17 +18551,17 @@ hinzufügen und den Assistent zum Hinzufügen von Freunden zu starten.
     <message>
         <location line="+17"/>
         <source>Posted not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Die gepostete Nachricht wurde nicht gefunden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Posted message not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Die gepostete Nachricht wurde nicht gefunden</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Posted messages not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Gepostete Nachrichten wurden nicht gefunden</translation>
     </message>
     <message>
         <location line="-13"/>
@@ -18570,22 +18571,22 @@ hinzufügen und den Assistent zum Hinzufügen von Freunden zu starten.
     <message>
         <location line="-932"/>
         <source>Click to browse/download this file collection</source>
-        <translation type="unfinished"></translation>
+        <translation>Klickenr, um diese Dateisammlung zu durchsuchen/herunterzuladen</translation>
     </message>
     <message>
         <location line="+163"/>
         <source>%1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Identity link (name=%1, ID=%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Identitätslink (Name=%1, ID=%2)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 (%2 files, %3)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 (%2 Dateien, %3)</translation>
     </message>
     <message>
         <location line="+743"/>
@@ -18965,7 +18966,7 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+766"/>
         <source>Join chat room</source>
-        <translation type="unfinished"></translation>
+        <translation>Treten Sie dem Chatroom bei</translation>
     </message>
     <message>
         <location filename="../gui/RetroShareLink.cpp" line="-201"/>
@@ -19043,52 +19044,52 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>Creating receipt</source>
-        <translation type="unfinished"></translation>
+        <translation>Quittung erstellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Signing receipt</source>
-        <translation type="unfinished"></translation>
+        <translation>Quittung unterschreiben</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Serializing</source>
-        <translation type="unfinished"></translation>
+        <translation>Serialisierung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creating payload</source>
-        <translation type="unfinished"></translation>
+        <translation>Payload erstellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Encrypting payload</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschlüsselung der Nutzlast</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Publishing</source>
-        <translation type="unfinished"></translation>
+        <translation>Veröffentlichung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Waiting for receipt</source>
-        <translation type="unfinished"></translation>
+        <translation>Warte auf die Quittung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Receipt received</source>
-        <translation type="unfinished"></translation>
+        <translation>Quittung erhalten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Receipt signature failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Signatur der Quittung ist fehlgeschlagen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Encryption failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Verschlüsselung ist fehlgeschlagen</translation>
     </message>
     <message>
         <location filename="../gui/statistics/GxsIdStatistics.cpp" line="-418"/>
@@ -19133,12 +19134,12 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>Service info</source>
-        <translation type="unfinished"></translation>
+        <translation>Serviceinformationen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bandwidth control</source>
-        <translation type="unfinished"></translation>
+        <translation>Bandbreitenkontrolle</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19149,22 +19150,22 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>Distant mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Distant-Mail</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Service control</source>
-        <translation type="unfinished"></translation>
+        <translation>Servicekontrolle</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Distant chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Distant-Chat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS Tunnel</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19195,7 +19196,7 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>NXS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19205,17 +19206,17 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>GXS Photo</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS Wiki</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS TheWire</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19250,12 +19251,12 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>GXS Transport</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>JSon API</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -19269,102 +19270,102 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>Group admin signature creation</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellung der Gruppenadministratorsignatur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Group admin signature validation</source>
-        <translation type="unfinished"></translation>
+        <translation>Validierung der Gruppenadministratorsignatur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Group author signature creation</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellung der Gruppenautorsignatur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Group author signature validation</source>
-        <translation type="unfinished"></translation>
+        <translation>Validierung der Signatur des Gruppenautors</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Message author signature creation</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellung der Signatur des Nachrichtenautors</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Message author signature validation</source>
-        <translation type="unfinished"></translation>
+        <translation>Validierung der Signatur des Nachrichtenautors</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Routine group author signature check.</source>
-        <translation type="unfinished"></translation>
+        <translation>Routinemäßige Überprüfung der Gruppenautorensignatur.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Routine message author signature check</source>
-        <translation type="unfinished"></translation>
+        <translation>Routinemäßige Überprüfung der Signatur des Nachrichtenautors</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Chat room signature validation</source>
-        <translation type="unfinished"></translation>
+        <translation>Validierung der Chatroom-Signatur</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Global router message validation</source>
-        <translation type="unfinished"></translation>
+        <translation>Globale Router-Nachrichtenvalidierung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Global router message creation</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellung globaler Router-Nachrichten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>DH Key exchange validation for GXS tunnel</source>
-        <translation type="unfinished"></translation>
+        <translation>DH-Schlüsselaustauschvalidierung für GXS-Tunnel</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>DH Key exchange creation for GXS tunnel</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstellung des DH-Schlüsselaustauschs für den GXS-Tunnel</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New identity from GXS sync</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Identität durch GXS-Synchronisierung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New friend identity from discovery</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Freundesidentität durch Entdeckung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New identity requested from friend node</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Identität vom Freundesknoten angefordert</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic signature validation</source>
-        <translation type="unfinished"></translation>
+        <translation>Generische Signaturvalidierung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic signature creation</source>
-        <translation type="unfinished"></translation>
+        <translation>Generische Signaturerstellung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic data decryption</source>
-        <translation type="unfinished"></translation>
+        <translation>Generische Datenentschlüsselung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic data encryption</source>
-        <translation type="unfinished"></translation>
+        <translation>Generische Datenverschlüsselung</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19374,79 +19375,79 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location filename="../gui/statusbar/hashingstatus.cpp" line="+25"/>
         <source>Click to pause the hashing process</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um den Hashing-Vorgang anzuhalten</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>[Hashing is paused]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Hashing ist pausiert]</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to resume the hashing process</source>
-        <translation type="unfinished"></translation>
+        <translation>Klicken, um den Hashing-Vorgang fortzusetzen</translation>
     </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
-        <translation type="unfinished">Untätig</translation>
+        <translation>Untätig</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Virtual peers available</source>
-        <translation type="unfinished"></translation>
+        <translation>Virtuelle Peers verfügbar</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Passive</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Active</source>
-        <translation type="unfinished">Aktiv</translation>
+        <translation>Aktiv</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Requesting peers</source>
-        <translation type="unfinished"></translation>
+        <translation>Peers angefordert</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Never</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Tunnel OK</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Tunnel active</source>
-        <translation type="unfinished"></translation>
+        <translation>Tunnel aktiv</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Client</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
         <location line="+13"/>
         <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlender Kanalbeitrag</translation>
     </message>
     <message>
         <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
         <location line="+17"/>
         <source>[System]</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -19982,12 +19983,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
         <source>View &amp;Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelltext anzeigen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Save image</source>
-        <translation type="unfinished">Bild speichern</translation>
+        <translation>Bild speichern</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -19997,7 +19998,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+27"/>
         <source>Document source</source>
-        <translation type="unfinished">Quelle des Dokuments</translation>
+        <translation>Quelle des Dokuments</translation>
     </message>
 </context>
 <context>
@@ -20569,12 +20570,12 @@ Die betroffenen Dateien sind rot markiert</translation>
     <message>
         <location line="-354"/>
         <source>Download files</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien herunterladen</translation>
     </message>
     <message>
         <location line="+100"/>
         <source>Specify...</source>
-        <translation type="unfinished"></translation>
+        <translation>Spezifizieren...</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -20621,7 +20622,7 @@ Die betroffenen Dateien sind rot markiert</translation>
     <message>
         <location line="+84"/>
         <source>Do you want to remove them and all their children, too?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie alle und ihre untergeordneten Elemente ebenfalls entfernen?</translation>
     </message>
     <message>
         <location line="+357"/>
@@ -21095,7 +21096,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="-425"/>
         <source>opmode</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21363,7 +21364,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+3"/>
         <source>Mark as bad</source>
-        <translation type="unfinished"></translation>
+        <translation>Als schlecht markieren</translation>
     </message>
     <message>
         <location line="+85"/>
@@ -21642,7 +21643,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+68"/>
         <source>SSL request</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL-Anfrage</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -21751,7 +21752,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="-962"/>
         <source>NAT</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+14"/>
@@ -21833,7 +21834,7 @@ Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
         <location line="-1032"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor wurde von Retroshare automatisch konfiguriert. Hier sollten Sie keine Änderungen vornehmenen.</translation>
     </message>
     <message>
         <location line="+825"/>
@@ -21843,7 +21844,7 @@ Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
     <message>
         <location line="+0"/>
         <source>local</source>
-        <translation type="unfinished"></translation>
+        <translation>lokal</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -21856,7 +21857,10 @@ Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
 
 List of found external IP:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>
+
+Liste der gefundenen externen IP:
+</translation>
     </message>
     <message>
         <location line="+197"/>
@@ -21909,23 +21913,23 @@ List of found external IP:
     <message>
         <location line="+8"/>
         <source>SAMv3 is running and accessible</source>
-        <translation type="unfinished"></translation>
+        <translation>SAMv3 läuft und ist zugänglich</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
-        <translation type="unfinished"></translation>
+        <translation>SAMv3 ist nicht zugänglich! Läuft i2p und ist SAM aktiviert?</translation>
     </message>
     <message>
         <location line="+318"/>
         <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihr Schlüssel verwendet die folgenden Algorithmen: %1 und %2</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+120"/>
         <source>unkown key type</source>
-        <translation type="unfinished"></translation>
+        <translation>unbekannter Schlüsseltyp</translation>
     </message>
     <message>
         <location line="-94"/>
@@ -21935,51 +21939,60 @@ List of found external IP:
 When changing options use the buttons at the bottom to restart SAMv3.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare verwendet SAMv3, um einen %1-Tunnel bei %2:%3 einzurichten
+(ID: %4)
+
+Wenn Sie Optionen ändern, verwenden Sie die Schaltflächen unten, um SAMv3 neu zu starten.
+
+</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Offline, no SAM session is established yet.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Offline, es wurde noch keine SAM-Sitzung eingerichtet.
+</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>SAM is trying to establish a session ... this can take some time.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>SAM versucht, eine Sitzung aufzubauen ... dies kann einige Zeit dauern.
+</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>SAM session established! Now setting up a forward session ...
 </source>
-        <translation type="unfinished"></translation>
+        <translation>SAM-Sitzung eingerichtet! Richten Sie jetzt eine Weiterleitungssitzung ein ...
+</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Online, SAM is working as exptected
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Online, SAM funktioniert wie erwartet
+</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
+        <translation>Ihr Schlüssel verwendet %1 zum Signieren und %2 für die Verschlüsselung</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoppen Sie zunächst den SAM-Tunnel, um einen neuen Schlüssel zu generieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoppen Sie zuerst den SAM-Tunnel, um einen Schlüssel zu laden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoppen Sie zuerst den SAM-Tunnel, um SAM zu deaktivieren</translation>
     </message>
     <message>
         <location line="-136"/>
@@ -21989,22 +22002,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
     <message>
         <location line="+0"/>
         <source>server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>unknown</source>
-        <translation type="unfinished">unbekannt</translation>
+        <translation>unbekannt</translation>
     </message>
     <message>
         <location line="+118"/>
         <source>request a new server key</source>
-        <translation type="unfinished"></translation>
+        <translation>Fordern Sie einen neuen Serverschlüssel an</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>load server key from base64</source>
-        <translation type="unfinished"></translation>
+        <translation>Serverschlüssel von Base64 laden</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -22016,7 +22029,9 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <source>The proxy is not enabled or broken.
 Are all services up and running fine??
 Also check your ports!</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Proxy ist nicht aktiviert oder defekt.
+Sind alle Dienste betriebsbereit?
+Überprüfen Sie auch Ihre Ports!</translation>
     </message>
     <message>
         <location filename="../gui/settings/ServerPage.ui" line="+267"/>
@@ -22057,7 +22072,8 @@ Also check your ports!</source>
         <location line="+336"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
-        <translation type="unfinished"></translation>
+        <translation>WARNUNG:
+Diese Werte berücksichtigen nicht die Relais.</translation>
     </message>
     <message>
         <location line="+127"/>
@@ -22073,7 +22089,13 @@ Tunnel Wizard -&gt; Client Tunnel -&gt; SOCKS 4/4a/5 -&gt; enter a name -&gt; le
 Now enter the address (e.g. 127.0.0.1) and the port you&apos;ve picked before for the I2P Proxy.
 
 You can connect to Hidden Nodes, even if you are running a standard Node, so why not setup Tor and/or I2P?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor-Socks-Proxy-Standard: 127.0.0.1:9050. In der Torrc-Konfiguration einstellen und hier aktualisieren.
+
+I2P-Socks-Proxy: Informationen zum Einrichten eines Client-Tunnels finden Sie unter http://127.0.0.1:7657/i2ptunnelmgr:
+Tunnel-Assistent -&gt; Client-Tunnel -&gt; SOCKS 4/4a/5 -&gt; geben Sie einen Namen ein -&gt; lassen Sie „Outproxies“ leer -&gt; geben Sie den Port ein (merken Sie sich!) [Vielleicht möchten Sie auch die Erreichbarkeit auf 127.0.0.1 setzen] -&gt; Weiter -&gt; &apos;Auto Start&apos; ankreuzen -&gt; Fertig!
+Geben Sie nun die Adresse (z. B. 127.0.0.1) und den Port ein, den Sie zuvor für den I2P-Proxy ausgewählt haben.
+
+Sie können sich mit versteckten Knoten verbinden, auch wenn Sie einen Standardknoten betreiben. Warum also nicht Tor und/oder I2P einrichten?</translation>
     </message>
     <message>
         <location line="+253"/>
@@ -22088,12 +22110,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
     <message>
         <location line="+23"/>
         <source>I2P Instance address</source>
-        <translation type="unfinished"></translation>
+        <translation>I2P-Instanzadresse</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>127.0.0.1</source>
-        <translation type="unfinished">127.0.0.1</translation>
+        <translation>127.0.0.1</translation>
     </message>
     <message>
         <location line="+54"/>
@@ -22113,17 +22135,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
     <message>
         <location line="+53"/>
         <source>Tunnel length (in/out)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tunnellänge (ein/aus)</translation>
     </message>
     <message>
         <location line="+43"/>
         <source>Tunnel quantity (in/out)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tunnelmenge (ein/aus)</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Tunnel variance (in/out)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tunnelvarianz (ein/aus)</translation>
     </message>
     <message>
         <location line="+56"/>
@@ -22133,22 +22155,22 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
     <message>
         <location line="+20"/>
         <source>load key</source>
-        <translation type="unfinished"></translation>
+        <translation>Ladeschlüssel</translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Start</source>
-        <translation type="unfinished">Start</translation>
+        <translation>Start</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation>Neustart</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Stop</source>
-        <translation type="unfinished">Stop</translation>
+        <translation>Stop</translation>
     </message>
     <message>
         <location line="-633"/>
@@ -22184,7 +22206,18 @@ This is your external address on the Tor/I2P network.
 Finally make sure that the Ports match the configuration.
 
 If you have issues connecting over Tor check the Tor logs too.</source>
-        <translation type="unfinished"></translation>
+        <translation>Um Verbindungen zu empfangen, müssen Sie zunächst einen versteckten Tor/I2P-Service einrichten.
+
+Für Tor: Siehe torrc und Dokumentation für HOWTO-Details.
+
+Für I2P: Informationen zum Einrichten eines Servertunnels finden Sie unter http://127.0.0.1:7657/i2ptunnelmgr:
+Tunnel-Assistent -&gt; Servertunnel -&gt; Standard -&gt; Geben Sie einen Namen ein -&gt; Geben Sie die Adresse und den Port ein, den Ihr RS verwendet (siehe Lokale Adresse oben) -&gt; Aktivieren Sie „Autostart“ -&gt; Fertig!
+
+Sobald dies erledigt ist, fügen Sie die Onion/I2P (Base32)-Adresse in das Feld oben ein.
+Dies ist Ihre externe Adresse im Tor/I2P-Netzwerk.
+Stellen Sie abschließend sicher, dass die Ports mit der Konfiguration übereinstimmen.
+
+Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen Sie auch die Tor-Protokolle.</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -22199,22 +22232,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="+32"/>
         <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+62"/>
         <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
+        <translation>SAM zugänglich</translation>
     </message>
     <message>
         <location line="+350"/>
         <source>SAM status</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+301"/>
         <source>Relay</source>
-        <translation type="unfinished"></translation>
+        <translation>Relais</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -22224,17 +22257,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="+20"/>
         <source>Use Relay Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwenden Sie Relay-Server</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Relay options</source>
-        <translation type="unfinished"></translation>
+        <translation>Relaisoptionen</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Number</source>
-        <translation type="unfinished"></translation>
+        <translation>Nummer</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -22244,7 +22277,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="+14"/>
         <source>Total Bandwidth</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesamtbandbreite</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -22264,17 +22297,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="+51"/>
         <source>Total:</source>
-        <translation type="unfinished">Gesamt:</translation>
+        <translation>Gesamt:</translation>
     </message>
     <message>
         <location line="+270"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
-        <translation type="unfinished"></translation>
+        <translation>Warnung: Diese Bandbreite summiert sich zur maximalen Bandbreite.</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Relay Server Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Relay-Server-Setup</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -22284,7 +22317,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="+8"/>
         <source>Server DHT Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Server-DHT-Schlüssel</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -22400,7 +22433,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <location line="+16"/>
         <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
         <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste der verwendeten OpenDns-Server.</translation>
     </message>
     <message>
         <location line="+58"/>
@@ -22415,7 +22448,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="+12"/>
         <source>I2P Socks Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -22431,7 +22464,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-353"/>
         <source>I2P outgoing Okay</source>
-        <translation type="unfinished"></translation>
+        <translation>I2P ausgehend Okay</translation>
     </message>
     <message>
         <location line="+105"/>
@@ -22550,7 +22583,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-938"/>
         <source>Outgoing Manual Tor/I2P</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgehend manuelles Tor/I2P</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -22560,7 +22593,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="+22"/>
         <source>Tor outgoing Okay</source>
-        <translation>Tor ausgehend o. k.</translation>
+        <translation>Tor ausgehend Okay</translation>
     </message>
     <message>
         <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
@@ -22869,7 +22902,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Erzwingt die erneute Überprüfung aller freigegebenen Verzeichnisse. Während sich die automatische Dateiprüfung aus Effizienzgründen nur um neue/entfernte Dateien kümmert, erzwingt diese Schaltfläche die erneute Prüfung aller Dateien und führt möglicherweise ein erneutes Hashing vorhandener Dateien durch, die sich möglicherweise geändert haben. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -22955,7 +22988,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+44"/>
         <source>More than 3000 results. Add more/longer search words to select less.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr als 3000 Ergebnisse. Fügen Sie mehr/längere Suchbegriffe hinzu, um weniger auszuwählen.</translation>
     </message>
     <message>
         <location line="+36"/>
@@ -22970,7 +23003,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+2"/>
         <source>More than %1 results. Add more/longer search words to select less.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehr als %1 Ergebnisse. Fügen Sie mehr/längere Suchbegriffe hinzu, um weniger auszuwählen.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -23967,7 +24000,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Maximum depth (0=unlimited):</source>
-        <translation type="unfinished"></translation>
+        <translation>Maximale Tiefe (0=unbegrenzt):</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -24041,7 +24074,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+69"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Maximale Uploads pro Freund (0 = keine Begrenzung)</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -24151,7 +24184,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Windows-Systemen kann das zufällige Schreiben in die Mitte großer leerer Dateien dazu führen, dass die Software mehrere Sekunden lang hängen bleibt. Möchten Sie diese Option trotzdem verwenden (andernfalls „progressiv“ verwenden)?</translation>
     </message>
     <message>
         <location line="+34"/>

From 4f56c7dd2f61deb2f9e8b086aa51720cec62bd5e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 4 Feb 2024 18:26:47 +0100
Subject: [PATCH 446/503] use argstream::usage() in the help message box

---
 retroshare-gui/src/main.cpp | 65 ++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 13710a28b..3bfec8696 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -29,6 +29,7 @@ CrashStackTrace gCrashStackTrace;
 #include <QObject>
 #include <QMessageBox>
 #include <QSplashScreen>
+#include <QMessageBox>
 
 #include <rshare.h>
 #include "gui/common/FilesDefs.h"
@@ -209,18 +210,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     Q_INIT_RESOURCE(images);
     Q_INIT_RESOURCE(icons);
 
-	// Loop through all command-line args/values to get help wanted before RsInit exit.
-	for (int i = 0; i < args.size(); ++i) {
-		QString arg;
-		/* Get the argument name and set a blank value */
-		arg = args.at(i);
-		if ((arg.toLower() == "-h") || (arg.toLower() == "--help")) {
-			QApplication dummyApp (argc, argv); // needed for QMessageBox
-			Rshare::showUsageMessageBox();
-		}
-	}
-
-	// This is needed to allocate rsNotify, so that it can be used to ask for PGP passphrase
+    // This is needed to allocate rsNotify, so that it can be used to ask for PGP passphrase
 	//
 	RsControl::earlyInitNotificationSystem() ;
 
@@ -233,28 +223,57 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     RsConfigOptions conf;
 
 	argstream as(argc,argv);
-	as      >> option('s',"stderr"           ,conf.outStderr      ,"output to stderr instead of log file."    )
-	        >> option('u',"udp"              ,conf.udpListenerOnly,"Only listen to UDP."                      )
-	        >> parameter('c',"base-dir"      ,conf.optBaseDir     ,"directory", "Set base directory."                                         ,false)
-	        >> parameter('l',"log-file"      ,conf.logfname       ,"logfile"   ,"Set Log filename."                                           ,false)
-	        >> parameter('d',"debug-level"   ,conf.debugLevel     ,"level"     ,"Set debug level."                                            ,false)
-	        >> parameter('i',"ip-address"    ,conf.forcedInetAddress,"nnn.nnn.nnn.nnn", "Force IP address to use (if cannot be detected)."    ,false)
-	        >> parameter('p',"port"          ,conf.forcedPort     ,"port"      ,"Set listenning port to use."                                 ,false)
-            >> parameter('o',"opmode"        ,conf.opModeStr      ,"opmode"    ,"Set Operating mode (Full, NoTurtle, Gaming, Minimal)."       ,false)
-            >> parameter('t',"opmode"        ,conf.userSuppliedTorExecutable,"tor"    ,"supply full tor eecutable path."       ,false);
+    as      >> option('s',"stderr"           ,conf.outStderr      ,"output to stderr instead of log file "    )
+            >> option('u',"udp"              ,conf.udpListenerOnly,"Only listen to UDP "                      )
+            >> parameter('c',"base-dir"      ,conf.optBaseDir     ,"directory", "Set base directory "                                         ,false)
+            >> parameter('l',"log-file"      ,conf.logfname       ,"logfile"   ,"Set Log filename "                                           ,false)
+            >> parameter('d',"debug-level"   ,conf.debugLevel     ,"level"     ,"Set debug level "                                            ,false)
+            >> parameter('i',"ip-address"    ,conf.forcedInetAddress,"nnn.nnn.nnn.nnn", "Force IP address "    ,false)
+            >> parameter('p',"port"          ,conf.forcedPort     ,"port"      ,"Set listenning port "                                 ,false)
+            >> parameter('o',"opmode"        ,conf.opModeStr      ,"opmode"    ,"Set mode (Full, NoTurtle, Gaming, Minimal) "       ,false)
+            >> parameter('t',"opmode"        ,conf.userSuppliedTorExecutable,"tor"    ,"supply full tor executable path "       ,false);
 #ifdef RS_JSONAPI
 	as      >> parameter('J', "jsonApiPort", conf.jsonApiPort, "jsonApiPort", "Enable JSON API on the specified port", false )
-	        >> parameter('P', "jsonApiBindAddress", conf.jsonApiBindAddress, "jsonApiBindAddress", "JSON API Bind Address.", false);
+            >> parameter('P', "jsonApiBindAddress", conf.jsonApiBindAddress, "jsonApiBindAddress", "JSON API Bind Address ", false);
 #endif // ifdef RS_JSONAPI
 
 #ifdef LOCALNET_TESTING
-	as      >> parameter('R',"restrict-port" ,portRestrictions             ,"port1-port2","Apply port restriction"                   ,false);
+    as      >> parameter('R',"restrict-port" ,portRestrictions             ,"port1-port2","Apply port restriction "                   ,false);
 #endif // ifdef LOCALNET_TESTING
 
 #ifdef RS_AUTOLOGIN
 	as      >> option('a',"auto-login"       ,conf.autoLogin      ,"AutoLogin (Windows Only) + StartMinimised");
 #endif // ifdef RS_AUTOLOGIN
+    as 		>> help('h',"help",QObject::tr("Display this help").toStdString().c_str());
 
+    if(as.helpRequested())
+    {
+        RsInfo() << "\n" <<
+            "+================================================================+\n"
+            "|     o---o                                             o        |\n"
+            "|      \\ /               - Retroshare GUI -            / \\       |\n"
+            "|       o                                             o---o      |\n"
+            "+================================================================+"
+                 << std::endl ;
+
+        std::cerr << as.usage(true) << std::endl;
+
+        QApplication dummyApp (argc, argv); // needed for QMessageBox
+        QMessageBox box;
+        QString text = QString::fromUtf8(as.usage(true,false).c_str());
+        QFont font("Courier New",10,50,false);
+        font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
+        font.setStyle(QFont::StyleNormal);
+        font.setBold(true);
+        box.setFont(font);
+        box.setInformativeText(text);
+        box.setWindowTitle(QObject::tr("Retroshare commandline arguments"));
+
+        // now compute the size of text and set the size of the box. For the record, this doesn't work...
+        box.setBaseSize( QSize(QFontMetricsF(font).width(text),QFontMetricsF(font).height()*text.count('\n')) );
+        box.exec();
+        return 0;
+    }
     conf.main_executable_path = argv[0];
 
 	int initResult = RsInit::InitRetroShare(conf);

From c5aface2cb52ba2747f58039bc1afa3ba6bae1cb Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 11 Feb 2024 22:16:50 +0100
Subject: [PATCH 447/503] additional step in rewriting commandline parameter
 handling

---
 retroshare-gui/src/gui/AboutWidget.cpp        |   6 +-
 .../src/gui/FileTransfer/SearchDialog.cpp     |   2 +-
 retroshare-gui/src/gui/GenCertDialog.cpp      |   2 +-
 retroshare-gui/src/gui/GetStartedDialog.cpp   |   2 +-
 retroshare-gui/src/gui/HelpDialog.cpp         |   2 +-
 .../src/gui/Identity/IdEditDialog.cpp         |   2 +-
 retroshare-gui/src/gui/MainWindow.cpp         | 113 ++-
 retroshare-gui/src/gui/PluginManager.cpp      |   2 +-
 retroshare-gui/src/gui/StartDialog.cpp        |   2 +-
 .../src/gui/common/AvatarWidget.cpp           |   6 +-
 .../src/gui/common/FriendSelectionWidget.cpp  |   4 +-
 .../src/gui/help/browser/helpbrowser.cpp      |   2 +-
 .../src/gui/help/browser/helptextbrowser.cpp  |   2 +-
 .../src/gui/profile/ProfileWidget.cpp         |   4 +-
 .../src/gui/settings/AppearancePage.cpp       |  10 +-
 .../src/gui/settings/CryptoPage.cpp           |   4 +-
 .../src/gui/settings/rsharesettings.cpp       |   2 +-
 retroshare-gui/src/main.cpp                   | 869 ++++++++++--------
 retroshare-gui/src/rshare.cpp                 | 467 +++++-----
 retroshare-gui/src/rshare.h                   |  61 +-
 retroshare-gui/src/util/DateTime.cpp          |   2 +-
 21 files changed, 878 insertions(+), 688 deletions(-)

diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
index b468550b1..1c4ae6827 100644
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -142,7 +142,7 @@ void AboutWidget::updateTitle()
 {
     if (tWidget == NULL)
     {
-        setWindowTitle(QString("%1 %2").arg(tr("About RetroShare"), Rshare::retroshareVersion(true)));
+        setWindowTitle(QString("%1 %2").arg(tr("About RetroShare"), RsApplication::retroshareVersion(true)));
     }
     else
     {
@@ -228,7 +228,7 @@ void AWidget::initImages()
 #ifdef RS_ONLYHIDDENNODE
     p.drawText(QPointF(10, 50), QString("%1 : %2 (With embedded Tor)").arg(tr("Retroshare version"), Rshare::retroshareVersion(true)));
 #else
-    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("Retroshare version"), Rshare::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
 #endif
 
     /* Draw Qt's version number */
@@ -936,7 +936,7 @@ void AboutWidget::on_copy_button_clicked()
 {
 	QString verInfo;
 	QString rsVerString = "RetroShare Version: ";
-	rsVerString+=Rshare::retroshareVersion(true);
+    rsVerString+=RsApplication::retroshareVersion(true);
 	verInfo+=rsVerString;
 #ifdef RS_ONLYHIDDENNODE
 	verInfo+=" " + tr("Only Hidden Node");
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 832970833..0223c1e7e 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -325,7 +325,7 @@ void SearchDialog::checkText(const QString& txt)
 	ui.searchButton->setDisabled(txt.length() < 3);
 	ui.searchLineFrame->setProperty("valid", (txt.length() >= 3));
 	ui.searchLineFrame->style()->unpolish(ui.searchLineFrame);
-	Rshare::refreshStyleSheet(ui.searchLineFrame, false);
+	RsApplication::refreshStyleSheet(ui.searchLineFrame, false);
 }
 
 void SearchDialog::initialiseFileTypeMappings()
diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index d3b755f0d..f91ccac1b 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -649,7 +649,7 @@ void GenCertDialog::genPerson()
 	{
 		/* complete the process */
 		RsInit::LoadPassword(sslPasswd);
-		if (Rshare::loadCertificate(sslId, false)) {
+		if (RsApplication::loadCertificate(sslId, false)) {
 
             // Normally we should clear the cached passphrase as soon as possible. However,some other GUI components may still need it at start.
             // (csoler) This is really bad: we have to guess that 30 secs will be enough. I have no better way to do this.
diff --git a/retroshare-gui/src/gui/GetStartedDialog.cpp b/retroshare-gui/src/gui/GetStartedDialog.cpp
index e3bbd7170..399cc36d7 100644
--- a/retroshare-gui/src/gui/GetStartedDialog.cpp
+++ b/retroshare-gui/src/gui/GetStartedDialog.cpp
@@ -421,7 +421,7 @@ void GetStartedDialog::emailSupport()
 	sysVersion = "Linux";
   #endif
 #endif
-	text += QString("My RetroShare Configuration is: (%1, %2, %3)").arg(Rshare::retroshareVersion(true)
+	text += QString("My RetroShare Configuration is: (%1, %2, %3)").arg(RsApplication::retroshareVersion(true)
 	                                                                    , sysVersion
 	                                                                    ).arg(static_cast<typename std::underlying_type<RsConfigUserLvl>::type>(userLevel)) + "\n";
 	text += "\n";
diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp
index cc3f1d407..ddaf925d4 100644
--- a/retroshare-gui/src/gui/HelpDialog.cpp
+++ b/retroshare-gui/src/gui/HelpDialog.cpp
@@ -80,7 +80,7 @@ HelpDialog::HelpDialog(QWidget *parent) :
 		ui->thanks->setHtml(in.readAll());
 	}
 
-	ui->version->setText(Rshare::retroshareVersion(true));
+	ui->version->setText(RsApplication::retroshareVersion(true));
 
 	/* Add version numbers of libretroshare */
 	std::list<RsLibraryInfo> libraries;
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index ac9965d2a..7e5544413 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -703,7 +703,7 @@ void IdEditDialog::updateInterface()
 	const QPixmap *pixmap = ui->avatarLabel->pixmap();
 	if (pixmap && !pixmap->isNull()) {
 		ui->removeButton->setEnabled(true);
-	} else if (mEditGroup.mImage.mSize != NULL) {
+    } else if (mEditGroup.mImage.mSize > 0) {
 		ui->removeButton->setEnabled(true);
 	} else {
 		ui->removeButton->setEnabled(false);
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index d69e2bb42..070f446e4 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -32,6 +32,7 @@
 
 #include <retroshare/rsplugin.h>
 #include <retroshare/rsconfig.h>
+#include <util/argstream.h>
 
 #if defined(Q_OS_DARWIN)
 #include "gui/common/MacDockIconHandler.h"
@@ -211,7 +212,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
             hiddenmode = true;
     }
 
-    setWindowTitle(tr("RetroShare %1 a secure decentralized communication platform").arg(Rshare::retroshareVersion(true)) + " - " + nameAndLocation);
+    setWindowTitle(tr("RetroShare %1 a secure decentralized communication platform").arg(RsApplication::retroshareVersion(true)) + " - " + nameAndLocation);
     connect(rApp, SIGNAL(newArgsReceived(QStringList)), this, SLOT(receiveNewArgs(QStringList)));
 
     /* add url handler for RetroShare links */
@@ -1253,10 +1254,87 @@ void MainWindow::doQuit()
 	rApp->quit();
 }
 
+// This method parses arguments passed by another process. All arguments
+// except -r, -f, -o and lists of rscollection files and rslinks are discarded.
+//
 void MainWindow::receiveNewArgs(QStringList args)
 {
-	Rshare::parseArguments(args, false);
-	processLastArgs();
+    QString arg, argl, value;
+    std::vector<const char *> argv;
+    for(auto l:args)
+        argv.push_back((const char *)l.data());
+
+    // This class does all the job at once: validate arguments, and parses them.
+
+    std::vector<std::string> links_and_files;
+
+    argstream as(argv.size(),const_cast<char **>(argv.data()));
+
+    QString omValues = QString(";full;noturtle;gaming;minimal;");
+    std::string opModeStr;
+    std::string retroshare_link_url;
+    std::string rscollection_file;
+
+    as  >> parameter('r',"rslink",retroshare_link_url,"Retroshare:// link","Retroshare link to open in Downloads " ,false)
+        >> parameter('f',"rsfile",rscollection_file,"file","File to open " ,false)
+        >> parameter('o',"opmode",opModeStr,"opmode","Set mode (Full, NoTurtle, Gaming, Minimal) " ,false)
+        >> values<std::string>(back_inserter(links_and_files),"links and files");
+
+    if(!as.isOk())
+    {
+        RsErr() << "Error while parsing arguments:" ;
+        RsErr() << as.errorLog() ;
+        return;
+    }
+    if(!opModeStr.empty() && omValues.contains(";"+QString::fromStdString(opModeStr).toLower()+";"))
+    {
+        QString opmode = QString::fromStdString(opModeStr).toLower();
+        //RsApplication::setOpMode(opModeStr.toLower()); // Do we need this??
+
+        if (opmode == "noturtle")
+            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE) - 1);
+        else if (opmode == "gaming")
+            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::GAMING) - 1);
+        else if (opmode == "minimal")
+            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::MINIMAL) - 1);
+        else if (opmode != "")
+            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::FULL) - 1);
+
+        opModeStatus->setOpMode();
+    }
+
+    // Sort all collected arguments into rscollection files and retroshare links, accordingly
+
+    QStringList rscollection_files;
+    QList<RetroShareLink> rslinks;
+
+    auto sort = [&](const QString s) {
+
+        if(QFile(s).exists() && s.endsWith(".rscollection"))
+            rscollection_files.append(QString::fromUtf8(rscollection_file.c_str()));
+        else if(s.startsWith("retroshare://"))
+        {
+            RetroShareLink link(s);
+
+            if(link.valid())
+                rslinks.push_back(link);
+        }
+    };
+
+    sort(QString::fromUtf8(rscollection_file.c_str()));
+    sort(QString::fromUtf8(retroshare_link_url.c_str()));
+
+    for(auto s:links_and_files)
+        sort(QString::fromUtf8(s.c_str()));
+
+    // Now handle links and rscollection files.
+
+    for(auto file:rscollection_files)
+        if(file.endsWith(".rscollection"))
+            openRsCollection(file);
+
+    for(auto link:rslinks)
+        retroshareLinkActivated(link.toUrl());
 }
 
 void MainWindow::displayErrorMessage(int /*a*/,int /*b*/,const QString& error_msg)
@@ -1633,35 +1711,6 @@ void MainWindow::openRsCollection(const QString &filename)
 
 void MainWindow::processLastArgs()
 {
-	while (!Rshare::links()->isEmpty()) {
-		std::cerr << "MainWindow::processLastArgs() : " << Rshare::links()->count() << std::endl;
-		/* Now use links from the command line, because no RetroShare was running */
-		RetroShareLink link(Rshare::links()->takeFirst());
-		if (link.valid()) {
-			retroshareLinkActivated(link.toUrl());
-		}
-	}
-	while (!Rshare::files()->isEmpty()) {
-		/* Now use files from the command line, because no RetroShare was running */
-		openRsCollection(Rshare::files()->takeFirst());
-	}
-	/* Handle the -opmode options. */
-	if (opModeStatus) {
-		QString opmode = Rshare::opmode().toLower();
-		if (opmode == "noturtle") {
-			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE) - 1);
-		} else if (opmode == "gaming") {
-			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::GAMING) - 1);
-		} else if (opmode == "minimal") {
-			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::MINIMAL) - 1);
-		} else if (opmode != "") {
-			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::FULL) - 1);
-		}
-		opModeStatus->setOpMode();
-	} else {
-		std::cerr << "ERR: MainWindow::processLastArgs opModeStatus is not initialized.";
-	}
-
 }
 
 void MainWindow::switchVisibilityStatus(StatusElement e,bool b)
diff --git a/retroshare-gui/src/gui/PluginManager.cpp b/retroshare-gui/src/gui/PluginManager.cpp
index 2b6fa01a6..e5ac7f7d5 100644
--- a/retroshare-gui/src/gui/PluginManager.cpp
+++ b/retroshare-gui/src/gui/PluginManager.cpp
@@ -41,7 +41,7 @@
 PluginManager::PluginManager()
 {
     baseFolder =  //qApp->applicationDirPath()+"///plugins" ;
-Rshare::dataDirectory() + "/plugins" ;
+RsApplication::dataDirectory() + "/plugins" ;
     lastError = "No error.";
 
     viewWidget = 0;
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index d6f9f707d..bc98527da 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -123,7 +123,7 @@ void StartDialog::loadPerson()
 	rsNotify->cachePgpPassphrase(ui.password_input->text().toUtf8().constData()) ;
 	rsNotify->setDisableAskPassword(true);
 
-    bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
+    bool res = RsApplication::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
 
 	rsNotify->setDisableAskPassword(false);
     rsNotify->clearPgpPassphrase();
diff --git a/retroshare-gui/src/gui/common/AvatarWidget.cpp b/retroshare-gui/src/gui/common/AvatarWidget.cpp
index e6d6d03d9..02151730a 100644
--- a/retroshare-gui/src/gui/common/AvatarWidget.cpp
+++ b/retroshare-gui/src/gui/common/AvatarWidget.cpp
@@ -121,7 +121,7 @@ void AvatarWidget::setFrameType(FrameType type)
 
     //refreshAvatarImage();
     refreshStatus();
-    Rshare::refreshStyleSheet(this, false);
+    RsApplication::refreshStyleSheet(this, false);
 }
 void AvatarWidget::setId(const ChatId &id)
 {
@@ -174,7 +174,7 @@ void AvatarWidget::refreshStatus()
     case NO_FRAME:
     case NORMAL_FRAME:
     {
-        Rshare::refreshStyleSheet(this, false);
+        RsApplication::refreshStyleSheet(this, false);
         break;
     }
     case STATUS_FRAME:
@@ -252,7 +252,7 @@ void AvatarWidget::updateStatus(int status)
     mPeerState = status;
 
     setEnabled(((uint32_t) status == RS_STATUS_OFFLINE) ? false : true);
-    Rshare::refreshStyleSheet(this, false);
+    RsApplication::refreshStyleSheet(this, false);
 }
 
 void AvatarWidget::updateAvatar(const QString &peerId)
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
index 2e91ded27..4608d1796 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
@@ -127,7 +127,7 @@ FriendSelectionWidget::FriendSelectionWidget(QWidget *parent)
 	ui->filterLineEdit->showFilterIcon();
 
 	/* Refresh style to have the correct text color */
-	Rshare::refreshStyleSheet(this, false);
+	RsApplication::refreshStyleSheet(this, false);
 
     mEventHandlerId_identities = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) {
@@ -1225,7 +1225,7 @@ std::string FriendSelectionWidget::idFromItem(QTreeWidgetItem *item)
 	return item->data(COLUMN_DATA, ROLE_ID).toString().toStdString();
 }
 
-void FriendSelectionWidget::sortByChecked(bool sort)
+void FriendSelectionWidget::sortByChecked(bool)
 {
     mCompareRole->clear();
     mCompareRole->setRole(COLUMN_NAME,ROLE_SORT_SELECTED);
diff --git a/retroshare-gui/src/gui/help/browser/helpbrowser.cpp b/retroshare-gui/src/gui/help/browser/helpbrowser.cpp
index b21ba2cc5..f062b908c 100644
--- a/retroshare-gui/src/gui/help/browser/helpbrowser.cpp
+++ b/retroshare-gui/src/gui/help/browser/helpbrowser.cpp
@@ -117,7 +117,7 @@ HelpBrowser::~HelpBrowser()
 QString
 HelpBrowser::language()
 {
-  QString lang = Rshare::language();
+  QString lang = RsApplication::language();
   if (!QDir(":/help/" + lang).exists())
     lang = "en";
   return lang;
diff --git a/retroshare-gui/src/gui/help/browser/helptextbrowser.cpp b/retroshare-gui/src/gui/help/browser/helptextbrowser.cpp
index a4b70058f..d9b012775 100644
--- a/retroshare-gui/src/gui/help/browser/helptextbrowser.cpp
+++ b/retroshare-gui/src/gui/help/browser/helptextbrowser.cpp
@@ -54,7 +54,7 @@ HelpTextBrowser::loadResource(int type, const QUrl &name)
     /* Fall back to English if there is no translation of the specified help
      * page in the current language. */
     if (!name.path().contains("/")) {
-      QString language = Rshare::language();
+      QString language = RsApplication::language();
       if (!QDir(":/help/" + language).exists())
         language = "en";
       helpPath += language + "/";
diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.cpp b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
index cf823ab53..670bb86c7 100644
--- a/retroshare-gui/src/gui/profile/ProfileWidget.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
@@ -45,13 +45,13 @@ ProfileWidget::ProfileWidget(QWidget *parent, Qt::WindowFlags flags)
     connect(ui.CopyCertButton,SIGNAL(clicked()), this, SLOT(copyCert()));
     connect(ui.profile_Button,SIGNAL(clicked()), this, SLOT(profilemanager()));
 
-    ui.onLineSince->setText(DateTime::formatLongDateTime(Rshare::startupTime()));
+    ui.onLineSince->setText(DateTime::formatLongDateTime(RsApplication::startupTime()));
 }
 
 void ProfileWidget::showEvent ( QShowEvent * /*event*/ )
 {
     /* set retroshare version */
-    ui.version->setText(Rshare::retroshareVersion(true));
+    ui.version->setText(RsApplication::retroshareVersion(true));
 
     RsPeerDetails detail;
     if (rsPeers->getPeerDetails(rsPeers->getOwnId(),detail))
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp
index 8ad086ae9..a96df209d 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.cpp
+++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp
@@ -84,7 +84,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
 	}
 
 	QMap<QString, QString> styleSheets;
-	Rshare::getAvailableStyleSheets(styleSheets);
+	RsApplication::getAvailableStyleSheets(styleSheets);
 
 	foreach (QString name, styleSheets.keys()) {
 		ui.cmboStyleSheet->addItem(name, styleSheets[name]);
@@ -136,7 +136,7 @@ void AppearancePage::updateInterfaceStyle()
 #ifndef QT_NO_CURSOR
 	QApplication::setOverrideCursor(Qt::WaitCursor);
 #endif
-	Rshare::setStyle(ui.cmboStyle->currentText());
+	RsApplication::setStyle(ui.cmboStyle->currentText());
 	Settings->setInterfaceStyle(ui.cmboStyle->currentText());
 #ifndef QT_NO_CURSOR
 	QApplication::restoreOverrideCursor();
@@ -152,7 +152,7 @@ void AppearancePage::loadStyleSheet(int index)
 #ifndef QT_NO_CURSOR
 	QApplication::setOverrideCursor(Qt::WaitCursor);
 #endif
-	Rshare::loadStyleSheet(ui.cmboStyleSheet->itemData(index).toString());
+	RsApplication::loadStyleSheet(ui.cmboStyleSheet->itemData(index).toString());
 #ifndef QT_NO_CURSOR
 	QApplication::restoreOverrideCursor();
 #endif
@@ -251,7 +251,7 @@ void AppearancePage::updateCmboToolButtonSize()
 //     NotifyQt::getInstance()->notifySettingsChanged();
 // }
 
-void AppearancePage::updateStyle() { Rshare::setStyle(ui.cmboStyle->currentText()); }
+void AppearancePage::updateStyle() { RsApplication::setStyle(ui.cmboStyle->currentText()); }
 
 /** Loads the settings for this page */
 void AppearancePage::load()
@@ -259,7 +259,7 @@ void AppearancePage::load()
 	int index = ui.cmboLanguage->findData(Settings->getLanguageCode());
 	whileBlocking(ui.cmboLanguage)->setCurrentIndex(index);
 
-	index = ui.cmboStyle->findData(Rshare::style().toLower());
+	index = ui.cmboStyle->findData(RsApplication::style().toLower());
 	whileBlocking(ui.cmboStyle)->setCurrentIndex(index);
 
 	index = ui.cmboStyleSheet->findData(Settings->getSheetName());
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 6c171bb1a..26d7cecea 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -66,7 +66,7 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags)
     ui.retroshareId_content_LB->hide();
     ui.stackPageCertificate->hide();
 
-	ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime()));
+	ui.onlinesince->setText(DateTime::formatLongDateTime(RsApplication::startupTime()));
 }
 
 #ifdef UNUSED_CODE
@@ -111,7 +111,7 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ )
         ui.retroshareId_content_LB->setText(QString::fromUtf8(invite.c_str()));
 		
         /* set retroshare version */
-        ui.version->setText(Rshare::retroshareVersion(true));
+        ui.version->setText(RsApplication::retroshareVersion(true));
 
         std::list<RsPgpId> ids;
         ids.clear();
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index 28a29300c..e811acd4a 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -910,7 +910,7 @@ void RshareSettings::setUseLocalServer(bool value)
 {
 	if (value != getUseLocalServer()) {
 		setValue("UseLocalServer", value);
-		Rshare::updateLocalServer();
+		RsApplication::updateLocalServer();
 	}
 }
 
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 3bfec8696..2150c2f16 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -30,6 +30,9 @@ CrashStackTrace gCrashStackTrace;
 #include <QMessageBox>
 #include <QSplashScreen>
 #include <QMessageBox>
+#include <QBuffer>
+#include <QSharedMemory>
+#include <QLocalSocket>
 
 #include <rshare.h>
 #include "gui/common/FilesDefs.h"
@@ -92,10 +95,10 @@ CrashStackTrace gCrashStackTrace;
 extern "C" {
 __declspec(dllexport) __cdecl BOOL _OPENSSL_isservice(void)
 {
-	DWORD sess;
-	if (ProcessIdToSessionId(GetCurrentProcessId(),&sess))
-		return sess==0;
-	return FALSE;
+    DWORD sess;
+    if (ProcessIdToSessionId(GetCurrentProcessId(),&sess))
+        return sess==0;
+    return FALSE;
 }
 }
 #endif
@@ -107,147 +110,8 @@ __declspec(dllexport) __cdecl BOOL _OPENSSL_isservice(void)
 #include "gui/notifyqt.h"
 #include <unistd.h>
 
-static void displayWarningAboutDSAKeys()
+static void showHelp(const argstream& as)
 {
-	std::map<std::string,std::vector<std::string> > unsupported_keys;
-	RsAccounts::GetUnsupportedKeys(unsupported_keys);
-	
-	if(unsupported_keys.empty())
-		return ;
-
-	QMessageBox msgBox;
-
-	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)
-	{
-		txt += "<LI>" + QString::fromStdString(it->first) ;
-		txt += "<UL>" ;
-
-		for(uint32_t i=0;i<it->second.size();++i)
-			txt += "<li>" + QString::fromStdString(it->second[i]) + "</li>" ;
-
-		txt += "</UL>" ;
-		txt += "</li>" ;
-	}
-	txt += "</UL>" ;
-
-	msgBox.setText(txt) ;
-	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(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
-
-	msgBox.exec();
-}
-
-#ifdef WINDOWS_SYS
-#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0) && QT_VERSION < QT_VERSION_CHECK (5, 3, 0)
-QStringList filedialog_open_filenames_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
-{
-	return QFileDialog::getOpenFileNames(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
-}
-
-QString filedialog_open_filename_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
-{
-	return QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
-}
-
-QString filedialog_save_filename_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
-{
-	return QFileDialog::getSaveFileName(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
-}
-
-QString filedialog_existing_directory_hook(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options)
-{
-	return QFileDialog::getExistingDirectory(parent, caption, dir, options | QFileDialog::DontUseNativeDialog);
-}
-#endif
-#endif
-
-int main(int argc, char *argv[])
-{ 
-#ifdef WINDOWS_SYS
-	// The current directory of the application is changed when using the native dialog on Windows
-	// This is a quick fix until libretroshare is using a absolute path in the portable Version
-#if QT_VERSION >= QT_VERSION_CHECK (5, 3, 0)
-	// Do we need a solution in v0.6?
-#endif
-#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0) && QT_VERSION < QT_VERSION_CHECK (5, 3, 0)
-	typedef QStringList (*_qt_filedialog_open_filenames_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-	typedef QString (*_qt_filedialog_open_filename_hook)     (QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-	typedef QString (*_qt_filedialog_save_filename_hook)     (QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-	typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options);
-
-	extern Q_GUI_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook;
-	extern Q_GUI_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook;
-	extern Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook;
-	extern Q_GUI_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook;
-
-	qt_filedialog_open_filename_hook = filedialog_open_filename_hook;
-	qt_filedialog_open_filenames_hook = filedialog_open_filenames_hook;
-	qt_filedialog_save_filename_hook = filedialog_save_filename_hook;
-	qt_filedialog_existing_directory_hook = filedialog_existing_directory_hook;
-#endif
-#if QT_VERSION < QT_VERSION_CHECK (5, 0, 0)
-	extern bool Q_GUI_EXPORT qt_use_native_dialogs;
-	qt_use_native_dialogs = false;
-#endif
-
-	{
-		/* Set the current directory to the application dir,
-		   because the start dir with autostart from the registry run key is not the exe dir */
-		QApplication app(argc, argv);
-		QDir::setCurrent(QCoreApplication::applicationDirPath());
-	}
-#endif
-#ifdef SIGFPE_DEBUG
-feenableexcept(FE_INVALID | FE_DIVBYZERO);
-#endif
-
-	QStringList args = char_array_to_stringlist(argv+1, argc-1);
-
-    Q_INIT_RESOURCE(images);
-    Q_INIT_RESOURCE(icons);
-
-    // This is needed to allocate rsNotify, so that it can be used to ask for PGP passphrase
-	//
-	RsControl::earlyInitNotificationSystem() ;
-
-	NotifyQt *notify = NotifyQt::Create();
-	rsNotify->registerNotifyClient(notify);
-
-	/* RetroShare Core Objects */
-	RsInit::InitRsConfig();
-
-    RsConfigOptions conf;
-
-	argstream as(argc,argv);
-    as      >> option('s',"stderr"           ,conf.outStderr      ,"output to stderr instead of log file "    )
-            >> option('u',"udp"              ,conf.udpListenerOnly,"Only listen to UDP "                      )
-            >> parameter('c',"base-dir"      ,conf.optBaseDir     ,"directory", "Set base directory "                                         ,false)
-            >> parameter('l',"log-file"      ,conf.logfname       ,"logfile"   ,"Set Log filename "                                           ,false)
-            >> parameter('d',"debug-level"   ,conf.debugLevel     ,"level"     ,"Set debug level "                                            ,false)
-            >> parameter('i',"ip-address"    ,conf.forcedInetAddress,"nnn.nnn.nnn.nnn", "Force IP address "    ,false)
-            >> parameter('p',"port"          ,conf.forcedPort     ,"port"      ,"Set listenning port "                                 ,false)
-            >> parameter('o',"opmode"        ,conf.opModeStr      ,"opmode"    ,"Set mode (Full, NoTurtle, Gaming, Minimal) "       ,false)
-            >> parameter('t',"opmode"        ,conf.userSuppliedTorExecutable,"tor"    ,"supply full tor executable path "       ,false);
-#ifdef RS_JSONAPI
-	as      >> parameter('J', "jsonApiPort", conf.jsonApiPort, "jsonApiPort", "Enable JSON API on the specified port", false )
-            >> parameter('P', "jsonApiBindAddress", conf.jsonApiBindAddress, "jsonApiBindAddress", "JSON API Bind Address ", false);
-#endif // ifdef RS_JSONAPI
-
-#ifdef LOCALNET_TESTING
-    as      >> parameter('R',"restrict-port" ,portRestrictions             ,"port1-port2","Apply port restriction "                   ,false);
-#endif // ifdef LOCALNET_TESTING
-
-#ifdef RS_AUTOLOGIN
-	as      >> option('a',"auto-login"       ,conf.autoLogin      ,"AutoLogin (Windows Only) + StartMinimised");
-#endif // ifdef RS_AUTOLOGIN
-    as 		>> help('h',"help",QObject::tr("Display this help").toStdString().c_str());
-
-    if(as.helpRequested())
-    {
         RsInfo() << "\n" <<
             "+================================================================+\n"
             "|     o---o                                             o        |\n"
@@ -258,6 +122,8 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 
         std::cerr << as.usage(true) << std::endl;
 
+        char *argv[1];
+        int argc=0;
         QApplication dummyApp (argc, argv); // needed for QMessageBox
         QMessageBox box;
         QString text = QString::fromUtf8(as.usage(true,false).c_str());
@@ -272,139 +138,410 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
         // now compute the size of text and set the size of the box. For the record, this doesn't work...
         box.setBaseSize( QSize(QFontMetricsF(font).width(text),QFontMetricsF(font).height()*text.count('\n')) );
         box.exec();
+}
+
+static bool notifyRunningInstance()
+{
+    // Connect to the Local Server of the main process to notify it
+    // that a new process had been started
+
+    QLocalSocket localSocket;
+    localSocket.connectToServer(QString(TARGET));
+#ifdef DEBUG
+    std::cerr << "RsApplication::RsApplication waitForConnected to other instance." << std::endl;
+#endif
+    if( localSocket.waitForConnected(100) )
+    {
+#ifdef DEBUG
+        std::cerr << "RsApplication::RsApplication Connection etablished. Waiting for disconnection." << std::endl;
+#endif
+        localSocket.waitForDisconnected(1000);
+        return true;
+    }
+    else
+    {
+#ifdef DEBUG
+        std::cerr << "RsApplication::RsApplication failed to connect to other instance." << std::endl;
+#endif
+        return false;
+    }
+}
+
+static void sendArgsToRunningInstance(const QStringList& args)
+{
+    QString serverName = QString(TARGET);
+
+    // load into shared memory
+    QBuffer buffer;
+    buffer.open(QBuffer::ReadWrite);
+    QDataStream out(&buffer);
+    out << args;
+    int size = buffer.size();
+
+    QSharedMemory newArgs;
+    newArgs.setKey(serverName + "_newArgs");
+    if (newArgs.isAttached()) newArgs.detach();
+
+    if (!newArgs.create(size)) {
+        std::cerr << "(EE) RsApplication::RsApplication Unable to create shared memory segment of size:"
+              << size << " error:" << newArgs.errorString().toStdString() << "." << std::endl;
+#ifdef Q_OS_UNIX
+        std::cerr << "Look with `ipcs -m` for nattch==0 segment. And remove it with `ipcrm -m 'shmid'`." << std::endl;
+        //No need for windows, as it removes shared segment directly even when crash.
+#endif
+        newArgs.detach();
+        ::exit(EXIT_FAILURE);
+    }
+    newArgs.lock();
+    char *to = (char*)newArgs.data();
+    const char *from = buffer.data().data();
+    memcpy(to, from, qMin(newArgs.size(), size));
+    newArgs.unlock();
+
+    std::cerr << "RsApplication::RsApplication waitForConnected to other instance." << std::endl;
+    if(notifyRunningInstance())
+    {
+        newArgs.detach();
+        std::cerr << "RsApplication::RsApplication Arguments was sended." << std::endl
+              << " To disable it, in Options - General - Misc," << std::endl
+              << " uncheck \"Use Local Server to get new Arguments\"." << std::endl;
+        ::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function
+    }
+    else
+        std::cerr << "RsApplication::RsApplication failed to connect to other instance." << std::endl;
+    newArgs.detach();
+}
+
+static void displayWarningAboutDSAKeys()
+{
+    std::map<std::string,std::vector<std::string> > unsupported_keys;
+    RsAccounts::GetUnsupportedKeys(unsupported_keys);
+
+    if(unsupported_keys.empty())
+        return ;
+
+    QMessageBox msgBox;
+
+    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)
+    {
+        txt += "<LI>" + QString::fromStdString(it->first) ;
+        txt += "<UL>" ;
+
+        for(uint32_t i=0;i<it->second.size();++i)
+            txt += "<li>" + QString::fromStdString(it->second[i]) + "</li>" ;
+
+        txt += "</UL>" ;
+        txt += "</li>" ;
+    }
+    txt += "</UL>" ;
+
+    msgBox.setText(txt) ;
+    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(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
+
+    msgBox.exec();
+}
+
+#ifdef WINDOWS_SYS
+#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0) && QT_VERSION < QT_VERSION_CHECK (5, 3, 0)
+QStringList filedialog_open_filenames_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
+{
+    return QFileDialog::getOpenFileNames(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
+}
+
+QString filedialog_open_filename_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
+{
+    return QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
+}
+
+QString filedialog_save_filename_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
+{
+    return QFileDialog::getSaveFileName(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
+}
+
+QString filedialog_existing_directory_hook(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options)
+{
+    return QFileDialog::getExistingDirectory(parent, caption, dir, options | QFileDialog::DontUseNativeDialog);
+}
+#endif
+#endif
+
+int main(int argc, char *argv[])
+{
+#ifdef WINDOWS_SYS
+    // The current directory of the application is changed when using the native dialog on Windows
+    // This is a quick fix until libretroshare is using a absolute path in the portable Version
+#if QT_VERSION >= QT_VERSION_CHECK (5, 3, 0)
+    // Do we need a solution in v0.6?
+#endif
+#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0) && QT_VERSION < QT_VERSION_CHECK (5, 3, 0)
+    typedef QStringList (*_qt_filedialog_open_filenames_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
+    typedef QString (*_qt_filedialog_open_filename_hook)     (QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
+    typedef QString (*_qt_filedialog_save_filename_hook)     (QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
+    typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options);
+
+    extern Q_GUI_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook;
+    extern Q_GUI_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook;
+    extern Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook;
+    extern Q_GUI_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook;
+
+    qt_filedialog_open_filename_hook = filedialog_open_filename_hook;
+    qt_filedialog_open_filenames_hook = filedialog_open_filenames_hook;
+    qt_filedialog_save_filename_hook = filedialog_save_filename_hook;
+    qt_filedialog_existing_directory_hook = filedialog_existing_directory_hook;
+#endif
+#if QT_VERSION < QT_VERSION_CHECK (5, 0, 0)
+    extern bool Q_GUI_EXPORT qt_use_native_dialogs;
+    qt_use_native_dialogs = false;
+#endif
+
+    {
+        /* Set the current directory to the application dir,
+           because the start dir with autostart from the registry run key is not the exe dir */
+        QApplication app(argc, argv);
+        QDir::setCurrent(QCoreApplication::applicationDirPath());
+    }
+#endif
+#ifdef SIGFPE_DEBUG
+feenableexcept(FE_INVALID | FE_DIVBYZERO);
+#endif
+
+    QStringList args = char_array_to_stringlist(argv+1, argc-1);
+
+    Q_INIT_RESOURCE(images);
+    Q_INIT_RESOURCE(icons);
+
+    // This is needed to allocate rsNotify, so that it can be used to ask for PGP passphrase
+    //
+    RsControl::earlyInitNotificationSystem() ;
+
+    NotifyQt *notify = NotifyQt::Create();
+    rsNotify->registerNotifyClient(notify);
+
+    /* RetroShare Core Objects */
+    RsInit::InitRsConfig();
+
+    RsGUIConfigOptions conf;
+//#define ARG_RESET           "reset"         /**< Reset Rshare's saved settings.   */
+//#define ARG_DATADIR         "datadir"       /**< Directory to use for data files. */
+//#define ARG_LOGFILE         "logfile"       /**< Location of our logfile.         */
+//#define ARG_LOGLEVEL        "loglevel"      /**< Log verbosity.                   */
+//#define ARG_GUISTYLE        "style"         /**< Argument specfying GUI style.    */
+//#define ARG_GUISTYLESHEET   "stylesheet"    /**< Argument specfying GUI style.    */
+//#define ARG_LANGUAGE        "lang"          /**< Argument specifying language.    */
+//#define ARG_OPMODE_L        "opmode"        /**< OpMode (Full, NoTurtle, Gaming, Minimal) */
+//#define ARG_RSLINK_S        "r"             /**< Open RsLink with protocol retroshare:// */
+//#define ARG_RSLINK_L        "link"          /**< Open RsLink with protocol retroshare:// */
+//#define ARG_RSFILE_S        "f"             /**< Open RsFile with or without arg.  */
+//#define ARG_RSFILE_L        "rsfile"        /**< Open RsFile with or without arg.  */
+
+    std::string rslink,rsfile;
+    std::list<std::string> links_and_files;
+    std::string loglevel="off";
+    std::string logfilename,language,guistyle,guistylesheetfile;
+
+    argstream as(argc,argv);
+    as      >> option(   's',"stderr"             ,conf.outStderr                ,"output to stderr instead of log file "                                                      )
+            >> option(   'u',"udp"                ,conf.udpListenerOnly          ,"Only listen to UDP "                                                                        )
+            >> option(   'R',"reset"              ,conf.optResetParams           ,"reset retroshare parameters "                                                               )
+            >> parameter('c',"base-dir"           ,conf.optBaseDir               ,"directory"                             ,"Set base directory "                         ,false)
+            >> parameter('l',"log-file"           ,logfilename                   ,"logfile"                               ,"Set Log filename "                           ,false)
+            >> parameter('d',"debug-level"        ,loglevel                      ,"level (debug,info,notice,warn,error,off)","Set debug level "                            ,false)
+            >> parameter('i',"ip-address"         ,conf.forcedInetAddress        ,"nnn.nnn.nnn.nnn"                       ,"Force IP address "                           ,false)
+            >> parameter('p',"port"               ,conf.forcedPort               ,"port"                                  ,"Set listenning port "                        ,false)
+            >> parameter('o',"opmode"             ,conf.opModeStr                ,"opmode (Full, NoTurtle, Gaming, Minimal)","Set mode" ,false)
+            >> parameter('t',"tor"                ,conf.userSuppliedTorExecutable,"tor"                                   ,"supply full tor executable path "            ,false)
+            >> parameter('g',"style"              ,guistyle                      ,"style "                                ,""            ,false)
+            >> parameter('k',"style"              ,guistylesheetfile             ,"style sheet file"                      ,"gui stylesheet file"                         ,false)
+            >> parameter('L',"lang"               ,language                      ,"langage"                               ,"language string"                             ,false)
+            >> parameter('r',"link"               ,rslink                        ,"retroshare link"                       ,"retroshare link to open (passed to running server)" ,false)
+            >> parameter('f',"rsfile"             ,rsfile                        ,"rsfile"                                ,"rsfile to open (passed to running server)"   ,false);
+#ifdef RS_JSONAPI
+    as      >> parameter('J', "jsonApiPort"       ,conf.jsonApiPort              ,"jsonApiPort"                           ,"Enable JSON API on the specified port"       ,false)
+            >> parameter('P', "jsonApiBindAddress",conf.jsonApiBindAddress       ,"jsonApiBindAddress"                    ,"JSON API Bind Address "                      ,false);
+#endif // ifdef RS_JSONAPI
+
+#ifdef LOCALNET_TESTING
+    as      >> parameter('R',"restrict-port" ,portRestrictions             ,"port1-port2","Apply port restriction "                   ,false);
+#endif // ifdef LOCALNET_TESTING
+
+#ifdef RS_AUTOLOGIN
+    as      >> option('a',"auto-login"       ,conf.autoLogin      ,"AutoLogin (Windows Only) + StartMinimised");
+#endif // ifdef RS_AUTOLOGIN
+    as      >> values<std::string>(std::back_inserter(links_and_files),"links and files")
+            >> help('h',"help",QObject::tr("Display this help").toStdString().c_str());
+
+    conf.logFileName       = QString::fromStdString(logfilename);
+    conf.logLevel          = QString::fromStdString(loglevel);		      // these will be checked when used in RsApplication
+    conf.guiStyle          = QString::fromStdString(guistyle);	      	  // these will be checked when used in RsApplication
+    conf.guiStyleSheetFile = QString::fromUtf8(guistylesheetfile.c_str());// these will be checked when used in RsApplication
+
+    if(as.helpRequested())
+    {
+        showHelp(as);
         return 0;
     }
+    // Look for parameters to be transmitted to running server
+
+    if((!rslink.empty() || !rsfile.empty() || !links_and_files.empty() || !conf.opModeStr.empty()) && notifyRunningInstance())
+    {
+        QStringList args;
+        RsErr() << "Sending rscollection files, retroshare links and opmode parameters to the runnning retroshare server." ;
+
+        if(!rslink.empty()) { args.push_back("-l"); args.push_back(QString::fromUtf8(rslink.c_str())); }
+        if(!rsfile.empty()) { args.push_back("-f"); args.push_back(QString::fromUtf8(rsfile.c_str())); }
+
+        for(auto s:links_and_files)
+            args.push_back(QString::fromUtf8(s.c_str()));
+
+        if(!conf.opModeStr.empty()) { args.push_back("-o"); args.push_back(QString::fromStdString(conf.opModeStr)); }
+
+        sendArgsToRunningInstance(args);
+        return 0;
+    }
+
+    // Now start RS login system
+
     conf.main_executable_path = argv[0];
 
-	int initResult = RsInit::InitRetroShare(conf);
+    int initResult = RsInit::InitRetroShare(conf);
 
-	if(initResult == RS_INIT_NO_KEYRING)	// happens when we already have accounts, but no pgp key. This is when switching to the openpgp-sdk version.
-	{
-		QApplication dummyApp (argc, argv); // needed for QMessageBox
-		/* Translate into the desired language */
-		LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
+    if(initResult == RS_INIT_NO_KEYRING)	// happens when we already have accounts, but no pgp key. This is when switching to the openpgp-sdk version.
+    {
+        QApplication dummyApp (argc, argv); // needed for QMessageBox
+        /* Translate into the desired language */
+        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
 
-		QMessageBox msgBox;
-		msgBox.setText(QObject::tr("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."));
-		msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
-		msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
-		msgBox.setDefaultButton(QMessageBox::Ok);
+        QMessageBox msgBox;
+        msgBox.setText(QObject::tr("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."));
+        msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
+        msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
+        msgBox.setDefaultButton(QMessageBox::Ok);
         msgBox.setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
 
-		int ret = msgBox.exec();
+        int ret = msgBox.exec();
 
-		if(ret == QMessageBox::Cancel)
-			return 0 ;
-		if(ret == QMessageBox::Ok)
-		{
-			if(!RsAccounts::CopyGnuPGKeyrings())
-				return 0 ; 
+        if(ret == QMessageBox::Cancel)
+            return 0 ;
+        if(ret == QMessageBox::Ok)
+        {
+            if(!RsAccounts::CopyGnuPGKeyrings())
+                return 0 ;
 
-			initResult = RsInit::InitRetroShare(conf);
+            initResult = RsInit::InitRetroShare(conf);
 
-			displayWarningAboutDSAKeys() ;
+            displayWarningAboutDSAKeys() ;
 
-		}
-		else
-			initResult = RS_INIT_OK ;
-	}
+        }
+        else
+            initResult = RS_INIT_OK ;
+    }
 
-	if (initResult < 0) {
-		/* Error occured */
-		QApplication dummyApp (argc, argv); // needed for QMessageBox
-		/* Translate into the desired language */
-		LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
+    if (initResult < 0) {
+        /* Error occured */
+        QApplication dummyApp (argc, argv); // needed for QMessageBox
+        /* Translate into the desired language */
+        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
 
-		displayWarningAboutDSAKeys();
+        displayWarningAboutDSAKeys();
 
-		QMessageBox mb(QMessageBox::Critical, QObject::tr("RetroShare"), "", QMessageBox::Ok);
+        QMessageBox mb(QMessageBox::Critical, QObject::tr("RetroShare"), "", QMessageBox::Ok);
         mb.setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
 
-		switch (initResult) 
-		{
-			case RS_INIT_AUTH_FAILED:
-				std::cerr << "RsInit::InitRetroShare AuthGPG::InitAuth failed" << std::endl;
-				mb.setText(QObject::tr("Initialization failed. Wrong or missing installation of PGP."));
-				break;
-			default:
-				/* Unexpected return code */
-				std::cerr << "RsInit::InitRetroShare unexpected return code " << initResult << std::endl;
-				mb.setText(QObject::tr("An unexpected error occurred. Please report 'RsInit::InitRetroShare unexpected return code %1'.").arg(initResult));
-				break;
-		}
-		mb.exec();
-		return 1;
-	}
+        switch (initResult)
+        {
+            case RS_INIT_AUTH_FAILED:
+                std::cerr << "RsInit::InitRetroShare AuthGPG::InitAuth failed" << std::endl;
+                mb.setText(QObject::tr("Initialization failed. Wrong or missing installation of PGP."));
+                break;
+            default:
+                /* Unexpected return code */
+                std::cerr << "RsInit::InitRetroShare unexpected return code " << initResult << std::endl;
+                mb.setText(QObject::tr("An unexpected error occurred. Please report 'RsInit::InitRetroShare unexpected return code %1'.").arg(initResult));
+                break;
+        }
+        mb.exec();
+        return 1;
+    }
 
-	/* create global settings object
-	   path maybe wrong, when no profile exist
-	   in this case it can be use only for default values */
-	RshareSettings::Create ();
+    /* create global settings object
+       path maybe wrong, when no profile exist
+       in this case it can be use only for default values */
+    RshareSettings::Create ();
 
-	/* Setup The GUI Stuff */
-	Rshare rshare(args, argc, argv,  QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
+    /* Setup The GUI Stuff */
+    //Rshare rshare(args, argc, argv,  QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
+    RsApplication rshare(conf);
 
-	/* Start RetroShare */
-	QString sDefaultGXSIdToCreate = "";
-	switch (initResult) {
-	case RS_INIT_OK:
-		{
-			/* Login Dialog */
-			/* check for existing Certificate */
-			bool genCert = false;
-			std::list<RsPeerId> accountIds;
-			if (RsAccounts::GetAccountIds(accountIds) && (accountIds.size() > 0))
-			{
-				StartDialog sd;
-				if (sd.exec() == QDialog::Rejected) {
-					return 1;
-				}
+    /* Start RetroShare */
+    QString sDefaultGXSIdToCreate = "";
+    switch (initResult) {
+    case RS_INIT_OK:
+        {
+            /* Login Dialog */
+            /* check for existing Certificate */
+            bool genCert = false;
+            std::list<RsPeerId> accountIds;
+            if (RsAccounts::GetAccountIds(accountIds) && (accountIds.size() > 0))
+            {
+                StartDialog sd;
+                if (sd.exec() == QDialog::Rejected) {
+                    return 1;
+                }
 
-				/* if we're logged in */
-				genCert = sd.requestedNewCert();
-			}
-			else
-			{
-				genCert = true;
-			}
+                /* if we're logged in */
+                genCert = sd.requestedNewCert();
+            }
+            else
+            {
+                genCert = true;
+            }
 
-			if (genCert)
-			{
-				GenCertDialog gd(false);
+            if (genCert)
+            {
+                GenCertDialog gd(false);
 
-				if (gd.exec () == QDialog::Rejected)
-					return 1;
+                if (gd.exec () == QDialog::Rejected)
+                    return 1;
 
-				sDefaultGXSIdToCreate = gd.getGXSNickname();
-			}
+                sDefaultGXSIdToCreate = gd.getGXSNickname();
+            }
 
-			//splashScreen.show();
-		}
-		break;
-	case RS_INIT_HAVE_ACCOUNT:
-		{
-			//splashScreen.show();
-			//splashScreen.showMessage(rshare.translate("SplashScreen", "Load profile"), Qt::AlignHCenter | Qt::AlignBottom);
+            //splashScreen.show();
+        }
+        break;
+    case RS_INIT_HAVE_ACCOUNT:
+        {
+            //splashScreen.show();
+            //splashScreen.showMessage(rshare.translate("SplashScreen", "Load profile"), Qt::AlignHCenter | Qt::AlignBottom);
 
-			RsPeerId preferredId;
-			RsAccounts::GetPreferredAccountId(preferredId);
+            RsPeerId preferredId;
+            RsAccounts::GetPreferredAccountId(preferredId);
 
-			// true: note auto-login is active
-			Rshare::loadCertificate(preferredId, true);
-		}
-		break;
-	default:
-		/* Unexpected return code */
-		std::cerr << "RsInit::InitRetroShare unexpected return code " << initResult << std::endl;
-		QMessageBox::warning(0, QObject::tr("RetroShare"), QObject::tr("An unexpected error occured. Please report 'RsInit::InitRetroShare unexpected return code %1'.").arg(initResult));
-		return 1;
-	}
+            // true: note auto-login is active
+            if(!RsApplication::loadCertificate(preferredId, true))
+            {
+                RsErr() << "Retroshare auto-login startup failed." ;
+                return 1;
+            }
+        }
+        break;
+    default:
+        /* Unexpected return code */
+        std::cerr << "RsInit::InitRetroShare unexpected return code " << initResult << std::endl;
+        QMessageBox::warning(0, QObject::tr("RetroShare"), QObject::tr("An unexpected error occured. Please report 'RsInit::InitRetroShare unexpected return code %1'.").arg(initResult));
+        return 1;
+    }
 
     /* recreate global settings object, now with correct path, specific to the selected node */
-	RshareSettings::Create(true);
-	Rshare::resetLanguageAndStyle();
+    RshareSettings::Create(true);
+    RsApplication::resetLanguageAndStyle();
 
-	SoundManager::create();
+    SoundManager::create();
 
     bool is_hidden_node = false;
     bool is_auto_tor = false ;
@@ -413,15 +550,15 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     RsAccounts::getCurrentAccountOptions(is_hidden_node,is_auto_tor,is_first_time);
 
     if(is_auto_tor)
-	{
+    {
         if(!conf.userSuppliedTorExecutable.empty())
             RsTor::setTorExecutablePath(conf.userSuppliedTorExecutable);
 
-		// Now that we know the Tor service running, and we know the SSL id, we can make sure it provides a viable hidden service
+        // Now that we know the Tor service running, and we know the SSL id, we can make sure it provides a viable hidden service
 
         std::string tor_hidden_service_dir = RsAccounts::AccountDirectory() + "/hidden_service/" ;
 
-        RsTor::setTorDataDirectory(Rshare::dataDirectory().toStdString() + "/tor/");
+        RsTor::setTorDataDirectory(RsApplication::dataDirectory().toStdString() + "/tor/");
         RsTor::setHiddenServiceDirectory(tor_hidden_service_dir);	// re-set it, because now it's changed to the specific location that is run
 
         RsDirUtil::checkCreateDirectory(std::string(tor_hidden_service_dir)) ;
@@ -429,72 +566,72 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
         //RsTor::setupHiddenService();
 
         if(! RsTor::start() || RsTor::hasError())
-		{
+        {
             QMessageBox::critical(NULL,QObject::tr("Cannot start Tor Manager!"),QObject::tr("Tor cannot be started on your system: \n\n")+QString::fromStdString(RsTor::errorMessage())) ;
-			return 1 ;
-		}
+            return 1 ;
+        }
 
-		{
+        {
             TorControlDialog tcd;
-			QString error_msg ;
-			tcd.show();
+            QString error_msg ;
+            tcd.show();
 
-			while(tcd.checkForTor(error_msg) != TorControlDialog::TOR_STATUS_OK || tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)	// runs until some status is reached: either tor works, or it fails.
-			{
-				QCoreApplication::processEvents();
-				rstime::rs_usleep(0.2*1000*1000) ;
+            while(tcd.checkForTor(error_msg) != TorControlDialog::TOR_STATUS_OK || tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)	// runs until some status is reached: either tor works, or it fails.
+            {
+                QCoreApplication::processEvents();
+                rstime::rs_usleep(0.2*1000*1000) ;
 
-				if(!error_msg.isNull())
-				{
-					QMessageBox::critical(NULL,QObject::tr("Cannot start Tor"),QObject::tr("Sorry but Tor cannot be started on your system!\n\nThe error reported is:\"")+error_msg+"\"") ;
-					return 1;
-				}
-			}
+                if(!error_msg.isNull())
+                {
+                    QMessageBox::critical(NULL,QObject::tr("Cannot start Tor"),QObject::tr("Sorry but Tor cannot be started on your system!\n\nThe error reported is:\"")+error_msg+"\"") ;
+                    return 1;
+                }
+            }
 
-			tcd.hide();
+            tcd.hide();
 
-			if(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)
-			{
-				QMessageBox::critical(NULL,QObject::tr("Cannot start a hidden tor service!"),QObject::tr("It was not possible to start a hidden service.")) ;
-				return 1 ;
-			}
-		}
-	}
+            if(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)
+            {
+                QMessageBox::critical(NULL,QObject::tr("Cannot start a hidden tor service!"),QObject::tr("It was not possible to start a hidden service.")) ;
+                return 1 ;
+            }
+        }
+    }
 
     QSplashScreen splashScreen(FilesDefs::getPixmapFromQtResourcePath(":/images/logo/logo_splash.png")/* , Qt::WindowStaysOnTopHint*/);
 
-	splashScreen.show();
-	splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom);
+    splashScreen.show();
+    splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom);
 
-	QCoreApplication::processEvents();
+    QCoreApplication::processEvents();
 
-	/* stop Retroshare if startup fails */
-	if (!RsControl::instance()->StartupRetroShare())
-	{
-		std::cerr << "libretroshare failed to startup!" << std::endl;
-		return 1;
-	}
+    /* stop Retroshare if startup fails */
+    if (!RsControl::instance()->StartupRetroShare())
+    {
+        std::cerr << "libretroshare failed to startup!" << std::endl;
+        return 1;
+    }
 
     if(is_auto_tor)
-	{
-		// Tor works with viable hidden service. Let's use it!
+    {
+        // Tor works with viable hidden service. Let's use it!
 
         std::string service_id ;
         std::string onion_address ;
-		uint16_t service_port ;
-		uint16_t service_target_port ;
-		uint16_t proxy_server_port ;
+        uint16_t service_port ;
+        uint16_t service_target_port ;
+        uint16_t proxy_server_port ;
         std::string service_target_address ;
         std::string proxy_server_address ;
 
         RsTor::getHiddenServiceInfo(service_id,onion_address,service_port,service_target_address,service_target_port);
         RsTor::getProxyServerInfo(proxy_server_address,proxy_server_port) ;
 
-		std::cerr << "Got hidden service info: " << std::endl;
+        std::cerr << "Got hidden service info: " << std::endl;
         std::cerr << "  onion address  : " << onion_address << std::endl;
         std::cerr << "  service_id     : " << service_id << std::endl;
-		std::cerr << "  service port   : " << service_port << std::endl;
-		std::cerr << "  target port    : " << service_target_port << std::endl;
+        std::cerr << "  service port   : " << service_port << std::endl;
+        std::cerr << "  target port    : " << service_target_port << std::endl;
         std::cerr << "  target address : " << service_target_address << std::endl;
 
         std::cerr << "Setting proxy server to " << service_target_address << ":" << service_target_port << std::endl;
@@ -502,95 +639,95 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
         rsPeers->setLocalAddress(rsPeers->getOwnId(), service_target_address, service_target_port);
         rsPeers->setHiddenNode(rsPeers->getOwnId(), onion_address, service_port);
         rsPeers->setProxyServer(RS_HIDDEN_TYPE_TOR, proxy_server_address,proxy_server_port) ;
-	}
+    }
 
-	Rshare::initPlugins();
+    RsApplication::initPlugins();
 
-	splashScreen.showMessage(rshare.translate("SplashScreen", "Create interface"), Qt::AlignHCenter | Qt::AlignBottom);
-	QCoreApplication::processEvents();	// forces splashscreen to show up
+    splashScreen.showMessage(rshare.translate("SplashScreen", "Create interface"), Qt::AlignHCenter | Qt::AlignBottom);
+    QCoreApplication::processEvents();	// forces splashscreen to show up
 
-	RsharePeerSettings::Create();
+    RsharePeerSettings::Create();
 
-	Emoticons::load();
-	AvatarDialog::load();
+    Emoticons::load();
+    AvatarDialog::load();
 
-	if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool()) {
-		splashScreen.hide();
+    if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool()) {
+        splashScreen.hide();
 
-		Settings->setValue(QString::fromUtf8("FirstRun"), false);
+        Settings->setValue(QString::fromUtf8("FirstRun"), false);
 
-		SoundManager::initDefault();
+        SoundManager::initDefault();
 
 #ifdef __APPLE__
-		/* For OSX, we set the default to "cleanlooks", as the AQUA style hides some input boxes 
-		 * only on the first run - as the user might want to change it ;)
-		 */
-		QString osx_style("cleanlooks");
-		Rshare::setStyle(osx_style);
-		Settings->setInterfaceStyle(osx_style);
+        /* For OSX, we set the default to "cleanlooks", as the AQUA style hides some input boxes
+         * only on the first run - as the user might want to change it ;)
+         */
+        QString osx_style("cleanlooks");
+        Rshare::setStyle(osx_style);
+        Settings->setInterfaceStyle(osx_style);
 #endif
 
 // This is now disabled - as it doesn't add very much.
 // Need to make sure that defaults are sensible!
 #ifdef ENABLE_QUICKSTART_WIZARD
-		QuickStartWizard qstartWizard;
-		qstartWizard.exec();
+        QuickStartWizard qstartWizard;
+        qstartWizard.exec();
 #endif
 
-	}
+    }
 
-	MainWindow *w = MainWindow::Create ();
-	splashScreen.finish(w);
+    MainWindow *w = MainWindow::Create ();
+    splashScreen.finish(w);
 
-	w->processLastArgs();
+    w->processLastArgs();
 
-	if (!sDefaultGXSIdToCreate.isEmpty()) {
-		RsIdentityParameters params;
-		params.nickname = sDefaultGXSIdToCreate.toUtf8().constData();
-		params.isPgpLinked = true;
-		params.mImage.clear();
-		uint32_t token = 0;
-		rsIdentity->createIdentity(token, params);
-	}
-	// I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to
-	// avoid clashes between infos from threads.
-	//
+    if (!sDefaultGXSIdToCreate.isEmpty()) {
+        RsIdentityParameters params;
+        params.nickname = sDefaultGXSIdToCreate.toUtf8().constData();
+        params.isPgpLinked = true;
+        params.mImage.clear();
+        uint32_t token = 0;
+        rsIdentity->createIdentity(token, params);
+    }
+    // I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to
+    // avoid clashes between infos from threads.
+    //
 
-	qRegisterMetaType<RsPeerId>("RsPeerId") ;
+    qRegisterMetaType<RsPeerId>("RsPeerId") ;
 #ifdef DEBUG
-	std::cerr << "connecting signals and slots" << std::endl ;
+    std::cerr << "connecting signals and slots" << std::endl ;
 #endif
-	QObject::connect(notify,SIGNAL(deferredSignatureHandlingRequested()),notify,SLOT(handleSignatureEvent()),Qt::QueuedConnection) ;
-	QObject::connect(notify,SIGNAL(chatLobbyTimeShift(int)),notify,SLOT(handleChatLobbyTimeShift(int)),Qt::QueuedConnection) ;
-	QObject::connect(notify,SIGNAL(diskFull(int,int))						,w                   		,SLOT(displayDiskSpaceWarning(int,int))) ;
+    QObject::connect(notify,SIGNAL(deferredSignatureHandlingRequested()),notify,SLOT(handleSignatureEvent()),Qt::QueuedConnection) ;
+    QObject::connect(notify,SIGNAL(chatLobbyTimeShift(int)),notify,SLOT(handleChatLobbyTimeShift(int)),Qt::QueuedConnection) ;
+    QObject::connect(notify,SIGNAL(diskFull(int,int))						,w                   		,SLOT(displayDiskSpaceWarning(int,int))) ;
     QObject::connect(notify,SIGNAL(filesPostModChanged(bool))         ,w                         ,SLOT(postModDirectories(bool)) ,Qt::QueuedConnection        ) ;
-	QObject::connect(notify,SIGNAL(transfersChanged())                ,w->transfersDialog  		,SLOT(insertTransfers()                )) ;
-	QObject::connect(notify,SIGNAL(publicChatChanged(int))            ,w->friendsDialog      		,SLOT(publicChatChanged(int)           ));
-	QObject::connect(notify,SIGNAL(neighboursChanged())               ,w->friendsDialog->networkDialog    		,SLOT(securedUpdateDisplay())) ;
+    QObject::connect(notify,SIGNAL(transfersChanged())                ,w->transfersDialog  		,SLOT(insertTransfers()                )) ;
+    QObject::connect(notify,SIGNAL(publicChatChanged(int))            ,w->friendsDialog      		,SLOT(publicChatChanged(int)           ));
+    QObject::connect(notify,SIGNAL(neighboursChanged())               ,w->friendsDialog->networkDialog    		,SLOT(securedUpdateDisplay())) ;
 
-	QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&,bool)),w->friendsDialog,SLOT(updatePeerStatusString(const QString&,const QString&,bool)));
-	QObject::connect(notify,SIGNAL(ownStatusMessageChanged()),w->friendsDialog,SLOT(loadmypersonalstatus()));
+    QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&,bool)),w->friendsDialog,SLOT(updatePeerStatusString(const QString&,const QString&,bool)));
+    QObject::connect(notify,SIGNAL(ownStatusMessageChanged()),w->friendsDialog,SLOT(loadmypersonalstatus()));
 
 //	QObject::connect(notify,SIGNAL(logInfoChanged(const QString&))		,w->friendsDialog->networkDialog,SLOT(setLogInfo(QString))) ;
-	QObject::connect(notify,SIGNAL(discInfoChanged())						,w->friendsDialog->networkView,SLOT(update()),Qt::QueuedConnection) ;
-	QObject::connect(notify,SIGNAL(errorOccurred(int,int,const QString&)),w,SLOT(displayErrorMessage(int,int,const QString&))) ;
+    QObject::connect(notify,SIGNAL(discInfoChanged())						,w->friendsDialog->networkView,SLOT(update()),Qt::QueuedConnection) ;
+    QObject::connect(notify,SIGNAL(errorOccurred(int,int,const QString&)),w,SLOT(displayErrorMessage(int,int,const QString&))) ;
 
-	w->installGroupChatNotifier();
+    w->installGroupChatNotifier();
 
-	/* only show window, if not startMinimized */
-	if (RsInit::getStartMinimised() || Settings->getStartMinimized())
-	{
-		splashScreen.close();
-	} else {
-		w->show();
-	}
+    /* only show window, if not startMinimized */
+    if (RsInit::getStartMinimised() || Settings->getStartMinimized())
+    {
+        splashScreen.close();
+    } else {
+        w->show();
+    }
 
-	/* Startup a Timer to keep the gui's updated */
-	QTimer *timer = new QTimer(w);
-	timer -> connect(timer, SIGNAL(timeout()), notify, SLOT(UpdateGUI()));
-	timer->start(1000);
+    /* Startup a Timer to keep the gui's updated */
+    QTimer *timer = new QTimer(w);
+    timer -> connect(timer, SIGNAL(timeout()), notify, SLOT(UpdateGUI()));
+    timer->start(1000);
 
-	notify->enable() ;	// enable notification system after GUI creation, to avoid data races in Qt.
+    notify->enable() ;	// enable notification system after GUI creation, to avoid data races in Qt.
 
     // Read webui params in settings. We cannot save them to some webui.cfg because cfg needs the node id and
     // jsonapi is started before node ID selection in retroshare-service.
@@ -605,31 +742,31 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     RsInit::startupWebServices(conf,false);
 #endif
 
-	/* dive into the endless loop */
-	int ti = rshare.exec();
-	delete w ;
+    /* dive into the endless loop */
+    int ti = rshare.exec();
+    delete w ;
 
 #ifdef RS_JSONAPI
-	JsonApiPage::checkShutdownJsonApi();
+    JsonApiPage::checkShutdownJsonApi();
 #endif // RS_JSONAPI
 
-	/* cleanup */
-	ChatDialog::cleanupChat();
+    /* cleanup */
+    ChatDialog::cleanupChat();
 #ifdef RS_ENABLE_GXS
-	RsGxsUpdateBroadcast::cleanup();
+    RsGxsUpdateBroadcast::cleanup();
 #endif
 
-	if (is_auto_tor) {
-		RsTor::stop();
-	}
+    if (is_auto_tor) {
+        RsTor::stop();
+    }
 
-	RsControl::instance()->rsGlobalShutDown();
+    RsControl::instance()->rsGlobalShutDown();
 
-	delete(soundManager);
-	soundManager = NULL;
+    delete(soundManager);
+    soundManager = NULL;
 
-	Settings->sync();
-	delete(Settings);
+    Settings->sync();
+    delete(Settings);
 
-	return ti ;
+    return ti ;
 }
diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index e5f450f57..65d0f5bea 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -50,6 +50,7 @@
 #include <lang/languagesupport.h>
 #include <util/stringutil.h>
 
+#include <util/argstream.h>
 #include <retroshare/rsinit.h>
 #include <retroshare/rsversion.h>
 #include <retroshare/rsplugin.h>
@@ -57,7 +58,7 @@
 #include "rshare.h"
 
 /* Available command-line arguments. */
-#define ARG_RESET           "reset"         /**< Reset Rshare's saved settings.   */
+#define ARG_RESET           "reset"         /**< Reset RsApplication's saved settings.   */
 #define ARG_DATADIR         "datadir"       /**< Directory to use for data files. */
 #define ARG_LOGFILE         "logfile"       /**< Location of our logfile.         */
 #define ARG_LOGLEVEL        "loglevel"      /**< Log verbosity.                   */
@@ -86,19 +87,22 @@ static const char* const forwardableArgs[] = {
 };
 
 /* Static member variables */
-QMap<QString, QString> Rshare::_args; /**< List of command-line arguments.  */
-Log Rshare::_log;                     /**< Logs debugging messages to file or stdout. */
-QString Rshare::_style;               /**< The current GUI style.           */
-QString Rshare::_stylesheet;          /**< The current GUI stylesheet.      */
-QString Rshare::_language;            /**< The current language.            */
-QString Rshare::_dateformat;          /**< The format of dates in feed items etc. */
-QString Rshare::_opmode;              /**< The operating mode passed by args. */
-QStringList Rshare::_links;           /**< List of links passed by arguments. */
-QStringList Rshare::_files;           /**< List of files passed by arguments. */
-QDateTime Rshare::mStartupTime;
-bool Rshare::useConfigDir;
-QString Rshare::configDir;
-QLocalServer* Rshare::localServer;
+#ifdef TO_REMOVE
+QMap<QString, QString> RsApplication::_args; /**< List of command-line arguments.  */
+QString RsApplication::_style;               /**< The current GUI style.           */
+QString RsApplication::_stylesheet;          /**< The current GUI stylesheet.      */
+QString RsApplication::_language;            /**< The current language.            */
+QString RsApplication::_dateformat;          /**< The format of dates in feed items etc. */
+QString RsApplication::_opmode;              /**< The operating mode passed by args. */
+QStringList RsApplication::_links;           /**< List of links passed by arguments. */
+QStringList RsApplication::_files;           /**< List of files passed by arguments. */
+bool RsApplication::useConfigDir;
+QString RsApplication::configDir;
+#endif
+Log RsApplication::log_output;                     /**< Logs debugging messages to file or stdout. */
+RsGUIConfigOptions RsApplication::options;
+QDateTime          RsApplication::mStartupTime;
+QLocalServer*      RsApplication::localServer;
 
 /** Catches debugging messages from Qt and sends them to RetroShare's logs. If Qt
  * emits a QtFatalMsg, we will write the message to the log and then abort().
@@ -133,194 +137,177 @@ void qt_msg_handler(QtMsgType type, const char *msg)
   }
 }
 
-static bool notifyRunningInstance()
-{
-    // Connect to the Local Server of the main process to notify it
-    // that a new process had been started
-    QLocalSocket localSocket;
-    localSocket.connectToServer(QString(TARGET));
-#ifdef DEBUG
-    std::cerr << "Rshare::Rshare waitForConnected to other instance." << std::endl;
-#endif
-    if( localSocket.waitForConnected(100) )
-    {
-#ifdef DEBUG
-      std::cerr << "Rshare::Rshare Connection etablished. Waiting for disconnection." << std::endl;
-#endif
-      localSocket.waitForDisconnected(1000);
-      return true;
-    }
-    else
-    {
-#ifdef DEBUG
-        std::cerr << "Rshare::Rshare failed to connect to other instance." << std::endl;
-#endif
-        return false;
-    }
-}
-
-/** Constructor. Parses the command-line arguments, resets Rshare's
+/** Constructor. Parses the command-line arguments, resets RsApplication's
  * configuration (if requested), and sets up the GUI style and language
- * translation. */
-Rshare::Rshare(QStringList args, int &argc, char **argv, const QString &dir)
-: QApplication(argc, argv)
+ * translation.
+ * the const_cast below is truely horrible, but it allows to hide these unused argc/argv
+ * when initing RsApplication
+ */
+
+RsApplication::RsApplication(const RsGUIConfigOptions& conf)
+: QApplication(const_cast<RsGUIConfigOptions*>(&conf)->argc,const_cast<RsGUIConfigOptions*>(&conf)->argv)
 {
-  mStartupTime = QDateTime::currentDateTime();
-  localServer = NULL;
+    mStartupTime = QDateTime::currentDateTime();
+    localServer = NULL;
+    options = conf;
 
-  //Initialize connection to LocalServer to know if other process runs.
-  {
-    QString serverName = QString(TARGET);
-
-    // check if another instance is running
-    bool haveRunningInstance = notifyRunningInstance();
-
-    bool sendArgsToRunningInstance = haveRunningInstance;
-    if(args.empty())
-        sendArgsToRunningInstance = false;
-    // if we find non-forwardable args, start a new instance
-    for(int iCurs = 0; iCurs < args.size(); ++iCurs)
+#ifdef TO_REMOVE
+    //Initialize connection to LocalServer to know if other process runs.
     {
-        const char* const* argit = forwardableArgs;
-        bool found = false;
-        while(*argit && iCurs < args.size())
-        {
-            if(args.value(iCurs) == "-"+QString(*argit) || args.value(iCurs) == "--"+QString(*argit))
-            {
-                found = true;
-                if(argNeedsValue(*argit))
-                    iCurs++;
-            }
-            argit++;
-        }
-        if(!found)
+        QString serverName = QString(TARGET);
+
+        // check if another instance is running
+        bool haveRunningInstance = notifyRunningInstance();
+
+        bool sendArgsToRunningInstance = haveRunningInstance;
+        if(args.empty())
             sendArgsToRunningInstance = false;
-    }
+        // if we find non-forwardable args, start a new instance
+        for(int iCurs = 0; iCurs < args.size(); ++iCurs)
+        {
+            const char* const* argit = forwardableArgs;
+            bool found = false;
+            while(*argit && iCurs < args.size())
+            {
+                if(args.value(iCurs) == "-"+QString(*argit) || args.value(iCurs) == "--"+QString(*argit))
+                {
+                    found = true;
+                    if(argNeedsValue(*argit))
+                        iCurs++;
+                }
+                argit++;
+            }
+            if(!found)
+                sendArgsToRunningInstance = false;
+        }
 
-    if (sendArgsToRunningInstance) {
-      // load into shared memory
-      QBuffer buffer;
-      buffer.open(QBuffer::ReadWrite);
-      QDataStream out(&buffer);
-      out << args;
-      int size = buffer.size();
+        if (sendArgsToRunningInstance) {
+            // load into shared memory
+            QBuffer buffer;
+            buffer.open(QBuffer::ReadWrite);
+            QDataStream out(&buffer);
+            out << args;
+            int size = buffer.size();
 
-      QSharedMemory newArgs;
-      newArgs.setKey(serverName + "_newArgs");
-      if (newArgs.isAttached()) newArgs.detach();
+            QSharedMemory newArgs;
+            newArgs.setKey(serverName + "_newArgs");
+            if (newArgs.isAttached()) newArgs.detach();
 
-      if (!newArgs.create(size)) {
-        std::cerr << "(EE) Rshare::Rshare Unable to create shared memory segment of size:"
-                  << size << " error:" << newArgs.errorString().toStdString() << "." << std::endl;
+            if (!newArgs.create(size)) {
+                std::cerr << "(EE) RsApplication::RsApplication Unable to create shared memory segment of size:"
+                      << size << " error:" << newArgs.errorString().toStdString() << "." << std::endl;
 #ifdef Q_OS_UNIX
-        std::cerr << "Look with `ipcs -m` for nattch==0 segment. And remove it with `ipcrm -m 'shmid'`." << std::endl;
-        //No need for windows, as it removes shared segment directly even when crash.
+                std::cerr << "Look with `ipcs -m` for nattch==0 segment. And remove it with `ipcrm -m 'shmid'`." << std::endl;
+                //No need for windows, as it removes shared segment directly even when crash.
 #endif
-        newArgs.detach();
-        ::exit(EXIT_FAILURE);
-      }
-      newArgs.lock();
-      char *to = (char*)newArgs.data();
-      const char *from = buffer.data().data();
-      memcpy(to, from, qMin(newArgs.size(), size));
-      newArgs.unlock();
+                newArgs.detach();
+                ::exit(EXIT_FAILURE);
+            }
+            newArgs.lock();
+            char *to = (char*)newArgs.data();
+            const char *from = buffer.data().data();
+            memcpy(to, from, qMin(newArgs.size(), size));
+            newArgs.unlock();
 
-      std::cerr << "Rshare::Rshare waitForConnected to other instance." << std::endl;
-      if(notifyRunningInstance())
-      {
-        newArgs.detach();
-        std::cerr << "Rshare::Rshare Arguments was sended." << std::endl
-                  << " To disable it, in Options - General - Misc," << std::endl
-                  << " uncheck \"Use Local Server to get new Arguments\"." << std::endl;
-        ::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function
-      }
-      else
-          std::cerr << "Rshare::Rshare failed to connect to other instance." << std::endl;
-      newArgs.detach();
-    }
+            std::cerr << "RsApplication::RsApplication waitForConnected to other instance." << std::endl;
+            if(notifyRunningInstance())
+            {
+                newArgs.detach();
+                std::cerr << "RsApplication::RsApplication Arguments was sended." << std::endl
+                      << " To disable it, in Options - General - Misc," << std::endl
+                      << " uncheck \"Use Local Server to get new Arguments\"." << std::endl;
+                ::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function
+            }
+            else
+                std::cerr << "RsApplication::RsApplication failed to connect to other instance." << std::endl;
+            newArgs.detach();
+        }
 
-    if(!haveRunningInstance)
-    {
-        // No main process exists
-        // Or started without arguments
-        // So we start a Local Server to listen for connections from new process
-        localServer= new QLocalServer();
-        QObject::connect(localServer, SIGNAL(newConnection()), this, SLOT(slotConnectionEstablished()));
-        updateLocalServer();
-		// clear out any old arguments (race condition?)
-		QSharedMemory newArgs;
-		newArgs.setKey(QString(TARGET) + "_newArgs");
-		if(newArgs.attach(QSharedMemory::ReadWrite))
-			newArgs.detach();
+        if(!haveRunningInstance)
+        {
+            // No main process exists
+            // Or started without arguments
+            // So we start a Local Server to listen for connections from new process
+            localServer= new QLocalServer();
+            QObject::connect(localServer, SIGNAL(newConnection()), this, SLOT(slotConnectionEstablished()));
+            updateLocalServer();
+            // clear out any old arguments (race condition?)
+            QSharedMemory newArgs;
+            newArgs.setKey(QString(TARGET) + "_newArgs");
+            if(newArgs.attach(QSharedMemory::ReadWrite))
+                newArgs.detach();
+        }
     }
-  }
+#endif
 
 #if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
-  qInstallMessageHandler(qt_msg_handler);
+    qInstallMessageHandler(qt_msg_handler);
 #else
-  qInstallMsgHandler(qt_msg_handler);
+    qInstallMsgHandler(qt_msg_handler);
 #endif
 
 #ifndef __APPLE__
 
-  /* set default window icon */
-  setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
+    /* set default window icon */
+    setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
 
 #endif
 
-  mBlink = true;
-  QTimer *timer = new QTimer(this);
-  timer->setInterval(500);
-  connect(timer, SIGNAL(timeout()), this, SLOT(blinkTimer()));
-  timer->start();
+    mBlink = true;
+    QTimer *timer = new QTimer(this);
+    timer->setInterval(500);
+    connect(timer, SIGNAL(timeout()), this, SLOT(blinkTimer()));
+    timer->start();
 
-  timer = new QTimer(this);
-  timer->setInterval(60000);
-  connect(timer, SIGNAL(timeout()), this, SIGNAL(minuteTick()));
-  timer->start();
+    timer = new QTimer(this);
+    timer->setInterval(60000);
+    connect(timer, SIGNAL(timeout()), this, SIGNAL(minuteTick()));
+    timer->start();
 
-  /* Read in all our command-line arguments. */
-  parseArguments(args);
+#ifdef TO_REMOVE
+    /* Read in all our command-line arguments. */
+    parseArguments(args);
+#endif
 
-  /* Check if we're supposed to reset our config before proceeding. */
-  if (_args.contains(ARG_RESET)) {
-    Settings->reset();
-  }
-  
-  /* Handle the -loglevel and -logfile options. */
-  if (_args.contains(ARG_LOGFILE))
-    _log.open(_args.value(ARG_LOGFILE));
-  if (_args.contains(ARG_LOGLEVEL)) {
-    _log.setLogLevel(Log::stringToLogLevel(
-                      _args.value(ARG_LOGLEVEL)));
-    if (!_args.contains(ARG_LOGFILE))
-      _log.open(stdout);
-  }
-  if (!_args.contains(ARG_LOGLEVEL) && 
-      !_args.contains(ARG_LOGFILE))
-    _log.setLogLevel(Log::Off);
+    /* Check if we're supposed to reset our config before proceeding. */
+    if (options.optResetParams)
+    {
+        RsInfo() << "Resetting Retroshare config parameters, as requested (option -R)";
+        Settings->reset();
+    }
 
-  /* config directory */
-  useConfigDir = false;
-  if (dir != "")
-  {
-  	setConfigDirectory(dir);
-  }
+    /* Handle the -loglevel and -logfile options. */
+    if (options.logLevel != "Off")
+    {
+        if (!options.logFileName.isNull())
+            log_output.open(options.logFileName);
+        else
+            log_output.open(stdout);
 
-  /** Initialize support for language translations. */
-  //LanguageSupport::initialize();
+        log_output.setLogLevel(Log::stringToLogLevel(options.logLevel));
+    }
 
-  resetLanguageAndStyle();
+#ifdef TO_REMOVE
+    /* config directory */
+    useConfigDir = false;
+    if (!conf.optBaseDir.empty())
+        setConfigDirectory(QString::fromStdString(conf.optBaseDir));
+#endif
 
-  /* Switch off auto shutdown */
-  setQuitOnLastWindowClosed ( false );
+    /** Initialize support for language translations. */
+    //LanguageSupport::initialize();
 
-	/* Initialize GxsIdDetails */
-	GxsIdDetails::initialize();
+    resetLanguageAndStyle();
+
+    /* Switch off auto shutdown */
+    setQuitOnLastWindowClosed ( false );
+
+    /* Initialize GxsIdDetails */
+    GxsIdDetails::initialize();
 }
 
 /** Destructor */
-Rshare::~Rshare()
+RsApplication::~RsApplication()
 {
 	/* Cleanup GxsIdDetails */
 	GxsIdDetails::cleanup();
@@ -334,7 +321,7 @@ Rshare::~Rshare()
 /**
  * @brief Executed when new instance connect command is sent to LocalServer
  */
-void Rshare::slotConnectionEstablished()
+void RsApplication::slotConnectionEstablished()
 {
 	QSharedMemory newArgs;
 	newArgs.setKey(QString(TARGET) + "_newArgs");
@@ -346,7 +333,7 @@ void Rshare::slotConnectionEstablished()
 		/* this is not an error. It just means we were notified to check
 		   newArgs, but none had been set yet.
 		   TODO: implement separate ping/take messages
-		   std::cerr << "(EE) Rshare::slotConnectionEstablished() Unable to attach to shared memory segment."
+           std::cerr << "(EE) RsApplication::slotConnectionEstablished() Unable to attach to shared memory segment."
 		   << newArgs.errorString().toStdString() << std::endl;
 		   */
 		socket->close();
@@ -371,22 +358,22 @@ void Rshare::slotConnectionEstablished()
 	emit newArgsReceived(args);
 	while (!args.empty())
 	{
-		std::cerr << "Rshare::slotConnectionEstablished args:" << QString(args.takeFirst()).toStdString() << std::endl;
+        std::cerr << "RsApplication::slotConnectionEstablished args:" << QString(args.takeFirst()).toStdString() << std::endl;
 	}
 }
 
-QString Rshare::retroshareVersion(bool) { return RS_HUMAN_READABLE_VERSION; }
+QString RsApplication::retroshareVersion(bool) { return RS_HUMAN_READABLE_VERSION; }
 
 /** Enters the main event loop and waits until exit() is called. The signal
  * running() will be emitted when the event loop has started. */
 int
-Rshare::run()
+RsApplication::run()
 {
   QTimer::singleShot(0, rApp, SLOT(onEventLoopStarted()));
   return rApp->exec();
 }
 
-QDateTime Rshare::startupTime()
+QDateTime RsApplication::startupTime()
 {
   return mStartupTime;
 }
@@ -395,14 +382,15 @@ QDateTime Rshare::startupTime()
  * will emit the running() signal to indicate that the application's event
  * loop is running. */
 void
-Rshare::onEventLoopStarted()
+RsApplication::onEventLoopStarted()
 {
   emit running();
 }
 
+#ifdef TO_REMOVE
 /** Display usage information regarding command-line arguments. */
 /*void
-Rshare::printUsage(QString errmsg)
+RsApplication::printUsage(QString errmsg)
 {
   QTextStream out(stdout);*/
 
@@ -417,18 +405,18 @@ Rshare::printUsage(QString errmsg)
 
   /* And available options */
   //out << endl << "Available Options:"                                   << endl;
-  //out << "\t-"ARG_RESET"\t\tResets ALL stored Rshare settings."        << endl;
-  //out << "\t-"ARG_DATADIR"\tSets the directory Rshare uses for data files"<< endl;
-  //out << "\t-"ARG_GUISTYLE"\t\tSets Rshare's interface style."         << endl;
-  //out << "\t-"ARG_GUISTYLESHEET"\t\tSets Rshare's stylesheet."         << endl;
+  //out << "\t-"ARG_RESET"\t\tResets ALL stored RsApplication settings."        << endl;
+  //out << "\t-"ARG_DATADIR"\tSets the directory RsApplication uses for data files"<< endl;
+  //out << "\t-"ARG_GUISTYLE"\t\tSets RsApplication's interface style."         << endl;
+  //out << "\t-"ARG_GUISTYLESHEET"\t\tSets RsApplication's stylesheet."         << endl;
   //out << "\t\t\t[" << QStyleFactory::keys().join("|") << "]"            << endl;
-  //out << "\t-"ARG_LANGUAGE"\t\tSets Rshare's language."                << endl;
+  //out << "\t-"ARG_LANGUAGE"\t\tSets RsApplication's language."                << endl;
   //out << "\t\t\t[" << LanguageSupport::languageCodes().join("|") << "]" << endl;
 //}
 
 /** Displays usage information for command-line args. */
 void
-Rshare::showUsageMessageBox()
+RsApplication::showUsageMessageBox()
 {
   QString usage;
   QTextStream out(&usage);
@@ -469,7 +457,7 @@ Rshare::showUsageMessageBox()
 
 /** Returns true if the specified argument expects a value. */
 bool
-Rshare::argNeedsValue(const QString &argName)
+RsApplication::argNeedsValue(const QString &argName)
 {
 	return (
 	        argName == ARG_DATADIR  ||
@@ -489,9 +477,12 @@ Rshare::argNeedsValue(const QString &argName)
 /** Parses the list of command-line arguments for their argument names and
  * values. */
 void
-Rshare::parseArguments(QStringList args, bool firstRun)
+RsApplication::parseArguments(QStringList args, bool firstRun)
 {
 	QString arg, argl, value;
+    std::vector<const char *> argv;
+    for(auto l:args)
+        argv.push_back((const char *)l.data());
 
 	/* Loop through all command-line args/values and put them in a map */
 	for (int iCurs = 0; iCurs < args.size(); ++iCurs) {
@@ -539,11 +530,12 @@ Rshare::parseArguments(QStringList args, bool firstRun)
 			_args.insert(arg, value);
 		}
 	}
+
 }
 
 /** Verifies that all specified arguments were valid. */
 bool
-Rshare::validateArguments(QString &errmsg)
+RsApplication::validateArguments(QString &errmsg)
 {
   /* Check for a writable log file */
   if (_args.contains(ARG_LOGFILE) && !_log.isOpen()) {
@@ -585,13 +577,14 @@ Rshare::validateArguments(QString &errmsg)
   }
   return true;
 }
+#endif
 
 /** Sets the translation RetroShare will use. If one was specified on the
  * command-line, we will use that. Otherwise, we'll check to see if one was
  * saved previously. If not, we'll default to one appropriate for the system
  * locale. */
 bool
-Rshare::setLanguage(QString languageCode)
+RsApplication::setLanguage(QString languageCode)
 {
   /* If the language code is empty, use the previously-saved setting */
   if (languageCode.isEmpty()) {
@@ -599,7 +592,7 @@ Rshare::setLanguage(QString languageCode)
   }
   /* Translate into the desired language */
   if (LanguageSupport::translate(languageCode)) {
-    _language = languageCode;
+    options.language = languageCode;
     return true;
   }
   return false;
@@ -610,7 +603,7 @@ Rshare::setLanguage(QString languageCode)
  * saved previously. If not, we'll default to the system
  * locale. */
 bool
-Rshare::setLocale(QString languageCode)
+RsApplication::setLocale(QString languageCode)
 {
   bool retVal = false;
   /* If the language code is empty, use the previously-saved setting */
@@ -626,20 +619,20 @@ Rshare::setLocale(QString languageCode)
 }
 
 /** customize date format for feeds etc. */
-void Rshare::customizeDateFormat()
+void RsApplication::customizeDateFormat()
 {
   QLocale locale = QLocale(); // set to default locale
   /* get long date format without weekday */
-  _dateformat = locale.dateFormat(QLocale::LongFormat);
-  _dateformat.replace(QRegExp("^dddd,*[^ ]* *('[^']+' )*"), "");
-  _dateformat.replace(QRegExp(",* *dddd"), "");
-  _dateformat = _dateformat.trimmed();
+  options.dateformat = locale.dateFormat(QLocale::LongFormat);
+  options.dateformat.replace(QRegExp("^dddd,*[^ ]* *('[^']+' )*"), "");
+  options.dateformat.replace(QRegExp(",* *dddd"), "");
+  options.dateformat = options.dateformat.trimmed();
 }
 
 /** Get custom date format (defaultlongformat) */
-QString Rshare::customDateFormat()
+QString RsApplication::customDateFormat()
 {
-    return _dateformat;
+    return options.dateformat;
 }
 
 /** Sets the GUI style RetroShare will use. If one was specified on the
@@ -647,49 +640,50 @@ QString Rshare::customDateFormat()
  * saved previously. If not, we'll default to one appropriate for the
  * operating system. */
 bool
-Rshare::setStyle(QString styleKey)
+RsApplication::setStyle(QString styleKey)
 {
   /* If no style was specified, use the previously-saved setting */
   if (styleKey.isEmpty()) {
     styleKey = Settings->getInterfaceStyle();
   }
   /* Apply the specified GUI style */
-  if (QApplication::setStyle(styleKey)) {
-    _style = styleKey;
+  if (QApplication::setStyle(styleKey))
+  {
+    options.guiStyle = styleKey;
     return true;
   }
   return false;
 }
 
 bool
-Rshare::setSheet(QString sheet)
+RsApplication::setSheet(QString sheet)
 {
   /* If no stylesheet was specified, use the previously-saved setting */
   if (sheet.isEmpty()) {
     sheet = Settings->getSheetName();
   }
   /* Apply the specified GUI stylesheet */
-    _stylesheet = sheet;
+    options.guiStyleSheetFile = sheet;
 
     /* load the StyleSheet*/
-    loadStyleSheet(_stylesheet);
+    loadStyleSheet(options.guiStyleSheetFile);
 
     return true;
 }
 
-void Rshare::resetLanguageAndStyle()
+void RsApplication::resetLanguageAndStyle()
 {
     /** Translate the GUI to the appropriate language. */
-    setLanguage(_args.value(ARG_LANGUAGE));
+    setLanguage(options.language);
 
     /** Set the locale appropriately. */
-    setLocale(_args.value(ARG_LANGUAGE));
+    setLocale(options.language);
 
    /** Set the GUI style appropriately. */
-    setStyle(_args.value(ARG_GUISTYLE));
+    setStyle(options.guiStyle);
 
     /** Set the GUI stylesheet appropriately. */
-    setSheet(_args.value(ARG_GUISTYLESHEET));
+    setSheet(options.guiStyleSheetFile);
 }
 
 // RetroShare:
@@ -714,7 +708,7 @@ void Rshare::resetLanguageAndStyle()
 //   Language depended stylesheet
 //     <Internal|External>_<locale>.lqss
 
-void Rshare::loadStyleSheet(const QString &sheetName)
+void RsApplication::loadStyleSheet(const QString &sheetName)
 {
     QString locale = QLocale().name();
     QString styleSheet;
@@ -785,7 +779,7 @@ void Rshare::loadStyleSheet(const QString &sheetName)
 }
 
 /** get list of available stylesheets **/
-void Rshare::getAvailableStyleSheets(QMap<QString, QString> &styleSheets)
+void RsApplication::getAvailableStyleSheets(QMap<QString, QString> &styleSheets)
 {
 	QFileInfoList fileInfoList = QDir(":/qss/stylesheet/").entryInfoList(QStringList("*.qss"));
 	QFileInfo fileInfo;
@@ -813,7 +807,7 @@ void Rshare::getAvailableStyleSheets(QMap<QString, QString> &styleSheets)
 	}
 }
 
-void Rshare::refreshStyleSheet(QWidget *widget, bool processChildren)
+void RsApplication::refreshStyleSheet(QWidget *widget, bool processChildren)
 {
 	if (widget != NULL) {
 		// force widget to recalculate valid style
@@ -839,40 +833,35 @@ void Rshare::refreshStyleSheet(QWidget *widget, bool processChildren)
 }
 
 /** Initialize plugins. */
-void Rshare::initPlugins()
+void RsApplication::initPlugins()
 {
-    loadStyleSheet(_stylesheet);
-    LanguageSupport::translatePlugins(_language);
+    loadStyleSheet(options.guiStyleSheetFile);
+    LanguageSupport::translatePlugins(options.language);
 }
 
 /** Returns the directory RetroShare uses for its data files. */
-QString
-Rshare::dataDirectory()
+QString RsApplication::dataDirectory()
 {
-  if (useConfigDir)
-  {
-    return configDir;
-  }
-  else if (_args.contains(ARG_DATADIR)) {
-    return _args.value(ARG_DATADIR);
-  }
-  return defaultDataDirectory();
+    if(!options.optBaseDir.empty())
+        return QString::fromUtf8(options.optBaseDir.c_str());
+    else
+        return defaultDataDirectory();
 }
 
 /** Returns the default location of RetroShare's data directory. */
 QString
-Rshare::defaultDataDirectory()
+RsApplication::defaultDataDirectory()
 {
 #if defined(Q_OS_WIN)
   return (win32_app_data_folder() + "\\RetroShare");
 #else
-  return (QDir::homePath() + "/.RetroShare");
+  return (QDir::homePath() + "/.retroshare");
 #endif
 }
 
-/** Creates Rshare's data directory, if it doesn't already exist. */
+/** Creates RsApplication's data directory, if it doesn't already exist. */
 bool
-Rshare::createDataDirectory(QString *errmsg)
+RsApplication::createDataDirectory(QString *errmsg)
 {
   QDir datadir(dataDirectory());
   if (!datadir.exists()) {
@@ -885,33 +874,29 @@ Rshare::createDataDirectory(QString *errmsg)
   return true;
 }
 
-/** Set Rshare's data directory - externally */
-bool Rshare::setConfigDirectory(const QString& dir)
+/** Set RsApplication's data directory - externally */
+bool RsApplication::setConfigDirectory(const QString& dir)
 {
-  useConfigDir = true;
-  configDir = dir;
+  options.optBaseDir = std::string(dir.toUtf8());
   return true;
 }
 
 /** Writes <b>msg</b> with severity <b>level</b> to RetroShare's log. */
-Log::LogMessage
-Rshare::log(Log::LogLevel level, QString msg)
+Log::LogMessage RsApplication::log(Log::LogLevel level, QString msg)
 {
-  return _log.log(level, msg);
+  return log_output.log(level, msg);
 }
 
 /** Creates and binds a shortcut such that when <b>key</b> is pressed in
  * <b>sender</b>'s context, <b>receiver</b>'s <b>slot</b> will be called. */
-void
-Rshare::createShortcut(const QKeySequence &key, QWidget *sender,
-                        QWidget *receiver, const char *slot)
+void RsApplication::createShortcut(const QKeySequence &key, QWidget *sender, QWidget *receiver, const char *slot)
 {
   QShortcut *s = new QShortcut(key, sender);
   connect(s, SIGNAL(activated()), receiver, slot);
 }
 
 #ifdef __APPLE__
-bool Rshare::event(QEvent *event)
+bool RsApplication::event(QEvent *event)
 {
   switch (event->type()) {
     case QEvent::FileOpen:{
@@ -933,7 +918,7 @@ bool Rshare::event(QEvent *event)
 }
 #endif
 
-void Rshare::blinkTimer()
+void RsApplication::blinkTimer()
 {
     mBlink = !mBlink;
     emit blink(mBlink);
@@ -944,7 +929,7 @@ void Rshare::blinkTimer()
     }
 }
 
-bool Rshare::loadCertificate(const RsPeerId &accountId, bool autoLogin)
+bool RsApplication::loadCertificate(const RsPeerId &accountId, bool autoLogin)
 {
 	if (!RsAccounts::SelectAccount(accountId))
 	{
@@ -985,14 +970,14 @@ bool Rshare::loadCertificate(const RsPeerId &accountId, bool autoLogin)
         //										QObject::tr("Login Failure"),
         //										QObject::tr("Maybe password is wrong") );
         return false;
-    default: std::cerr << "Rshare::loadCertificate() unexpected switch value " << retVal << std::endl;
+    default: std::cerr << "RsApplication::loadCertificate() unexpected switch value " << retVal << std::endl;
         return false;
     }
 
 	return true;
 }
 
-bool Rshare::updateLocalServer()
+bool RsApplication::updateLocalServer()
 {
 	if (localServer) {
 		QString serverName = QString(TARGET);
diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h
index 2b59b7875..92b8cdf09 100644
--- a/retroshare-gui/src/rshare.h
+++ b/retroshare-gui/src/rshare.h
@@ -36,9 +36,10 @@
 #include "util/log.h"
 
 #include "retroshare/rstypes.h"
+#include "retroshare/rsinit.h"
 
 /** Pointer to this RetroShare application instance. */
-#define rApp  (static_cast<Rshare *>(qApp))
+#define rApp  (static_cast<RsApplication *>(qApp))
 
 #define rDebug(fmt)   (rApp->log(Log::Debug, (fmt)))
 #define rInfo(fmt)    (rApp->log(Log::Info, (fmt)))
@@ -46,20 +47,39 @@
 #define rWarn(fmt)    (rApp->log(Log::Warn, (fmt)))
 #define rError(fmt)   (rApp->log(Log::Error, (fmt)))
 
+struct RsGUIConfigOptions: public RsConfigOptions
+{
+    RsGUIConfigOptions()
+        : logLevel("Off"), argc(0)
+    {}
 
-class Rshare : public QApplication
+    QString dateformat;         // The format for dates in feed items etc.
+    QString language;           // The current language.
+
+    QString logFileName;		// output filename for log
+    QString logLevel;			// severity threshold for log output
+
+    QString guiStyle;           // CSS Style for the GUI
+    QString guiStyleSheetFile;  // CSS Style for the GUI
+
+    int argc ;					// stores argc parameter. Only used by the creator of QApplication
+    char *argv[1] ;				// stores argv parameter. Only used by the creator of QApplication
+};
+
+class RsApplication : public QApplication
 {
   Q_OBJECT
 
 public:
   /** Constructor. */
-  Rshare(QStringList args, int &argc, char **argv, const QString &dir);
+  RsApplication(const RsGUIConfigOptions& conf);
   /** Destructor. */
-  ~Rshare();
+  ~RsApplication();
 
   /** Return the version info */
   static QString retroshareVersion(bool=true);
 
+#ifdef TO_REMOVE
   /** Return the map of command-line arguments and values. */
   static QMap<QString, QString> arguments() { return _args; }
   /** Parse the list of command-line arguments. */
@@ -72,6 +92,7 @@ public:
   static void showUsageMessageBox();
   /** Returns true if the user wants to see usage information. */
   static bool showUsage();
+#endif
 
   /** Sets the current language. */
   static bool setLanguage(QString languageCode = QString());
@@ -105,17 +126,22 @@ public:
   static void initPlugins();
 
   /** Returns the current GUI style. */
-  static QString style() { return _style; }
+  static QString style() { return options.guiStyle; }
   /** Returns the current GUI stylesheet. */
-  static QString stylesheet() { return _stylesheet; }
+  static QString stylesheet() { return options.guiStyleSheetFile; }
   /** Returns the current language. */
-  static QString language() { return _language; }
-	/** Returns the operating mode. */
-  static QString opmode() { return _opmode; }
+  static QString language() { return options.language; }
+
+  /** Sets/Returns the operating mode. */
+  static void setOpMode(const QString& op ) { options.opModeStr = op.toStdString(); }
+  static QString opmode() { return QString::fromStdString(options.opModeStr); }
+
+#ifdef TO_REMOVE
   /** Returns links passed by arguments. */
   static QStringList* links() { return &_links; }
   /** Returns files passed by arguments. */
   static QStringList* files()  {return &_files; }
+#endif
   /** Returns Rshare's application startup time. */
   static QDateTime startupTime();
 
@@ -176,24 +202,17 @@ private:
   /** customize the date format (defaultlongformat) */
   static void customizeDateFormat();
 
+#ifdef TO_REMOVE
   /** Returns true if the specified arguments wants a value. */
   static bool argNeedsValue(const QString &argName);
+#endif
+
 
-  static QMap<QString, QString> _args; /**< List of command-line arguments.  */
-  static Log _log;                     /**< Logs debugging messages to file or stdout. */
-  static QString _style;               /**< The current GUI style.           */
-  static QString _stylesheet;          /**< The current GUI stylesheet.      */
-  static QString _language;            /**< The current language.            */
-  static QString _dateformat;          /**< The format for dates in feed items etc. */
-  static QString _opmode;              /**< The operating mode passed by args. */
-  static QStringList _links;           /**< List of links passed by arguments. */
-  static QStringList _files;           /**< List of files passed by arguments. */
   static QDateTime mStartupTime;       // startup time
-
-  static bool    useConfigDir;
-  static QString configDir;
   bool mBlink;
   static QLocalServer* localServer;
+  static RsGUIConfigOptions options;
+  static Log log_output;
 };
 
 #endif
diff --git a/retroshare-gui/src/util/DateTime.cpp b/retroshare-gui/src/util/DateTime.cpp
index b93a4dfe1..658772c5a 100644
--- a/retroshare-gui/src/util/DateTime.cpp
+++ b/retroshare-gui/src/util/DateTime.cpp
@@ -30,7 +30,7 @@ QString DateTime::formatLongDate(time_t dateValue)
 
 QString DateTime::formatLongDate(const QDate &dateValue)
 {
-	QString customDateFormat = Rshare::customDateFormat();
+	QString customDateFormat = RsApplication::customDateFormat();
 
 	if (customDateFormat.isEmpty()) {
 		return dateValue.toString(Qt::ISODate);

From 9210e52aae6fef44872add9b072a82705c9a90aa Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 13 Feb 2024 16:24:32 +0100
Subject: [PATCH 448/503] fixed compilation in parameter handling

---
 retroshare-gui/src/gui/MainWindow.cpp |  3 ++-
 retroshare-gui/src/main.cpp           | 10 ++++++++--
 retroshare-gui/src/rshare.cpp         |  2 +-
 retroshare-gui/src/rshare.h           |  4 +++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 070f446e4..6a3148e5a 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -1704,7 +1704,8 @@ void MainWindow::openRsCollection(const QString &filename)
 	if (qinfo.exists()) {
 		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
 			RsCollection collection;
-			collection.openColl(qinfo.absoluteFilePath());
+            collection.downloadFiles();
+            //collection.openColl(qinfo.absoluteFilePath());
 		}
 	}
 }
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 2150c2f16..07a46a8a1 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -359,7 +359,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
             >> parameter('k',"style"              ,guistylesheetfile             ,"style sheet file"                      ,"gui stylesheet file"                         ,false)
             >> parameter('L',"lang"               ,language                      ,"langage"                               ,"language string"                             ,false)
             >> parameter('r',"link"               ,rslink                        ,"retroshare link"                       ,"retroshare link to open (passed to running server)" ,false)
-            >> parameter('f',"rsfile"             ,rsfile                        ,"rsfile"                                ,"rsfile to open (passed to running server)"   ,false);
+            >> parameter('f',"rsfile"             ,rsfile                        ,"rsfile"                                ,"rscollection file to open (passed to running server)"   ,false);
 #ifdef RS_JSONAPI
     as      >> parameter('J', "jsonApiPort"       ,conf.jsonApiPort              ,"jsonApiPort"                           ,"Enable JSON API on the specified port"       ,false)
             >> parameter('P', "jsonApiBindAddress",conf.jsonApiBindAddress       ,"jsonApiBindAddress"                    ,"JSON API Bind Address "                      ,false);
@@ -372,9 +372,15 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 #ifdef RS_AUTOLOGIN
     as      >> option('a',"auto-login"       ,conf.autoLogin      ,"AutoLogin (Windows Only) + StartMinimised");
 #endif // ifdef RS_AUTOLOGIN
-    as      >> values<std::string>(std::back_inserter(links_and_files),"links and files")
+    as      >> values<std::string>(std::back_inserter(links_and_files),"links and rscollection files")
             >> help('h',"help",QObject::tr("Display this help").toStdString().c_str());
 
+    if(!as.isOk())
+    {
+        std::cerr << "Incorrect arguments." << std::endl;
+        std::cerr << as.usage() << std::endl;
+        return 0;
+    }
     conf.logFileName       = QString::fromStdString(logfilename);
     conf.logLevel          = QString::fromStdString(loglevel);		      // these will be checked when used in RsApplication
     conf.guiStyle          = QString::fromStdString(guistyle);	      	  // these will be checked when used in RsApplication
diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index 65d0f5bea..1f95d6997 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -57,6 +57,7 @@
 
 #include "rshare.h"
 
+#ifdef TO_REMOVE
 /* Available command-line arguments. */
 #define ARG_RESET           "reset"         /**< Reset RsApplication's saved settings.   */
 #define ARG_DATADIR         "datadir"       /**< Directory to use for data files. */
@@ -87,7 +88,6 @@ static const char* const forwardableArgs[] = {
 };
 
 /* Static member variables */
-#ifdef TO_REMOVE
 QMap<QString, QString> RsApplication::_args; /**< List of command-line arguments.  */
 QString RsApplication::_style;               /**< The current GUI style.           */
 QString RsApplication::_stylesheet;          /**< The current GUI stylesheet.      */
diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h
index 92b8cdf09..e16a0049f 100644
--- a/retroshare-gui/src/rshare.h
+++ b/retroshare-gui/src/rshare.h
@@ -50,9 +50,11 @@
 struct RsGUIConfigOptions: public RsConfigOptions
 {
     RsGUIConfigOptions()
-        : logLevel("Off"), argc(0)
+        : optResetParams(false), logLevel("Off"), argc(0)
     {}
 
+    bool optResetParams;		// reset all GUI parameters
+
     QString dateformat;         // The format for dates in feed items etc.
     QString language;           // The current language.
 

From f4f51e53eb2dbc7c049d145b562915d7447bb980 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:46:30 +0100
Subject: [PATCH 449/503] update invite icon

---
 retroshare-gui/src/gui/icons/invite64.png   | Bin 2519 -> 2835 bytes
 retroshare-gui/src/gui/icons/png/invite.png | Bin 5218 -> 5704 bytes
 retroshare-gui/src/gui/icons/svg/invite.svg |  88 +++++++++-----------
 3 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/retroshare-gui/src/gui/icons/invite64.png b/retroshare-gui/src/gui/icons/invite64.png
index 8ab342a7b3da3452b844784e7e7a1015bec72ab5..f07e0fb4f17068e4e8e6ec037fea795c1c8df5b5 100644
GIT binary patch
delta 2792
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

delta 2473
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

diff --git a/retroshare-gui/src/gui/icons/png/invite.png b/retroshare-gui/src/gui/icons/png/invite.png
index 5fda4753e62a963203073ce59fb8097f0360f1e0..7f0baf91b26563b9167078eddc696f5149e7f9ef 100644
GIT binary patch
delta 5684
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
a3jYtk{G0_l<94wC0000<MNUMnLSTY4PVjsH

delta 5194
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
Ef>19gK>z>%

diff --git a/retroshare-gui/src/gui/icons/svg/invite.svg b/retroshare-gui/src/gui/icons/svg/invite.svg
index afcefbd72..8a25949a8 100644
--- a/retroshare-gui/src/gui/icons/svg/invite.svg
+++ b/retroshare-gui/src/gui/icons/svg/invite.svg
@@ -2,25 +2,28 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4823"
+   id="svg4155"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
    xml:space="preserve"
    width="80"
    height="80"
    viewBox="0 0 80 80"
-   sodipodi:docname="invite.svg"><metadata
-     id="metadata4829"><rdf:RDF><cc:Work
+   sodipodi:docname="invite.svg"
+   inkscape:export-filename="C:\Users\ProBook\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\invite.png"
+   inkscape:export-xdpi="153.60001"
+   inkscape:export-ydpi="153.60001"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs4827" /><sodipodi:namedview
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -29,46 +32,31 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
-     id="namedview4825"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     id="namedview4157"
      showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="1.475"
-     inkscape:cx="-155.33838"
-     inkscape:cy="28.585876"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:zoom="2.559375"
+     inkscape:cx="34.188034"
+     inkscape:cy="69.352868"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g4831" /><g
-     id="g4831"
+     inkscape:current-layer="layer1"
+     inkscape:pagecheckerboard="0" /><g
+     id="g4163"
      inkscape:groupmode="layer"
      inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+     transform="matrix(1.25,0,0,-1.25,0,80)"
+     style="display:inline"><path
        inkscape:connector-curvature="0"
-       id="path4835"
+       id="path4167"
        style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /><path
-       sodipodi:nodetypes="csasccsassc"
-       d="m 33.346398,27.138373 c 2.012782,2.397011 3.817716,9.137224 3.780729,13.03223 -0.04053,4.268676 -4.147427,7.833723 -7.844104,7.839587 -3.89323,0.0062 -8.134746,-3.432459 -8.287329,-8.230168 C 20.876209,36.02303 22.815244,29.25428 24.970657,27.344578 24.73295,25.80496 23.829344,23.960201 21.144182,22.793431 19.6943,22.163465 15.581718,20.946417 15.626371,18.600543 c 0.04851,-2.548391 8.793599,-4.303905 13.521842,-4.28593 4.621336,0.01757 13.160147,1.682212 13.183878,4.289387 0.01639,1.800667 -5.45021,3.369885 -6.656712,4.623374 -1.535253,1.595043 -2.168834,3.07356 -2.328981,3.910999 z"
-       style="fill:#000000;fill-opacity:0.15686275;fill-rule:nonzero;stroke:none"
-       id="use4155"
-       inkscape:connector-curvature="0" /><path
-       inkscape:connector-curvature="0"
-       id="path4839"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 33.346398,28.617307 c 2.012782,2.397011 3.817716,9.137224 3.780729,13.03223 -0.04053,4.268677 -4.147427,7.833723 -7.844104,7.839587 -3.89323,0.0062 -8.134746,-3.432459 -8.287329,-8.230168 -0.119485,-3.756992 1.81955,-10.525742 3.974963,-12.435444 -0.237707,-1.539618 -1.141313,-3.384377 -3.826475,-4.551147 -1.449882,-0.629966 -5.562464,-1.847014 -5.517811,-4.192888 0.04851,-2.54839 8.793599,-4.303905 13.521842,-4.28593 4.621336,0.01757 13.160147,1.682212 13.183878,4.289387 0.01639,1.800667 -5.45021,3.369885 -6.656712,4.623374 -1.535253,1.595044 -2.168834,3.07356 -2.328981,3.910999 z"
-       sodipodi:nodetypes="csasccsassc" /><path
-       inkscape:connector-curvature="0"
-       id="path5440"
-       style="fill:#000000;fill-opacity:0.15686275;fill-rule:nonzero;stroke:none"
-       d="m 46.384917,23.38757 c -1.021112,0 -1.848668,0.827556 -1.848668,1.848667 l 0,3.697335 -3.697335,0 c -1.021112,0 -1.848668,0.827556 -1.848668,1.848668 0,1.021112 0.827556,1.848668 1.848668,1.848668 l 3.697335,0 0,3.697335 c 0,1.021111 0.827556,1.848668 1.848668,1.848668 1.021111,0 1.848667,-0.827557 1.848667,-1.848668 l 0,-3.697335 3.697336,0 c 1.021111,0 1.848667,-0.827556 1.848667,-1.848668 0,-1.021112 -0.827556,-1.848668 -1.848667,-1.848668 l -3.697336,0 0,-3.697335 c 0,-1.021111 -0.827556,-1.848667 -1.848667,-1.848667" /><path
-       inkscape:connector-curvature="0"
-       id="path5452"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 53.779587,32.010539 c 0,-1.021111 -0.827556,-1.848667 -1.848667,-1.848667 l -11.092006,0 c -1.021112,0 -1.848668,0.827556 -1.848668,1.848667 0,1.021112 0.827556,1.848668 1.848668,1.848668 l 11.092006,0 c 1.021111,0 1.848667,-0.827556 1.848667,-1.848668" /><path
-       inkscape:connector-curvature="0"
-       id="path5456"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 46.384917,24.615869 c -1.021112,0 -1.848668,0.827556 -1.848668,1.848667 l 0,11.092006 c 0,1.021112 0.827556,1.848668 1.848668,1.848668 1.021111,0 1.848667,-0.827556 1.848667,-1.848668 l 0,-11.092006 c 0,-1.021111 -0.827556,-1.848667 -1.848667,-1.848667" /></g></svg>
\ No newline at end of file
+       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /></g><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="forground"
+     style="display:inline"><path
+       style="fill:#f9f9f9;stroke-width:0.115097"
+       d="m 16.369227,64.730725 c -2.410081,-0.519492 -4.393567,-2.486625 -4.89547,-4.855106 -0.230292,-1.086748 -0.232509,-8.437472 -0.0031,-10.160706 0.544804,-4.091726 2.311934,-7.6619 5.240845,-10.588196 0.729631,-0.728977 1.620855,-1.524992 1.9805,-1.768921 l 0.653899,-0.443506 0.870488,0.635708 c 1.713047,1.251025 4.034249,2.2608 6.317223,2.748136 1.666706,0.355784 4.587773,0.356708 6.248914,0.0019 2.717698,-0.580353 4.507782,-1.407765 7.126351,-3.293936 0.472315,-0.340212 5.163656,4.356013 4.822871,4.827896 -1.873071,2.593626 -2.716501,4.411741 -3.283366,7.077697 -0.3636,1.710005 -0.366662,4.607965 -0.0066,6.294485 0.619445,2.901855 2.005028,5.663034 3.887193,7.746366 0.407391,0.450932 0.415297,0.475502 0.20546,0.638472 -0.545416,0.423596 -2.110246,1.093106 -2.807926,1.201366 -0.471223,0.07313 -5.349087,0.113024 -13.178634,0.107808 -10.202918,-0.0067 -12.564565,-0.03718 -13.178629,-0.169543 z m 39.420806,0.0498 c -4.989364,-0.623224 -9.270985,-4.31662 -10.693102,-9.224051 -1.670749,-5.765402 1.045758,-12.068253 6.384936,-14.81436 2.550296,-1.311698 5.092938,-1.744661 7.818632,-1.331366 2.790409,0.423106 5.148972,1.616342 7.149858,3.617227 6.209256,6.209257 4.488252,16.634919 -3.383501,20.496904 -2.348935,1.152418 -4.765258,1.569365 -7.276823,1.255646 z M 58.3181,57.212066 c 0.613555,-0.348996 0.802549,-0.844473 0.85019,-2.228919 l 0.04257,-1.237296 1.224561,-4.6e-4 c 1.026113,-3.45e-4 1.286453,-0.03817 1.60646,-0.233264 0.506112,-0.308566 0.877263,-1.129212 0.76979,-1.702082 -0.199788,-1.064967 -0.953807,-1.510795 -2.561627,-1.514613 l -1.064649,-0.0025 -0.0026,-1.064649 c -0.0038,-1.607821 -0.449645,-2.36184 -1.514612,-2.561627 -0.572871,-0.107472 -1.393515,0.263677 -1.702082,0.769789 -0.195498,0.320659 -0.232903,0.580298 -0.233265,1.619192 l -4.25e-4,1.237295 h -1.12656 c -0.940194,0 -1.211113,0.04284 -1.637501,0.258969 -0.911823,0.462175 -1.238494,1.559926 -0.71455,2.401192 0.397339,0.637989 0.639056,0.729347 2.09747,0.792756 l 1.323618,0.05755 0.05755,1.323619 c 0.06014,1.383222 0.154758,1.663359 0.68795,2.036821 0.579138,0.405644 1.239785,0.422433 1.897665,0.04823 z M 28.051598,37.042095 C 23.062233,36.418873 18.780612,32.725476 17.358495,27.818044 15.67366,22.00403 18.44977,15.656315 23.867225,12.935506 c 2.497687,-1.254414 5.02093,-1.66863 7.694839,-1.263188 2.790408,0.423107 5.148971,1.616342 7.149857,3.617228 6.209256,6.209257 4.488253,16.634919 -3.3835,20.496904 -2.348935,1.152417 -4.765259,1.569364 -7.276823,1.255645 z"
+       id="path1478" /></g></svg>

From 91ed9ed894bb66aa8061305ca2b5586c8dba8b45 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:04:38 +0100
Subject: [PATCH 450/503] update readme

---
 retroshare-gui/src/README.txt | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/README.txt b/retroshare-gui/src/README.txt
index 7f7f35c8e..231d16b23 100644
--- a/retroshare-gui/src/README.txt
+++ b/retroshare-gui/src/README.txt
@@ -2,17 +2,14 @@
 README for RetroShare
 =======================================================================================
 
-RetroShare web site . . . . http://retroshare.net/index.html
+RetroShare web site . . . . https://retroshare.cc/
 Developer's blog  . . . . . https://retroshareteam.wordpress.com
-Documentation . . . . . . . https://retroshare.readthedocs.io/en/latest/
-Support . . . . . . . . . . http://retroshare.net/support.html
-Forums  . . . . . . . . . . http://retroshare.sourceforge.net/forum/
+Documentation . . . . . . . https://retrosharedocs.readthedocs.io/en/latest/
 Wiki  . . . . . . . . . . . https://github.com/RetroShare/documentation/wiki 
-Old developers site . . . . http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner
 Project site  . . . . . . . https://github.com/RetroShare/RetroShare
-Relted projects/plugins . . https://github.com/RetroShare
+Related projects/plugins . .https://github.com/RetroShare
 
-Contact:  . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net
+Contact:  . . . . . . . . . retroshare.project@gmail.com
 
 =========================================================================================
 Compiling RetroShare
@@ -22,9 +19,9 @@ Build Scripts are avaible on GIT:
 https://github.com/RetroShare/RetroShare/tree/master/build_scripts
 
 You can find here instructions howto compile RetroShare:
-https://retroshare.readthedocs.io/en/latest/developer/compilation/
+https://retrosharedocs.readthedocs.io/en/latest/developer/compilation/
 
-You can go on over to our forum or chat lobby when you have trouble with compiling:
+You can go on over to our forum or chat room when you have trouble with compiling:
 retroshare://forum?name=Developers%20Discussions&id=8fd22bd8f99754461e7ba1ca8a727995
 retroshare://chat_room?name=Retroshare%20Devel%20%28signed%29&id=L68DB0A1E09BDA3A5
-http://retroshare.sourceforge.net/forum/
+

From 142a8e25030b83971356ea5b9f7e2d888959c3db Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 16 Feb 2024 10:33:41 +0100
Subject: [PATCH 451/503] fixed proper handling of language parameter at
 startup

---
 retroshare-gui/src/gui/GenCertDialog.cpp      |  2 +-
 .../src/gui/settings/GeneralPage.ui           |  2 +-
 retroshare-gui/src/main.cpp                   | 69 ++++++++++++++-----
 3 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index f91ccac1b..0f318049d 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -251,7 +251,7 @@ void GenCertDialog::initKeyList()
 
 void GenCertDialog::mouseMoveEvent(QMouseEvent *e)
 {
-	std::cerr << "Mouse : " << e->x() << ", " << e->y() << std::endl;
+    //std::cerr << "Mouse : " << e->x() << ", " << e->y() << std::endl;
 
 	QDialog::mouseMoveEvent(e) ;
 }
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui
index ab2863f1c..2b36130c9 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.ui
+++ b/retroshare-gui/src/gui/settings/GeneralPage.ui
@@ -146,7 +146,7 @@
       <item row="5" column="0">
        <widget class="QCheckBox" name="useLocalServer">
         <property name="toolTip">
-         <string>When checked, this instance receives new parameters (like RsLink or RsFile) and avoid new one.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When checked, this retroshare instance will accept calls by your operating system to open Retroshare collection files, and download links.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Use Local Server to get new arguments.</string>
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 07a46a8a1..630e10aa7 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -120,13 +120,13 @@ static void showHelp(const argstream& as)
             "+================================================================+"
                  << std::endl ;
 
-        std::cerr << as.usage(true) << std::endl;
+        std::cerr << as.usage(false) << std::endl;
 
         char *argv[1];
         int argc=0;
         QApplication dummyApp (argc, argv); // needed for QMessageBox
         QMessageBox box;
-        QString text = QString::fromUtf8(as.usage(true,false).c_str());
+        QString text = QString::fromUtf8(as.usage(false,false).c_str());
         QFont font("Courier New",10,50,false);
         font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
         font.setStyle(QFont::StyleNormal);
@@ -212,6 +212,31 @@ static void sendArgsToRunningInstance(const QStringList& args)
     newArgs.detach();
 }
 
+static bool setLanguage(const std::string& language)
+{
+    if(!language.empty())
+    {
+        if(!LanguageSupport::translate(QString::fromStdString(language)))
+        {
+            RsErr() << "Language \"" << language << "\" is not supported." ;
+
+            QString s;
+            for(QString ss:LanguageSupport::languageCodes())
+                s += ss + ", " ;
+
+            RsErr() << "Possible choices are: " << s.toStdString();
+            return false;
+        }
+        return true;
+    }
+    else
+    {
+        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
+        return true;
+    }
+}
+
+
 static void displayWarningAboutDSAKeys()
 {
     std::map<std::string,std::vector<std::string> > unsupported_keys;
@@ -348,21 +373,21 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     as      >> option(   's',"stderr"             ,conf.outStderr                ,"output to stderr instead of log file "                                                      )
             >> option(   'u',"udp"                ,conf.udpListenerOnly          ,"Only listen to UDP "                                                                        )
             >> option(   'R',"reset"              ,conf.optResetParams           ,"reset retroshare parameters "                                                               )
-            >> parameter('c',"base-dir"           ,conf.optBaseDir               ,"directory"                             ,"Set base directory "                         ,false)
-            >> parameter('l',"log-file"           ,logfilename                   ,"logfile"                               ,"Set Log filename "                           ,false)
-            >> parameter('d',"debug-level"        ,loglevel                      ,"level (debug,info,notice,warn,error,off)","Set debug level "                            ,false)
-            >> parameter('i',"ip-address"         ,conf.forcedInetAddress        ,"nnn.nnn.nnn.nnn"                       ,"Force IP address "                           ,false)
-            >> parameter('p',"port"               ,conf.forcedPort               ,"port"                                  ,"Set listenning port "                        ,false)
+            >> parameter('c',"base-dir"           ,conf.optBaseDir               ,"directory"                             ,"Set base directory "                                  ,false)
+            >> parameter('l',"log-file"           ,logfilename                   ,"logfile"                               ,"Set Log filename "                                    ,false)
+            >> parameter('d',"debug-level"        ,loglevel                      ,"level (debug,info,notice,warn,error,off)","Set debug level "                                   ,false)
+            >> parameter('i',"ip-address"         ,conf.forcedInetAddress        ,"nnn.nnn.nnn.nnn"                       ,"Force IP address "                                    ,false)
+            >> parameter('p',"port"               ,conf.forcedPort               ,"port"                                  ,"Set listenning port "                                 ,false)
             >> parameter('o',"opmode"             ,conf.opModeStr                ,"opmode (Full, NoTurtle, Gaming, Minimal)","Set mode" ,false)
-            >> parameter('t',"tor"                ,conf.userSuppliedTorExecutable,"tor"                                   ,"supply full tor executable path "            ,false)
-            >> parameter('g',"style"              ,guistyle                      ,"style "                                ,""            ,false)
-            >> parameter('k',"style"              ,guistylesheetfile             ,"style sheet file"                      ,"gui stylesheet file"                         ,false)
-            >> parameter('L',"lang"               ,language                      ,"langage"                               ,"language string"                             ,false)
-            >> parameter('r',"link"               ,rslink                        ,"retroshare link"                       ,"retroshare link to open (passed to running server)" ,false)
-            >> parameter('f',"rsfile"             ,rsfile                        ,"rsfile"                                ,"rscollection file to open (passed to running server)"   ,false);
+            >> parameter('t',"tor"                ,conf.userSuppliedTorExecutable,"path"                                  ,"supply full tor executable path "                     ,false)
+            >> parameter('g',"style"              ,guistyle                      ,"style (fusion,windows,gtk2,breeze)"    ,"set GUI style"                                        ,false)
+            >> parameter('k',"style"              ,guistylesheetfile             ,"file"                                  ,"gui stylesheet file"                                  ,false)
+            >> parameter('L',"lang"               ,language                      ,"langage (fr,cn,...)"                   ,"set language"                                         ,false)
+            >> parameter('r',"link"               ,rslink                        ,"retroshare link"                       ,"retroshare link to open (passed to running server)"   ,false)
+            >> parameter('f',"rsfile"             ,rsfile                        ,"rsfile"                                ,"rscollection file to open (passed to running server)" ,false);
 #ifdef RS_JSONAPI
-    as      >> parameter('J', "jsonApiPort"       ,conf.jsonApiPort              ,"jsonApiPort"                           ,"Enable JSON API on the specified port"       ,false)
-            >> parameter('P', "jsonApiBindAddress",conf.jsonApiBindAddress       ,"jsonApiBindAddress"                    ,"JSON API Bind Address "                      ,false);
+    as      >> parameter('J', "jsonApiPort"       ,conf.jsonApiPort              ,"jsonApiPort"                           ,"Enable JSON API on the specified port"                ,false)
+            >> parameter('P', "jsonApiBindAddress",conf.jsonApiBindAddress       ,"jsonApiBindAddress"                    ,"JSON API Bind Address "                               ,false);
 #endif // ifdef RS_JSONAPI
 
 #ifdef LOCALNET_TESTING
@@ -420,7 +445,9 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     {
         QApplication dummyApp (argc, argv); // needed for QMessageBox
         /* Translate into the desired language */
-        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
+
+        if(!setLanguage(language))
+            return 1;
 
         QMessageBox msgBox;
         msgBox.setText(QObject::tr("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."));
@@ -451,7 +478,9 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
         /* Error occured */
         QApplication dummyApp (argc, argv); // needed for QMessageBox
         /* Translate into the desired language */
-        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
+
+        if(!setLanguage(language))
+            return 1;
 
         displayWarningAboutDSAKeys();
 
@@ -479,10 +508,16 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
        in this case it can be use only for default values */
     RshareSettings::Create ();
 
+    if(LanguageSupport::isValidLanguageCode(QString::fromStdString(language)))
+        conf.language = QString::fromStdString(language);
+
     /* Setup The GUI Stuff */
     //Rshare rshare(args, argc, argv,  QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
     RsApplication rshare(conf);
 
+    if(!setLanguage(language))
+        return 1;
+
     /* Start RetroShare */
     QString sDefaultGXSIdToCreate = "";
     switch (initResult) {

From eccfc7ba7119f505eb91d8a5f08a2450fd4ace1f Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 16 Feb 2024 13:28:55 +0100
Subject: [PATCH 452/503] fixed handling of incoming rscollection files

---
 retroshare-gui/src/gui/MainWindow.cpp         | 20 ++++++---
 .../src/gui/common/RsCollection.cpp           |  4 +-
 .../src/gui/settings/GeneralPage.ui           |  2 +-
 retroshare-gui/src/main.cpp                   |  1 +
 retroshare-gui/src/rshare.cpp                 | 42 +++++++++++++------
 5 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 6a3148e5a..672847aa9 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -1254,21 +1254,23 @@ void MainWindow::doQuit()
 	rApp->quit();
 }
 
-// This method parses arguments passed by another process. All arguments
+// This method parses arguments passed by the operating system. All arguments
 // except -r, -f, -o and lists of rscollection files and rslinks are discarded.
 //
 void MainWindow::receiveNewArgs(QStringList args)
 {
-    QString arg, argl, value;
-    std::vector<const char *> argv;
+    RsInfo() << "Received new arguments from operating system call.";
+
+    std::string argstring = RsApplication::applicationFilePath().toStdString() ;
+
     for(auto l:args)
-        argv.push_back((const char *)l.data());
+        argstring += " " + l.toStdString();
 
     // This class does all the job at once: validate arguments, and parses them.
 
     std::vector<std::string> links_and_files;
 
-    argstream as(argv.size(),const_cast<char **>(argv.data()));
+    argstream as(argstring.c_str());
 
     QString omValues = QString(";full;noturtle;gaming;minimal;");
     std::string opModeStr;
@@ -1291,6 +1293,8 @@ void MainWindow::receiveNewArgs(QStringList args)
         QString opmode = QString::fromStdString(opModeStr).toLower();
         //RsApplication::setOpMode(opModeStr.toLower()); // Do we need this??
 
+        RsInfo() << "Setting new operating mode to \"" << opmode.toStdString() << "\"";
+
         if (opmode == "noturtle")
             opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE) - 1);
         else if (opmode == "gaming")
@@ -1704,6 +1708,12 @@ void MainWindow::openRsCollection(const QString &filename)
 	if (qinfo.exists()) {
 		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
 			RsCollection collection;
+
+            if(!collection.load(filename))
+            {
+                RsErr() << "Could not open Rscollection file " << filename.toStdString();
+                return;
+            }
             collection.downloadFiles();
             //collection.openColl(qinfo.absoluteFilePath());
 		}
diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index c49296503..5d4ba01ad 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -385,7 +385,7 @@ bool RsCollection::checkFile(const QString& fileName, bool showError)
 
 		//std::cerr << "n==" << n <<" Checking string " << std::string(current,n+1)  << " c = " << std::hex << (int)c << std::dec << std::endl;
 
-			for(uint i=0;i<bad_strings.size();++i)
+        for(uint i=0;i<bad_strings.size();++i)
 			if(std::string(current,bad_strings[i].length()) == bad_strings[i])
 			{
 					showErrorBox(file.fileName(), QApplication::translate("RsCollectionFile", "This file contains the string \"%1\" and is therefore an invalid collection file. \n\nIf you believe it is correct, remove the corresponding line from the file and re-open it with Retroshare.").arg(bad_strings[i].c_str()));
@@ -394,7 +394,7 @@ bool RsCollection::checkFile(const QString& fileName, bool showError)
 				//std::cerr << "Bad string detected" << std::endl;
 			}
 
-			if(file.atEnd())
+        if(file.atEnd())
 			n-- ;
 		else if(n < max_size)
 			++n ;
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui
index 2b36130c9..3eea0544f 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.ui
+++ b/retroshare-gui/src/gui/settings/GeneralPage.ui
@@ -149,7 +149,7 @@
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When checked, this retroshare instance will accept calls by your operating system to open Retroshare collection files, and download links.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
-         <string>Use Local Server to get new arguments.</string>
+         <string>Accept operating systems calls</string>
         </property>
         <property name="checked">
          <bool>true</bool>
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 630e10aa7..3bc8e3c76 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -145,6 +145,7 @@ static bool notifyRunningInstance()
     // Connect to the Local Server of the main process to notify it
     // that a new process had been started
 
+    RsInfo() << "Trying to contact running instance through socket \"" << TARGET << "\"";
     QLocalSocket localSocket;
     localSocket.connectToServer(QString(TARGET));
 #ifdef DEBUG
diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index 1f95d6997..a5ecbf17d 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -240,6 +240,17 @@ RsApplication::RsApplication(const RsGUIConfigOptions& conf)
     }
 #endif
 
+    // So we start a Local Server to listen for connections from new process
+    localServer= new QLocalServer();
+    QObject::connect(localServer, SIGNAL(newConnection()), this, SLOT(slotConnectionEstablished()));
+    updateLocalServer();
+
+    // clear out any old arguments (race condition?)
+    QSharedMemory newArgs;
+    newArgs.setKey(QString(TARGET) + "_newArgs");
+    if(newArgs.attach(QSharedMemory::ReadWrite))
+        newArgs.detach();
+
 #if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
     qInstallMessageHandler(qt_msg_handler);
 #else
@@ -344,22 +355,27 @@ void RsApplication::slotConnectionEstablished()
 	socket->close();
 	delete socket;
 
-	QBuffer buffer;
-	QDataStream in(&buffer);
-	QStringList args;
+    if(newArgs.error())
+    {
+        RsErr() << "Something when wrong in receiving arguments from operating system: " << newArgs.errorString().toStdString() ;
+        return ;
+    }
+    QBuffer buffer;
+    QDataStream in(&buffer);
+    QStringList args;
 
-	newArgs.lock();
-	buffer.setData((char*)newArgs.constData(), newArgs.size());
-	buffer.open(QBuffer::ReadOnly);
-	in >> args;
-	newArgs.unlock();
-	newArgs.detach();
+    newArgs.lock();
+    buffer.setData((char*)newArgs.constData(), newArgs.size());
+    buffer.open(QBuffer::ReadOnly);
+    in >> args;
+    newArgs.unlock();
+    newArgs.detach();
 
-	emit newArgsReceived(args);
-	while (!args.empty())
-	{
+    emit newArgsReceived(args);
+    while (!args.empty())
+    {
         std::cerr << "RsApplication::slotConnectionEstablished args:" << QString(args.takeFirst()).toStdString() << std::endl;
-	}
+    }
 }
 
 QString RsApplication::retroshareVersion(bool) { return RS_HUMAN_READABLE_VERSION; }

From 258fe58547dcdd0a04dae0c53e1841bde112a472 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 23 Feb 2024 21:10:13 +0100
Subject: [PATCH 453/503] switch RsCollection to using RsfileTree as a base
 structure instead of a QDomDocument (not compiling yet)

---
 .../src/gui/common/RsCollection.cpp           | 235 ++++++++++++++----
 retroshare-gui/src/gui/common/RsCollection.h  |  28 ++-
 retroshare-gui/src/retroshare-gui.pro         |   2 +
 3 files changed, 212 insertions(+), 53 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index c49296503..1baaed636 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -38,27 +38,20 @@
 const QString RsCollection::ExtensionString = QString("rscollection") ;
 
 RsCollection::RsCollection(QObject *parent)
-	: QObject(parent), _xml_doc("RsCollection")
+    : QObject(parent)
 {
-	_root = _xml_doc.createElement("RsCollection");
-	_xml_doc.appendChild(_root);
+//	_root = _xml_doc.createElement("RsCollection");
+//	_xml_doc.appendChild(_root);
 }
 
-RsCollection::RsCollection(const RsFileTree& fr)
-	: _xml_doc("RsCollection")
+RsCollection::RsCollection(const RsFileTree& ft)
+    : mFileTree(ft)
 {
-	_root = _xml_doc.createElement("RsCollection");
-	_xml_doc.appendChild(_root);
-
-	recursAddElements(_xml_doc,fr,0,_root) ;
 }
 
 RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchFlags flags, QObject *parent)
-	: QObject(parent), _xml_doc("RsCollection")
+    : QObject(parent)
 {
-	_root = _xml_doc.createElement("RsCollection");
-	_xml_doc.appendChild(_root);
-
 	if(! ( (flags & RS_FILE_HINTS_LOCAL) || (flags & RS_FILE_HINTS_REMOTE)))
 	{
 		std::cerr << "(EE) Wrong flags passed to RsCollection constructor. Please fix the code!" << std::endl;
@@ -66,7 +59,7 @@ RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchF
 	}
 
 	for(uint32_t i = 0;i<file_infos.size();++i)
-		recursAddElements(_xml_doc,file_infos[i],_root,flags) ;
+        recursAddElements(mFileTree.root(),file_infos[i],flags) ;
 }
 
 RsCollection::~RsCollection()
@@ -75,6 +68,7 @@ RsCollection::~RsCollection()
 
 void RsCollection::downloadFiles() const
 {
+#ifdef TODO
 	// print out the element names of all elements that are direct children
 	// of the outermost element.
 	QDomElement docElem = _xml_doc.documentElement();
@@ -84,10 +78,12 @@ void RsCollection::downloadFiles() const
 	recursCollectColFileInfos(docElem,colFileInfos,QString(),false) ;
 
 	RsCollectionDialog(_fileName, colFileInfos, false).exec() ;
+#endif
 }
 
 void RsCollection::autoDownloadFiles() const
 {
+#ifdef TODO
 	QDomElement docElem = _xml_doc.documentElement();
 
 	std::vector<ColFileInfo> colFileInfos;
@@ -100,6 +96,7 @@ void RsCollection::autoDownloadFiles() const
 	{
 		autoDownloadFiles(colFileInfo, dlDir);
 	}
+#endif
 }
 
 void RsCollection::autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const
@@ -145,6 +142,8 @@ static QString purifyFileName(const QString& input,bool& bad)
 
 void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash)
 {
+    mFileTree.addFile(mFileTree.root(),fname.toStdString(),hash,size);
+#ifdef TO_REMOVE
 	ColFileInfo info ;
 	info.type = DIR_TYPE_FILE ;
 	info.name = fname ;
@@ -152,12 +151,45 @@ void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash&
 	info.hash = QString::fromStdString(hash.toStdString()) ;
 
 	recursAddElements(_xml_doc,info,_root) ;
+#endif
 }
 void RsCollection::merge_in(const RsFileTree& tree)
 {
-	recursAddElements(_xml_doc,tree,0,_root) ;
+    RsFileTree::DirData dd;
+    tree.getDirectoryContent(tree.root(),dd);
+
+    recursMergeTree(mFileTree.root(),tree,dd) ;
 }
 
+void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree& tree,const RsFileTree::DirData& dd)
+{
+    for(uint32_t i=0;i<dd.subfiles.size();++i)
+    {
+        RsFileTree::FileData fd;
+        if(!tree.getFileContent(dd.subfiles[i],fd))
+        {
+            RsErr() << "Error while merging file trees. This should not happen. Report a bug!";
+            return;
+        }
+
+        mFileTree.addFile(parent,fd.name,fd.hash,fd.size);
+    }
+    for(uint32_t i=0;i<dd.subdirs.size();++i)
+    {
+        RsFileTree::DirData ld;
+        if(!tree.getDirectoryContent(dd.subdirs[i],ld))
+        {
+            RsErr() << "Error while merging file trees. This should not happen. Report a bug!";
+            return;
+        }
+
+        auto new_dir_index = mFileTree.addDirectory(parent,ld.name);
+
+        recursMergeTree(new_dir_index,tree,ld);
+    }
+}
+
+#ifdef TO_REMOVE
 void RsCollection::recursCollectColFileInfos(const QDomElement& e,std::vector<ColFileInfo>& colFileInfos,const QString& current_path, bool bad_chars_in_parent) const
 {
 	QDomNode n = e.firstChild() ;
@@ -211,43 +243,33 @@ void RsCollection::recursCollectColFileInfos(const QDomElement& e,std::vector<Co
 		n = n.nextSibling() ;
 	}
 }
+#endif
 
 
-void RsCollection::recursAddElements(QDomDocument& doc,const DirDetails& details,QDomElement& e,FileSearchFlags flags) const
+void RsCollection::recursAddElements(RsFileTree::DirIndex parent, const DirDetails& dd, FileSearchFlags flags)
 {
-	if (details.type == DIR_TYPE_FILE)
+    if (dd.type == DIR_TYPE_FILE)
+        mFileTree.addFile(parent,dd.name,dd.hash,dd.size);
+    else if (dd.type == DIR_TYPE_DIR)
 	{
-		QDomElement f = doc.createElement("File") ;
+        RsFileTree::DirIndex new_dir_index = mFileTree.addDirectory(parent,dd.name);
 
-		f.setAttribute(QString("name"),QString::fromUtf8(details.name.c_str())) ;
-        f.setAttribute(QString("sha1"),QString::fromStdString(details.hash.toStdString())) ;
-        f.setAttribute(QString("size"),QString::number(details.size)) ;
-
-		e.appendChild(f) ;
-	}
-	else if (details.type == DIR_TYPE_DIR)
-	{
-		QDomElement d = doc.createElement("Directory") ;
-
-		d.setAttribute(QString("name"),QString::fromUtf8(details.name.c_str())) ;
-
-        for(uint32_t i=0;i<details.children.size();++i)
+        for(uint32_t i=0;i<dd.children.size();++i)
 		{
-            if (!details.children[i].ref)
+            if (!dd.children[i].ref)
 				continue;
 
 			DirDetails subDirDetails;
 
-            if (!rsFiles->RequestDirDetails(details.children[i].ref, subDirDetails, flags))
+            if (!rsFiles->RequestDirDetails(dd.children[i].ref, subDirDetails, flags))
 				continue;
 
-			recursAddElements(doc,subDirDetails,d,flags) ;
+            recursAddElements(new_dir_index,subDirDetails,flags) ;
 		}
-
-		e.appendChild(d) ;
 	}
 }
 
+#ifdef TO_REMOVE
 void RsCollection::recursAddElements(QDomDocument& doc,const ColFileInfo& colFileInfo,QDomElement& e) const
 {
 	if (colFileInfo.type == DIR_TYPE_FILE)
@@ -300,6 +322,7 @@ void RsCollection::recursAddElements(
 		d.appendChild(f) ;
 	}
 }
+#endif
 
 static void showErrorBox(const QString& fileName, const QString& error)
 {
@@ -322,16 +345,11 @@ bool RsCollection::load(const QString& fileName, bool showError /* = true*/)
 		return false;
 	}
 
-	bool ok = _xml_doc.setContent(&file) ;
+    QDomDocument xml_doc;
+    bool ok = xml_doc.setContent(&file) ;
 	file.close();
 
-	if (ok) {
-		_fileName = fileName;
-	} else {
-		if (showError) {
-			showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Error parsing xml file"));
-		}
-	}
+
 
 	return ok;
 }
@@ -404,6 +422,8 @@ bool RsCollection::checkFile(const QString& fileName, bool showError)
 		}
 	return false;
 }
+
+#ifdef TO_REMOVE
 bool RsCollection::load(QWidget *parent)
 {
 	QString fileName;
@@ -414,6 +434,7 @@ bool RsCollection::load(QWidget *parent)
 
 	return load(fileName, true);
 }
+#endif
 
 bool RsCollection::save(const QString& fileName) const
 {
@@ -425,16 +446,129 @@ bool RsCollection::save(const QString& fileName) const
 		return false;
 	}
 
-	QTextStream stream(&file) ;
+    QDomDocument xml_doc ;
+    QDomElement root = xml_doc.createElement("RsCollection");
+
+    RsFileTree::DirData root_data;
+    if(!mFileTree.getDirectoryContent(mFileTree.root(),root_data))
+        return false;
+
+    if(!recursExportToXml(xml_doc,root,root_data))
+        return false;
+
+    xml_doc.appendChild(root);
+
+    QTextStream stream(&file) ;
 	stream.setCodec("UTF-8") ;
 
-	stream << _xml_doc.toString() ;
-
+    stream << xml_doc.toString() ;
 	file.close();
 
 	return true;
 }
 
+bool RsCollection::recursParseXml(QDomDocument& doc,const QDomElement& e,const RsFileTree::DirIndex parent)
+{
+    QDomNode n = e.firstChild() ;
+#ifdef COLLECTION_DEBUG
+    std::cerr << "Parsing element " << e.tagName().toStdString() << std::endl;
+#endif
+
+    while(!n.isNull())
+    {
+        QDomElement ee = n.toElement(); // try to convert the node to an element.
+
+#ifdef COLLECTION_DEBUG
+        std::cerr << "  Seeing child " << ee.tagName().toStdString() << std::endl;
+#endif
+
+        if(ee.tagName() == QString("File"))
+        {
+            RsFileHash hash(ee.attribute(QString("sha1")).toStdString()) ;
+
+            bool bad_chars_detected = false;
+            std::string name = purifyFileName(ee.attribute(QString("name")), bad_chars_detected).toUtf8().constData() ;
+            uint64_t size = ee.attribute(QString("size")).toULongLong() ;
+
+            mFileTree.addFile(parent,name,hash,size);
+#ifdef TO_REMOVE
+            mFileTree.addFile(parent,)
+            ColFileInfo newChild ;
+            bool bad_chars_detected = false ;
+            newChild.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
+            newChild.size = ee.attribute(QString("size")).toULongLong() ;
+            newChild.path = current_path ;
+            newChild.type = DIR_TYPE_FILE ;
+
+            colFileInfos.push_back(newChild) ;
+#endif
+        }
+        else if(ee.tagName() == QString("Directory"))
+        {
+            bool bad_chars_detected = false ;
+            std::string cleanDirName = purifyFileName(ee.attribute(QString("name")),bad_chars_detected).toUtf8().constData() ;
+
+            RsFileTree::DirIndex new_dir_index = mFileTree.addDirectory(parent,cleanDirName);
+
+            recursParseXml(doc,ee,new_dir_index);
+#ifdef TO_REMOVE
+            newParent.name=cleanDirName;
+            newParent.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
+            newParent.size = 0;
+            newParent.path = current_path ;
+            newParent.type = DIR_TYPE_DIR ;
+
+            recursCollectColFileInfos(ee,newParent.children,current_path + "/" + cleanDirName, bad_chars_in_parent || bad_chars_detected) ;
+            uint32_t size = newParent.children.size();
+            for(uint32_t i=0;i<size;++i)
+            {
+                const ColFileInfo &colFileInfo = newParent.children[i];
+                newParent.size +=colFileInfo.size ;
+            }
+
+            colFileInfos.push_back(newParent) ;
+#endif
+        }
+
+        n = n.nextSibling() ;
+    }
+}
+bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const
+{
+    for(uint32_t i=0;i<dd.subfiles.size();++i)
+    {
+        QDomElement f = doc.createElement("File") ;
+
+        RsFileTree::FileData fd;
+        if(!mFileTree.getFileContent(dd.subfiles[i],fd))
+            return false;
+
+        f.setAttribute(QString("name"),QString::fromUtf8(fd.name.c_str())) ;
+        f.setAttribute(QString("sha1"),QString::fromStdString(fd.hash.toStdString())) ;
+        f.setAttribute(QString("size"),QString::number(fd.size)) ;
+
+        e.appendChild(f) ;
+    }
+
+    for(uint32_t i=0;i<dd.subdirs.size();++i)
+    {
+        RsFileTree::DirData di;
+        if(!mFileTree.getDirectoryContent(dd.subdirs[i],di))
+            return false;
+
+        QDomElement d = doc.createElement("Directory") ;
+        d.setAttribute(QString("name"),QString::fromUtf8(di.name.c_str())) ;
+
+        if(!recursExportToXml(doc,d,di))
+            return false;
+
+        e.appendChild(d) ;
+    }
+
+    return true;
+}
+
+#ifdef TO_REMOVE
 bool RsCollection::save(QWidget *parent) const
 {
 	QString fileName;
@@ -533,9 +667,13 @@ bool RsCollection::openColl(const QString& fileName, bool readOnly /* = false */
 	}
 	return false;
 }
+#endif
 
 qulonglong RsCollection::size()
 {
+    return mFileTree.totalFileSize();
+
+#ifdef TO_REMOVE
 	QDomElement docElem = _xml_doc.documentElement();
 
 	std::vector<ColFileInfo> colFileInfos;
@@ -548,6 +686,7 @@ qulonglong RsCollection::size()
 	}
 
 	return size;
+#endif
 }
 
 bool RsCollection::isCollectionFile(const QString &fileName)
@@ -557,6 +696,7 @@ bool RsCollection::isCollectionFile(const QString &fileName)
 	return (ext == RsCollection::ExtensionString);
 }
 
+#ifdef TO_REMOVE
 void RsCollection::saveColl(std::vector<ColFileInfo> colFileInfos, const QString &fileName)
 {
 
@@ -568,3 +708,4 @@ void RsCollection::saveColl(std::vector<ColFileInfo> colFileInfos, const QString
 	_saved=save(fileName);
 
 }
+#endif
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 492d407d8..e21c118d2 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -62,7 +62,7 @@ public:
 	RsCollection(QObject *parent = 0) ;
 	// create from list of files and directories
 	RsCollection(const std::vector<DirDetails>& file_entries, FileSearchFlags flags, QObject *parent = 0) ;
-	RsCollection(const RsFileTree& fr);
+    RsCollection(const RsFileTree& ft);
 	virtual ~RsCollection() ;
 
 	void merge_in(const QString& fname,uint64_t size,const RsFileHash& hash) ;
@@ -70,12 +70,14 @@ public:
 
 	static const QString ExtensionString ;
 
-	// Loads file from disk.
+#ifdef TO_REMOVE
 	bool load(QWidget *parent);
-	bool load(const QString& fileName, bool showError = true);
+    bool save(QWidget *parent) const ;
+#endif
+    // Loads file from disk.
+    bool load(const QString& fileName, bool showError = true);
 
 	// Save to disk
-	bool save(QWidget *parent) const ;
 	bool save(const QString& fileName) const ;
 
 	// Open new collection
@@ -97,22 +99,36 @@ private slots:
 
 private:
 
-	void recursAddElements(QDomDocument&, const DirDetails&, QDomElement&, FileSearchFlags flags) const ;
+    bool recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const;
+    bool recursParseXml(QDomDocument& doc,const QDomElement& e,RsFileTree::DirIndex dd) ;
+
+    // This function is used to populate a RsCollection from locally or remotly shared files.
+    void recursAddElements(RsFileTree::DirIndex parent, const DirDetails& dd, FileSearchFlags flags) ;
+
+    // This function is used to merge an existing RsFileTree into the RsCollection
+    void recursMergeTree(RsFileTree::DirIndex parent, const RsFileTree& tree, const RsFileTree::DirData &dd);
+
+#ifdef TO_REMOVE
 	void recursAddElements(QDomDocument&,const ColFileInfo&,QDomElement&) const;
 	void recursAddElements(
 	        QDomDocument& doc, const RsFileTree& ft, uint32_t index,
 	        QDomElement& e ) const;
 
 	void recursCollectColFileInfos(const QDomElement&,std::vector<ColFileInfo>& colFileInfos,const QString& current_dir,bool bad_chars_in_parent) const ;
-	// check that the file is a valid rscollection file, and not a lol bomb or some shit like this
+#endif
+
+    // check that the file is a valid rscollection file, and not a lol bomb or some shit like this
 	static bool checkFile(const QString &fileName, bool showError);
 	// Auto Download recursively.
 	void autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const ;
 
+    RsFileTree mFileTree;
+#ifdef TO_REMOVE
 	QDomDocument _xml_doc ;
 	QString _fileName ;
 	bool _saved;
 	QDomElement _root ;
+#endif
 
 	friend class RsCollectionDialog ;
 };
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index b27102d42..d73117b84 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -519,6 +519,7 @@ HEADERS +=  rshare.h \
             gui/common/vmessagebox.h \
             gui/common/RsUrlHandler.h \
             gui/common/RsCollectionDialog.h \
+            gui/common/RsCollectionModel.h \
             gui/common/rwindow.h \
             gui/common/rshtml.h \
             gui/common/AvatarDefs.h \
@@ -845,6 +846,7 @@ SOURCES +=  main.cpp \
             gui/common/ElidedLabel.cpp \
             gui/common/vmessagebox.cpp \
             gui/common/RsCollectionDialog.cpp \
+            gui/common/RsCollectionModel.cpp \
             gui/common/RsUrlHandler.cpp \
             gui/common/rwindow.cpp \
             gui/common/rshtml.cpp \

From 206da93d99ae119f9be121e2b5a604f12f9b33ca Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 24 Feb 2024 15:55:21 +0100
Subject: [PATCH 454/503] fixed a few compilation errors in RsCollection
 handling

---
 .../src/gui/FileTransfer/SearchDialog.cpp     |  33 ++--
 .../gui/FileTransfer/SharedFilesDialog.cpp    |  23 ++-
 .../src/gui/FileTransfer/TransfersDialog.cpp  |  45 ++---
 retroshare-gui/src/gui/RetroShareLink.cpp     |  10 +-
 .../src/gui/common/RsCollection.cpp           | 169 +++++++++++-------
 retroshare-gui/src/gui/common/RsCollection.h  |  22 ++-
 6 files changed, 181 insertions(+), 121 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 832970833..ed2498545 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -597,32 +597,35 @@ void SearchDialog::collOpen()
 
 			if (rsFiles->FileDetails(hash, RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL
 			                               | RS_FILE_HINTS_BROWSABLE | RS_FILE_HINTS_NETWORK_WIDE
-                                     | RS_FILE_HINTS_SPEC_ONLY, info)) {
-
+                                     | RS_FILE_HINTS_SPEC_ONLY, info))
+            {
 				/* make path for downloaded files */
 				std::string path;
 				path = info.path;
 
 				/* open file with a suitable application */
 				QFileInfo qinfo;
+                RsCollection::RsCollectionErrorCode err;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-				if (qinfo.exists()) {
-					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-						RsCollection collection;
-						if (collection.load(qinfo.absoluteFilePath())) {
-							collection.downloadFiles();
-							return;
-						}
-					}
-				}
+                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+                    RsCollection(qinfo.absoluteFilePath(),err).downloadFiles();
 			}
 		}
 	}
 
-	RsCollection collection;
-	if (collection.load(this)) {
-		collection.downloadFiles();
-	}//if (collection.load(this))
+    QString fileName;
+    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
+        return ;
+
+    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
+
+    RsCollection::RsCollectionErrorCode err;
+    RsCollection collection(fileName, err);
+
+    if(err == RsCollection::RsCollectionErrorCode::NO_ERROR)
+        collection.downloadFiles();
+    else
+        QMessageBox::information(nullptr,tr("Error open RsCollection file"),RsCollection::errorString(err));
 }
 
 void SearchDialog::downloadDirectory(const QTreeWidgetItem *item, const QString &base)
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 5abe9ab39..4645841a9 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -652,7 +652,7 @@ void SharedFilesDialog::copyLinks(const QModelIndexList& lst, bool remote,QList<
 
             QString dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
 
-            RetroShareLink link = RetroShareLink::createFileTree(dir_name,ft->mTotalSize,ft->mTotalFiles,QString::fromStdString(ft->toRadix64())) ;
+            RetroShareLink link = RetroShareLink::createFileTree(dir_name,ft->totalFileSize(),ft->numFiles(),QString::fromStdString(ft->toRadix64())) ;
 
 			if(link.valid())
 				urls.push_back(link) ;
@@ -821,8 +821,12 @@ void SharedFilesDialog::collOpen()
             qinfo.setFile(QString::fromUtf8(path.c_str()));
             if (qinfo.exists()) {
                 if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-                    RsCollection collection;
-                    if (collection.load(qinfo.absoluteFilePath())) {
+
+                    RsCollection::RsCollectionErrorCode err;
+                    RsCollection collection(qinfo.absoluteFilePath(),err);
+
+                    if(err == RsCollection::RsCollectionErrorCode::NO_ERROR)
+                    {
                         collection.downloadFiles();
                         return;
                     }
@@ -831,10 +835,17 @@ void SharedFilesDialog::collOpen()
         }
     }
 
-    RsCollection collection;
-    if (collection.load(this)) {
+    QString fileName;
+    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
+        return ;
+
+    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
+
+    RsCollection::RsCollectionErrorCode err;
+    RsCollection collection(fileName,err);
+
+    if(err == RsCollection::RsCollectionErrorCode::NO_ERROR)
         collection.downloadFiles();
-    }
 }
 
 void LocalSharedFilesDialog::playselectedfiles()
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 6fc45a070..8dca82e28 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -2564,23 +2564,29 @@ void TransfersDialog::collOpen()
 				/* open file with a suitable application */
 				QFileInfo qinfo;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-				if (qinfo.exists()) {
-					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-						RsCollection collection;
-						if (collection.load(qinfo.absoluteFilePath())) {
-							collection.downloadFiles();
-							return;
-						}
-					}
-				}
+                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+                {
+                        RsCollection::RsCollectionErrorCode code;
+                        RsCollection(qinfo.absoluteFilePath(),code).downloadFiles();
+                        return;
+                }
 			}
 		}
 	}
 
-	RsCollection collection;
-	if (collection.load(this)) {
+    QString fileName;
+    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
+        return ;
+
+    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
+
+    RsCollection::RsCollectionErrorCode code;
+    RsCollection collection(fileName,code);
+
+    if(code == RsCollection::RsCollectionErrorCode::NO_ERROR)
 		collection.downloadFiles();
-	}
+    else
+        QMessageBox::information(nullptr,tr("Error openning collection file"),RsCollection::errorString(code));
 }
 
 void TransfersDialog::collAutoOpen(const QString &fileHash)
@@ -2592,21 +2598,18 @@ void TransfersDialog::collAutoOpen(const QString &fileHash)
 		if (rsFiles->FileDetails(hash, RS_FILE_HINTS_DOWNLOAD, info)) {
 
 			/* make path for downloaded files */
-			if (info.downloadStatus == FT_STATE_COMPLETE) {
+            if (info.downloadStatus == FT_STATE_COMPLETE)
+            {
 				std::string path;
 				path = info.path + "/" + info.fname;
 
 				/* open file with a suitable application */
 				QFileInfo qinfo;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-				if (qinfo.exists()) {
-					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-						RsCollection collection;
-						if (collection.load(qinfo.absoluteFilePath(), false)) {
-							collection.autoDownloadFiles();
-						}
-					}
-				}
+                RsCollection::RsCollectionErrorCode err;
+
+                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+                    RsCollection(qinfo.absoluteFilePath(),err).autoDownloadFiles();
 			}
 		}
 	}
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 6e377f70e..f87c72760 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -1143,11 +1143,13 @@ QString RetroShareLink::toHtmlSize() const
 
 	if (type() == TYPE_FILE && RsCollection::isCollectionFile(name())) {
 		FileInfo finfo;
-		if (rsFiles->FileDetails(RsFileHash(hash().toStdString()), RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL, finfo)) {
-			RsCollection collection;
-			if (collection.load(QString::fromUtf8(finfo.path.c_str()), false)) {
+        if (rsFiles->FileDetails(RsFileHash(hash().toStdString()), RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL, finfo))
+        {
+            RsCollection::RsCollectionErrorCode code;
+            RsCollection collection(QString::fromUtf8(finfo.path.c_str()), code) ;
+
+            if(code == RsCollection::RsCollectionErrorCode::NO_ERROR)
 				size += QString(" [%1]").arg(misc::friendlyUnit(collection.size()));
-			}
 		}
 	}
 	QString link = QString("<a href=\"%1\">%2</a> <font color=\"blue\">%3</font>").arg(toString()).arg(name()).arg(size);
diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 1baaed636..08474fb19 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -330,97 +330,128 @@ static void showErrorBox(const QString& fileName, const QString& error)
 	mb.exec();
 }
 
-bool RsCollection::load(const QString& fileName, bool showError /* = true*/)
+QString RsCollection::errorString(RsCollectionErrorCode code)
 {
+    switch(code)
+    {
+    default: [[fallthrough]] ;
+    case RsCollectionErrorCode::UNKNOWN_ERROR:                 return tr("Unknown error");
+    case RsCollectionErrorCode::NO_ERROR:                      return tr("No error");
+    case RsCollectionErrorCode::FILE_READ_ERROR:               return tr("Error while openning file");
+    case RsCollectionErrorCode::FILE_CONTAINS_HARMFUL_STRINGS: return tr("Collection file contains potentially harmful code");
+    case RsCollectionErrorCode::INVALID_ROOT_NODE:             return tr("Invalid root node. RsCollection node was expected.");
+    case RsCollectionErrorCode::XML_PARSING_ERROR:             return tr("XML parsing error in collection file");
+    }
+}
 
-	if (!checkFile(fileName,showError)) return false;
-	QFile file(fileName);
+RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error)
+{
+    if (!checkFile(fileName,error))
+        return ;
 
-	if (!file.open(QIODevice::ReadOnly))
-	{
-		std::cerr << "Cannot open file " << fileName.toStdString() << " !!" << std::endl;
-		if (showError) {
-			showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(fileName));
-		}
-		return false;
-	}
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::ReadOnly))
+    {
+        std::cerr << "Cannot open file " << fileName.toStdString() << " !!" << std::endl;
+        error = RsCollectionErrorCode::FILE_READ_ERROR;
+        //showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(fileName));
+        return ;
+    }
 
     QDomDocument xml_doc;
     bool ok = xml_doc.setContent(&file) ;
-	file.close();
 
+    if(!ok)
+    {
+        error = RsCollectionErrorCode::XML_PARSING_ERROR;
+        return;
+    }
+    file.close();
 
+    QDomNode root = xml_doc.elementsByTagName("RsCollection").at(0).toElement();
 
-	return ok;
+    if(root.isNull())
+    {
+        error = RsCollectionErrorCode::INVALID_ROOT_NODE;
+        return;
+    }
+
+    recursParseXml(xml_doc,root,0);
+    error = RsCollectionErrorCode::NO_ERROR;
 }
 
-	// check that the file is a valid rscollection file, and not a lol bomb or some shit like this
-bool RsCollection::checkFile(const QString& fileName, bool showError)
+// check that the file is a valid rscollection file, and not a lol bomb or some shit like this
+
+bool RsCollection::checkFile(const QString& fileName, RsCollectionErrorCode& error)
 {
-	QFile file(fileName);
+    QFile file(fileName);
+    error = RsCollectionErrorCode::NO_ERROR;
 
-	if (!file.open(QIODevice::ReadOnly))
-	{
-		std::cerr << "Cannot open file " << fileName.toStdString() << " !!" << std::endl;
-		if (showError) {
-			showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(fileName));
-		}
-		return false;
-	}
-	if (file.reset()){
-	std::cerr << "Checking this file for bomb elements and various wrong stuff" << std::endl;
-	char c ;
+    if (!file.open(QIODevice::ReadOnly))
+    {
+        std::cerr << "Cannot open file " << fileName.toStdString() << " !!" << std::endl;
+        error = RsCollectionErrorCode::FILE_READ_ERROR;
 
-	std::vector<std::string> bad_strings ;
-	bad_strings.push_back(std::string("<!entity ")) ;
-	static const int max_size = 12 ; // should be as large as the largest element in bad_strings
-	char current[max_size] = { 0,0,0,0,0,0,0,0,0,0,0,0 } ;
-	int n=0 ;
+        //showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(fileName));
+        return false;
+    }
+    if (file.reset()){
+        std::cerr << "Checking this file for bomb elements and various wrong stuff" << std::endl;
+        char c ;
 
-		while( !file.atEnd() || n >= 0)
-	{
-			if (!file.atEnd())
-				file.getChar(&c);
-			else
-				c=0;
+        std::vector<std::string> bad_strings ;
+        bad_strings.push_back(std::string("<!entity ")) ;
+        static const int max_size = 12 ; // should be as large as the largest element in bad_strings
+        char current[max_size] = { 0,0,0,0,0,0,0,0,0,0,0,0 } ;
+        int n=0 ;
 
-		if(c == '\t' || c == '\n' || c == '\b' || c == '\r')
-			continue ;
+        while( !file.atEnd() || n >= 0)
+        {
+            if (!file.atEnd())
+                file.getChar(&c);
+            else
+                c=0;
 
-		if (n == max_size || file.atEnd())
-			for(int i=0;i<n-1;++i)
-				current[i] = current[i+1] ;
+            if(c == '\t' || c == '\n' || c == '\b' || c == '\r')
+                continue ;
 
-		if(n == max_size)
-			--n ;
+            if (n == max_size || file.atEnd())
+                for(int i=0;i<n-1;++i)
+                    current[i] = current[i+1] ;
 
-		if(c >= 'A' && c <= 'Z') c += 'a' - 'A' ;
+            if(n == max_size)
+                --n ;
 
-			if(!file.atEnd())
-			current[n] = c ;
-		else
-			current[n] = 0 ;
+            if(c >= 'A' && c <= 'Z') c += 'a' - 'A' ;
 
-		//std::cerr << "n==" << n <<" Checking string " << std::string(current,n+1)  << " c = " << std::hex << (int)c << std::dec << std::endl;
+            if(!file.atEnd())
+                current[n] = c ;
+            else
+                current[n] = 0 ;
 
-			for(uint i=0;i<bad_strings.size();++i)
-			if(std::string(current,bad_strings[i].length()) == bad_strings[i])
-			{
-					showErrorBox(file.fileName(), QApplication::translate("RsCollectionFile", "This file contains the string \"%1\" and is therefore an invalid collection file. \n\nIf you believe it is correct, remove the corresponding line from the file and re-open it with Retroshare.").arg(bad_strings[i].c_str()));
-					file.close();
-				return false ;
-				//std::cerr << "Bad string detected" << std::endl;
-			}
+            //std::cerr << "n==" << n <<" Checking string " << std::string(current,n+1)  << " c = " << std::hex << (int)c << std::dec << std::endl;
 
-			if(file.atEnd())
-			n-- ;
-		else if(n < max_size)
-			++n ;
-	}
-	file.close();
-		return true;
-		}
-	return false;
+            for(uint i=0;i<bad_strings.size();++i)
+                if(std::string(current,bad_strings[i].length()) == bad_strings[i])
+                {
+                    //showErrorBox(file.fileName(), QApplication::translate("RsCollectionFile", "This file contains the string \"%1\" and is therefore an invalid collection file. \n\nIf you believe it is correct, remove the corresponding line from the file and re-open it with Retroshare.").arg(bad_strings[i].c_str()));
+                    error = RsCollectionErrorCode::FILE_CONTAINS_HARMFUL_STRINGS;
+                    file.close();
+                    return false ;
+                    //std::cerr << "Bad string detected" << std::endl;
+                }
+
+            if(file.atEnd())
+                n-- ;
+            else if(n < max_size)
+                ++n ;
+        }
+        file.close();
+        return true;
+    }
+    error = RsCollectionErrorCode::UNKNOWN_ERROR;
+    return false;
 }
 
 #ifdef TO_REMOVE
@@ -467,7 +498,7 @@ bool RsCollection::save(const QString& fileName) const
 	return true;
 }
 
-bool RsCollection::recursParseXml(QDomDocument& doc,const QDomElement& e,const RsFileTree::DirIndex parent)
+bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFileTree::DirIndex parent)
 {
     QDomNode n = e.firstChild() ;
 #ifdef COLLECTION_DEBUG
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index e21c118d2..31fa777a3 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -58,12 +58,24 @@ class RsCollection : public QObject
 	Q_OBJECT
 
 public:
+    enum class RsCollectionErrorCode:uint8_t {
+        NO_ERROR                      = 0x00,
+        UNKNOWN_ERROR                 = 0x01,
+        FILE_READ_ERROR               = 0x02,
+        FILE_CONTAINS_HARMFUL_STRINGS = 0x03,
+        INVALID_ROOT_NODE             = 0x04,
+        XML_PARSING_ERROR             = 0x05,
+    };
 
 	RsCollection(QObject *parent = 0) ;
 	// create from list of files and directories
 	RsCollection(const std::vector<DirDetails>& file_entries, FileSearchFlags flags, QObject *parent = 0) ;
     RsCollection(const RsFileTree& ft);
-	virtual ~RsCollection() ;
+    RsCollection(const QString& filename,RsCollectionErrorCode& error_code);
+
+    static QString errorString(RsCollectionErrorCode code);
+
+    virtual ~RsCollection() ;
 
 	void merge_in(const QString& fname,uint64_t size,const RsFileHash& hash) ;
 	void merge_in(const RsFileTree& tree) ;
@@ -74,9 +86,6 @@ public:
 	bool load(QWidget *parent);
     bool save(QWidget *parent) const ;
 #endif
-    // Loads file from disk.
-    bool load(const QString& fileName, bool showError = true);
-
 	// Save to disk
 	bool save(const QString& fileName) const ;
 
@@ -100,7 +109,7 @@ private slots:
 private:
 
     bool recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const;
-    bool recursParseXml(QDomDocument& doc,const QDomElement& e,RsFileTree::DirIndex dd) ;
+    bool recursParseXml(QDomDocument& doc, const QDomNode &e, RsFileTree::DirIndex dd) ;
 
     // This function is used to populate a RsCollection from locally or remotly shared files.
     void recursAddElements(RsFileTree::DirIndex parent, const DirDetails& dd, FileSearchFlags flags) ;
@@ -118,7 +127,8 @@ private:
 #endif
 
     // check that the file is a valid rscollection file, and not a lol bomb or some shit like this
-	static bool checkFile(const QString &fileName, bool showError);
+    static bool checkFile(const QString &fileName, RsCollectionErrorCode &error);
+
 	// Auto Download recursively.
 	void autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const ;
 

From 5071656209bd0dad327303d12413e274650e8bdf Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 24 Feb 2024 17:44:13 +0100
Subject: [PATCH 455/503] started adapting RsCollectionDialog to the new API of
 RsCollection

---
 .../src/gui/FileTransfer/SearchDialog.cpp     |  18 +--
 .../gui/FileTransfer/SharedFilesDialog.cpp    |  18 +--
 .../src/gui/FileTransfer/TransfersDialog.cpp  |  30 ++---
 retroshare-gui/src/gui/MainWindow.cpp         |  10 +-
 .../src/gui/common/RsCollection.cpp           |  82 ------------
 retroshare-gui/src/gui/common/RsCollection.h  |   6 +-
 .../src/gui/common/RsCollectionDialog.cpp     | 126 +++++++++++++++---
 .../src/gui/common/RsCollectionDialog.h       |  15 ++-
 .../src/gui/common/RsCollectionModel.cpp      |   0
 .../src/gui/common/RsCollectionModel.h        |   0
 .../src/gui/common/RsUrlHandler.cpp           |   9 +-
 11 files changed, 148 insertions(+), 166 deletions(-)
 create mode 100644 retroshare-gui/src/gui/common/RsCollectionModel.cpp
 create mode 100644 retroshare-gui/src/gui/common/RsCollectionModel.h

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index ed2498545..a2be7bc07 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -30,7 +30,7 @@
 #include "gui/RetroShareLink.h"
 #include "retroshare-gui/RsAutoUpdatePage.h"
 #include "gui/msgs/MessageComposer.h"
-#include "gui/common/RsCollection.h"
+#include "gui/common/RsCollectionDialog.h"
 #include "gui/common/FilesDefs.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/settings/rsharesettings.h"
@@ -542,12 +542,8 @@ void SearchDialog::collModif()
 	/* open file with a suitable application */
 	QFileInfo qinfo;
 	qinfo.setFile(QString::fromUtf8(path.c_str()));
-	if (qinfo.exists()) {
-		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-			RsCollection collection;
-			collection.openColl(qinfo.absoluteFilePath());
-		}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
-	}//if (qinfo.exists())
+    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+            RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
 }
 
 void SearchDialog::collView()
@@ -574,12 +570,8 @@ void SearchDialog::collView()
 	/* open file with a suitable application */
 	QFileInfo qinfo;
 	qinfo.setFile(QString::fromUtf8(path.c_str()));
-	if (qinfo.exists()) {
-		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-			RsCollection collection;
-			collection.openColl(qinfo.absoluteFilePath(), true);
-		}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
-	}//if (qinfo.exists())
+    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+        RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
 }
 
 void SearchDialog::collOpen()
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 4645841a9..2cd2437be 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -27,7 +27,7 @@
 #include "gui/RetroShareLink.h"
 #include "gui/ShareManager.h"
 #include "gui/common/PeerDefs.h"
-#include "gui/common/RsCollection.h"
+#include "gui/common/RsCollectionDialog.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/gxschannels/GxsChannelDialog.h"
 #include "gui/gxsforums/GxsForumsDialog.h"
@@ -759,12 +759,8 @@ void SharedFilesDialog::collModif()
     /* open file with a suitable application */
     QFileInfo qinfo;
     qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists()) {
-        if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-            RsCollection collection;
-            collection.openColl(qinfo.absoluteFilePath());
-        }
-    }
+    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+            RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
 }
 
 void SharedFilesDialog::collView()
@@ -789,12 +785,8 @@ void SharedFilesDialog::collView()
     /* open file with a suitable application */
     QFileInfo qinfo;
     qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists()) {
-        if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-            RsCollection collection;
-            collection.openColl(qinfo.absoluteFilePath(), true);
-        }
-    }
+    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+        RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
 }
 
 void SharedFilesDialog::collOpen()
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 8dca82e28..44c0260bd 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -24,7 +24,7 @@
 #include "gui/SoundManager.h"
 #include "gui/RetroShareLink.h"
 #include "gui/common/FilesDefs.h"
-#include "gui/common/RsCollection.h"
+#include "gui/common/RsCollectionDialog.h"
 #include "gui/common/RSTreeView.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/FileTransfer/DetailsDialog.h"
@@ -2466,21 +2466,17 @@ void TransfersDialog::collCreate()
 	std::set<RsFileHash>::iterator it ;
 	getDLSelectedItems(&items, NULL);
 
+    RsFileTree tree;
+
 	for (it = items.begin(); it != items.end(); ++it)
 	{
 		FileInfo info;
 		if (!rsFiles->FileDetails(*it, RS_FILE_HINTS_DOWNLOAD, info)) continue;
 
-		DirDetails details;
-		details.name = info.fname;
-		details.hash = info.hash;
-        details.size = info.size;
-		details.type = DIR_TYPE_FILE;
-
-		dirVec.push_back(details);
+        tree.addFile(tree.root(),info.fname,info.hash,info.size);
 	}
 
-	RsCollection(dirVec,RS_FILE_HINTS_LOCAL).openNewColl(this);
+    RsCollectionDialog::openNewCollection(tree);
 }
 
 void TransfersDialog::collModif()
@@ -2504,12 +2500,8 @@ void TransfersDialog::collModif()
 		/* open collection */
 		QFileInfo qinfo;
 		qinfo.setFile(QString::fromUtf8(path.c_str()));
-		if (qinfo.exists()) {
-			if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-				RsCollection collection;
-				collection.openColl(qinfo.absoluteFilePath());
-			}
-		}
+        if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+                RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
 	}
 }
 
@@ -2534,12 +2526,8 @@ void TransfersDialog::collView()
 		/* open collection  */
 		QFileInfo qinfo;
 		qinfo.setFile(QString::fromUtf8(path.c_str()));
-		if (qinfo.exists()) {
-			if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-				RsCollection collection;
-				collection.openColl(qinfo.absoluteFilePath(), true);
-			}
-		}
+        if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+                RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
 	}
 }
 
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index d69e2bb42..a35870bd1 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -119,7 +119,7 @@
 #include "gui/statistics/StatisticsWindow.h"
 
 #include "gui/connect/ConnectFriendWizard.h"
-#include "gui/common/RsCollection.h"
+#include "gui/common/RsCollectionDialog.h"
 #include "settings/rsettingswin.h"
 #include "settings/rsharesettings.h"
 #include "common/StatusDefs.h"
@@ -1623,12 +1623,8 @@ void MainWindow::retroshareLinkActivated(const QUrl &url)
 void MainWindow::openRsCollection(const QString &filename)
 {
 	QFileInfo qinfo(filename);
-	if (qinfo.exists()) {
-		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-			RsCollection collection;
-			collection.openColl(qinfo.absoluteFilePath());
-		}
-	}
+    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
+            RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
 }
 
 void MainWindow::processLastArgs()
diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 08474fb19..c1a21f9a1 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -615,89 +615,7 @@ bool RsCollection::save(QWidget *parent) const
 }
 
 
-bool RsCollection::openNewColl(QWidget *parent, QString fileName)
-{
-	if(!misc::getSaveFileName(parent, RshareSettings::LASTDIR_EXTRAFILE
-														, QApplication::translate("RsCollectionFile", "Create collection file")
-														, QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")"
-														, fileName,0, QFileDialog::DontConfirmOverwrite))
-		return false;
 
-	if (!fileName.endsWith("." + RsCollection::ExtensionString))
-		fileName += "." + RsCollection::ExtensionString ;
-
-	std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-	QFile file(fileName) ;
-
-	if(file.exists())
-	{
-		if (!checkFile(fileName,true)) return false;
-
-		QMessageBox mb;
-		mb.setText(tr("Save Collection File."));
-		mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
-		QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
-		QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
-		QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
-		mb.setIcon(QMessageBox::Question);
-		mb.exec();
-
-		if (mb.clickedButton()==btnOwerWrite) {
-			//Nothing to do _xml_doc already up to date
-		} else if (mb.clickedButton()==btnMerge) {
-			//Open old file to merge it with _xml_doc
-			QDomDocument qddOldFile("RsCollection");
-			if (qddOldFile.setContent(&file)) {
-				QDomElement docOldElem = qddOldFile.elementsByTagName("RsCollection").at(0).toElement();
-				std::vector<ColFileInfo> colOldFileInfos;
-				recursCollectColFileInfos(docOldElem,colOldFileInfos,QString(),false);
-
-				QDomElement root = _xml_doc.elementsByTagName("RsCollection").at(0).toElement();
-				for(uint32_t i = 0;i<colOldFileInfos.size();++i){
-					recursAddElements(_xml_doc,colOldFileInfos[i],root) ;
-				}
-			}
-
-		} else if (mb.clickedButton()==btnCancel) {
-			return false;
-		} else {
-			return false;
-		}
-
-	}//if(file.exists())
-
-	_fileName=fileName;
-	std::vector<ColFileInfo> colFileInfos ;
-
-	recursCollectColFileInfos(_xml_doc.documentElement(),colFileInfos,QString(),false) ;
-
-	RsCollectionDialog* rcd = new RsCollectionDialog(fileName, colFileInfos,true);
-	connect(rcd,SIGNAL(saveColl(std::vector<ColFileInfo>, QString)),this,SLOT(saveColl(std::vector<ColFileInfo>, QString))) ;
-	_saved=false;
-	rcd->exec() ;
-	delete rcd;
-
-	return _saved;
-}
-
-bool RsCollection::openColl(const QString& fileName, bool readOnly /* = false */, bool showError /* = true*/)
-{
-	if (load(fileName, showError)) {
-		std::vector<ColFileInfo> colFileInfos ;
-
-		recursCollectColFileInfos(_xml_doc.documentElement(),colFileInfos,QString(),false) ;
-
-		RsCollectionDialog* rcd = new RsCollectionDialog(fileName, colFileInfos, true, readOnly);
-		connect(rcd,SIGNAL(saveColl(std::vector<ColFileInfo>, QString)),this,SLOT(saveColl(std::vector<ColFileInfo>, QString))) ;
-		_saved=false;
-		rcd->exec() ;
-		delete rcd;
-
-		return _saved;
-	}
-	return false;
-}
 #endif
 
 qulonglong RsCollection::size()
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 31fa777a3..32863be80 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -89,10 +89,8 @@ public:
 	// Save to disk
 	bool save(const QString& fileName) const ;
 
-	// Open new collection
-	bool openNewColl(QWidget *parent, QString fileName = "");
-	// Open existing collection
-	bool openColl(const QString& fileName, bool readOnly = false, bool showError = true);
+    // returns the file tree
+    const RsFileTree& fileTree() const { return mFileTree; }
 
 	// Download the content.
 	void downloadFiles() const ;
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 417af69bc..240bae85c 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -693,36 +693,35 @@ void RsCollectionDialog::changeFileName()
 	std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
 
 	QFile file(fileName) ;
+    RsCollection::RsCollectionErrorCode err;
 
-	if(file.exists())
-	{
-		RsCollection collFile;
-		if (!collFile.checkFile(fileName,true)) return;
-
+    if(file.exists() && RsCollection::checkFile(fileName,err))
+    {
 		QMessageBox mb;
 		mb.setText(tr("Save Collection File."));
 		mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
 		QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
-		QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
-		QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
+        QAbstractButton *btnMerge     = mb.addButton(tr("Merge"),     QMessageBox::NoRole);
+        QAbstractButton *btnCancel    = mb.addButton(tr("Cancel"),    QMessageBox::ResetRole);
 		mb.setIcon(QMessageBox::Question);
 		mb.exec();
 
 		if (mb.clickedButton()==btnOwerWrite) {
 			//Nothing to do
-		} else if (mb.clickedButton()==btnMerge) {
+        }
+        else if(mb.clickedButton()==btnMerge)
+        {
 			//Open old file to merge it with RsCollection
-			QDomDocument qddOldFile("RsCollection");
-			if (qddOldFile.setContent(&file)) {
-				QDomElement docOldElem = qddOldFile.elementsByTagName("RsCollection").at(0).toElement();
-				collFile.recursCollectColFileInfos(docOldElem,_newColFileInfos,QString(),false);
-			}
 
-		} else if (mb.clickedButton()==btnCancel) {
+            RsCollection qddOldFileCollection(fileName,err);
+
+            if(err != RsCollection::RsCollectionErrorCode::NO_ERROR)
+                _collection.merge_in(qddOldFileCollection.fileTree());
+        }
+        else if(mb.clickedButton()==btnCancel)
 			return;
-		} else {
+        else
 			return;
-		}
 
 	} else {//if(file.exists())
 		//create a new empty file to check if name if good.
@@ -1444,3 +1443,98 @@ void RsCollectionDialog::saveChild(QTreeWidgetItem *parentItem, ColFileInfo *par
 		}
 	}
 }
+
+bool RsCollectionDialog::openExistingCollection(const QString& fileName, bool readOnly /* = false */, bool showError /* = true*/)
+{
+#ifdef TODO
+    RsCollection::RsCollectionErrorCode err;
+    RsCollection col(fileName,err);
+
+    if(err != RsCollection::RsCollectionErrorCode::NO_ERROR)
+    {
+        RsCollectionDialog rcd = new RsCollectionDialog(col, true, readOnly);
+        return rcd.exec() ;
+    }
+
+    if(showError)
+        QMessageBox::information(nullptr,tr("Error openning RsCollection"),RsCollection::errorString(err));
+
+#endif
+    return false;
+}
+
+bool RsCollectionDialog::openNewCollection(const RsFileTree& tree,const QString& proposed_file_name)
+{
+#ifdef TODO
+    QString fileName = proposed_file_name;
+
+    if(!misc::getSaveFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE
+                                                        , QApplication::translate("RsCollectionFile", "Create collection file")
+                                                        , QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")"
+                                                        , fileName,0, QFileDialog::DontConfirmOverwrite))
+        return false;
+
+    if (!fileName.endsWith("." + RsCollection::ExtensionString))
+        fileName += "." + RsCollection::ExtensionString ;
+
+    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
+
+    QFile file(fileName) ;
+
+    if(file.exists())
+    {
+        RsCollection::RsCollectionErrorCode err;
+        if (!RsCollection::checkFile(fileName,err))
+        {
+            QMessageBox::information(nullptr,tr("Error openning collection"),RsCollection::errorString(err));
+            return false;
+        }
+
+        QMessageBox mb;
+        mb.setText(tr("Save Collection File."));
+        mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
+        QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
+        QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
+        QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
+        mb.setIcon(QMessageBox::Question);
+        mb.exec();
+
+        if (mb.clickedButton()==btnOwerWrite) {
+            //Nothing to do _xml_doc already up to date
+        } else if (mb.clickedButton()==btnMerge) {
+            //Open old file to merge it with _xml_doc
+            QDomDocument qddOldFile("RsCollection");
+            if (qddOldFile.setContent(&file)) {
+                QDomElement docOldElem = qddOldFile.elementsByTagName("RsCollection").at(0).toElement();
+                std::vector<ColFileInfo> colOldFileInfos;
+                recursCollectColFileInfos(docOldElem,colOldFileInfos,QString(),false);
+
+                QDomElement root = _xml_doc.elementsByTagName("RsCollection").at(0).toElement();
+                for(uint32_t i = 0;i<colOldFileInfos.size();++i){
+                    recursAddElements(_xml_doc,colOldFileInfos[i],root) ;
+                }
+            }
+
+        } else if (mb.clickedButton()==btnCancel) {
+            return false;
+        } else {
+            return false;
+        }
+
+    }//if(file.exists())
+
+    _fileName=fileName;
+    std::vector<ColFileInfo> colFileInfos ;
+
+    recursCollectColFileInfos(_xml_doc.documentElement(),colFileInfos,QString(),false) ;
+
+    RsCollectionDialog* rcd = new RsCollectionDialog(fileName, colFileInfos,true);
+    connect(rcd,SIGNAL(saveColl(std::vector<ColFileInfo>, QString)),this,SLOT(saveColl(std::vector<ColFileInfo>, QString))) ;
+    _saved=false;
+    rcd->exec() ;
+    delete rcd;
+
+#endif
+    return true;
+}
+
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h
index 43c7dbdd7..f4fd5749a 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.h
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h
@@ -30,15 +30,20 @@ class RsCollectionDialog: public QDialog
 	Q_OBJECT
 
 public:
-	RsCollectionDialog(const QString& filename
-	                   , const std::vector<ColFileInfo> &colFileInfos
-	                   , const bool& creation
-	                   , const bool& readOnly = false) ;
 	virtual ~RsCollectionDialog();
 
+    // Open new collection
+    static bool openNewCollection(const RsFileTree &tree, const QString &proposed_file_name = QString());
+
+    // Open existing collection
+    static bool openExistingCollection(const QString& fileName, bool readOnly = false, bool showError = true);
+
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
 
+    RsCollectionDialog(const QString& filename, const std::vector<ColFileInfo> &colFileInfos, const bool& creation,
+                       const bool& readOnly = false) ;
+
 private slots:
 	void directoryLoaded(QString dirLoaded);
 	void updateSizes() ;
@@ -88,4 +93,6 @@ private:
 	QItemSelectionModel *_selectionProxy;
 	bool _dirLoaded;
 	QHash<QString,QString> _listOfFilesAddedInDir;
+
+    RsCollection _collection;
 };
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/retroshare-gui/src/gui/common/RsUrlHandler.cpp b/retroshare-gui/src/gui/common/RsUrlHandler.cpp
index 6ac6310ac..3d005aed6 100644
--- a/retroshare-gui/src/gui/common/RsUrlHandler.cpp
+++ b/retroshare-gui/src/gui/common/RsUrlHandler.cpp
@@ -28,12 +28,9 @@ bool RsUrlHandler::openUrl(const QUrl& url)
 {
 	if(url.scheme() == QString("file") && url.toLocalFile().endsWith("."+RsCollection::ExtensionString))
 	{
-		RsCollection collection ;
-		if(collection.load(url.toLocalFile()))
-		{
-			collection.downloadFiles() ;
-			return true;
-		}
+        RsCollection::RsCollectionErrorCode err;
+        RsCollection(url.toLocalFile(),err).downloadFiles() ;
+        return true;
 	}
 	return QDesktopServices::openUrl(url) ;
 }

From 5bc071b03c134dadeb2b9f7e27906d1efac3d5bf Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 24 Feb 2024 20:27:18 +0100
Subject: [PATCH 456/503] fixed compilation

---
 .../src/gui/FileTransfer/SearchDialog.cpp     | 18 ++++++-------
 .../gui/FileTransfer/SharedFilesDialog.cpp    | 19 +++++++++++++-
 retroshare-gui/src/gui/RemoteDirModel.cpp     | 25 -------------------
 retroshare-gui/src/gui/RemoteDirModel.h       |  2 --
 retroshare-gui/src/gui/common/RsCollection.h  |  3 ---
 .../src/gui/common/RsCollectionDialog.cpp     |  3 ++-
 6 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index a2be7bc07..33646816a 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -497,25 +497,23 @@ void SearchDialog::collCreate()
 	int selectedCount = selectedItems.size() ;
 	QTreeWidgetItem * item ;
 
-	for (int i = 0; i < selectedCount; ++i) {
+    RsFileTree tree;
+
+    for (int i = 0; i < selectedCount; ++i)
+    {
 		item = selectedItems.at(i) ;
 
-		if (!item->text(SR_HASH_COL).isEmpty()) {
+        if (!item->text(SR_HASH_COL).isEmpty())
+        {
 			std::string name = item->text(SR_NAME_COL).toUtf8().constData();
 			RsFileHash hash( item->text(SR_HASH_COL).toStdString() );
 			uint64_t count = item->text(SR_SIZE_COL).toULongLong();
 
-			DirDetails details;
-			details.name = name;
-			details.hash = hash;
-            details.size = count;
-			details.type = DIR_TYPE_FILE;
-
-			dirVec.push_back(details);
+            tree.addFile(tree.root(),name,hash,count);
 		}
 	}
 
-	RsCollection(dirVec,RS_FILE_HINTS_LOCAL).openNewColl(this);
+    RsCollectionDialog::openNewCollection(tree);
 }
 
 void SearchDialog::collModif()
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 2cd2437be..7321486fe 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -733,8 +733,25 @@ void SharedFilesDialog::sendLinkTo()
 
 void SharedFilesDialog::collCreate()
 {
+#ifdef TODO
     QModelIndexList lst = getSelected();
-    model->createCollectionFile(this, lst);
+
+    std::vector <DirDetails> dirVec;
+    model->getDirDetailsFromSelect(lst, dirVec);
+
+    FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
+
+    QString dir_name;
+    if(!RemoteMode)
+    {
+        if(!dirVec.empty())
+        {
+            const DirDetails& details = dirVec[0];
+            dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
+        }
+    }
+    RsCollection(dirVec,f).openNewColl(parent,dir_name);
+#endif
 }
 
 void SharedFilesDialog::collModif()
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index 05e19857f..87f70c06c 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -1233,31 +1233,6 @@ bool RetroshareDirModel::requestDirDetails(void *ref, bool remote,DirDetails& d)
     return false ;
 }
 
-void RetroshareDirModel::createCollectionFile(QWidget *parent, const QModelIndexList &list)
-{
-/*	if(RemoteMode)
-	{
-		std::cerr << "Cannot create a collection file from remote" << std::endl;
-		return ;
-	}*/
-
-	std::vector <DirDetails> dirVec;
-	getDirDetailsFromSelect(list, dirVec);
-
-	FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
-	
-	QString dir_name;
-	if(!RemoteMode)
-	{
-		if(!dirVec.empty())
-		{
-			const DirDetails& details = dirVec[0];
-			dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
-		}
-	}
-	RsCollection(dirVec,f).openNewColl(parent,dir_name);
-}
-
 void RetroshareDirModel::downloadSelected(const QModelIndexList &list,bool interactive)
 {
 	if (!RemoteMode)
diff --git a/retroshare-gui/src/gui/RemoteDirModel.h b/retroshare-gui/src/gui/RemoteDirModel.h
index 83028dd48..b7811533e 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.h
+++ b/retroshare-gui/src/gui/RemoteDirModel.h
@@ -68,8 +68,6 @@ class RetroshareDirModel : public QAbstractItemModel
 
 		/* Callback from GUI */
 		void downloadSelected(const QModelIndexList &list, bool interactive);
-		void createCollectionFile(QWidget *parent, const QModelIndexList &list);
-
 		void getDirDetailsFromSelect (const QModelIndexList &list, std::vector <DirDetails>& dirVec);
 
 		int getType ( const QModelIndex & index ) const ;
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 32863be80..ecc5aa6fc 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -101,9 +101,6 @@ public:
 
 	static bool isCollectionFile(const QString& fileName);
 
-private slots:
-	void saveColl(std::vector<ColFileInfo> colFileInfos, const QString& fileName);
-
 private:
 
     bool recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const;
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 240bae85c..c7a9ef7bb 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -1411,8 +1411,9 @@ void RsCollectionDialog::save()
 	QTreeWidgetItem* root = getRootItem();
 	if (root) {
 		saveChild(root);
-
+#ifdef TODO_COLLECTION
 		emit saveColl(_newColFileInfos, _fileName);
+#endif
 	}
 	close();
 }

From 97309f2f9fd876716aea91e09e4a444fa0ebaef8 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 24 Feb 2024 21:49:50 +0100
Subject: [PATCH 457/503] started implementing RsCollectionModel

---
 .../src/gui/common/RsCollection.cpp           |  7 ++-
 retroshare-gui/src/gui/common/RsCollection.h  |  4 +-
 .../src/gui/common/RsCollectionModel.cpp      | 56 +++++++++++++++++
 .../src/gui/common/RsCollectionModel.h        | 62 +++++++++++++++++++
 4 files changed, 124 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index c1a21f9a1..8f23a3d50 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -68,7 +68,7 @@ RsCollection::~RsCollection()
 
 void RsCollection::downloadFiles() const
 {
-#ifdef TODO
+#ifdef TODO_COLLECTION
 	// print out the element names of all elements that are direct children
 	// of the outermost element.
 	QDomElement docElem = _xml_doc.documentElement();
@@ -83,7 +83,7 @@ void RsCollection::downloadFiles() const
 
 void RsCollection::autoDownloadFiles() const
 {
-#ifdef TODO
+#ifdef TODO_COLLECTION
 	QDomElement docElem = _xml_doc.documentElement();
 
 	std::vector<ColFileInfo> colFileInfos;
@@ -322,13 +322,13 @@ void RsCollection::recursAddElements(
 		d.appendChild(f) ;
 	}
 }
-#endif
 
 static void showErrorBox(const QString& fileName, const QString& error)
 {
 	QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok);
 	mb.exec();
 }
+#endif
 
 QString RsCollection::errorString(RsCollectionErrorCode code)
 {
@@ -563,6 +563,7 @@ bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFi
 
         n = n.nextSibling() ;
     }
+    return true;
 }
 bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const
 {
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index ecc5aa6fc..2295acacd 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -91,14 +91,14 @@ public:
 
     // returns the file tree
     const RsFileTree& fileTree() const { return mFileTree; }
+    // total size of files in the collection
+    qulonglong size();
 
 	// Download the content.
 	void downloadFiles() const ;
 	// Auto Download all the content.
 	void autoDownloadFiles() const ;
 
-	qulonglong size();
-
 	static bool isCollectionFile(const QString& fileName);
 
 private:
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index e69de29bb..bcc61d86f 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -0,0 +1,56 @@
+#include <string>
+
+#include "RsCollectionModel.h"
+
+// Indernal Id is always a quintptr_t (basically a uint with the size of a pointer). Depending on the
+// architecture, the pointer may have 4 or 8 bytes. We use the low-level bit for type (0=dir, 1=file) and
+// the remaining bits for the index (which will be accordingly understood as a FileIndex or a DirIndex)
+// This way, index 0 is always the top dir.
+
+bool RsCollectionModel::convertIndexToInternalId(const EntryIndex& e,quintptr& ref)
+{
+    ref = (e.index << 1) || e.is_file;
+    return true;
+}
+
+bool RsCollectionModel::convertInternalIdToIndex(quintptr ref, EntryIndex& e)
+{
+    e.is_file = (bool)(ref & 1);
+    e.index   = ref >> 1;
+    return true;
+}
+
+int RsCollectionModel::rowCount(const QModelIndex& parent) const
+{
+    if(!parent.isValid())
+        return mCollection.fileTree().root();
+
+    EntryIndex i;
+    if(!convertInternalIdToIndex(parent.internalId(),i))
+        return 0;
+
+    if(i.is_file)
+        return 0;
+    else
+        return mCollection.fileTree().directoryData(i.index).subdirs.size();
+}
+
+int RsCollectionModel::columnCount(const QModelIndex&) const
+{
+    return 5;
+}
+
+QVariant RsCollectionModel::headerData(int section, Qt::Orientation,int) const
+{
+    switch(section)
+    {
+    case 0: return tr("File");
+    case 1: return tr("Path");
+    case 2: return tr("Size");
+    case 3: return tr("Hash");
+    case 4: return tr("Count");
+    default:
+        return QVariant();
+    }
+}
+
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index e69de29bb..22b4a4ddf 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -0,0 +1,62 @@
+#include <QAbstractItemModel>
+
+#include "RsCollection.h"
+
+class RsCollectionModel: public QAbstractItemModel
+{
+    Q_OBJECT
+
+    public:
+        enum Roles{ FileNameRole = Qt::UserRole+1, SortRole = Qt::UserRole+2, FilterRole = Qt::UserRole+3 };
+
+        RsCollectionModel(bool mode, QObject *parent = 0);
+        virtual ~RsCollectionModel() ;
+
+
+        /* Callback from Core */
+        void preMods();
+        void postMods();
+
+        /* Callback from GUI */
+
+        void update() {}
+        void filterItems(const std::list<std::string>& keywords, uint32_t& found) ;
+
+        // Overloaded from QAbstractItemModel
+        virtual Qt::ItemFlags flags ( const QModelIndex & index ) const override;
+        virtual QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex() ) const override;
+        virtual QModelIndex parent ( const QModelIndex & index ) const override;
+
+        virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+        virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+        virtual bool hasChildren(const QModelIndex & parent = QModelIndex()) const override;
+
+        virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+        virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+        virtual QStringList mimeTypes () const override;
+        virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const override;
+#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
+        virtual Qt::DropActions supportedDragActions() const override;
+#endif
+
+    protected:
+        struct EntryIndex {
+            bool is_file;		// false=dir, true=file
+            uint64_t index;
+        };
+        static bool convertIndexToInternalId(const EntryIndex& e,quintptr& ref);
+        static bool convertInternalIdToIndex(quintptr ref, EntryIndex& e);
+
+        // virtual QVariant displayRole(const DirDetails&,int) const = 0 ;
+        // virtual QVariant sortRole(const QModelIndex&,const DirDetails&,int) const =0;
+
+        // QVariant decorationRole(const DirDetails&,int) const ;
+        // QVariant filterRole(const DirDetails& details,int coln) const;
+
+        bool mUpdating ;
+
+        const RsCollection& mCollection;
+
+        // std::set<void*> mFilteredPointers ;
+};

From eb0ef1e39bc6a37369c16df2d14bf6d9def7eb64 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 25 Feb 2024 17:58:51 +0100
Subject: [PATCH 458/503] implemented RsCollectionModel

---
 .../src/gui/common/RsCollection.cpp           |  33 +---
 .../src/gui/common/RsCollectionModel.cpp      | 146 +++++++++++++++++-
 .../src/gui/common/RsCollectionModel.h        |  20 +--
 3 files changed, 157 insertions(+), 42 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 8f23a3d50..0313d4456 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -155,36 +155,21 @@ void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash&
 }
 void RsCollection::merge_in(const RsFileTree& tree)
 {
-    RsFileTree::DirData dd;
-    tree.getDirectoryContent(tree.root(),dd);
-
-    recursMergeTree(mFileTree.root(),tree,dd) ;
+    recursMergeTree(mFileTree.root(),tree,tree.directoryData(tree.root())) ;
 }
 
 void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree& tree,const RsFileTree::DirData& dd)
 {
     for(uint32_t i=0;i<dd.subfiles.size();++i)
     {
-        RsFileTree::FileData fd;
-        if(!tree.getFileContent(dd.subfiles[i],fd))
-        {
-            RsErr() << "Error while merging file trees. This should not happen. Report a bug!";
-            return;
-        }
-
+        const RsFileTree::FileData& fd(tree.fileData(dd.subfiles[i]));
         mFileTree.addFile(parent,fd.name,fd.hash,fd.size);
     }
     for(uint32_t i=0;i<dd.subdirs.size();++i)
     {
-        RsFileTree::DirData ld;
-        if(!tree.getDirectoryContent(dd.subdirs[i],ld))
-        {
-            RsErr() << "Error while merging file trees. This should not happen. Report a bug!";
-            return;
-        }
+        const RsFileTree::DirData& ld(tree.directoryData(dd.subdirs[i]));
 
         auto new_dir_index = mFileTree.addDirectory(parent,ld.name);
-
         recursMergeTree(new_dir_index,tree,ld);
     }
 }
@@ -480,9 +465,7 @@ bool RsCollection::save(const QString& fileName) const
     QDomDocument xml_doc ;
     QDomElement root = xml_doc.createElement("RsCollection");
 
-    RsFileTree::DirData root_data;
-    if(!mFileTree.getDirectoryContent(mFileTree.root(),root_data))
-        return false;
+    const RsFileTree::DirData& root_data(mFileTree.directoryData(mFileTree.root()));
 
     if(!recursExportToXml(xml_doc,root,root_data))
         return false;
@@ -571,9 +554,7 @@ bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFi
     {
         QDomElement f = doc.createElement("File") ;
 
-        RsFileTree::FileData fd;
-        if(!mFileTree.getFileContent(dd.subfiles[i],fd))
-            return false;
+        const RsFileTree::FileData& fd(mFileTree.fileData(dd.subfiles[i]));
 
         f.setAttribute(QString("name"),QString::fromUtf8(fd.name.c_str())) ;
         f.setAttribute(QString("sha1"),QString::fromStdString(fd.hash.toStdString())) ;
@@ -584,9 +565,7 @@ bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFi
 
     for(uint32_t i=0;i<dd.subdirs.size();++i)
     {
-        RsFileTree::DirData di;
-        if(!mFileTree.getDirectoryContent(dd.subdirs[i],di))
-            return false;
+        const RsFileTree::DirData& di(mFileTree.directoryData(dd.subdirs[i]));
 
         QDomElement d = doc.createElement("Directory") ;
         d.setAttribute(QString("name"),QString::fromUtf8(di.name.c_str())) ;
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index bcc61d86f..c9e2f86c9 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -32,12 +32,12 @@ int RsCollectionModel::rowCount(const QModelIndex& parent) const
     if(i.is_file)
         return 0;
     else
-        return mCollection.fileTree().directoryData(i.index).subdirs.size();
+        return mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size();
 }
 
 int RsCollectionModel::columnCount(const QModelIndex&) const
 {
-    return 5;
+    return 4;
 }
 
 QVariant RsCollectionModel::headerData(int section, Qt::Orientation,int) const
@@ -45,12 +45,146 @@ QVariant RsCollectionModel::headerData(int section, Qt::Orientation,int) const
     switch(section)
     {
     case 0: return tr("File");
-    case 1: return tr("Path");
-    case 2: return tr("Size");
-    case 3: return tr("Hash");
-    case 4: return tr("Count");
+    case 1: return tr("Size");
+    case 2: return tr("Hash");
+    case 3: return tr("Count");
     default:
         return QVariant();
     }
 }
 
+QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & parent) const
+{
+    EntryIndex i;
+    if(!convertInternalIdToIndex(parent.internalId(),i))
+        return QModelIndex();
+
+    if(i.is_file || i.index >= mCollection.fileTree().numDirs())
+        return QModelIndex();
+
+    const auto& parentData(mCollection.fileTree().directoryData(i.index));
+
+    if(row < 0)
+        return QModelIndex();
+
+    if((size_t)row < parentData.subdirs.size())
+    {
+        EntryIndex e;
+        e.is_file = false;
+        e.index = parentData.subdirs[row];
+
+        quintptr ref;
+        convertIndexToInternalId(e,ref);
+        return createIndex(row,column,ref);
+    }
+
+    if((size_t)row < parentData.subdirs.size() + parentData.subfiles.size())
+    {
+        EntryIndex e;
+        e.is_file = true;
+        e.index = parentData.subfiles[row - parentData.subdirs.size()];
+
+        quintptr ref;
+        convertIndexToInternalId(e,ref);
+        return createIndex(row,column,ref);
+    }
+
+    return QModelIndex();
+}
+
+QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
+{
+    EntryIndex i;
+    if(!convertInternalIdToIndex(index.internalId(),i))
+        return QModelIndex();
+
+    EntryIndex p;
+    p.is_file = false;	// all parents are directories
+
+    if(i.is_file)
+    {
+        const auto it = mFileParents.find(i.index);
+        if(it == mFileParents.end())
+        {
+            RsErr() << "Error: parent not found for index " << index.row() << ", " << index.column();
+            return QModelIndex();
+        }
+        p.index = it->second;
+    }
+    else
+    {
+        const auto it = mDirParents.find(i.index);
+        if(it == mDirParents.end())
+        {
+            RsErr() << "Error: parent not found for index " << index.row() << ", " << index.column();
+            return QModelIndex();
+        }
+        p.index = it->second;
+    }
+
+    quintptr ref;
+    convertIndexToInternalId(p,ref);
+    return createIndex(0,index.column(),ref);
+}
+
+QVariant RsCollectionModel::data(const QModelIndex& index, int role) const
+{
+    EntryIndex i;
+    if(!convertInternalIdToIndex(index.internalId(),i))
+        return QVariant();
+
+    switch(role)
+    {
+    case Qt::DisplayRole: return displayRole(i,index.column());
+    //case Qt::SortRole: return SortRole(i,index.column());
+    case Qt::DecorationRole: return decorationRole(i,index.column());
+    default:
+        return QVariant();
+    }
+}
+
+QVariant RsCollectionModel::displayRole(const EntryIndex& i,int col) const
+{
+    switch(col)
+    {
+    case 0: return (i.is_file)?
+                    (QString::fromUtf8(mCollection.fileTree().fileData(i.index).name.c_str()))
+                  : (QString::fromUtf8(mCollection.fileTree().directoryData(i.index).name.c_str()));
+
+    case 1: if(i.is_file)
+                return QVariant((qulonglong)mCollection.fileTree().fileData(i.index).size) ;
+
+            {
+                auto it = mDirSizes.find(i.index);
+
+                if(it == mDirSizes.end())
+                    return QVariant();
+                else
+                    return QVariant((qulonglong)it->second);
+            }
+
+    case 2: return (i.is_file)?
+                    QString::fromStdString(mCollection.fileTree().fileData(i.index).hash.toStdString())
+                   :QVariant();
+
+    case 3: return (i.is_file)?((qulonglong)1):((qulonglong)(mCollection.fileTree().directoryData(i.index).subdirs.size()));
+    }
+    return QVariant();
+}
+QVariant RsCollectionModel::sortRole(const EntryIndex& i,int col) const
+{
+    return QVariant();
+}
+QVariant RsCollectionModel::decorationRole(const EntryIndex& i,int col) const
+{
+    return QVariant();
+}
+
+
+
+
+
+
+
+
+
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index 22b4a4ddf..0ad770cc1 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -9,13 +9,12 @@ class RsCollectionModel: public QAbstractItemModel
     public:
         enum Roles{ FileNameRole = Qt::UserRole+1, SortRole = Qt::UserRole+2, FilterRole = Qt::UserRole+3 };
 
-        RsCollectionModel(bool mode, QObject *parent = 0);
+        RsCollectionModel(const RsCollection& col, QObject *parent = 0);
         virtual ~RsCollectionModel() ;
 
-
         /* Callback from Core */
-        void preMods();
-        void postMods();
+        void preMods();			// always call this before updating the RsCollection!
+        void postMods();		// always call this after updating the RsCollection!
 
         /* Callback from GUI */
 
@@ -48,15 +47,18 @@ class RsCollectionModel: public QAbstractItemModel
         static bool convertIndexToInternalId(const EntryIndex& e,quintptr& ref);
         static bool convertInternalIdToIndex(quintptr ref, EntryIndex& e);
 
-        // virtual QVariant displayRole(const DirDetails&,int) const = 0 ;
-        // virtual QVariant sortRole(const QModelIndex&,const DirDetails&,int) const =0;
-
-        // QVariant decorationRole(const DirDetails&,int) const ;
-        // QVariant filterRole(const DirDetails& details,int coln) const;
+        QVariant displayRole(const EntryIndex&,int col) const ;
+        QVariant sortRole(const EntryIndex&,int col) const ;
+        QVariant decorationRole(const EntryIndex&,int col) const ;
+        //QVariant filterRole(const DirDetails& details,int coln) const;
 
         bool mUpdating ;
 
         const RsCollection& mCollection;
 
+        std::map<uint64_t,RsFileTree::DirIndex> mFileParents;
+        std::map<uint64_t,RsFileTree::DirIndex> mDirParents;
+        std::map<uint64_t,uint64_t> mDirSizes;
+
         // std::set<void*> mFilteredPointers ;
 };

From eae4fe86aaff2335e40f9e137299326a25ffeebf Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 26 Feb 2024 22:10:32 +0100
Subject: [PATCH 459/503] added RsCollectionModel to RsCollectionDialog
 (unfiished)

---
 .../src/gui/common/RsCollection.cpp           |   4 +
 retroshare-gui/src/gui/common/RsCollection.h  |   2 +
 .../src/gui/common/RsCollectionDialog.cpp     | 235 +++++++++---------
 .../src/gui/common/RsCollectionDialog.h       |  28 ++-
 .../src/gui/common/RsCollectionDialog.ui      |  12 +-
 .../src/gui/common/RsCollectionModel.cpp      |  62 ++++-
 .../src/gui/common/RsCollectionModel.h        |  11 +-
 7 files changed, 208 insertions(+), 146 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 0313d4456..bc76fff00 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -598,6 +598,10 @@ bool RsCollection::save(QWidget *parent) const
 
 #endif
 
+qulonglong RsCollection::count() const
+{
+    return mFileTree.numFiles();
+}
 qulonglong RsCollection::size()
 {
     return mFileTree.totalFileSize();
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 2295acacd..47fdee5d6 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -93,6 +93,8 @@ public:
     const RsFileTree& fileTree() const { return mFileTree; }
     // total size of files in the collection
     qulonglong size();
+    // total number of files in the collection
+    qulonglong count() const;
 
 	// Download the content.
 	void downloadFiles() const ;
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index c7a9ef7bb..52583c4f7 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -120,24 +120,31 @@ protected:
 /**
  * @brief RsCollectionDialog::RsCollectionDialog
  * @param collectionFileName: Filename of RSCollection saved
- * @param colFileInfos: Vector of ColFileInfo to be add in intialization
  * @param creation: Open dialog as RsColl Creation or RsColl DownLoad
  * @param readOnly: Open dialog for RsColl as ReadOnly
  */
 RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
-                                       , const std::vector<ColFileInfo>& colFileInfos
-                                       , const bool& creation /* = false*/
-                                       , const bool& readOnly)
+                                       , const bool& creation /* = false */
+                                       , const bool& readOnly /* = false */)
   : _fileName(collectionFileName), _creationMode(creation) ,_readOnly(readOnly)
 {
+    RsCollection::RsCollectionErrorCode err_code;
+    mCollection = new RsCollection(collectionFileName,err_code);
+
+    if(err_code != RsCollection::RsCollectionErrorCode::NO_ERROR)
+    {
+        QMessageBox::information(nullptr,tr("Could not load collection file"),tr("Could not load collection file"));
+        close();
+    }
+
 	ui.setupUi(this) ;
 
-	uint32_t size = colFileInfos.size();
-	for(uint32_t i=0;i<size;++i)
-	{
-		const ColFileInfo &colFileInfo = colFileInfos[i];
-		_newColFileInfos.push_back(colFileInfo);
-	}
+//	uint32_t size = colFileInfos.size();
+//	for(uint32_t i=0;i<size;++i)
+//	{
+//		const ColFileInfo &colFileInfo = colFileInfos[i];
+//		_newColFileInfos.push_back(colFileInfo);
+//	}
 
 	setWindowFlags(Qt::Window); // for maximize button
 	setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint);
@@ -170,6 +177,10 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
 
 	// 1 - add all elements to the list.
 
+    mCollectionModel = new RsCollectionModel(*mCollection);
+    ui._fileEntriesTW->setModel(mCollectionModel);
+
+#ifdef TO_REMOVE
 	ui._fileEntriesTW->setColumnCount(COLUMN_COUNT) ;
 
 	QTreeWidgetItem *headerItem = ui._fileEntriesTW->headerItem();
@@ -178,14 +189,15 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
 	headerItem->setText(COLUMN_SIZE, tr("Size"));
 	headerItem->setText(COLUMN_HASH, tr("Hash"));
 	headerItem->setText(COLUMN_FILEC, tr("File Count"));
+#endif
 
 	bool wrong_chars = !updateList();
 
 	// 2 - connect necessary signals/slots
 
 	connect(ui._changeFile, SIGNAL(clicked()), this, SLOT(changeFileName()));
-	connect(ui._add_PB, SIGNAL(clicked()), this, SLOT(add()));
-	connect(ui._addRecur_PB, SIGNAL(clicked()), this, SLOT(addRecursive()));
+    connect(ui._add_PB, SIGNAL(clicked()), this, SLOT(addSelection()));
+    connect(ui._addRecur_PB, SIGNAL(clicked()), this, SLOT(addSelectionRecursive()));
 	connect(ui._remove_PB, SIGNAL(clicked()), this, SLOT(remove()));
 	connect(ui._makeDir_PB, SIGNAL(clicked()), this, SLOT(makeDir()));
 	connect(ui._removeDuplicate_CB, SIGNAL(clicked(bool)), this, SLOT(updateRemoveDuplicate(bool)));
@@ -193,7 +205,9 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
 	connect(ui._save_PB, SIGNAL(clicked()), this, SLOT(save()));
 	connect(ui._download_PB, SIGNAL(clicked()), this, SLOT(download()));
 	connect(ui._hashBox, SIGNAL(fileHashingFinished(QList<HashedFile>)), this, SLOT(fileHashingFinished(QList<HashedFile>)));
-	connect(ui._fileEntriesTW, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*,int)));
+#ifdef TO_REMOVE
+    connect(ui._fileEntriesTW, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*,int)));
+#endif
 
 	// 3 Initialize List
 	_dirModel = new QFileSystemModel(this);
@@ -223,7 +237,9 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
 	ui._treeViewFrame->setVisible(_creationMode && !_readOnly);
 	ui._download_PB->setVisible(!_creationMode && !_readOnly);
 
-	ui._fileEntriesTW->installEventFilter(this);
+#ifdef TO_REMOVE
+    ui._fileEntriesTW->installEventFilter(this);
+#endif
 	ui._systemFileTW->installEventFilter(this);
 
 	// 6 Add HashBox
@@ -293,6 +309,7 @@ RsCollectionDialog::~RsCollectionDialog()
  */
 bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef TODO_COLLECTION
 	if (obj == ui._fileEntriesTW) {
 		if (event->type() == QEvent::KeyPress) {
 			QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
@@ -350,6 +367,8 @@ bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
 
 	// pass the event on to the parent class
 	return QDialog::eventFilter(obj, event);
+#endif
+    return true;
 }
 
 /**
@@ -411,6 +430,7 @@ void RsCollectionDialog::processSettings(bool bLoad)
 	Settings->endGroup();
 }
 
+#ifdef TO_REMOVE
 /**
  * @brief RsCollectionDialog::getRootItem: Create the root Item if not existing
  * @return: the root item
@@ -418,34 +438,8 @@ void RsCollectionDialog::processSettings(bool bLoad)
 QTreeWidgetItem* RsCollectionDialog::getRootItem()
 {
 	return ui._fileEntriesTW->invisibleRootItem();
-
-// (csoler) I removed this code because it does the job of the invisibleRootItem() method.
-//
-//	QTreeWidgetItem* root= ui._fileEntriesTW->topLevelItem(0);
-//	if (!root) {
-//		root= new QTreeWidgetItem;
-//		root->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate);
-//		root->setText(COLUMN_FILE, "/");
-//		root->setToolTip(COLUMN_FILE,tr("This is the root directory."));
-//		root->setText(COLUMN_FILEPATH, "/");
-//		root->setText(COLUMN_HASH, "");
-//		root->setData(COLUMN_HASH, ROLE_NAME, "");
-//		root->setData(COLUMN_HASH, ROLE_PATH, "");
-//		root->setData(COLUMN_HASH, ROLE_TYPE, DIR_TYPE_DIR);
-//		root->setText(COLUMN_SIZE, misc::friendlyUnit(0));
-//		root->setToolTip(COLUMN_SIZE, tr("Real Size: Waiting child..."));
-//		root->setData(COLUMN_SIZE, ROLE_SIZE, 0);
-//		root->setData(COLUMN_SIZE, ROLE_SELSIZE, 0);
-//		root->setText(COLUMN_FILEC, "0");
-//		root->setToolTip(COLUMN_FILEC, tr("Real File Count: Waiting child..."));
-//		root->setData(COLUMN_FILEC, ROLE_FILEC, 0);
-//		root->setData(COLUMN_FILEC, ROLE_SELFILEC, 0);
-//		ui._fileEntriesTW->addTopLevelItem(root);
-//	}
-//	root->setExpanded(true);
-//
-//	return root;
 }
+#endif
 
 /**
  * @brief RsCollectionDialog::updateList: Update list of item in RsCollection
@@ -453,6 +447,7 @@ QTreeWidgetItem* RsCollectionDialog::getRootItem()
  */
 bool RsCollectionDialog::updateList()
 {
+#ifdef TODO_COLLECTION
 	bool wrong_chars = false ;
 	wrong_chars = addChild(getRootItem(), _newColFileInfos);
 
@@ -466,8 +461,11 @@ bool RsCollectionDialog::updateList()
 	updateSizes() ;
 
 	return !wrong_chars;
+#endif
+    return true;
 }
 
+#ifdef TO_REMOVE
 /**
  * @brief RsCollectionDialog::addChild: Add Child Item in list
  * @param parent: Parent Item
@@ -586,6 +584,7 @@ bool RsCollectionDialog::addChild(QTreeWidgetItem* parent, const std::vector<Col
 	}
 	return wrong_chars;
 }
+#endif
 
 /**
  * @brief RsCollectionDialog::directoryLoaded: called when ui._treeView have load an directory as QFileSystemModel don't load all in one time
@@ -639,17 +638,8 @@ void RsCollectionDialog::directoryLoaded(QString dirLoaded)
  */
 void RsCollectionDialog::updateSizes()
 {
-	uint64_t total_size = 0 ;
-	uint32_t total_count = 0 ;
-
-	for(int i=0;i<ui._fileEntriesTW->topLevelItemCount();++i)
-	{
-		total_size  += ui._fileEntriesTW->topLevelItem(i)->data(COLUMN_SIZE ,ROLE_SELSIZE ).toULongLong();
-		total_count += ui._fileEntriesTW->topLevelItem(i)->data(COLUMN_FILEC,ROLE_SELFILEC).toULongLong();
-	}
-
-	ui._selectedFiles_TL->setText(QString::number(total_count));
-	ui._totalSize_TL->setText(misc::friendlyUnit(total_size));
+    ui._selectedFiles_TL->setText(QString::number(mCollection->count()));
+    ui._totalSize_TL->setText(misc::friendlyUnit(mCollection->size()));
 }
 
 /**
@@ -716,16 +706,23 @@ void RsCollectionDialog::changeFileName()
             RsCollection qddOldFileCollection(fileName,err);
 
             if(err != RsCollection::RsCollectionErrorCode::NO_ERROR)
-                _collection.merge_in(qddOldFileCollection.fileTree());
+            {
+                mCollectionModel->preMods();
+                mCollection->merge_in(qddOldFileCollection.fileTree());
+                mCollectionModel->postMods();
+            }
         }
         else if(mb.clickedButton()==btnCancel)
 			return;
         else
 			return;
 
-	} else {//if(file.exists())
+    }
+    else
+    {
 		//create a new empty file to check if name if good.
-		if (!file.open(QFile::WriteOnly)) return;
+        if (!file.open(QFile::WriteOnly))
+            return;
 		file.remove();
 	}
 
@@ -736,19 +733,40 @@ void RsCollectionDialog::changeFileName()
 
 /**
  * @brief RsCollectionDialog::add:  */
-void RsCollectionDialog::add()
+void RsCollectionDialog::addSelection()
 {
-	addRecursive(false);
+    addSelection(false);
 }
 
 /**
  * @brief RsCollectionDialog::addRecursive:
  */
-void RsCollectionDialog::addRecursive()
+void RsCollectionDialog::addSelectionRecursive()
 {
-	addRecursive(true);
+    addSelection(true);
 }
 
+static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree::DirIndex dir_index,bool recursive)
+{
+    QFileInfo fileInfo = path;
+
+    if (fileInfo.isDir())
+    {
+        auto di = tree.addDirectory(dir_index,fileInfo.fileName().toUtf8().constData());
+
+        QDir dirParent = fileInfo.absoluteFilePath();
+        dirParent.setFilter(QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot);
+        QFileInfoList childrenList = dirParent.entryInfoList();
+
+        for(QFileInfo f:childrenList)
+            recursBuildFileTree(f.absoluteFilePath(),tree,di,recursive);
+    }
+    else
+    {
+#warning TODO: compute the hash
+        tree.addFile(dir_index,fileInfo.fileName().toUtf8().constData(),RsFileHash(),fileInfo.size());
+    }
+}
 /**
  * @brief RsCollectionDialog::addRecursive: Add Selected item to RSCollection
  *   -Add File seperatly if parent folder not selected
@@ -756,18 +774,25 @@ void RsCollectionDialog::addRecursive()
  *   -Get root folder the selected one
  * @param recursive: If true, add all selected directory childrens
  */
-void RsCollectionDialog::addRecursive(bool recursive)
+void RsCollectionDialog::addSelection(bool recursive)
 {
 	QStringList fileToHash;
 	QMap<QString, QString > dirToAdd;
     int count=0;//to not scan all items on list .count()
 
 	QModelIndexList milSelectionList =	ui._systemFileTW->selectionModel()->selectedIndexes();
-	foreach (QModelIndex index, milSelectionList)
-	{
 
-		if (index.column()==0){//Get only FileName
-			QString filePath = _dirModel->filePath(_tree_proxyModel->mapToSource(index));
+    mCollectionModel->preMods();
+
+	foreach (QModelIndex index, milSelectionList)
+        if(index.column()==0)    //Get only FileName
+        {
+            RsFileTree tree;
+            recursBuildFileTree(_dirModel->filePath(_tree_proxyModel->mapToSource(index)),tree,tree.root(),recursive);
+
+            mCollection->merge_in(tree);
+
+#ifdef TO_REMOVE
 			QFileInfo fileInfo = filePath;
 			if (fileInfo.isDir()) {
 				dirToAdd.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
@@ -786,9 +811,10 @@ void RsCollectionDialog::addRecursive(bool recursive)
 				else
 					_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),"");
 			}
+#endif
 		}
-	}
 
+#ifdef TO_REMOVE
 	// Process Dirs
 	QTreeWidgetItem *item = NULL;
 	if (!ui._fileEntriesTW->selectedItems().empty())
@@ -833,6 +859,7 @@ void RsCollectionDialog::addRecursive(bool recursive)
 
 	// Process Files once all done
 	ui._hashBox->addAttachments(fileToHash,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
+#endif
 }
 
 /**
@@ -896,6 +923,7 @@ bool RsCollectionDialog::addAllChild(QFileInfo &fileInfoParent
  */
 void RsCollectionDialog::remove()
 {
+#ifdef TODO_COLLECTION
 	bool removeOnlyFile=false;
 	QString listDir;
 	// First, check if selection contains directories
@@ -987,9 +1015,10 @@ void RsCollectionDialog::remove()
 	}
 
 	updateSizes() ;
-
+#endif
 }
 
+#ifdef TODO_COLLECTION
 bool RsCollectionDialog::removeItem(QTreeWidgetItem *item, bool &removeOnlyFile)
 {
 	if (item){
@@ -1019,7 +1048,9 @@ bool RsCollectionDialog::removeItem(QTreeWidgetItem *item, bool &removeOnlyFile)
 	}
 	return false;
 }
+#endif
 
+#ifdef TO_REMOVE
 /** Process each item to make a new RsCollection item */
 void RsCollectionDialog::processItem(QMap<QString, QString> &dirToAdd
                                      , int &index
@@ -1063,12 +1094,14 @@ void RsCollectionDialog::processItem(QMap<QString, QString> &dirToAdd
 		}
 	}
 }
+#endif
 
 /**
  * @brief RsCollectionDialog::addDir: Add new empty dir to list
  */
 void RsCollectionDialog::makeDir()
 {
+#ifdef TODO_COLLECTION
 	QString childName="";
 	bool ok, badChar, nameOK = false;
 	// Ask for name
@@ -1149,39 +1182,8 @@ void RsCollectionDialog::makeDir()
 			_newColFileInfos.push_back(newChild);
 		}
 
-
-//	// Process all selected items
-//	int count = ui._fileEntriesTW->selectedItems().count();
-//	int curs = 0;
-//	if (count == 0) curs = -1;
-//
-//	for (; curs < count; ++curs)
-//	{
-//		QTreeWidgetItem *item = NULL;
-//		if (curs >= 0) {
-//			item= ui._fileEntriesTW->selectedItems().at(curs);
-//		} else {
-//			item = getRootItem();
-//		}
-//		if (item) {
-//			while (item->parent() != NULL && item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR) {
-//				item = item->parent();//Only Dir as Parent
-//			}
-//			ColFileInfo newChild;
-//			newChild.name = childName;
-//			newChild.filename_has_wrong_characters = false;
-//			newChild.size = 0;
-//			newChild.type = DIR_TYPE_DIR;
-//			newChild.path = item->data(COLUMN_HASH, ROLE_PATH).toString()
-//			                + "/" + item->data(COLUMN_HASH, ROLE_NAME).toString();
-//			if (item == getRootItem()) newChild.path = "";
-//
-//			_newColFileInfos.push_back(newChild);
-//		}
-//	}
-
-
 	updateList();
+#endif
 }
 
 /**
@@ -1212,9 +1214,9 @@ void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
 			colFileInfo.path = _listOfFilesAddedInDir.value(hashedFile.filepath,"");
 			_listOfFilesAddedInDir.remove(hashedFile.filepath);
 		}
-
+#ifdef TODO_COLLECTION
 		_newColFileInfos.push_back(colFileInfo);
-
+#endif
 	}
 
 	std::cerr << "RsCollectionDialog::fileHashingFinished message : " << message.toStdString() << std::endl;
@@ -1222,6 +1224,7 @@ void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
 	updateList();
 }
 
+#ifdef TO_REMOVE
 void RsCollectionDialog::itemChanged(QTreeWidgetItem *item, int col)
 {
 	if (col != COLUMN_FILE) return;
@@ -1254,6 +1257,7 @@ void RsCollectionDialog::itemChanged(QTreeWidgetItem *item, int col)
 	updateSizes() ;
 
 }
+#endif
 
 /**
  * @brief RsCollectionDialog::updateRemoveDuplicate Remove all duplicate file when checked.
@@ -1261,6 +1265,7 @@ void RsCollectionDialog::itemChanged(QTreeWidgetItem *item, int col)
  */
 void RsCollectionDialog::updateRemoveDuplicate(bool checked)
 {
+#ifdef TODO_COLLECTION
 	if (checked) {
 		bool bRemoveAll = false;
 		QTreeWidgetItemIterator it(ui._fileEntriesTW);
@@ -1341,6 +1346,7 @@ void RsCollectionDialog::updateRemoveDuplicate(bool checked)
 			}
 		}
 	}
+#endif
 }
 
 /**
@@ -1357,14 +1363,13 @@ void RsCollectionDialog::cancel()
  */
 void RsCollectionDialog::download()
 {
+#ifdef TODO_COLLECTION
 	std::cerr << "Downloading!" << std::endl;
 
 	QString dldir = ui.downloadFolder_LE->text();
 
 	std::cerr << "downloading all these files:" << std::endl;
 
-	QTreeWidgetItemIterator itemIterator(ui._fileEntriesTW);
-	QTreeWidgetItem *item;
 	while ((item = *itemIterator) != NULL) {
 		++itemIterator;
 
@@ -1399,6 +1404,7 @@ void RsCollectionDialog::download()
 	}
 
 	close();
+#endif
 }
 
 /**
@@ -1406,18 +1412,20 @@ void RsCollectionDialog::download()
  */
 void RsCollectionDialog::save()
 {
+    mCollection->save(_fileName);
+#ifdef TO_REMOVE
 	std::cerr << "Saving!" << std::endl;
 	_newColFileInfos.clear();
 	QTreeWidgetItem* root = getRootItem();
 	if (root) {
 		saveChild(root);
-#ifdef TODO_COLLECTION
 		emit saveColl(_newColFileInfos, _fileName);
-#endif
 	}
 	close();
+#endif
 }
 
+#ifdef TO_REMOVE
 /**
  * @brief RsCollectionDialog::saveChild: Save each child in _newColFileInfos
  * @param parent
@@ -1444,29 +1452,16 @@ void RsCollectionDialog::saveChild(QTreeWidgetItem *parentItem, ColFileInfo *par
 		}
 	}
 }
+#endif
 
 bool RsCollectionDialog::openExistingCollection(const QString& fileName, bool readOnly /* = false */, bool showError /* = true*/)
 {
-#ifdef TODO
-    RsCollection::RsCollectionErrorCode err;
-    RsCollection col(fileName,err);
-
-    if(err != RsCollection::RsCollectionErrorCode::NO_ERROR)
-    {
-        RsCollectionDialog rcd = new RsCollectionDialog(col, true, readOnly);
-        return rcd.exec() ;
-    }
-
-    if(showError)
-        QMessageBox::information(nullptr,tr("Error openning RsCollection"),RsCollection::errorString(err));
-
-#endif
-    return false;
+    return RsCollectionDialog(fileName,readOnly,showError).exec();
 }
 
 bool RsCollectionDialog::openNewCollection(const RsFileTree& tree,const QString& proposed_file_name)
 {
-#ifdef TODO
+#ifdef TODO_COLLECTION
     QString fileName = proposed_file_name;
 
     if(!misc::getSaveFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h
index f4fd5749a..192732338 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.h
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h
@@ -20,6 +20,7 @@
 
 #include "ui_RsCollectionDialog.h"
 #include "RsCollection.h"
+#include "RsCollectionModel.h"
 #include <QFileSystemModel>
 #include <QSortFilterProxyModel>
 
@@ -41,26 +42,29 @@ public:
 protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
 
-    RsCollectionDialog(const QString& filename, const std::vector<ColFileInfo> &colFileInfos, const bool& creation,
-                       const bool& readOnly = false) ;
+    RsCollectionDialog(const QString& filename, const bool& creation, const bool& readOnly = false) ;
 
 private slots:
 	void directoryLoaded(QString dirLoaded);
 	void updateSizes() ;
 	void changeFileName() ;
-	void add() ;
-	void addRecursive() ;
+    void addSelection() ;
+    void addSelectionRecursive() ;
 	void remove() ;
 	void chooseDestinationDirectory();
 	void setDestinationDirectory();
 	void openDestinationDirectoryMenu();
+#ifdef TO_REMOVE
 	void processItem(QMap<QString, QString> &dirToAdd
 	                 , int &index
                    , ColFileInfo &parent
                    ) ;
+#endif
 	void makeDir() ;
 	void fileHashingFinished(QList<HashedFile> hashedFiles) ;
-	void itemChanged(QTreeWidgetItem* item,int col) ;
+#ifdef TO_REMOVE
+    void itemChanged(QTreeWidgetItem* item,int col) ;
+#endif
 	void updateRemoveDuplicate(bool checked);
 	void cancel() ;
 	void download() ;
@@ -71,22 +75,23 @@ signals:
 
 private:
 	void processSettings(bool bLoad) ;
-	QTreeWidgetItem*  getRootItem();
 	bool updateList();
-	bool addChild(QTreeWidgetItem *parent, const std::vector<ColFileInfo> &child);
+#ifdef TO_REMOVE
+    QTreeWidgetItem*  getRootItem();
+    bool addChild(QTreeWidgetItem *parent, const std::vector<ColFileInfo> &child);
 	bool removeItem(QTreeWidgetItem *item, bool &removeOnlyFile) ;
-	void addRecursive(bool recursive) ;
+    void saveChild(QTreeWidgetItem *parentItem, ColFileInfo *parentInfo = NULL);
+#endif
+    void addSelection(bool recursive) ;
 	bool addAllChild(QFileInfo &fileInfoParent
 	                 , QMap<QString, QString > &dirToAdd
 	                 , QStringList &fileToHash
 	                 , int &count);
-	void saveChild(QTreeWidgetItem *parentItem, ColFileInfo *parentInfo = NULL);
 
 	Ui::RsCollectionDialog ui;
 	QString _fileName ;
 	const bool _creationMode ;
 	const bool _readOnly;
-	std::vector<ColFileInfo> _newColFileInfos ;
 
 	QFileSystemModel *_dirModel;
 	QSortFilterProxyModel *_tree_proxyModel;
@@ -94,5 +99,6 @@ private:
 	bool _dirLoaded;
 	QHash<QString,QString> _listOfFilesAddedInDir;
 
-    RsCollection _collection;
+    RsCollectionModel *mCollectionModel;
+    RsCollection *mCollection;
 };
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
index d8693ef0a..7d4de185b 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
+    <width>671</width>
     <height>400</height>
    </rect>
   </property>
@@ -17,7 +17,7 @@
    <string>Collection</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../images.qrc">
+   <iconset>
     <normaloff>:/images/mimetypes/rscollection-16.png</normaloff>:/images/mimetypes/rscollection-16.png</iconset>
   </property>
   <property name="sizeGripEnabled">
@@ -382,7 +382,7 @@
                  </item>
                 </layout>
                </widget>
-               <widget class="QTreeWidget" name="_fileEntriesTW">
+               <widget class="QTreeView" name="_fileEntriesTW">
                 <property name="editTriggers">
                  <set>QAbstractItemView::NoEditTriggers</set>
                 </property>
@@ -398,11 +398,6 @@
                 <property name="allColumnsShowFocus">
                  <bool>true</bool>
                 </property>
-                <column>
-                 <property name="text">
-                  <string notr="true">1</string>
-                 </property>
-                </column>
                </widget>
               </widget>
              </item>
@@ -517,7 +512,6 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
-  <include location="../../../../plugins/FeedReader/gui/FeedReader_images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index c9e2f86c9..0bc0b779c 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -2,6 +2,10 @@
 
 #include "RsCollectionModel.h"
 
+RsCollectionModel::RsCollectionModel(const RsCollection& col, QObject *parent)
+    : QAbstractItemModel(parent),mCollection(col)
+{}
+
 // Indernal Id is always a quintptr_t (basically a uint with the size of a pointer). Depending on the
 // architecture, the pointer may have 4 or 8 bytes. We use the low-level bit for type (0=dir, 1=file) and
 // the remaining bits for the index (which will be accordingly understood as a FileIndex or a DirIndex)
@@ -35,6 +39,21 @@ int RsCollectionModel::rowCount(const QModelIndex& parent) const
         return mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size();
 }
 
+bool RsCollectionModel::hasChildren(const QModelIndex & parent) const
+{
+    if(!parent.isValid())
+        return mCollection.fileTree().root();
+
+    EntryIndex i;
+    if(!convertInternalIdToIndex(parent.internalId(),i))
+        return 0;
+
+    if(i.is_file)
+        return false;
+    else
+        return mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size() > 0;
+}
+
 int RsCollectionModel::columnCount(const QModelIndex&) const
 {
     return 4;
@@ -180,8 +199,47 @@ QVariant RsCollectionModel::decorationRole(const EntryIndex& i,int col) const
     return QVariant();
 }
 
-
-
+void RsCollectionModel::preMods()
+{
+    mUpdating = true;
+    emit layoutAboutToBeChanged();
+}
+void RsCollectionModel::postMods()
+{
+    // update all the local structures
+
+    mDirParents.clear();
+    mFileParents.clear();
+    mDirSizes.clear();
+
+    uint64_t s;
+    recursUpdateLocalStructures(mCollection.fileTree().root(),s);
+
+    mUpdating = false;
+    emit layoutChanged();
+}
+
+void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,uint64_t& total_size)
+{
+    total_size = 0;
+
+    const auto& dd(mCollection.fileTree().directoryData(dir_index));
+
+    for(uint32_t i=0;i<dd.subfiles.size();++i)
+    {
+        total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
+        mFileParents[dd.subfiles[i]] = dir_index;
+    }
+
+    for(uint32_t i=0;i<dd.subdirs.size();++i)
+    {
+        uint64_t ss;
+        recursUpdateLocalStructures(dd.subdirs[i],ss);
+        total_size += ss;
+        mDirParents[dd.subdirs[i]] = dir_index;
+    }
+    mDirSizes[dir_index] = total_size;
+}
 
 
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index 0ad770cc1..d2ffb4f92 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -10,7 +10,7 @@ class RsCollectionModel: public QAbstractItemModel
         enum Roles{ FileNameRole = Qt::UserRole+1, SortRole = Qt::UserRole+2, FilterRole = Qt::UserRole+3 };
 
         RsCollectionModel(const RsCollection& col, QObject *parent = 0);
-        virtual ~RsCollectionModel() ;
+        virtual ~RsCollectionModel() = default;
 
         /* Callback from Core */
         void preMods();			// always call this before updating the RsCollection!
@@ -22,7 +22,6 @@ class RsCollectionModel: public QAbstractItemModel
         void filterItems(const std::list<std::string>& keywords, uint32_t& found) ;
 
         // Overloaded from QAbstractItemModel
-        virtual Qt::ItemFlags flags ( const QModelIndex & index ) const override;
         virtual QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex() ) const override;
         virtual QModelIndex parent ( const QModelIndex & index ) const override;
 
@@ -31,15 +30,17 @@ class RsCollectionModel: public QAbstractItemModel
         virtual bool hasChildren(const QModelIndex & parent = QModelIndex()) const override;
 
         virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-
         virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+#ifdef TODO
+        virtual Qt::ItemFlags flags ( const QModelIndex & index ) const override;
         virtual QStringList mimeTypes () const override;
         virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const override;
 #if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
         virtual Qt::DropActions supportedDragActions() const override;
+#endif
 #endif
 
-    protected:
+    private:
         struct EntryIndex {
             bool is_file;		// false=dir, true=file
             uint64_t index;
@@ -47,6 +48,8 @@ class RsCollectionModel: public QAbstractItemModel
         static bool convertIndexToInternalId(const EntryIndex& e,quintptr& ref);
         static bool convertInternalIdToIndex(quintptr ref, EntryIndex& e);
 
+        void recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,uint64_t& total_size);
+
         QVariant displayRole(const EntryIndex&,int col) const ;
         QVariant sortRole(const EntryIndex&,int col) const ;
         QVariant decorationRole(const EntryIndex&,int col) const ;

From 885eb640dc381f73ea0cfa15954dc90978b695a6 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 27 Feb 2024 22:10:49 +0100
Subject: [PATCH 460/503] starting fixing RsCollection with the new model

---
 .../gui/FileTransfer/SharedFilesDialog.cpp    |  5 ++-
 .../src/gui/common/RsCollection.cpp           | 37 +++++++++----------
 retroshare-gui/src/gui/common/RsCollection.h  |  4 +-
 .../src/gui/common/RsCollectionDialog.cpp     |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 7321486fe..8c7e460c2 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -733,7 +733,7 @@ void SharedFilesDialog::sendLinkTo()
 
 void SharedFilesDialog::collCreate()
 {
-#ifdef TODO
+#ifdef TODO_COLLECTION
     QModelIndexList lst = getSelected();
 
     std::vector <DirDetails> dirVec;
@@ -831,6 +831,8 @@ void SharedFilesDialog::collOpen()
             if (qinfo.exists()) {
                 if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
 
+                    RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(),true);
+#ifdef TO_REMOVE
                     RsCollection::RsCollectionErrorCode err;
                     RsCollection collection(qinfo.absoluteFilePath(),err);
 
@@ -839,6 +841,7 @@ void SharedFilesDialog::collOpen()
                         collection.downloadFiles();
                         return;
                     }
+#endif
                 }
             }
         }
diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index bc76fff00..e7e329604 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -38,19 +38,17 @@
 const QString RsCollection::ExtensionString = QString("rscollection") ;
 
 RsCollection::RsCollection(QObject *parent)
-    : QObject(parent)
+    : QObject(parent), mFileTree(new RsFileTree)
 {
-//	_root = _xml_doc.createElement("RsCollection");
-//	_xml_doc.appendChild(_root);
 }
 
 RsCollection::RsCollection(const RsFileTree& ft)
-    : mFileTree(ft)
 {
+    mFileTree = std::unique_ptr<RsFileTree>(new RsFileTree(ft));
 }
 
 RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchFlags flags, QObject *parent)
-    : QObject(parent)
+    : QObject(parent), mFileTree(new RsFileTree)
 {
 	if(! ( (flags & RS_FILE_HINTS_LOCAL) || (flags & RS_FILE_HINTS_REMOTE)))
 	{
@@ -59,7 +57,7 @@ RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchF
 	}
 
 	for(uint32_t i = 0;i<file_infos.size();++i)
-        recursAddElements(mFileTree.root(),file_infos[i],flags) ;
+        recursAddElements(mFileTree->root(),file_infos[i],flags) ;
 }
 
 RsCollection::~RsCollection()
@@ -142,7 +140,7 @@ static QString purifyFileName(const QString& input,bool& bad)
 
 void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash)
 {
-    mFileTree.addFile(mFileTree.root(),fname.toStdString(),hash,size);
+    mFileTree->addFile(mFileTree->root(),fname.toStdString(),hash,size);
 #ifdef TO_REMOVE
 	ColFileInfo info ;
 	info.type = DIR_TYPE_FILE ;
@@ -155,7 +153,7 @@ void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash&
 }
 void RsCollection::merge_in(const RsFileTree& tree)
 {
-    recursMergeTree(mFileTree.root(),tree,tree.directoryData(tree.root())) ;
+    recursMergeTree(mFileTree->root(),tree,tree.directoryData(tree.root())) ;
 }
 
 void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree& tree,const RsFileTree::DirData& dd)
@@ -163,13 +161,13 @@ void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree&
     for(uint32_t i=0;i<dd.subfiles.size();++i)
     {
         const RsFileTree::FileData& fd(tree.fileData(dd.subfiles[i]));
-        mFileTree.addFile(parent,fd.name,fd.hash,fd.size);
+        mFileTree->addFile(parent,fd.name,fd.hash,fd.size);
     }
     for(uint32_t i=0;i<dd.subdirs.size();++i)
     {
         const RsFileTree::DirData& ld(tree.directoryData(dd.subdirs[i]));
 
-        auto new_dir_index = mFileTree.addDirectory(parent,ld.name);
+        auto new_dir_index = mFileTree->addDirectory(parent,ld.name);
         recursMergeTree(new_dir_index,tree,ld);
     }
 }
@@ -234,10 +232,10 @@ void RsCollection::recursCollectColFileInfos(const QDomElement& e,std::vector<Co
 void RsCollection::recursAddElements(RsFileTree::DirIndex parent, const DirDetails& dd, FileSearchFlags flags)
 {
     if (dd.type == DIR_TYPE_FILE)
-        mFileTree.addFile(parent,dd.name,dd.hash,dd.size);
+        mFileTree->addFile(parent,dd.name,dd.hash,dd.size);
     else if (dd.type == DIR_TYPE_DIR)
 	{
-        RsFileTree::DirIndex new_dir_index = mFileTree.addDirectory(parent,dd.name);
+        RsFileTree::DirIndex new_dir_index = mFileTree->addDirectory(parent,dd.name);
 
         for(uint32_t i=0;i<dd.children.size();++i)
 		{
@@ -330,6 +328,7 @@ QString RsCollection::errorString(RsCollectionErrorCode code)
 }
 
 RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error)
+    : mFileTree(new RsFileTree)
 {
     if (!checkFile(fileName,error))
         return ;
@@ -465,7 +464,7 @@ bool RsCollection::save(const QString& fileName) const
     QDomDocument xml_doc ;
     QDomElement root = xml_doc.createElement("RsCollection");
 
-    const RsFileTree::DirData& root_data(mFileTree.directoryData(mFileTree.root()));
+    const RsFileTree::DirData& root_data(mFileTree->directoryData(mFileTree->root()));
 
     if(!recursExportToXml(xml_doc,root,root_data))
         return false;
@@ -504,7 +503,7 @@ bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFi
             std::string name = purifyFileName(ee.attribute(QString("name")), bad_chars_detected).toUtf8().constData() ;
             uint64_t size = ee.attribute(QString("size")).toULongLong() ;
 
-            mFileTree.addFile(parent,name,hash,size);
+            mFileTree->addFile(parent,name,hash,size);
 #ifdef TO_REMOVE
             mFileTree.addFile(parent,)
             ColFileInfo newChild ;
@@ -522,7 +521,7 @@ bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFi
             bool bad_chars_detected = false ;
             std::string cleanDirName = purifyFileName(ee.attribute(QString("name")),bad_chars_detected).toUtf8().constData() ;
 
-            RsFileTree::DirIndex new_dir_index = mFileTree.addDirectory(parent,cleanDirName);
+            RsFileTree::DirIndex new_dir_index = mFileTree->addDirectory(parent,cleanDirName);
 
             recursParseXml(doc,ee,new_dir_index);
 #ifdef TO_REMOVE
@@ -554,7 +553,7 @@ bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFi
     {
         QDomElement f = doc.createElement("File") ;
 
-        const RsFileTree::FileData& fd(mFileTree.fileData(dd.subfiles[i]));
+        const RsFileTree::FileData& fd(mFileTree->fileData(dd.subfiles[i]));
 
         f.setAttribute(QString("name"),QString::fromUtf8(fd.name.c_str())) ;
         f.setAttribute(QString("sha1"),QString::fromStdString(fd.hash.toStdString())) ;
@@ -565,7 +564,7 @@ bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFi
 
     for(uint32_t i=0;i<dd.subdirs.size();++i)
     {
-        const RsFileTree::DirData& di(mFileTree.directoryData(dd.subdirs[i]));
+        const RsFileTree::DirData& di(mFileTree->directoryData(dd.subdirs[i]));
 
         QDomElement d = doc.createElement("Directory") ;
         d.setAttribute(QString("name"),QString::fromUtf8(di.name.c_str())) ;
@@ -600,11 +599,11 @@ bool RsCollection::save(QWidget *parent) const
 
 qulonglong RsCollection::count() const
 {
-    return mFileTree.numFiles();
+    return mFileTree->numFiles();
 }
 qulonglong RsCollection::size()
 {
-    return mFileTree.totalFileSize();
+    return mFileTree->totalFileSize();
 
 #ifdef TO_REMOVE
 	QDomElement docElem = _xml_doc.documentElement();
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 47fdee5d6..745a4c764 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -90,7 +90,7 @@ public:
 	bool save(const QString& fileName) const ;
 
     // returns the file tree
-    const RsFileTree& fileTree() const { return mFileTree; }
+    const RsFileTree& fileTree() const { return *mFileTree; }
     // total size of files in the collection
     qulonglong size();
     // total number of files in the collection
@@ -129,7 +129,7 @@ private:
 	// Auto Download recursively.
 	void autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const ;
 
-    RsFileTree mFileTree;
+    std::unique_ptr<RsFileTree> mFileTree;
 #ifdef TO_REMOVE
 	QDomDocument _xml_doc ;
 	QString _fileName ;
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 52583c4f7..c6f22ceb7 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -1456,7 +1456,7 @@ void RsCollectionDialog::saveChild(QTreeWidgetItem *parentItem, ColFileInfo *par
 
 bool RsCollectionDialog::openExistingCollection(const QString& fileName, bool readOnly /* = false */, bool showError /* = true*/)
 {
-    return RsCollectionDialog(fileName,readOnly,showError).exec();
+    return RsCollectionDialog(fileName,false,readOnly).exec();
 }
 
 bool RsCollectionDialog::openNewCollection(const RsFileTree& tree,const QString& proposed_file_name)

From 790c169c02d8a5580b8a081c01a33376f450d757 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Wed, 28 Feb 2024 19:47:01 +0100
Subject: [PATCH 461/503] Fix for macos

---
 retroshare-gui/src/main.cpp   | 2 +-
 retroshare-gui/src/rshare.cpp | 6 ++++++
 retroshare-gui/src/rshare.h   | 7 +++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 3bc8e3c76..0eeca919d 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -705,7 +705,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
          * only on the first run - as the user might want to change it ;)
          */
         QString osx_style("cleanlooks");
-        Rshare::setStyle(osx_style);
+        RsApplication::setStyle(osx_style);
         Settings->setInterfaceStyle(osx_style);
 #endif
 
diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index a5ecbf17d..01ca5304b 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -99,6 +99,12 @@ QStringList RsApplication::_files;           /**< List of files passed by argume
 bool RsApplication::useConfigDir;
 QString RsApplication::configDir;
 #endif
+
+#ifdef __APPLE__
+QStringList RsApplication::_links;           /**< List of links passed by arguments. */
+QStringList RsApplication::_files;           /**< List of files passed by arguments. */
+#endif
+
 Log RsApplication::log_output;                     /**< Logs debugging messages to file or stdout. */
 RsGUIConfigOptions RsApplication::options;
 QDateTime          RsApplication::mStartupTime;
diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h
index e16a0049f..37847fa5e 100644
--- a/retroshare-gui/src/rshare.h
+++ b/retroshare-gui/src/rshare.h
@@ -138,7 +138,7 @@ public:
   static void setOpMode(const QString& op ) { options.opModeStr = op.toStdString(); }
   static QString opmode() { return QString::fromStdString(options.opModeStr); }
 
-#ifdef TO_REMOVE
+#ifdef __APPLE__
   /** Returns links passed by arguments. */
   static QStringList* links() { return &_links; }
   /** Returns files passed by arguments. */
@@ -209,7 +209,10 @@ private:
   static bool argNeedsValue(const QString &argName);
 #endif
 
-
+#ifdef __APPLE__
+  static QStringList _links;           /**< List of links passed by arguments. */
+  static QStringList _files;           /**< List of files passed by arguments. */
+#endif
   static QDateTime mStartupTime;       // startup time
   bool mBlink;
   static QLocalServer* localServer;

From 2ed72a146b047921e79963c1fd24b40ae4cbb672 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 28 Feb 2024 21:56:38 +0100
Subject: [PATCH 462/503] fixed basic functionality of RsCollectionModel

---
 .../src/gui/common/RsCollectionDialog.cpp     |   5 +-
 .../src/gui/common/RsCollectionDialog.h       |   2 +-
 .../src/gui/common/RsCollectionModel.cpp      | 163 ++++++++++++++----
 .../src/gui/common/RsCollectionModel.h        |  15 +-
 4 files changed, 141 insertions(+), 44 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index c6f22ceb7..775b70e06 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -307,9 +307,9 @@ RsCollectionDialog::~RsCollectionDialog()
  * @param event: event occured
  * @return If we don't have to process event in parent.
  */
+#ifdef TODO_COLLECTION
 bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
 {
-#ifdef TODO_COLLECTION
 	if (obj == ui._fileEntriesTW) {
 		if (event->type() == QEvent::KeyPress) {
 			QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
@@ -367,9 +367,8 @@ bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
 
 	// pass the event on to the parent class
 	return QDialog::eventFilter(obj, event);
-#endif
-    return true;
 }
+#endif
 
 /**
  * @brief RsCollectionDialog::processSettings
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h
index 192732338..82a28ee5c 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.h
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h
@@ -40,7 +40,7 @@ public:
     static bool openExistingCollection(const QString& fileName, bool readOnly = false, bool showError = true);
 
 protected:
-	bool eventFilter(QObject *obj, QEvent *ev);
+    //bool eventFilter(QObject *obj, QEvent *ev);
 
     RsCollectionDialog(const QString& filename, const bool& creation, const bool& readOnly = false) ;
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index 0bc0b779c..c0485360d 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -2,10 +2,28 @@
 
 #include "RsCollectionModel.h"
 
+// #define DEBUG_COLLECTION_MODEL 1
+
+static const int COLLECTION_MODEL_NB_COLUMN = 4;
+
 RsCollectionModel::RsCollectionModel(const RsCollection& col, QObject *parent)
     : QAbstractItemModel(parent),mCollection(col)
-{}
+{
+    postMods();
+}
 
+#ifdef DEBUG_COLLECTION_MODEL
+static std::ostream& operator<<(std::ostream& o,const RsCollectionModel::EntryIndex& i)
+{
+    return o << ((i.is_file)?("File"):"Dir") << " with index " << (int)i.index ;
+}
+static std::ostream& operator<<(std::ostream& o,const QModelIndex& i)
+{
+    return o << "QModelIndex (row " << i.row() << ", of ref " << i.internalId() << ")" ;
+}
+#endif
+
+// Indernal Id is always a quintptr_t (basically a uint with the size of a pointer). Depending on the
 // Indernal Id is always a quintptr_t (basically a uint with the size of a pointer). Depending on the
 // architecture, the pointer may have 4 or 8 bytes. We use the low-level bit for type (0=dir, 1=file) and
 // the remaining bits for the index (which will be accordingly understood as a FileIndex or a DirIndex)
@@ -13,7 +31,7 @@ RsCollectionModel::RsCollectionModel(const RsCollection& col, QObject *parent)
 
 bool RsCollectionModel::convertIndexToInternalId(const EntryIndex& e,quintptr& ref)
 {
-    ref = (e.index << 1) || e.is_file;
+    ref = (e.index << 1) | e.is_file;
     return true;
 }
 
@@ -26,56 +44,95 @@ bool RsCollectionModel::convertInternalIdToIndex(quintptr ref, EntryIndex& e)
 
 int RsCollectionModel::rowCount(const QModelIndex& parent) const
 {
+#ifdef DEBUG_COLLECTION_MODEL
+    std::cerr << "Asking rowCount of " << parent << std::endl;
+#endif
+
+    if(parent.column() >= COLLECTION_MODEL_NB_COLUMN)
+        return 0;
+
     if(!parent.isValid())
-        return mCollection.fileTree().root();
+    {
+#ifdef DEBUG_COLLECTION_MODEL
+        std::cerr << "  root! returning " << mCollection.fileTree().directoryData(0).subdirs.size()
+                + mCollection.fileTree().directoryData(0).subfiles.size() << std::endl;
+#endif
+
+        return    mCollection.fileTree().directoryData(0).subdirs.size()
+                + mCollection.fileTree().directoryData(0).subfiles.size();
+    }
 
     EntryIndex i;
     if(!convertInternalIdToIndex(parent.internalId(),i))
         return 0;
 
     if(i.is_file)
+    {
+#ifdef DEBUG_COLLECTION_MODEL
+        std::cerr << "  file: returning 0" << std::endl;
+#endif
         return 0;
+    }
     else
+    {
+#ifdef DEBUG_COLLECTION_MODEL
+        std::cerr << "  dir: returning " << mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size()
+                  << std::endl;
+#endif
         return mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size();
+    }
 }
 
 bool RsCollectionModel::hasChildren(const QModelIndex & parent) const
 {
     if(!parent.isValid())
-        return mCollection.fileTree().root();
+        return true;
 
     EntryIndex i;
     if(!convertInternalIdToIndex(parent.internalId(),i))
-        return 0;
+        return false;
 
     if(i.is_file)
         return false;
+    else if(mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size() > 0)
+        return true;
     else
-        return mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size() > 0;
+        return false;
 }
 
 int RsCollectionModel::columnCount(const QModelIndex&) const
 {
-    return 4;
+    return COLLECTION_MODEL_NB_COLUMN;
 }
 
-QVariant RsCollectionModel::headerData(int section, Qt::Orientation,int) const
+QVariant RsCollectionModel::headerData(int section, Qt::Orientation,int role) const
 {
-    switch(section)
-    {
-    case 0: return tr("File");
-    case 1: return tr("Size");
-    case 2: return tr("Hash");
-    case 3: return tr("Count");
-    default:
-        return QVariant();
-    }
+    if(role == Qt::DisplayRole)
+        switch(section)
+        {
+        case 0: return tr("File");
+        case 1: return tr("Size");
+        case 2: return tr("Hash");
+        case 3: return tr("Count");
+        default:
+            return QVariant();
+        }
+    return QVariant();
 }
 
 QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & parent) const
 {
+    if(row < 0 || column < 0 || column >= columnCount(parent) || row >= rowCount(parent))
+        return QModelIndex();
+
     EntryIndex i;
-    if(!convertInternalIdToIndex(parent.internalId(),i))
+
+    if(!parent.isValid())	// root
+    {
+        i.is_file = false;
+        i.index = 0;
+    }
+    else if(!convertInternalIdToIndex(parent.internalId(),i))
         return QModelIndex();
 
     if(i.is_file || i.index >= mCollection.fileTree().numDirs())
@@ -83,9 +140,6 @@ QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & pa
 
     const auto& parentData(mCollection.fileTree().directoryData(i.index));
 
-    if(row < 0)
-        return QModelIndex();
-
     if((size_t)row < parentData.subdirs.size())
     {
         EntryIndex e;
@@ -94,6 +148,10 @@ QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & pa
 
         quintptr ref;
         convertIndexToInternalId(e,ref);
+
+#ifdef DEBUG_COLLECTION_MODEL
+        std::cerr << "creating index for row " << row << " of parent " << parent << ". result is " << createIndex(row,column,ref) << std::endl;
+#endif
         return createIndex(row,column,ref);
     }
 
@@ -105,6 +163,9 @@ QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & pa
 
         quintptr ref;
         convertIndexToInternalId(e,ref);
+#ifdef DEBUG_COLLECTION_MODEL
+        std::cerr << "creating index for row " << row << " of parent " << parent << ". result is " << createIndex(row,column,ref) << std::endl;
+#endif
         return createIndex(row,column,ref);
     }
 
@@ -113,12 +174,16 @@ QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & pa
 
 QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
 {
+    if(!index.isValid())
+        return QModelIndex();
+
     EntryIndex i;
-    if(!convertInternalIdToIndex(index.internalId(),i))
+    if(!convertInternalIdToIndex(index.internalId(),i) || i.index==0)
         return QModelIndex();
 
     EntryIndex p;
     p.is_file = false;	// all parents are directories
+    int row;
 
     if(i.is_file)
     {
@@ -128,7 +193,8 @@ QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
             RsErr() << "Error: parent not found for index " << index.row() << ", " << index.column();
             return QModelIndex();
         }
-        p.index = it->second;
+        p.index = it->second.parent_index;
+        row = it->second.parent_row;
     }
     else
     {
@@ -138,12 +204,14 @@ QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
             RsErr() << "Error: parent not found for index " << index.row() << ", " << index.column();
             return QModelIndex();
         }
-        p.index = it->second;
+        p.index = it->second.parent_index;
+        row = it->second.parent_row;
     }
 
     quintptr ref;
     convertIndexToInternalId(p,ref);
-    return createIndex(0,index.column(),ref);
+
+    return createIndex(row,0,ref);
 }
 
 QVariant RsCollectionModel::data(const QModelIndex& index, int role) const
@@ -152,6 +220,9 @@ QVariant RsCollectionModel::data(const QModelIndex& index, int role) const
     if(!convertInternalIdToIndex(index.internalId(),i))
         return QVariant();
 
+#ifdef DEBUG_COLLECTION_MODEL
+    std::cerr << "Asking data of " << i << std::endl;
+#endif
     switch(role)
     {
     case Qt::DisplayRole: return displayRole(i,index.column());
@@ -212,32 +283,54 @@ void RsCollectionModel::postMods()
     mFileParents.clear();
     mDirSizes.clear();
 
+#ifdef DEBUG_COLLECTION_MODEL
+    std::cerr << "Updating from tree: " << std::endl;
+#endif
     uint64_t s;
-    recursUpdateLocalStructures(mCollection.fileTree().root(),s);
+    recursUpdateLocalStructures(mCollection.fileTree().root(),s,0);
 
     mUpdating = false;
     emit layoutChanged();
 }
 
-void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,uint64_t& total_size)
+void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,uint64_t& total_size,int depth)
 {
     total_size = 0;
 
     const auto& dd(mCollection.fileTree().directoryData(dir_index));
 
-    for(uint32_t i=0;i<dd.subfiles.size();++i)
-    {
-        total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
-        mFileParents[dd.subfiles[i]] = dir_index;
-    }
-
     for(uint32_t i=0;i<dd.subdirs.size();++i)
     {
+#ifdef DEBUG_COLLECTION_MODEL
+        for(int j=0;j<depth;++j) std::cerr << "  ";
+        std::cerr << "Dir \"" << mCollection.fileTree().directoryData(dd.subdirs[i]).name << "\"" << std::endl ;
+#endif
+
         uint64_t ss;
-        recursUpdateLocalStructures(dd.subdirs[i],ss);
+        recursUpdateLocalStructures(dd.subdirs[i],ss,depth+1);
         total_size += ss;
-        mDirParents[dd.subdirs[i]] = dir_index;
+
+        auto& ref(mDirParents[dd.subdirs[i]]);
+
+        ref.parent_index = dir_index;
+        ref.parent_row   = i;
     }
+
+    for(uint32_t i=0;i<dd.subfiles.size();++i)
+    {
+#ifdef DEBUG_COLLECTION_MODEL
+        for(int j=0;j<depth;++j) std::cerr << "  ";
+        std::cerr << "File \"" << mCollection.fileTree().fileData(dd.subfiles[i]).name << "\"" << std::endl;
+#endif
+
+        total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
+
+        auto& ref(mFileParents[dd.subfiles[i]]);
+
+        ref.parent_index = dir_index;
+        ref.parent_row   = i + dd.subdirs.size();
+    }
+
     mDirSizes[dir_index] = total_size;
 }
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index d2ffb4f92..ff0a2993a 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -18,7 +18,7 @@ class RsCollectionModel: public QAbstractItemModel
 
         /* Callback from GUI */
 
-        void update() {}
+        void update() ;
         void filterItems(const std::list<std::string>& keywords, uint32_t& found) ;
 
         // Overloaded from QAbstractItemModel
@@ -40,15 +40,15 @@ class RsCollectionModel: public QAbstractItemModel
 #endif
 #endif
 
-    private:
         struct EntryIndex {
             bool is_file;		// false=dir, true=file
             uint64_t index;
         };
+    private:
         static bool convertIndexToInternalId(const EntryIndex& e,quintptr& ref);
         static bool convertInternalIdToIndex(quintptr ref, EntryIndex& e);
 
-        void recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,uint64_t& total_size);
+        void recursUpdateLocalStructures(RsFileTree::DirIndex dir_index, uint64_t& total_size, int depth);
 
         QVariant displayRole(const EntryIndex&,int col) const ;
         QVariant sortRole(const EntryIndex&,int col) const ;
@@ -59,8 +59,13 @@ class RsCollectionModel: public QAbstractItemModel
 
         const RsCollection& mCollection;
 
-        std::map<uint64_t,RsFileTree::DirIndex> mFileParents;
-        std::map<uint64_t,RsFileTree::DirIndex> mDirParents;
+        struct ParentInfo {
+             RsFileTree::DirIndex parent_index;	// index of the parent
+             RsFileTree::DirIndex parent_row; // row of that child, in this parent
+        };
+
+        std::map<uint64_t,ParentInfo> mFileParents;
+        std::map<uint64_t,ParentInfo> mDirParents;
         std::map<uint64_t,uint64_t> mDirSizes;
 
         // std::set<void*> mFilteredPointers ;

From 31c390aa27f1697445752384b37ba53346b0b4df Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 29 Feb 2024 22:07:52 +0100
Subject: [PATCH 463/503] simplified usage of RsCollectionDialog in shared
 files (removed duplicate functionality)

---
 .../gui/FileTransfer/SharedFilesDialog.cpp    | 12 +--
 .../src/gui/common/RsCollectionDialog.cpp     | 87 +++++++++++++------
 .../src/gui/common/RsCollectionDialog.h       | 21 +++--
 .../src/gui/common/RsUrlHandler.cpp           |  9 +-
 4 files changed, 86 insertions(+), 43 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 8c7e460c2..f4e4cfbb3 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -777,7 +777,7 @@ void SharedFilesDialog::collModif()
     QFileInfo qinfo;
     qinfo.setFile(QString::fromUtf8(path.c_str()));
     if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-            RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
+            RsCollectionDialog::editExistingCollection(qinfo.absoluteFilePath());
 }
 
 void SharedFilesDialog::collView()
@@ -1168,12 +1168,14 @@ void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point )
     collViewAct->setEnabled(bIsRsColl);
     collOpenAct->setEnabled(true);
 
-    QMenu collectionMenu(tr("Collection"), this);
+    QMenu collectionMenu(tr("Retroshare Collection"), this);
     collectionMenu.setIcon(QIcon(IMAGE_LIBRARY));
     collectionMenu.addAction(collCreateAct);
-    collectionMenu.addAction(collModifAct);
-    collectionMenu.addAction(collViewAct);
-    collectionMenu.addAction(collOpenAct);
+
+    if(bIsRsColl)
+        collectionMenu.addAction(collModifAct);
+    //collectionMenu.addAction(collViewAct);
+    //collectionMenu.addAction(collOpenAct);
 
     switch (type) {
         case DIR_TYPE_DIR :
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 775b70e06..09f8159b7 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -123,10 +123,8 @@ protected:
  * @param creation: Open dialog as RsColl Creation or RsColl DownLoad
  * @param readOnly: Open dialog for RsColl as ReadOnly
  */
-RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
-                                       , const bool& creation /* = false */
-                                       , const bool& readOnly /* = false */)
-  : _fileName(collectionFileName), _creationMode(creation) ,_readOnly(readOnly)
+RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsCollectionDialogMode mode)
+  : _fileName(collectionFileName), _mode(mode)
 {
     RsCollection::RsCollectionErrorCode err_code;
     mCollection = new RsCollection(collectionFileName,err_code);
@@ -154,26 +152,27 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
 	
     ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/collections.png"));
 
-	if(creation)
-	{
-		ui.headerFrame->setHeaderText(tr("Collection Editor"));
-		ui.downloadFolder_LE->hide();
-		ui.downloadFolder_LB->hide();
-		ui.destinationDir_TB->hide();
-	}
-	else
+    if(_mode == DOWNLOAD)
 	{
 		ui.headerFrame->setHeaderText(tr("Download files"));
 		ui.downloadFolder_LE->show();
 		ui.downloadFolder_LB->show();
-		ui.label_filename->hide();
+        ui.label_filename->hide();
 		ui._filename_TL->hide();
 
 		ui.downloadFolder_LE->setText(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str())) ;
 
 		QObject::connect(ui.downloadFolder_LE,SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(openDestinationDirectoryMenu()));
 		QObject::connect(ui.destinationDir_TB,SIGNAL(pressed()), this, SLOT(openDestinationDirectoryMenu()));
-	}
+    }
+    else
+    {
+        ui.headerFrame->setHeaderText(tr("Collection Editor"));
+        ui.downloadFolder_LE->hide();
+        ui.downloadFolder_LB->hide();
+        ui.destinationDir_TB->hide();
+    }
+
 
 	// 1 - add all elements to the list.
 
@@ -230,12 +229,12 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
 	processSettings(true);
 
 	// 5 Activate button follow creationMode
-	ui._changeFile->setVisible(_creationMode && !_readOnly);
-	ui._makeDir_PB->setVisible(_creationMode && !_readOnly);
-	ui._removeDuplicate_CB->setVisible(_creationMode && !_readOnly);
-	ui._save_PB->setVisible(_creationMode && !_readOnly);
-	ui._treeViewFrame->setVisible(_creationMode && !_readOnly);
-	ui._download_PB->setVisible(!_creationMode && !_readOnly);
+    ui._changeFile->setVisible(_mode == EDIT);
+    ui._makeDir_PB->setVisible(_mode == EDIT);
+    ui._removeDuplicate_CB->setVisible(_mode == EDIT);
+    ui._save_PB->setVisible(_mode == EDIT);
+    ui._treeViewFrame->setVisible(_mode == EDIT);
+    ui._download_PB->setVisible(_mode == DOWNLOAD);
 
 #ifdef TO_REMOVE
     ui._fileEntriesTW->installEventFilter(this);
@@ -376,12 +375,12 @@ bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
  */
 void RsCollectionDialog::processSettings(bool bLoad)
 {
-	Settings->beginGroup("RsCollectionDialog");
+    Settings->beginGroup("RsCollectionDialogV2");
 
 	if (bLoad) {
 		// load settings
 
-		if(_creationMode && !_readOnly){
+        if(_mode == EDIT){
 			// Load windows geometrie
 			restoreGeometry(Settings->value("WindowGeometrie_CM").toByteArray());
 			// Load splitters state
@@ -403,7 +402,7 @@ void RsCollectionDialog::processSettings(bool bLoad)
 			ui._fileEntriesTW->header()->restoreState(Settings->value("FileEntriesHeader").toByteArray());
 		}
 	} else {
-		if(_creationMode && !_readOnly){
+        if(_mode == EDIT){
 			// Save windows geometrie
 			Settings->setValue("WindowGeometrie_CM",saveGeometry());
 			// Save splitters state
@@ -1412,6 +1411,7 @@ void RsCollectionDialog::download()
 void RsCollectionDialog::save()
 {
     mCollection->save(_fileName);
+    close();
 #ifdef TO_REMOVE
 	std::cerr << "Saving!" << std::endl;
 	_newColFileInfos.clear();
@@ -1453,13 +1453,48 @@ void RsCollectionDialog::saveChild(QTreeWidgetItem *parentItem, ColFileInfo *par
 }
 #endif
 
-bool RsCollectionDialog::openExistingCollection(const QString& fileName, bool readOnly /* = false */, bool showError /* = true*/)
+bool RsCollectionDialog::editExistingCollection(const QString& fileName, bool showError /* = true*/)
 {
-    return RsCollectionDialog(fileName,false,readOnly).exec();
+    return RsCollectionDialog(fileName,EDIT).exec();
 }
 
-bool RsCollectionDialog::openNewCollection(const RsFileTree& tree,const QString& proposed_file_name)
+bool RsCollectionDialog::openExistingCollection(const QString& fileName, bool showError /* = true*/)
 {
+    return RsCollectionDialog(fileName,DOWNLOAD).exec();
+}
+
+bool RsCollectionDialog::openNewCollection(const RsFileTree& tree)
+{
+    RsCollection collection(tree);
+    QString fileName;
+
+    if(!misc::getSaveFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE
+                                                        , QApplication::translate("RsCollectionFile", "Create collection file")
+                                                        , QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")"
+                                                        , fileName,0, QFileDialog::DontConfirmOverwrite))
+        return false;
+
+    if (!fileName.endsWith("." + RsCollection::ExtensionString))
+        fileName += "." + RsCollection::ExtensionString ;
+
+    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
+
+    QMessageBox mb;
+    mb.setText(tr("Save Collection File."));
+    mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
+    QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
+    QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
+    mb.setIcon(QMessageBox::Question);
+    mb.exec();
+
+    if (mb.clickedButton()==btnCancel)
+        return false;
+
+    if(!collection.save(fileName))
+        return false;
+
+    return RsCollectionDialog(fileName,EDIT).exec();
+
 #ifdef TODO_COLLECTION
     QString fileName = proposed_file_name;
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h
index 82a28ee5c..71c261cb4 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.h
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h
@@ -34,15 +34,24 @@ public:
 	virtual ~RsCollectionDialog();
 
     // Open new collection
-    static bool openNewCollection(const RsFileTree &tree, const QString &proposed_file_name = QString());
+    static bool openNewCollection(const RsFileTree &tree = RsFileTree());
 
-    // Open existing collection
-    static bool openExistingCollection(const QString& fileName, bool readOnly = false, bool showError = true);
+    // Edit existing collection
+    static bool editExistingCollection(const QString& fileName, bool showError = true);
+
+    // Open existing collection for download
+    static bool openExistingCollection(const QString& fileName, bool showError = true);
 
 protected:
     //bool eventFilter(QObject *obj, QEvent *ev);
 
-    RsCollectionDialog(const QString& filename, const bool& creation, const bool& readOnly = false) ;
+    enum RsCollectionDialogMode {
+        UNKNOWN       = 0x00,
+        EDIT          = 0x01,
+        DOWNLOAD      = 0x02,
+    };
+
+    RsCollectionDialog(const QString& filename, RsCollectionDialogMode mode) ;
 
 private slots:
 	void directoryLoaded(QString dirLoaded);
@@ -90,8 +99,8 @@ private:
 
 	Ui::RsCollectionDialog ui;
 	QString _fileName ;
-	const bool _creationMode ;
-	const bool _readOnly;
+
+    RsCollectionDialogMode _mode;
 
 	QFileSystemModel *_dirModel;
 	QSortFilterProxyModel *_tree_proxyModel;
diff --git a/retroshare-gui/src/gui/common/RsUrlHandler.cpp b/retroshare-gui/src/gui/common/RsUrlHandler.cpp
index 3d005aed6..94ec79753 100644
--- a/retroshare-gui/src/gui/common/RsUrlHandler.cpp
+++ b/retroshare-gui/src/gui/common/RsUrlHandler.cpp
@@ -21,16 +21,13 @@
 #include <stdexcept>
 #include <QDesktopServices>
 #include <QUrl>
-#include "RsCollection.h"
+#include "RsCollectionDialog.h"
 #include "RsUrlHandler.h"
 
 bool RsUrlHandler::openUrl(const QUrl& url)
 {
 	if(url.scheme() == QString("file") && url.toLocalFile().endsWith("."+RsCollection::ExtensionString))
-	{
-        RsCollection::RsCollectionErrorCode err;
-        RsCollection(url.toLocalFile(),err).downloadFiles() ;
-        return true;
-	}
+        return RsCollectionDialog::openExistingCollection(url.toLocalFile());
+
 	return QDesktopServices::openUrl(url) ;
 }

From e106959fbd0b506ba1ca771b1a2ad4025c779210 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 1 Mar 2024 23:00:17 +0100
Subject: [PATCH 464/503] fixed creating new collection

---
 .../src/gui/FileTransfer/SharedFilesDialog.cpp     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index f4e4cfbb3..a26f13728 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -733,15 +733,16 @@ void SharedFilesDialog::sendLinkTo()
 
 void SharedFilesDialog::collCreate()
 {
-#ifdef TODO_COLLECTION
     QModelIndexList lst = getSelected();
 
     std::vector <DirDetails> dirVec;
     model->getDirDetailsFromSelect(lst, dirVec);
 
+    auto RemoteMode = isRemote();
     FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
 
     QString dir_name;
+
     if(!RemoteMode)
     {
         if(!dirVec.empty())
@@ -750,8 +751,15 @@ void SharedFilesDialog::collCreate()
             dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
         }
     }
-    RsCollection(dirVec,f).openNewColl(parent,dir_name);
-#endif
+
+    RsFileTree tree;
+
+    for(uint32_t i=0;i<dirVec.size();++i)
+        tree.addFileTree(tree.root(),*RsFileTree::fromDirDetails(dirVec[i],RemoteMode,true));
+
+    RsCollectionDialog::openNewCollection(tree);
+
+            //auto ft = RsFileTree::fromDirDetails(details,remote);
 }
 
 void SharedFilesDialog::collModif()

From be96f417b3ab540645ea096c790cabc7988d075c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 4 Mar 2024 23:00:25 +0100
Subject: [PATCH 465/503] fixed update of tree when changed

---
 build_scripts/OBS                                    | 2 +-
 libbitdht                                            | 2 +-
 libretroshare                                        | 2 +-
 retroshare-gui/src/gui/common/RsCollectionDialog.cpp | 3 +++
 retroshare-webui                                     | 2 +-
 supportlibs/libsam3                                  | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index 353596b0e..9dd9d7f94 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 353596b0ee5ea76611eb663b90bf3ab1c9f34ad7
+Subproject commit 9dd9d7f94a600e8c8478887a4f7784fdc3294034
diff --git a/libbitdht b/libbitdht
index 2ddc86fb5..659423769 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
+Subproject commit 659423769541169457c41f71c8a038e2d64ba079
diff --git a/libretroshare b/libretroshare
index ac1c5f301..7e526a423 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit ac1c5f3019ff17c695758dabec0ee8e540d401e0
+Subproject commit 7e526a4232285e1c2789315c1f382f54d868df8d
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 09f8159b7..b1a5e405a 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -171,6 +171,8 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
         ui.downloadFolder_LE->hide();
         ui.downloadFolder_LB->hide();
         ui.destinationDir_TB->hide();
+        ui.label_filename->show();
+        ui._filename_TL->show();
     }
 
 
@@ -858,6 +860,7 @@ void RsCollectionDialog::addSelection(bool recursive)
 	// Process Files once all done
 	ui._hashBox->addAttachments(fileToHash,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
 #endif
+    mCollectionModel->postMods();
 }
 
 /**
diff --git a/retroshare-webui b/retroshare-webui
index ba0de17f4..542a8c07b 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit ba0de17f41914f1be6754db5bc5b4507b0deaafd
+Subproject commit 542a8c07bd02f9bb9082f7aba5aaaed54e643fc1
diff --git a/supportlibs/libsam3 b/supportlibs/libsam3
index 2226ef0a2..8623304b6 160000
--- a/supportlibs/libsam3
+++ b/supportlibs/libsam3
@@ -1 +1 @@
-Subproject commit 2226ef0a20a001ec0942be6abe5e909c15447d8e
+Subproject commit 8623304b62294dafbe477573f321a464fef721dd

From 2a5698c9d31f8134c5553f17560bb1aae1909302 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 4 Mar 2024 23:22:03 +0100
Subject: [PATCH 466/503] removed dead code

---
 retroshare-gui/src/rshare.cpp | 336 ----------------------------------
 retroshare-gui/src/rshare.h   |  15 --
 2 files changed, 351 deletions(-)

diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index 01ca5304b..d867f1545 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -57,49 +57,6 @@
 
 #include "rshare.h"
 
-#ifdef TO_REMOVE
-/* Available command-line arguments. */
-#define ARG_RESET           "reset"         /**< Reset RsApplication's saved settings.   */
-#define ARG_DATADIR         "datadir"       /**< Directory to use for data files. */
-#define ARG_LOGFILE         "logfile"       /**< Location of our logfile.         */
-#define ARG_LOGLEVEL        "loglevel"      /**< Log verbosity.                   */
-#define ARG_GUISTYLE        "style"         /**< Argument specfying GUI style.    */
-#define ARG_GUISTYLESHEET   "stylesheet"    /**< Argument specfying GUI style.    */
-#define ARG_LANGUAGE        "lang"          /**< Argument specifying language.    */
-#define ARG_OPMODE_S        "o"             /**< OpMode (Full, NoTurtle, Gaming, Minimal) */
-#define ARG_OPMODE_L        "opmode"        /**< OpMode (Full, NoTurtle, Gaming, Minimal) */
-#define ARG_RSLINK_S        "r"             /**< Open RsLink with protocol retroshare:// */
-#define ARG_RSLINK_L        "link"          /**< Open RsLink with protocol retroshare:// */
-#define ARG_RSFILE_S        "f"             /**< Open RsFile with or without arg.  */
-#define ARG_RSFILE_L        "rsfile"        /**< Open RsFile with or without arg.  */
-//Other defined for server in /libretroshare/src/rsserver/rsinit.cc:351
-
-// The arguments here can be send to a running instance.
-// If the command line contains arguments not listed here, we have to start a new instance.
-// For example, the user wants to start a second instance using --base-dir arg of libretroshare.
-static const char* const forwardableArgs[] = {
-    ARG_OPMODE_S,
-    ARG_OPMODE_L,
-    ARG_RSLINK_S,
-    ARG_RSLINK_L,
-    ARG_RSFILE_S,
-    ARG_RSFILE_L,
-    NULL,
-};
-
-/* Static member variables */
-QMap<QString, QString> RsApplication::_args; /**< List of command-line arguments.  */
-QString RsApplication::_style;               /**< The current GUI style.           */
-QString RsApplication::_stylesheet;          /**< The current GUI stylesheet.      */
-QString RsApplication::_language;            /**< The current language.            */
-QString RsApplication::_dateformat;          /**< The format of dates in feed items etc. */
-QString RsApplication::_opmode;              /**< The operating mode passed by args. */
-QStringList RsApplication::_links;           /**< List of links passed by arguments. */
-QStringList RsApplication::_files;           /**< List of files passed by arguments. */
-bool RsApplication::useConfigDir;
-QString RsApplication::configDir;
-#endif
-
 #ifdef __APPLE__
 QStringList RsApplication::_links;           /**< List of links passed by arguments. */
 QStringList RsApplication::_files;           /**< List of files passed by arguments. */
@@ -157,95 +114,6 @@ RsApplication::RsApplication(const RsGUIConfigOptions& conf)
     localServer = NULL;
     options = conf;
 
-#ifdef TO_REMOVE
-    //Initialize connection to LocalServer to know if other process runs.
-    {
-        QString serverName = QString(TARGET);
-
-        // check if another instance is running
-        bool haveRunningInstance = notifyRunningInstance();
-
-        bool sendArgsToRunningInstance = haveRunningInstance;
-        if(args.empty())
-            sendArgsToRunningInstance = false;
-        // if we find non-forwardable args, start a new instance
-        for(int iCurs = 0; iCurs < args.size(); ++iCurs)
-        {
-            const char* const* argit = forwardableArgs;
-            bool found = false;
-            while(*argit && iCurs < args.size())
-            {
-                if(args.value(iCurs) == "-"+QString(*argit) || args.value(iCurs) == "--"+QString(*argit))
-                {
-                    found = true;
-                    if(argNeedsValue(*argit))
-                        iCurs++;
-                }
-                argit++;
-            }
-            if(!found)
-                sendArgsToRunningInstance = false;
-        }
-
-        if (sendArgsToRunningInstance) {
-            // load into shared memory
-            QBuffer buffer;
-            buffer.open(QBuffer::ReadWrite);
-            QDataStream out(&buffer);
-            out << args;
-            int size = buffer.size();
-
-            QSharedMemory newArgs;
-            newArgs.setKey(serverName + "_newArgs");
-            if (newArgs.isAttached()) newArgs.detach();
-
-            if (!newArgs.create(size)) {
-                std::cerr << "(EE) RsApplication::RsApplication Unable to create shared memory segment of size:"
-                      << size << " error:" << newArgs.errorString().toStdString() << "." << std::endl;
-#ifdef Q_OS_UNIX
-                std::cerr << "Look with `ipcs -m` for nattch==0 segment. And remove it with `ipcrm -m 'shmid'`." << std::endl;
-                //No need for windows, as it removes shared segment directly even when crash.
-#endif
-                newArgs.detach();
-                ::exit(EXIT_FAILURE);
-            }
-            newArgs.lock();
-            char *to = (char*)newArgs.data();
-            const char *from = buffer.data().data();
-            memcpy(to, from, qMin(newArgs.size(), size));
-            newArgs.unlock();
-
-            std::cerr << "RsApplication::RsApplication waitForConnected to other instance." << std::endl;
-            if(notifyRunningInstance())
-            {
-                newArgs.detach();
-                std::cerr << "RsApplication::RsApplication Arguments was sended." << std::endl
-                      << " To disable it, in Options - General - Misc," << std::endl
-                      << " uncheck \"Use Local Server to get new Arguments\"." << std::endl;
-                ::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function
-            }
-            else
-                std::cerr << "RsApplication::RsApplication failed to connect to other instance." << std::endl;
-            newArgs.detach();
-        }
-
-        if(!haveRunningInstance)
-        {
-            // No main process exists
-            // Or started without arguments
-            // So we start a Local Server to listen for connections from new process
-            localServer= new QLocalServer();
-            QObject::connect(localServer, SIGNAL(newConnection()), this, SLOT(slotConnectionEstablished()));
-            updateLocalServer();
-            // clear out any old arguments (race condition?)
-            QSharedMemory newArgs;
-            newArgs.setKey(QString(TARGET) + "_newArgs");
-            if(newArgs.attach(QSharedMemory::ReadWrite))
-                newArgs.detach();
-        }
-    }
-#endif
-
     // So we start a Local Server to listen for connections from new process
     localServer= new QLocalServer();
     QObject::connect(localServer, SIGNAL(newConnection()), this, SLOT(slotConnectionEstablished()));
@@ -281,11 +149,6 @@ RsApplication::RsApplication(const RsGUIConfigOptions& conf)
     connect(timer, SIGNAL(timeout()), this, SIGNAL(minuteTick()));
     timer->start();
 
-#ifdef TO_REMOVE
-    /* Read in all our command-line arguments. */
-    parseArguments(args);
-#endif
-
     /* Check if we're supposed to reset our config before proceeding. */
     if (options.optResetParams)
     {
@@ -304,13 +167,6 @@ RsApplication::RsApplication(const RsGUIConfigOptions& conf)
         log_output.setLogLevel(Log::stringToLogLevel(options.logLevel));
     }
 
-#ifdef TO_REMOVE
-    /* config directory */
-    useConfigDir = false;
-    if (!conf.optBaseDir.empty())
-        setConfigDirectory(QString::fromStdString(conf.optBaseDir));
-#endif
-
     /** Initialize support for language translations. */
     //LanguageSupport::initialize();
 
@@ -409,198 +265,6 @@ RsApplication::onEventLoopStarted()
   emit running();
 }
 
-#ifdef TO_REMOVE
-/** Display usage information regarding command-line arguments. */
-/*void
-RsApplication::printUsage(QString errmsg)
-{
-  QTextStream out(stdout);*/
-
-  /* If there was an error message, print it out. */
-  /*if (!errmsg.isEmpty()) {
-    out << "** " << errmsg << " **" << endl << endl;
-  }*/
-
-  /* Now print the application usage */
-  //out << "Usage: " << endl;
-  //out << "\t" << qApp->arguments().at(0) << " [options]"    << endl;
-
-  /* And available options */
-  //out << endl << "Available Options:"                                   << endl;
-  //out << "\t-"ARG_RESET"\t\tResets ALL stored RsApplication settings."        << endl;
-  //out << "\t-"ARG_DATADIR"\tSets the directory RsApplication uses for data files"<< endl;
-  //out << "\t-"ARG_GUISTYLE"\t\tSets RsApplication's interface style."         << endl;
-  //out << "\t-"ARG_GUISTYLESHEET"\t\tSets RsApplication's stylesheet."         << endl;
-  //out << "\t\t\t[" << QStyleFactory::keys().join("|") << "]"            << endl;
-  //out << "\t-"ARG_LANGUAGE"\t\tSets RsApplication's language."                << endl;
-  //out << "\t\t\t[" << LanguageSupport::languageCodes().join("|") << "]" << endl;
-//}
-
-/** Displays usage information for command-line args. */
-void
-RsApplication::showUsageMessageBox()
-{
-  QString usage;
-  QTextStream out(&usage);
-
-  out << "Available Options:" << endl;
-  out << "<table>";
-  //out << trow(tcol("-"ARG_HELP) + 
-  //            tcol(tr("Displays this usage message and exits.")));
-  out << trow(tcol("-" ARG_RESET) +
-              tcol(tr("Resets ALL stored RetroShare settings.")));
-  out << trow(tcol("-" ARG_DATADIR" &lt;dir&gt;") +
-              tcol(tr("Sets the directory RetroShare uses for data files.")));
-  out << trow(tcol("-" ARG_LOGFILE" &lt;" + tr("filename") + "&gt;") +
-              tcol(tr("Sets the name and location of RetroShare's logfile.")));
-  out << trow(tcol("-" ARG_LOGLEVEL" &lt;" + tr("level") + "&gt;") +
-              tcol(tr("Sets the verbosity of RetroShare's logging.") +
-                   "<br>[" + Log::logLevels().join("|") +"]"));
-  out << trow(tcol("-" ARG_GUISTYLE" &lt;" + tr("style") +"&gt;") +
-              tcol(tr("Sets RetroShare's interface style.") +
-                   "<br>[" + QStyleFactory::keys().join("|") + "]"));
-  out << trow(tcol("-" ARG_GUISTYLESHEET" &lt;" + tr("stylesheet") + "&gt;") +
-              tcol(tr("Sets RetroShare's interface stylesheets.")));
-  out << trow(tcol("-" ARG_LANGUAGE" &lt;" + tr("language") + "&gt;") +
-              tcol(tr("Sets RetroShare's language.") +
-                   "<br>[" + LanguageSupport::languageCodes().join("|") + "]"));
-  out << trow(tcol("--" ARG_OPMODE_L" &lt;" + tr("opmode") + "&gt;") +
-              tcol(tr("Sets RetroShare's operating mode.") +
-                   "<br>[full|noturtle|gaming|minimal]"));
-  out << trow(tcol("-" ARG_RSLINK_L" &lt;" + tr("RsLinkURL") + "&gt;") +
-              tcol(tr("Open RsLink with protocol retroshare://")));
-  out << trow(tcol("-" ARG_RSFILE_L" &lt;" + tr("filename") + "&gt;") +
-              tcol(tr("Open RsFile with or without arg.")));
-  out << "</table>";
-
-  VMessageBox::information(0, 
-    tr("RetroShare GUI Usage Information"), usage, VMessageBox::Ok);
-}
-
-/** Returns true if the specified argument expects a value. */
-bool
-RsApplication::argNeedsValue(const QString &argName)
-{
-	return (
-	        argName == ARG_DATADIR  ||
-	        argName == ARG_LOGFILE  ||
-	        argName == ARG_LOGLEVEL ||
-	        argName == ARG_GUISTYLE ||
-	        argName == ARG_GUISTYLESHEET ||
-	        argName == ARG_LANGUAGE ||
-	        argName == ARG_OPMODE_S ||
-	        argName == ARG_OPMODE_L ||
-	        argName == ARG_RSLINK_S ||
-	        argName == ARG_RSLINK_L ||
-	        argName == ARG_RSFILE_S ||
-	        argName == ARG_RSFILE_L   );
-}
-
-/** Parses the list of command-line arguments for their argument names and
- * values. */
-void
-RsApplication::parseArguments(QStringList args, bool firstRun)
-{
-	QString arg, argl, value;
-    std::vector<const char *> argv;
-    for(auto l:args)
-        argv.push_back((const char *)l.data());
-
-	/* Loop through all command-line args/values and put them in a map */
-	for (int iCurs = 0; iCurs < args.size(); ++iCurs) {
-		/* Get the argument name and set a blank value */
-		arg = args.at(iCurs);//.toLower(); Need Upper case for file name.
-		argl = arg.toLower();
-		if (argl == "empty") continue;
-		value = "";
-
-		/* Check if it starts with a - or -- */
-		if (arg.startsWith("-")) {
-			arg = arg.mid((arg.startsWith("--") ? 2 : 1));
-			/* Check if it takes a value and there is one on the command-line */
-			if (iCurs < args.size()-1 && argNeedsValue(arg)) {
-				value = args.at(++iCurs);
-			}
-		} else {
-			/* Check if links or files without arg */
-			if (argl.startsWith("retroshare://")) {
-				value = arg;
-				arg = ARG_RSLINK_L;
-			} else {
-				if (QFile(arg).exists()) {
-					value = arg;
-					arg = ARG_RSFILE_L;
-				}
-			}
-		}
-
-		/* handle opmode that could be change while running.*/
-		QString omValue = QString(value).prepend(";").append(";").toLower();
-		QString omValues = QString(";full;noturtle;gaming;minimal;");
-		if ((arg == ARG_OPMODE_S || arg == ARG_OPMODE_L )
-		    && omValues.contains(omValue)) {
-			_opmode = value;
-		}
-
-		/* Don't send theses argument to _args map to allow multiple. */
-		if (arg == ARG_RSLINK_S || arg == ARG_RSLINK_L) {
-			_links.append(value);
-		} else if (arg == ARG_RSFILE_S || arg == ARG_RSFILE_L) {
-			_files.append(value);
-		} else if (firstRun) {
-			/* Place this arg/value in the map only first time*/
-			_args.insert(arg, value);
-		}
-	}
-
-}
-
-/** Verifies that all specified arguments were valid. */
-bool
-RsApplication::validateArguments(QString &errmsg)
-{
-  /* Check for a writable log file */
-  if (_args.contains(ARG_LOGFILE) && !_log.isOpen()) {
-    errmsg = tr("Unable to open log file '%1': %2")
-                           .arg(  _args.value(ARG_LOGFILE)
-                                , _log.errorString());
-    return false;
-  }
-  /* Check for a valid log level */
-  if (_args.contains(ARG_LOGLEVEL) &&
-      !Log::logLevels().contains(_args.value(ARG_LOGLEVEL))) {
-    errmsg = tr("Invalid log level specified:")+" " + _args.value(ARG_LOGLEVEL);
-    return false;
-  }
-  /* Check for a valid GUI style */
-  if (_args.contains(ARG_GUISTYLE) &&
-      !QStyleFactory::keys().contains(_args.value(ARG_GUISTYLE),
-                                      Qt::CaseInsensitive)) {
-    errmsg = tr("Invalid GUI style specified:")+" " + _args.value(ARG_GUISTYLE);
-    return false;
-  }
-  /* Check for a language that Retroshare recognizes. */
-  if (_args.contains(ARG_LANGUAGE) &&
-      !LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) {
-    errmsg = tr("Invalid language code specified:")+" " + _args.value(ARG_LANGUAGE);
-    return false;
-  }
-  /* Check for an opmode that Retroshare recognizes. */
-  if (_args.contains(ARG_OPMODE_S) &&
-      !QString(";full;noturtle;gaming;minimal;").contains(QString(_args.value(ARG_OPMODE_S)).prepend(";").append(";").toLower())) {
-    errmsg = tr("Invalid operating mode specified:")+" " + _args.value(ARG_OPMODE_S);
-    return false;
-  }
-  /* Check for an opmode that Retroshare recognizes. */
-  if (_args.contains(ARG_OPMODE_L) &&
-      !QString(";full;noturtle;gaming;minimal;").contains(QString(_args.value(ARG_OPMODE_L)).prepend(";").append(";").toLower())) {
-    errmsg = tr("Invalid operating mode specified:")+" " + _args.value(ARG_OPMODE_L);
-    return false;
-  }
-  return true;
-}
-#endif
-
 /** Sets the translation RetroShare will use. If one was specified on the
  * command-line, we will use that. Otherwise, we'll check to see if one was
  * saved previously. If not, we'll default to one appropriate for the system
diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h
index 37847fa5e..be6af336c 100644
--- a/retroshare-gui/src/rshare.h
+++ b/retroshare-gui/src/rshare.h
@@ -81,21 +81,6 @@ public:
   /** Return the version info */
   static QString retroshareVersion(bool=true);
 
-#ifdef TO_REMOVE
-  /** Return the map of command-line arguments and values. */
-  static QMap<QString, QString> arguments() { return _args; }
-  /** Parse the list of command-line arguments. */
-  static void parseArguments(QStringList args, bool firstRun = true);
-  /** Validates that all arguments were well-formed. */
-  bool validateArguments(QString &errmsg);
-  /** Prints usage information to the given text stream. */
-  //void printUsage(QString errmsg = QString());
-  /** Displays usage information for command-line args. */
-  static void showUsageMessageBox();
-  /** Returns true if the user wants to see usage information. */
-  static bool showUsage();
-#endif
-
   /** Sets the current language. */
   static bool setLanguage(QString languageCode = QString());
   /** Sets the current locale. */

From c0d222dedffd94aacb6370ba2021b9921614af4b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 4 Mar 2024 23:32:50 +0100
Subject: [PATCH 467/503] more cleaning in PR 2844

---
 retroshare-gui/src/gui/MainWindow.cpp |  4 ----
 retroshare-gui/src/gui/MainWindow.h   |  1 -
 retroshare-gui/src/main.cpp           | 14 --------------
 3 files changed, 19 deletions(-)

diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 672847aa9..adc014ac5 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -1720,10 +1720,6 @@ void MainWindow::openRsCollection(const QString &filename)
 	}
 }
 
-void MainWindow::processLastArgs()
-{
-}
-
 void MainWindow::switchVisibilityStatus(StatusElement e,bool b)
 {
     switch(e)
diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h
index 64211d67d..a7f3013f1 100644
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@@ -214,7 +214,6 @@ public slots:
     void externalLinkActivated(const QUrl &url);
     void retroshareLinkActivated(const QUrl &url);
     void openRsCollection(const QString &filename);
-    void processLastArgs();
     //! Go to a specific part of the control panel.
     void setNewPage(int page);
     void setCompactStatusMode(bool compact);
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 0eeca919d..228f24067 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -352,18 +352,6 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     RsInit::InitRsConfig();
 
     RsGUIConfigOptions conf;
-//#define ARG_RESET           "reset"         /**< Reset Rshare's saved settings.   */
-//#define ARG_DATADIR         "datadir"       /**< Directory to use for data files. */
-//#define ARG_LOGFILE         "logfile"       /**< Location of our logfile.         */
-//#define ARG_LOGLEVEL        "loglevel"      /**< Log verbosity.                   */
-//#define ARG_GUISTYLE        "style"         /**< Argument specfying GUI style.    */
-//#define ARG_GUISTYLESHEET   "stylesheet"    /**< Argument specfying GUI style.    */
-//#define ARG_LANGUAGE        "lang"          /**< Argument specifying language.    */
-//#define ARG_OPMODE_L        "opmode"        /**< OpMode (Full, NoTurtle, Gaming, Minimal) */
-//#define ARG_RSLINK_S        "r"             /**< Open RsLink with protocol retroshare:// */
-//#define ARG_RSLINK_L        "link"          /**< Open RsLink with protocol retroshare:// */
-//#define ARG_RSFILE_S        "f"             /**< Open RsFile with or without arg.  */
-//#define ARG_RSFILE_L        "rsfile"        /**< Open RsFile with or without arg.  */
 
     std::string rslink,rsfile;
     std::list<std::string> links_and_files;
@@ -721,8 +709,6 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     MainWindow *w = MainWindow::Create ();
     splashScreen.finish(w);
 
-    w->processLastArgs();
-
     if (!sDefaultGXSIdToCreate.isEmpty()) {
         RsIdentityParameters params;
         params.nickname = sDefaultGXSIdToCreate.toUtf8().constData();

From f375912bc577f03be865b11e7aec1183835167a6 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 7 Mar 2024 22:15:12 +0100
Subject: [PATCH 468/503] added checkable items in RsCollectionModel

---
 .../src/gui/common/RsCollectionModel.cpp      | 128 ++++++++++++++----
 .../src/gui/common/RsCollectionModel.h        |  29 +++-
 2 files changed, 125 insertions(+), 32 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index c0485360d..87fe1fb53 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -4,6 +4,10 @@
 
 // #define DEBUG_COLLECTION_MODEL 1
 
+static const int COLLECTION_MODEL_FILENAME  = 0;
+static const int COLLECTION_MODEL_SIZE      = 1;
+static const int COLLECTION_MODEL_HASH      = 2;
+static const int COLLECTION_MODEL_COUNT     = 3;
 static const int COLLECTION_MODEL_NB_COLUMN = 4;
 
 RsCollectionModel::RsCollectionModel(const RsCollection& col, QObject *parent)
@@ -172,6 +176,14 @@ QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & pa
     return QModelIndex();
 }
 
+Qt::ItemFlags RsCollectionModel::flags ( const QModelIndex & index ) const
+{
+    if(index.isValid() && index.column() == COLLECTION_MODEL_FILENAME)
+        return QAbstractItemModel::flags(index) | Qt::ItemIsUserTristate;
+
+    return QAbstractItemModel::flags(index) & ~Qt::ItemIsUserTristate;
+}
+
 QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
 {
     if(!index.isValid())
@@ -187,8 +199,8 @@ QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
 
     if(i.is_file)
     {
-        const auto it = mFileParents.find(i.index);
-        if(it == mFileParents.end())
+        const auto it = mFileInfos.find(i.index);
+        if(it == mFileInfos.end())
         {
             RsErr() << "Error: parent not found for index " << index.row() << ", " << index.column();
             return QModelIndex();
@@ -198,8 +210,8 @@ QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
     }
     else
     {
-        const auto it = mDirParents.find(i.index);
-        if(it == mDirParents.end())
+        const auto it = mDirInfos.find(i.index);
+        if(it == mDirInfos.end())
         {
             RsErr() << "Error: parent not found for index " << index.row() << ", " << index.column();
             return QModelIndex();
@@ -228,11 +240,61 @@ QVariant RsCollectionModel::data(const QModelIndex& index, int role) const
     case Qt::DisplayRole: return displayRole(i,index.column());
     //case Qt::SortRole: return SortRole(i,index.column());
     case Qt::DecorationRole: return decorationRole(i,index.column());
+    case Qt::CheckStateRole: return checkStateRole(i,index.column());
     default:
         return QVariant();
     }
 }
 
+bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,int role)
+{
+    if(!index.isValid())
+        return false;
+
+    if (role==Qt::CheckStateRole)
+    {
+#ifdef DEBUG_COLLECTION_MODEL
+        std::cerr << "Setting check state of item " << index << " to " << value.toBool() << std::endl;
+#endif
+        return true;
+    }
+    else
+        return setData(index,value,role);
+}
+
+QVariant RsCollectionModel::checkStateRole(const EntryIndex& i,int col) const
+{
+    if(col == COLLECTION_MODEL_FILENAME)
+    {
+        if(i.is_file)
+        {
+            auto it = mFileInfos.find(i.index);
+            if(it == mFileInfos.end())
+                return QVariant();
+
+            if(it->second.is_checked)
+                return QVariant(Qt::Checked);
+            else
+                return QVariant(Qt::Unchecked);
+        }
+        else
+        {
+            auto it = mDirInfos.find(i.index);
+            if(it == mDirInfos.end())
+                return QVariant();
+
+            switch(it->second.check_state)
+            {
+            case SELECTED: return QVariant(Qt::Checked);
+            case PARTIALLY_SELECTED: return QVariant(Qt::PartiallyChecked);
+            default:
+            case UNSELECTED: return QVariant(Qt::Unchecked);
+            }
+        }
+    }
+    else
+        return QVariant();
+}
 QVariant RsCollectionModel::displayRole(const EntryIndex& i,int col) const
 {
     switch(col)
@@ -245,12 +307,12 @@ QVariant RsCollectionModel::displayRole(const EntryIndex& i,int col) const
                 return QVariant((qulonglong)mCollection.fileTree().fileData(i.index).size) ;
 
             {
-                auto it = mDirSizes.find(i.index);
+                auto it = mDirInfos.find(i.index);
 
-                if(it == mDirSizes.end())
+                if(it == mDirInfos.end())
                     return QVariant();
                 else
-                    return QVariant((qulonglong)it->second);
+                    return QVariant((qulonglong)it->second.total_size);
             }
 
     case 2: return (i.is_file)?
@@ -279,9 +341,8 @@ void RsCollectionModel::postMods()
 {
     // update all the local structures
 
-    mDirParents.clear();
-    mFileParents.clear();
-    mDirSizes.clear();
+    mDirInfos.clear();
+    mFileInfos.clear();
 
 #ifdef DEBUG_COLLECTION_MODEL
     std::cerr << "Updating from tree: " << std::endl;
@@ -296,9 +357,29 @@ void RsCollectionModel::postMods()
 void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,uint64_t& total_size,int depth)
 {
     total_size = 0;
+    bool all_checked = true;
+    bool all_unchecked = false;
 
     const auto& dd(mCollection.fileTree().directoryData(dir_index));
 
+    for(uint32_t i=0;i<dd.subfiles.size();++i)
+    {
+#ifdef DEBUG_COLLECTION_MODEL
+        for(int j=0;j<depth;++j) std::cerr << "  ";
+        std::cerr << "File \"" << mCollection.fileTree().fileData(dd.subfiles[i]).name << "\"" << std::endl;
+#endif
+
+        total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
+
+        auto& ref(mFileInfos[dd.subfiles[i]]);
+
+        ref.parent_index = dir_index;
+        ref.parent_row   = i + dd.subdirs.size();
+
+        all_checked = all_checked && ref.is_checked;
+        all_unchecked = all_unchecked && !ref.is_checked;
+    }
+
     for(uint32_t i=0;i<dd.subdirs.size();++i)
     {
 #ifdef DEBUG_COLLECTION_MODEL
@@ -310,28 +391,25 @@ void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_ind
         recursUpdateLocalStructures(dd.subdirs[i],ss,depth+1);
         total_size += ss;
 
-        auto& ref(mDirParents[dd.subdirs[i]]);
+        auto& ref(mDirInfos[dd.subdirs[i]]);
 
         ref.parent_index = dir_index;
         ref.parent_row   = i;
+
+        all_checked = all_checked && (ref.check_state == SELECTED);
+        all_unchecked = all_unchecked && (ref.check_state == UNSELECTED);
     }
 
-    for(uint32_t i=0;i<dd.subfiles.size();++i)
-    {
-#ifdef DEBUG_COLLECTION_MODEL
-        for(int j=0;j<depth;++j) std::cerr << "  ";
-        std::cerr << "File \"" << mCollection.fileTree().fileData(dd.subfiles[i]).name << "\"" << std::endl;
-#endif
+    auto& r(mDirInfos[dir_index]);
 
-        total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
+    r.total_size = total_size;
 
-        auto& ref(mFileParents[dd.subfiles[i]]);
-
-        ref.parent_index = dir_index;
-        ref.parent_row   = i + dd.subdirs.size();
-    }
-
-    mDirSizes[dir_index] = total_size;
+    if(all_checked)
+        r.check_state = SELECTED;
+    else if(all_unchecked)
+        r.check_state = UNSELECTED;
+    else
+        r.check_state = PARTIALLY_SELECTED;
 }
 
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index ff0a2993a..459eb102d 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -31,8 +31,9 @@ class RsCollectionModel: public QAbstractItemModel
 
         virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
         virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-#ifdef TODO
+        virtual bool setData(const QModelIndex& index,const QVariant& value,int role) override;
         virtual Qt::ItemFlags flags ( const QModelIndex & index ) const override;
+#ifdef TODO
         virtual QStringList mimeTypes () const override;
         virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const override;
 #if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
@@ -53,20 +54,34 @@ class RsCollectionModel: public QAbstractItemModel
         QVariant displayRole(const EntryIndex&,int col) const ;
         QVariant sortRole(const EntryIndex&,int col) const ;
         QVariant decorationRole(const EntryIndex&,int col) const ;
+        QVariant checkStateRole(const EntryIndex& i,int col) const;
         //QVariant filterRole(const DirDetails& details,int coln) const;
 
         bool mUpdating ;
 
         const RsCollection& mCollection;
 
-        struct ParentInfo {
-             RsFileTree::DirIndex parent_index;	// index of the parent
-             RsFileTree::DirIndex parent_row; // row of that child, in this parent
+        enum DirCheckState: uint8_t {
+            UNSELECTED            = 0x00,
+            PARTIALLY_SELECTED    = 0x01,
+            SELECTED              = 0x02,
         };
 
-        std::map<uint64_t,ParentInfo> mFileParents;
-        std::map<uint64_t,ParentInfo> mDirParents;
-        std::map<uint64_t,uint64_t> mDirSizes;
+        struct ModelDirInfo {
+             RsFileTree::DirIndex parent_index;	// index of the parent
+             RsFileTree::DirIndex parent_row; // row of that child, in this parent
+             DirCheckState check_state;
+             uint64_t total_size;
+        };
+
+        struct ModelFileInfo {
+             RsFileTree::DirIndex parent_index;	// index of the parent
+             RsFileTree::DirIndex parent_row; // row of that child, in this parent
+            bool is_checked;
+        };
+
+        std::map<uint64_t,ModelFileInfo> mFileInfos;
+        std::map<uint64_t,ModelDirInfo> mDirInfos;
 
         // std::set<void*> mFilteredPointers ;
 };

From 67ff37a0d43783d04f03365fb78ac8195f9ea590 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 9 Mar 2024 00:03:16 +0100
Subject: [PATCH 469/503] using vectors instead of maps for mCollectionModel
 data.

---
 .../src/gui/common/RsCollectionModel.cpp      | 160 +++++++++++++-----
 .../src/gui/common/RsCollectionModel.h        |   4 +-
 2 files changed, 120 insertions(+), 44 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index 87fe1fb53..91cea236e 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -16,7 +16,6 @@ RsCollectionModel::RsCollectionModel(const RsCollection& col, QObject *parent)
     postMods();
 }
 
-#ifdef DEBUG_COLLECTION_MODEL
 static std::ostream& operator<<(std::ostream& o,const RsCollectionModel::EntryIndex& i)
 {
     return o << ((i.is_file)?("File"):"Dir") << " with index " << (int)i.index ;
@@ -25,6 +24,7 @@ static std::ostream& operator<<(std::ostream& o,const QModelIndex& i)
 {
     return o << "QModelIndex (row " << i.row() << ", of ref " << i.internalId() << ")" ;
 }
+#ifdef DEBUG_COLLECTION_MODEL
 #endif
 
 // Indernal Id is always a quintptr_t (basically a uint with the size of a pointer). Depending on the
@@ -179,9 +179,19 @@ QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & pa
 Qt::ItemFlags RsCollectionModel::flags ( const QModelIndex & index ) const
 {
     if(index.isValid() && index.column() == COLLECTION_MODEL_FILENAME)
-        return QAbstractItemModel::flags(index) | Qt::ItemIsUserTristate;
+    {
+        EntryIndex e;
 
-    return QAbstractItemModel::flags(index) & ~Qt::ItemIsUserTristate;
+        if(!convertInternalIdToIndex(index.internalId(),e))
+            return QAbstractItemModel::flags(index) ;
+
+        if(e.is_file)
+            return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
+        else
+            return QAbstractItemModel::flags(index) | Qt::ItemIsAutoTristate | Qt::ItemIsUserCheckable;
+    }
+
+    return QAbstractItemModel::flags(index) ;
 }
 
 QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
@@ -199,25 +209,13 @@ QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
 
     if(i.is_file)
     {
-        const auto it = mFileInfos.find(i.index);
-        if(it == mFileInfos.end())
-        {
-            RsErr() << "Error: parent not found for index " << index.row() << ", " << index.column();
-            return QModelIndex();
-        }
-        p.index = it->second.parent_index;
-        row = it->second.parent_row;
+        p.index = mFileInfos[i.index].parent_index;
+        row = mFileInfos[i.index].parent_row;
     }
     else
     {
-        const auto it = mDirInfos.find(i.index);
-        if(it == mDirInfos.end())
-        {
-            RsErr() << "Error: parent not found for index " << index.row() << ", " << index.column();
-            return QModelIndex();
-        }
-        p.index = it->second.parent_index;
-        row = it->second.parent_row;
+        p.index = mDirInfos[i.index].parent_index;
+        row = mDirInfos[i.index].parent_row;
     }
 
     quintptr ref;
@@ -237,8 +235,7 @@ QVariant RsCollectionModel::data(const QModelIndex& index, int role) const
 #endif
     switch(role)
     {
-    case Qt::DisplayRole: return displayRole(i,index.column());
-    //case Qt::SortRole: return SortRole(i,index.column());
+    case Qt::DisplayRole:    return displayRole(i,index.column());
     case Qt::DecorationRole: return decorationRole(i,index.column());
     case Qt::CheckStateRole: return checkStateRole(i,index.column());
     default:
@@ -251,15 +248,94 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
     if(!index.isValid())
         return false;
 
-    if (role==Qt::CheckStateRole)
+    EntryIndex e;
+
+    if(role==Qt::CheckStateRole && convertInternalIdToIndex(index.internalId(), e))
     {
-#ifdef DEBUG_COLLECTION_MODEL
+//#ifdef DEBUG_COLLECTION_MODEL
         std::cerr << "Setting check state of item " << index << " to " << value.toBool() << std::endl;
-#endif
+//#endif
+        RsFileTree::DirIndex dir_index ;
+
+        if(e.is_file)
+        {
+            mFileInfos[e.index].is_checked = value.toBool();
+            dir_index = mFileInfos[e.index].parent_index;
+        }
+        else
+        {
+            std::function<void(RsFileTree::DirIndex i,bool s)> recursSetCheckFlag = [&](RsFileTree::DirIndex i,bool s) -> void
+            {
+                mDirInfos[i].check_state = (s)?SELECTED:UNSELECTED;
+                auto& dir_data(mCollection.fileTree().directoryData(i));
+
+                for(uint32_t i=0;i<dir_data.subdirs.size();++i)
+                    recursSetCheckFlag(dir_data.subdirs[i],s);
+
+                for(uint32_t i=0;i<dir_data.subfiles.size();++i)
+                    mFileInfos[dir_data.subfiles[i]].is_checked = s;
+            };
+            recursSetCheckFlag(e.index,value.toBool());
+            dir_index = mDirInfos[e.index].parent_index;
+        }
+
+        // now go up the directories and update the check tristate flag, depending on whether the children are all checked/unchecked or mixed.
+
+        do
+        {
+            auto& dit(mDirInfos[dir_index]);
+
+            const RsFileTree::DirData& dir_data(mCollection.fileTree().directoryData(dir_index));	// get the directory data
+
+            bool locally_all_checked = true;
+            bool locally_all_unchecked = true;
+
+            for(uint32_t i=0;i<dir_data.subdirs.size() && (locally_all_checked || locally_all_unchecked);++i)
+            {
+                const auto& dit2(mDirInfos[dir_data.subdirs[i]]);
+
+                if(dit2.check_state == UNSELECTED || dit2.check_state == PARTIALLY_SELECTED)
+                    locally_all_checked   = false;
+
+                if(dit2.check_state ==   SELECTED || dit2.check_state == PARTIALLY_SELECTED)
+                    locally_all_unchecked = false;
+            }
+            for(uint32_t i=0;i<dir_data.subfiles.size() && (locally_all_checked || locally_all_unchecked);++i)
+            {
+                const auto& fit2(mFileInfos[dir_data.subfiles[i]]);
+
+                if(fit2.is_checked)
+                    locally_all_unchecked = false;
+                else
+                    locally_all_checked = false;
+            }
+
+            if(locally_all_checked)
+                dit.check_state = SELECTED;
+            else if(locally_all_unchecked)
+                dit.check_state = UNSELECTED;
+            else
+                dit.check_state = PARTIALLY_SELECTED;
+
+            if(dir_index == mCollection.fileTree().root())
+                break;
+            else
+                dir_index = dit.parent_index;	// get the directory data
+
+        }
+        while(true);
+
+        const auto& top_dir(mCollection.fileTree().directoryData(mCollection.fileTree().root()));
+        emit dataChanged(createIndex(0,0,(void*)NULL),
+                         createIndex(top_dir.subdirs.size() + top_dir.subfiles.size() - 1,
+                                     COLLECTION_MODEL_NB_COLUMN-1,
+                                     (void*)NULL),
+                         { Qt::CheckStateRole });
+
         return true;
     }
     else
-        return setData(index,value,role);
+        return QAbstractItemModel::setData(index,value,role);
 }
 
 QVariant RsCollectionModel::checkStateRole(const EntryIndex& i,int col) const
@@ -268,27 +344,22 @@ QVariant RsCollectionModel::checkStateRole(const EntryIndex& i,int col) const
     {
         if(i.is_file)
         {
-            auto it = mFileInfos.find(i.index);
-            if(it == mFileInfos.end())
-                return QVariant();
-
-            if(it->second.is_checked)
+            std::cerr<< "entry is file, checkstate = " << (int)mFileInfos[i.index].is_checked << std::endl;
+            if(mFileInfos[i.index].is_checked)
                 return QVariant(Qt::Checked);
             else
                 return QVariant(Qt::Unchecked);
         }
         else
         {
-            auto it = mDirInfos.find(i.index);
-            if(it == mDirInfos.end())
-                return QVariant();
+            std::cerr<< "entry is dir, checkstate = " << (int)mDirInfos[i.index].check_state << std::endl;
 
-            switch(it->second.check_state)
+            switch(mDirInfos[i.index].check_state)
             {
-            case SELECTED: return QVariant(Qt::Checked);
-            case PARTIALLY_SELECTED: return QVariant(Qt::PartiallyChecked);
+            case SELECTED: return QVariant::fromValue((int)Qt::Checked);
+            case PARTIALLY_SELECTED: return QVariant::fromValue((int)Qt::PartiallyChecked);
             default:
-            case UNSELECTED: return QVariant(Qt::Unchecked);
+            case UNSELECTED: return QVariant::fromValue((int)Qt::Unchecked);
             }
         }
     }
@@ -307,12 +378,12 @@ QVariant RsCollectionModel::displayRole(const EntryIndex& i,int col) const
                 return QVariant((qulonglong)mCollection.fileTree().fileData(i.index).size) ;
 
             {
-                auto it = mDirInfos.find(i.index);
+//                auto it = mDirInfos[i.index];
 
-                if(it == mDirInfos.end())
-                    return QVariant();
-                else
-                    return QVariant((qulonglong)it->second.total_size);
+//                if(it == mDirInfos.end())
+//                    return QVariant();
+//                else
+                    return QVariant((qulonglong)mDirInfos[i.index].total_size);
             }
 
     case 2: return (i.is_file)?
@@ -344,6 +415,11 @@ void RsCollectionModel::postMods()
     mDirInfos.clear();
     mFileInfos.clear();
 
+    mDirInfos.resize(mCollection.fileTree().numDirs());
+    mFileInfos.resize(mCollection.fileTree().numFiles());
+
+    mDirInfos[0].parent_index = 0;
+
 #ifdef DEBUG_COLLECTION_MODEL
     std::cerr << "Updating from tree: " << std::endl;
 #endif
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index 459eb102d..7d6dc2a11 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -80,8 +80,8 @@ class RsCollectionModel: public QAbstractItemModel
             bool is_checked;
         };
 
-        std::map<uint64_t,ModelFileInfo> mFileInfos;
-        std::map<uint64_t,ModelDirInfo> mDirInfos;
+        std::vector<ModelFileInfo> mFileInfos;
+        std::vector<ModelDirInfo> mDirInfos;
 
         // std::set<void*> mFilteredPointers ;
 };

From 9ba4ac6362d11b69d49728f91186100bf9b60005 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 9 Mar 2024 18:31:01 +0100
Subject: [PATCH 470/503] fixed a few bugs in file counting

---
 .../src/gui/common/RsCollectionDialog.cpp     | 16 +---
 .../src/gui/common/RsCollectionModel.cpp      | 92 ++++++++++++-------
 .../src/gui/common/RsCollectionModel.h        | 13 ++-
 3 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index b1a5e405a..71e1c2c75 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -181,16 +181,8 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
     mCollectionModel = new RsCollectionModel(*mCollection);
     ui._fileEntriesTW->setModel(mCollectionModel);
 
-#ifdef TO_REMOVE
-	ui._fileEntriesTW->setColumnCount(COLUMN_COUNT) ;
-
-	QTreeWidgetItem *headerItem = ui._fileEntriesTW->headerItem();
-	headerItem->setText(COLUMN_FILE, tr("File"));
-	headerItem->setText(COLUMN_FILEPATH, tr("File Path"));
-	headerItem->setText(COLUMN_SIZE, tr("Size"));
-	headerItem->setText(COLUMN_HASH, tr("Hash"));
-	headerItem->setText(COLUMN_FILEC, tr("File Count"));
-#endif
+    connect(mCollectionModel,SIGNAL(sizesChanged()),this,SLOT(updateSizes()));
+    updateSizes(); // forced because it's only called when the collection is changed, or when the model is created.
 
 	bool wrong_chars = !updateList();
 
@@ -638,8 +630,8 @@ void RsCollectionDialog::directoryLoaded(QString dirLoaded)
  */
 void RsCollectionDialog::updateSizes()
 {
-    ui._selectedFiles_TL->setText(QString::number(mCollection->count()));
-    ui._totalSize_TL->setText(misc::friendlyUnit(mCollection->size()));
+    ui._selectedFiles_TL->setText(QString::number(mCollectionModel->totalSelected()));
+    ui._totalSize_TL->setText(misc::friendlyUnit(mCollectionModel->totalSize()));
 }
 
 /**
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index 91cea236e..bdf6c7abe 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -264,16 +264,31 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
         }
         else
         {
-            std::function<void(RsFileTree::DirIndex i,bool s)> recursSetCheckFlag = [&](RsFileTree::DirIndex i,bool s) -> void
+            std::function<void(RsFileTree::DirIndex,bool)> recursSetCheckFlag = [&](RsFileTree::DirIndex index,bool s) -> void
             {
-                mDirInfos[i].check_state = (s)?SELECTED:UNSELECTED;
-                auto& dir_data(mCollection.fileTree().directoryData(i));
+                mDirInfos[index].check_state = (s)?SELECTED:UNSELECTED;
+                auto& dir_data(mCollection.fileTree().directoryData(index));
+
+                mDirInfos[index].total_size = 0;
+                mDirInfos[index].total_count = 0;
 
                 for(uint32_t i=0;i<dir_data.subdirs.size();++i)
+                {
                     recursSetCheckFlag(dir_data.subdirs[i],s);
+                    mDirInfos[index].total_size += mDirInfos[dir_data.subdirs[i]].total_size ;
+                    ++mDirInfos[index].total_count;
+                }
 
                 for(uint32_t i=0;i<dir_data.subfiles.size();++i)
+                {
                     mFileInfos[dir_data.subfiles[i]].is_checked = s;
+
+                    if(s)
+                    {
+                        mDirInfos[index].total_size += mCollection.fileTree().fileData(dir_data.subfiles[i]).size;
+                        ++mDirInfos[index].total_count;
+                    }
+                }
             };
             recursSetCheckFlag(e.index,value.toBool());
             dir_index = mDirInfos[e.index].parent_index;
@@ -290,9 +305,14 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
             bool locally_all_checked = true;
             bool locally_all_unchecked = true;
 
-            for(uint32_t i=0;i<dir_data.subdirs.size() && (locally_all_checked || locally_all_unchecked);++i)
+            dit.total_size = 0;
+            dit.total_count = 0;
+
+            for(uint32_t i=0;i<dir_data.subdirs.size();++i)
             {
                 const auto& dit2(mDirInfos[dir_data.subdirs[i]]);
+                dit.total_size += dit2.total_size;
+                dit.total_count += dit2.total_count;
 
                 if(dit2.check_state == UNSELECTED || dit2.check_state == PARTIALLY_SELECTED)
                     locally_all_checked   = false;
@@ -300,12 +320,16 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
                 if(dit2.check_state ==   SELECTED || dit2.check_state == PARTIALLY_SELECTED)
                     locally_all_unchecked = false;
             }
-            for(uint32_t i=0;i<dir_data.subfiles.size() && (locally_all_checked || locally_all_unchecked);++i)
+            for(uint32_t i=0;i<dir_data.subfiles.size();++i)
             {
                 const auto& fit2(mFileInfos[dir_data.subfiles[i]]);
 
                 if(fit2.is_checked)
+                {
+                    dit.total_size += mCollection.fileTree().fileData(dir_data.subfiles[i]).size;
+                    ++dit.total_count;
                     locally_all_unchecked = false;
+                }
                 else
                     locally_all_checked = false;
             }
@@ -332,6 +356,8 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
                                      (void*)NULL),
                          { Qt::CheckStateRole });
 
+        emit sizesChanged();
+
         return true;
     }
     else
@@ -370,27 +396,23 @@ QVariant RsCollectionModel::displayRole(const EntryIndex& i,int col) const
 {
     switch(col)
     {
-    case 0: return (i.is_file)?
+    case COLLECTION_MODEL_FILENAME: return (i.is_file)?
                     (QString::fromUtf8(mCollection.fileTree().fileData(i.index).name.c_str()))
                   : (QString::fromUtf8(mCollection.fileTree().directoryData(i.index).name.c_str()));
 
-    case 1: if(i.is_file)
-                return QVariant((qulonglong)mCollection.fileTree().fileData(i.index).size) ;
+    case COLLECTION_MODEL_SIZE: if(i.is_file)
+            return QVariant((qulonglong)mCollection.fileTree().fileData(i.index).size) ;
+        else
+            return QVariant((qulonglong)mDirInfos[i.index].total_size);
 
-            {
-//                auto it = mDirInfos[i.index];
-
-//                if(it == mDirInfos.end())
-//                    return QVariant();
-//                else
-                    return QVariant((qulonglong)mDirInfos[i.index].total_size);
-            }
-
-    case 2: return (i.is_file)?
+    case COLLECTION_MODEL_HASH: return (i.is_file)?
                     QString::fromStdString(mCollection.fileTree().fileData(i.index).hash.toStdString())
-                   :QVariant();
+                  :QVariant();
 
-    case 3: return (i.is_file)?((qulonglong)1):((qulonglong)(mCollection.fileTree().directoryData(i.index).subdirs.size()));
+    case COLLECTION_MODEL_COUNT: if(i.is_file)
+            return (qulonglong)mFileInfos[i.index].is_checked;
+        else
+            return (qulonglong)(mDirInfos[i.index].total_count);
     }
     return QVariant();
 }
@@ -423,16 +445,17 @@ void RsCollectionModel::postMods()
 #ifdef DEBUG_COLLECTION_MODEL
     std::cerr << "Updating from tree: " << std::endl;
 #endif
-    uint64_t s;
-    recursUpdateLocalStructures(mCollection.fileTree().root(),s,0);
+    recursUpdateLocalStructures(mCollection.fileTree().root(),0);
 
     mUpdating = false;
     emit layoutChanged();
+    emit sizesChanged();
 }
 
-void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,uint64_t& total_size,int depth)
+void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,int depth)
 {
-    total_size = 0;
+    uint64_t total_size = 0;
+    uint64_t total_count = 0;
     bool all_checked = true;
     bool all_unchecked = false;
 
@@ -444,11 +467,14 @@ void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_ind
         for(int j=0;j<depth;++j) std::cerr << "  ";
         std::cerr << "File \"" << mCollection.fileTree().fileData(dd.subfiles[i]).name << "\"" << std::endl;
 #endif
-
-        total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
-
         auto& ref(mFileInfos[dd.subfiles[i]]);
 
+        if(ref.is_checked)
+        {
+            total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
+            ++total_count;
+        }
+
         ref.parent_index = dir_index;
         ref.parent_row   = i + dd.subdirs.size();
 
@@ -463,22 +489,24 @@ void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_ind
         std::cerr << "Dir \"" << mCollection.fileTree().directoryData(dd.subdirs[i]).name << "\"" << std::endl ;
 #endif
 
-        uint64_t ss;
-        recursUpdateLocalStructures(dd.subdirs[i],ss,depth+1);
-        total_size += ss;
+        recursUpdateLocalStructures(dd.subdirs[i],depth+1);
 
         auto& ref(mDirInfos[dd.subdirs[i]]);
 
+        total_size  += ref.total_size;
+        total_count += ref.total_count;
+
         ref.parent_index = dir_index;
         ref.parent_row   = i;
 
-        all_checked = all_checked && (ref.check_state == SELECTED);
+        all_checked   = all_checked && (ref.check_state == SELECTED);
         all_unchecked = all_unchecked && (ref.check_state == UNSELECTED);
     }
 
     auto& r(mDirInfos[dir_index]);
 
-    r.total_size = total_size;
+    r.total_size  = total_size;
+    r.total_count = total_count;
 
     if(all_checked)
         r.check_state = SELECTED;
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index 7d6dc2a11..4b56cc86e 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -45,11 +45,17 @@ class RsCollectionModel: public QAbstractItemModel
             bool is_file;		// false=dir, true=file
             uint64_t index;
         };
+        uint64_t totalSize() const { return mDirInfos[0].total_size; }
+        uint64_t totalSelected() const { return mDirInfos[0].total_count; }
+
+    signals:
+        void sizesChanged();	// tells that the total size of the top level dir has changed (due to selection)
+
     private:
         static bool convertIndexToInternalId(const EntryIndex& e,quintptr& ref);
         static bool convertInternalIdToIndex(quintptr ref, EntryIndex& e);
 
-        void recursUpdateLocalStructures(RsFileTree::DirIndex dir_index, uint64_t& total_size, int depth);
+        void recursUpdateLocalStructures(RsFileTree::DirIndex dir_index, int depth);
 
         QVariant displayRole(const EntryIndex&,int col) const ;
         QVariant sortRole(const EntryIndex&,int col) const ;
@@ -68,13 +74,18 @@ class RsCollectionModel: public QAbstractItemModel
         };
 
         struct ModelDirInfo {
+             ModelDirInfo() :parent_index(0),parent_row(0),check_state(SELECTED),total_size(0),total_count(0){}
+
              RsFileTree::DirIndex parent_index;	// index of the parent
              RsFileTree::DirIndex parent_row; // row of that child, in this parent
              DirCheckState check_state;
              uint64_t total_size;
+             uint64_t total_count;
         };
 
         struct ModelFileInfo {
+                ModelFileInfo() :parent_index(0),parent_row(0),is_checked(true){}
+
              RsFileTree::DirIndex parent_index;	// index of the parent
              RsFileTree::DirIndex parent_row; // row of that child, in this parent
             bool is_checked;

From c1a6b8fe12775d554f2966da1cb38d19be3982c4 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 10 Mar 2024 23:41:10 +0100
Subject: [PATCH 471/503] added some debug info in RsCollectionModel

---
 .../src/gui/common/RsCollectionModel.cpp      | 106 +++++++++++++-----
 .../src/gui/common/RsCollectionModel.h        |   2 +
 2 files changed, 81 insertions(+), 27 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index bdf6c7abe..d7d352c8a 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -129,20 +129,20 @@ QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & pa
     if(row < 0 || column < 0 || column >= columnCount(parent) || row >= rowCount(parent))
         return QModelIndex();
 
-    EntryIndex i;
+    EntryIndex parent_index;
 
     if(!parent.isValid())	// root
     {
-        i.is_file = false;
-        i.index = 0;
+        parent_index.is_file = false;
+        parent_index.index = 0;
     }
-    else if(!convertInternalIdToIndex(parent.internalId(),i))
+    else if(!convertInternalIdToIndex(parent.internalId(),parent_index))
         return QModelIndex();
 
-    if(i.is_file || i.index >= mCollection.fileTree().numDirs())
+    if(parent_index.is_file || parent_index.index >= mCollection.fileTree().numDirs())
         return QModelIndex();
 
-    const auto& parentData(mCollection.fileTree().directoryData(i.index));
+    const auto& parentData(mCollection.fileTree().directoryData(parent_index.index));
 
     if((size_t)row < parentData.subdirs.size())
     {
@@ -450,6 +450,8 @@ void RsCollectionModel::postMods()
     mUpdating = false;
     emit layoutChanged();
     emit sizesChanged();
+
+    debugDump();
 }
 
 void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,int depth)
@@ -461,27 +463,6 @@ void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_ind
 
     const auto& dd(mCollection.fileTree().directoryData(dir_index));
 
-    for(uint32_t i=0;i<dd.subfiles.size();++i)
-    {
-#ifdef DEBUG_COLLECTION_MODEL
-        for(int j=0;j<depth;++j) std::cerr << "  ";
-        std::cerr << "File \"" << mCollection.fileTree().fileData(dd.subfiles[i]).name << "\"" << std::endl;
-#endif
-        auto& ref(mFileInfos[dd.subfiles[i]]);
-
-        if(ref.is_checked)
-        {
-            total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
-            ++total_count;
-        }
-
-        ref.parent_index = dir_index;
-        ref.parent_row   = i + dd.subdirs.size();
-
-        all_checked = all_checked && ref.is_checked;
-        all_unchecked = all_unchecked && !ref.is_checked;
-    }
-
     for(uint32_t i=0;i<dd.subdirs.size();++i)
     {
 #ifdef DEBUG_COLLECTION_MODEL
@@ -502,6 +483,26 @@ void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_ind
         all_checked   = all_checked && (ref.check_state == SELECTED);
         all_unchecked = all_unchecked && (ref.check_state == UNSELECTED);
     }
+    for(uint32_t i=0;i<dd.subfiles.size();++i)
+    {
+#ifdef DEBUG_COLLECTION_MODEL
+        for(int j=0;j<depth;++j) std::cerr << "  ";
+        std::cerr << "File \"" << mCollection.fileTree().fileData(dd.subfiles[i]).name << "\"" << std::endl;
+#endif
+        auto& ref(mFileInfos[dd.subfiles[i]]);
+
+        if(ref.is_checked)
+        {
+            total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
+            ++total_count;
+        }
+
+        ref.parent_index = dir_index;
+        ref.parent_row   = i + dd.subdirs.size();
+
+        all_checked = all_checked && ref.is_checked;
+        all_unchecked = all_unchecked && !ref.is_checked;
+    }
 
     auto& r(mDirInfos[dir_index]);
 
@@ -516,6 +517,57 @@ void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_ind
         r.check_state = PARTIALLY_SELECTED;
 }
 
+void RsCollectionModel::debugDump()
+{
+    std::function<void(RsFileTree::DirIndex,int)> recursDump = [&](RsFileTree::DirIndex indx,int depth) {
+        const auto& dir_data(mCollection.fileTree().directoryData(indx));
+
+        for(int i=0;i<depth;++i) std::cerr << "  ";
+        std::cerr << "Directory: \"" << dir_data.name << "\"  total_size: " << mDirInfos[indx].total_size << " cnt: " << mDirInfos[indx].total_count << std::endl;
+
+        for(uint32_t i=0;i<dir_data.subdirs.size();++i)
+            recursDump(dir_data.subdirs[i],depth+1);
+
+        for(uint32_t i=0;i<dir_data.subfiles.size();++i)
+        {
+            for(int i=0;i<depth+1;++i) std::cerr << "  ";
+            std::cerr << "File: \"" << mCollection.fileTree().fileData(dir_data.subfiles[i]).name << "\"" << std::endl;
+        }
+    };
+
+    std::cerr << "mCollectionModel data: " << std::endl;
+
+    recursDump(mCollection.fileTree().root(),0);
+
+    std::function<void(QModelIndex index,int)> recursDump2 = [&](QModelIndex indx,int depth) {
+
+        for(int i=0;i<depth;++i) std::cerr << "  ";
+
+        EntryIndex entry;
+        convertInternalIdToIndex(indx.internalId(),entry);
+
+        std::cerr << "Index: " << indx << " has_children: " << RsCollectionModel::hasChildren(indx)
+                  << ", rowCount: " << RsCollectionModel::rowCount(indx)
+                  << ", type: " << (entry.is_file?"file":"dir") << " number " << entry.index
+                  << ", display role: \"" << displayRole(entry,0).toString().toStdString()
+                  << std::endl;
+
+        for(int i=0;i<RsCollectionModel::rowCount(indx);++i)
+            recursDump2(RsCollectionModel::index(i,0,indx),depth+1);
+    };
+
+    std::cerr << "mCollectionModel index structure: " << std::endl;
+
+    recursDump2(QModelIndex(),0);
+
+    std::cerr << "mCollectionModel internal data: " << std::endl;
+    std::cerr << "Directories: "<< std::endl;
+    for(uint32_t i=0;i<mCollection.fileTree().numDirs();++i)
+        std::cerr << "  " << mCollection.fileTree().directoryData(i).name << std::endl;
+    std::cerr << "Files: "<< std::endl;
+    for(uint32_t i=0;i<mCollection.fileTree().numFiles();++i)
+        std::cerr << "  " << mCollection.fileTree().fileData(i).name << std::endl;
+}
 
 
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index 4b56cc86e..d41b64dd4 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -63,6 +63,8 @@ class RsCollectionModel: public QAbstractItemModel
         QVariant checkStateRole(const EntryIndex& i,int col) const;
         //QVariant filterRole(const DirDetails& details,int coln) const;
 
+        void debugDump();
+
         bool mUpdating ;
 
         const RsCollection& mCollection;

From 5e3434396c4c32d6c6e520a72e892f7a1dec9a73 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 11 Mar 2024 13:37:09 +0100
Subject: [PATCH 472/503] fixed a few bugs in counting and model parenting

---
 retroshare-gui/src/gui/common/RsCollectionModel.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index d7d352c8a..f05e25231 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -22,7 +22,7 @@ static std::ostream& operator<<(std::ostream& o,const RsCollectionModel::EntryIn
 }
 static std::ostream& operator<<(std::ostream& o,const QModelIndex& i)
 {
-    return o << "QModelIndex (row " << i.row() << ", of ref " << i.internalId() << ")" ;
+    return o << "QModelIndex (row " << i.row() << ", ref " << i.internalId() << ")" ;
 }
 #ifdef DEBUG_COLLECTION_MODEL
 #endif
@@ -200,7 +200,7 @@ QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
         return QModelIndex();
 
     EntryIndex i;
-    if(!convertInternalIdToIndex(index.internalId(),i) || i.index==0)
+    if(index.internalId()==0 || !convertInternalIdToIndex(index.internalId(),i))
         return QModelIndex();
 
     EntryIndex p;
@@ -276,7 +276,7 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
                 {
                     recursSetCheckFlag(dir_data.subdirs[i],s);
                     mDirInfos[index].total_size += mDirInfos[dir_data.subdirs[i]].total_size ;
-                    ++mDirInfos[index].total_count;
+                    mDirInfos[index].total_count+= mDirInfos[dir_data.subdirs[i]].total_count;
                 }
 
                 for(uint32_t i=0;i<dir_data.subfiles.size();++i)
@@ -548,7 +548,10 @@ void RsCollectionModel::debugDump()
 
         std::cerr << "Index: " << indx << " has_children: " << RsCollectionModel::hasChildren(indx)
                   << ", rowCount: " << RsCollectionModel::rowCount(indx)
+                  << ", internalId: " << (uint64_t)indx.internalId()
                   << ", type: " << (entry.is_file?"file":"dir") << " number " << entry.index
+                  << ", prow: " << (entry.is_file?mFileInfos[entry.index].parent_row:mDirInfos[entry.index].parent_row)
+                  << ", parent: " << RsCollectionModel::parent(indx)
                   << ", display role: \"" << displayRole(entry,0).toString().toStdString()
                   << std::endl;
 
@@ -563,10 +566,10 @@ void RsCollectionModel::debugDump()
     std::cerr << "mCollectionModel internal data: " << std::endl;
     std::cerr << "Directories: "<< std::endl;
     for(uint32_t i=0;i<mCollection.fileTree().numDirs();++i)
-        std::cerr << "  " << mCollection.fileTree().directoryData(i).name << std::endl;
+        std::cerr << "  " << i << ": "<< mCollection.fileTree().directoryData(i).name << std::endl;
     std::cerr << "Files: "<< std::endl;
     for(uint32_t i=0;i<mCollection.fileTree().numFiles();++i)
-        std::cerr << "  " << mCollection.fileTree().fileData(i).name << std::endl;
+        std::cerr << "  " << i << ": " << mCollection.fileTree().fileData(i).name << std::endl;
 }
 
 

From 7ef81a37ff9ac0acad2ae350f5a5fa0f5a4f8188 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 12 Mar 2024 21:39:05 +0100
Subject: [PATCH 473/503] added auto-update of files being hashed

---
 .../src/gui/common/RsCollection.cpp           | 375 ++++++++++--------
 retroshare-gui/src/gui/common/RsCollection.h  |   3 +
 .../src/gui/common/RsCollectionDialog.cpp     |  64 ++-
 .../src/gui/common/RsCollectionDialog.h       |   7 +-
 .../src/gui/common/RsCollectionModel.cpp      |   7 +-
 5 files changed, 266 insertions(+), 190 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index e7e329604..21079c114 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -45,19 +45,25 @@ RsCollection::RsCollection(QObject *parent)
 RsCollection::RsCollection(const RsFileTree& ft)
 {
     mFileTree = std::unique_ptr<RsFileTree>(new RsFileTree(ft));
+
+    for(uint64_t i=0;i<mFileTree->numFiles();++i)
+        mHashes.insert(std::make_pair(mFileTree->fileData(i).hash,i ));
 }
 
 RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchFlags flags, QObject *parent)
     : QObject(parent), mFileTree(new RsFileTree)
 {
-	if(! ( (flags & RS_FILE_HINTS_LOCAL) || (flags & RS_FILE_HINTS_REMOTE)))
-	{
-		std::cerr << "(EE) Wrong flags passed to RsCollection constructor. Please fix the code!" << std::endl;
-		return ;
-	}
+    if(! ( (flags & RS_FILE_HINTS_LOCAL) || (flags & RS_FILE_HINTS_REMOTE)))
+    {
+        std::cerr << "(EE) Wrong flags passed to RsCollection constructor. Please fix the code!" << std::endl;
+        return ;
+    }
 
-	for(uint32_t i = 0;i<file_infos.size();++i)
+    for(uint32_t i = 0;i<file_infos.size();++i)
         recursAddElements(mFileTree->root(),file_infos[i],flags) ;
+
+    for(uint64_t i=0;i<mFileTree->numFiles();++i)
+        mHashes.insert(std::make_pair(mFileTree->fileData(i).hash,i ));
 }
 
 RsCollection::~RsCollection()
@@ -67,88 +73,88 @@ RsCollection::~RsCollection()
 void RsCollection::downloadFiles() const
 {
 #ifdef TODO_COLLECTION
-	// print out the element names of all elements that are direct children
-	// of the outermost element.
-	QDomElement docElem = _xml_doc.documentElement();
+    // print out the element names of all elements that are direct children
+    // of the outermost element.
+    QDomElement docElem = _xml_doc.documentElement();
 
-	std::vector<ColFileInfo> colFileInfos ;
+    std::vector<ColFileInfo> colFileInfos ;
 
-	recursCollectColFileInfos(docElem,colFileInfos,QString(),false) ;
+    recursCollectColFileInfos(docElem,colFileInfos,QString(),false) ;
 
-	RsCollectionDialog(_fileName, colFileInfos, false).exec() ;
+    RsCollectionDialog(_fileName, colFileInfos, false).exec() ;
 #endif
 }
 
 void RsCollection::autoDownloadFiles() const
 {
 #ifdef TODO_COLLECTION
-	QDomElement docElem = _xml_doc.documentElement();
+    QDomElement docElem = _xml_doc.documentElement();
 
-	std::vector<ColFileInfo> colFileInfos;
+    std::vector<ColFileInfo> colFileInfos;
 
-	recursCollectColFileInfos(docElem,colFileInfos,QString(),false);
+    recursCollectColFileInfos(docElem,colFileInfos,QString(),false);
 
-	QString dlDir = QString::fromUtf8(rsFiles->getDownloadDirectory().c_str());
+    QString dlDir = QString::fromUtf8(rsFiles->getDownloadDirectory().c_str());
 
-	foreach(ColFileInfo colFileInfo, colFileInfos)
-	{
-		autoDownloadFiles(colFileInfo, dlDir);
-	}
+    foreach(ColFileInfo colFileInfo, colFileInfos)
+    {
+        autoDownloadFiles(colFileInfo, dlDir);
+    }
 #endif
 }
 
 void RsCollection::autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const
 {
-	if (!colFileInfo.filename_has_wrong_characters)
-	{
-		QString cleanPath = dlDir + colFileInfo.path ;
-		std::cout << "making directory " << cleanPath.toStdString() << std::endl;
+    if (!colFileInfo.filename_has_wrong_characters)
+    {
+        QString cleanPath = dlDir + colFileInfo.path ;
+        std::cout << "making directory " << cleanPath.toStdString() << std::endl;
 
-		if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath))
-			std::cerr << "Unable to make path: " + cleanPath.toStdString() << std::endl;
+        if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath))
+            std::cerr << "Unable to make path: " + cleanPath.toStdString() << std::endl;
 
-		if (colFileInfo.type==DIR_TYPE_FILE)
-			rsFiles->FileRequest(colFileInfo.name.toUtf8().constData(),
-			                     RsFileHash(colFileInfo.hash.toStdString()),
-			                     colFileInfo.size,
-			                     cleanPath.toUtf8().constData(),
-			                     RS_FILE_REQ_ANONYMOUS_ROUTING,
-			                     std::list<RsPeerId>());
-	}
-	foreach(ColFileInfo colFileInfoChild, colFileInfo.children)
-	{
-		autoDownloadFiles(colFileInfoChild, dlDir);
-	}
+        if (colFileInfo.type==DIR_TYPE_FILE)
+            rsFiles->FileRequest(colFileInfo.name.toUtf8().constData(),
+                                 RsFileHash(colFileInfo.hash.toStdString()),
+                                 colFileInfo.size,
+                                 cleanPath.toUtf8().constData(),
+                                 RS_FILE_REQ_ANONYMOUS_ROUTING,
+                                 std::list<RsPeerId>());
+    }
+    foreach(ColFileInfo colFileInfoChild, colFileInfo.children)
+    {
+        autoDownloadFiles(colFileInfoChild, dlDir);
+    }
 }
 
 static QString purifyFileName(const QString& input,bool& bad)
 {
-	static const QString bad_chars = "/\\\"*:?<>|" ;
-	bad = false ;
-	QString output = input ;
+    static const QString bad_chars = "/\\\"*:?<>|" ;
+    bad = false ;
+    QString output = input ;
 
-	for(int i=0;i<output.length();++i)
-		for(int j=0;j<bad_chars.length();++j)
-			if(output[i] == bad_chars[j])
-			{
-				output[i] = '_' ;
-				bad = true ;
-			}
+    for(int i=0;i<output.length();++i)
+        for(int j=0;j<bad_chars.length();++j)
+            if(output[i] == bad_chars[j])
+            {
+                output[i] = '_' ;
+                bad = true ;
+            }
 
-	return output ;
+    return output ;
 }
 
 void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash)
 {
     mFileTree->addFile(mFileTree->root(),fname.toStdString(),hash,size);
 #ifdef TO_REMOVE
-	ColFileInfo info ;
-	info.type = DIR_TYPE_FILE ;
-	info.name = fname ;
-	info.size = size ;
-	info.hash = QString::fromStdString(hash.toStdString()) ;
+    ColFileInfo info ;
+    info.type = DIR_TYPE_FILE ;
+    info.name = fname ;
+    info.size = size ;
+    info.hash = QString::fromStdString(hash.toStdString()) ;
 
-	recursAddElements(_xml_doc,info,_root) ;
+    recursAddElements(_xml_doc,info,_root) ;
 #endif
 }
 void RsCollection::merge_in(const RsFileTree& tree)
@@ -175,56 +181,56 @@ void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree&
 #ifdef TO_REMOVE
 void RsCollection::recursCollectColFileInfos(const QDomElement& e,std::vector<ColFileInfo>& colFileInfos,const QString& current_path, bool bad_chars_in_parent) const
 {
-	QDomNode n = e.firstChild() ;
+    QDomNode n = e.firstChild() ;
 #ifdef COLLECTION_DEBUG
-	std::cerr << "Parsing element " << e.tagName().toStdString() << std::endl;
+    std::cerr << "Parsing element " << e.tagName().toStdString() << std::endl;
 #endif
 
-	while(!n.isNull()) 
-	{
-		QDomElement ee = n.toElement(); // try to convert the node to an element.
+    while(!n.isNull())
+    {
+        QDomElement ee = n.toElement(); // try to convert the node to an element.
 
 #ifdef COLLECTION_DEBUG
-		std::cerr << "  Seeing child " << ee.tagName().toStdString() << std::endl;
+        std::cerr << "  Seeing child " << ee.tagName().toStdString() << std::endl;
 #endif
 
-		if(ee.tagName() == QString("File"))
-		{
-			ColFileInfo newChild ;
-			newChild.hash = ee.attribute(QString("sha1")) ;
-			bool bad_chars_detected = false ;
-			newChild.name = purifyFileName(ee.attribute(QString("name")), bad_chars_detected) ;
-			newChild.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
-			newChild.size = ee.attribute(QString("size")).toULongLong() ;
-			newChild.path = current_path ;
-			newChild.type = DIR_TYPE_FILE ;
+        if(ee.tagName() == QString("File"))
+        {
+            ColFileInfo newChild ;
+            newChild.hash = ee.attribute(QString("sha1")) ;
+            bool bad_chars_detected = false ;
+            newChild.name = purifyFileName(ee.attribute(QString("name")), bad_chars_detected) ;
+            newChild.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
+            newChild.size = ee.attribute(QString("size")).toULongLong() ;
+            newChild.path = current_path ;
+            newChild.type = DIR_TYPE_FILE ;
 
-			colFileInfos.push_back(newChild) ;
-		}
-		else if(ee.tagName() == QString("Directory"))
-		{
-			ColFileInfo newParent ;
-			bool bad_chars_detected = false ;
-			QString cleanDirName = purifyFileName(ee.attribute(QString("name")),bad_chars_detected) ;
-			newParent.name=cleanDirName;
-			newParent.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
-			newParent.size = 0;
-			newParent.path = current_path ;
-			newParent.type = DIR_TYPE_DIR ;
+            colFileInfos.push_back(newChild) ;
+        }
+        else if(ee.tagName() == QString("Directory"))
+        {
+            ColFileInfo newParent ;
+            bool bad_chars_detected = false ;
+            QString cleanDirName = purifyFileName(ee.attribute(QString("name")),bad_chars_detected) ;
+            newParent.name=cleanDirName;
+            newParent.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
+            newParent.size = 0;
+            newParent.path = current_path ;
+            newParent.type = DIR_TYPE_DIR ;
 
-			recursCollectColFileInfos(ee,newParent.children,current_path + "/" + cleanDirName, bad_chars_in_parent || bad_chars_detected) ;
-			uint32_t size = newParent.children.size();
-			for(uint32_t i=0;i<size;++i)
-			{
-				const ColFileInfo &colFileInfo = newParent.children[i];
-				newParent.size +=colFileInfo.size ;
-			}
+            recursCollectColFileInfos(ee,newParent.children,current_path + "/" + cleanDirName, bad_chars_in_parent || bad_chars_detected) ;
+            uint32_t size = newParent.children.size();
+            for(uint32_t i=0;i<size;++i)
+            {
+                const ColFileInfo &colFileInfo = newParent.children[i];
+                newParent.size +=colFileInfo.size ;
+            }
 
-			colFileInfos.push_back(newParent) ;
-		}
+            colFileInfos.push_back(newParent) ;
+        }
 
-		n = n.nextSibling() ;
-	}
+        n = n.nextSibling() ;
+    }
 }
 #endif
 
@@ -234,82 +240,82 @@ void RsCollection::recursAddElements(RsFileTree::DirIndex parent, const DirDetai
     if (dd.type == DIR_TYPE_FILE)
         mFileTree->addFile(parent,dd.name,dd.hash,dd.size);
     else if (dd.type == DIR_TYPE_DIR)
-	{
+    {
         RsFileTree::DirIndex new_dir_index = mFileTree->addDirectory(parent,dd.name);
 
         for(uint32_t i=0;i<dd.children.size();++i)
-		{
+        {
             if (!dd.children[i].ref)
-				continue;
+                continue;
 
-			DirDetails subDirDetails;
+            DirDetails subDirDetails;
 
             if (!rsFiles->RequestDirDetails(dd.children[i].ref, subDirDetails, flags))
-				continue;
+                continue;
 
             recursAddElements(new_dir_index,subDirDetails,flags) ;
-		}
-	}
+        }
+    }
 }
 
 #ifdef TO_REMOVE
 void RsCollection::recursAddElements(QDomDocument& doc,const ColFileInfo& colFileInfo,QDomElement& e) const
 {
-	if (colFileInfo.type == DIR_TYPE_FILE)
-	{
-		QDomElement f = doc.createElement("File") ;
+    if (colFileInfo.type == DIR_TYPE_FILE)
+    {
+        QDomElement f = doc.createElement("File") ;
 
-		f.setAttribute(QString("name"),colFileInfo.name) ;
-		f.setAttribute(QString("sha1"),colFileInfo.hash) ;
-		f.setAttribute(QString("size"),QString::number(colFileInfo.size)) ;
+        f.setAttribute(QString("name"),colFileInfo.name) ;
+        f.setAttribute(QString("sha1"),colFileInfo.hash) ;
+        f.setAttribute(QString("size"),QString::number(colFileInfo.size)) ;
 
-		e.appendChild(f) ;
-	}
-	else if (colFileInfo.type == DIR_TYPE_DIR)
-	{
-		QDomElement d = doc.createElement("Directory") ;
+        e.appendChild(f) ;
+    }
+    else if (colFileInfo.type == DIR_TYPE_DIR)
+    {
+        QDomElement d = doc.createElement("Directory") ;
 
-		d.setAttribute(QString("name"),colFileInfo.name) ;
+        d.setAttribute(QString("name"),colFileInfo.name) ;
 
-		for (std::vector<ColFileInfo>::const_iterator it = colFileInfo.children.begin(); it != colFileInfo.children.end(); ++it)
-			recursAddElements(doc,(*it),d) ;
+        for (std::vector<ColFileInfo>::const_iterator it = colFileInfo.children.begin(); it != colFileInfo.children.end(); ++it)
+            recursAddElements(doc,(*it),d) ;
 
-		e.appendChild(d) ;
-	}
+        e.appendChild(d) ;
+    }
 }
 
 void RsCollection::recursAddElements(
         QDomDocument& doc, const RsFileTree& ft, uint32_t index,
         QDomElement& e ) const
 {
-	std::vector<uint64_t> subdirs;
-	std::vector<RsFileTree::FileData> subfiles ;
-	std::string name;
-	if(!ft.getDirectoryContent(name, subdirs, subfiles, index)) return;
+    std::vector<uint64_t> subdirs;
+    std::vector<RsFileTree::FileData> subfiles ;
+    std::string name;
+    if(!ft.getDirectoryContent(name, subdirs, subfiles, index)) return;
 
-	QDomElement d = doc.createElement("Directory") ;
-	d.setAttribute(QString("name"),QString::fromUtf8(name.c_str())) ;
-	e.appendChild(d) ;
+    QDomElement d = doc.createElement("Directory") ;
+    d.setAttribute(QString("name"),QString::fromUtf8(name.c_str())) ;
+    e.appendChild(d) ;
 
-	for (uint32_t i=0;i<subdirs.size();++i)
-		recursAddElements(doc,ft,subdirs[i],d) ;
+    for (uint32_t i=0;i<subdirs.size();++i)
+        recursAddElements(doc,ft,subdirs[i],d) ;
 
-	for(uint32_t i=0;i<subfiles.size();++i)
-	{
-		QDomElement f = doc.createElement("File") ;
+    for(uint32_t i=0;i<subfiles.size();++i)
+    {
+        QDomElement f = doc.createElement("File") ;
 
-		f.setAttribute(QString("name"),QString::fromUtf8(subfiles[i].name.c_str())) ;
-		f.setAttribute(QString("sha1"),QString::fromStdString(subfiles[i].hash.toStdString())) ;
-		f.setAttribute(QString("size"),QString::number(subfiles[i].size)) ;
+        f.setAttribute(QString("name"),QString::fromUtf8(subfiles[i].name.c_str())) ;
+        f.setAttribute(QString("sha1"),QString::fromStdString(subfiles[i].hash.toStdString())) ;
+        f.setAttribute(QString("size"),QString::number(subfiles[i].size)) ;
 
-		d.appendChild(f) ;
-	}
+        d.appendChild(f) ;
+    }
 }
 
 static void showErrorBox(const QString& fileName, const QString& error)
 {
-	QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok);
-	mb.exec();
+    QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok);
+    mb.exec();
 }
 #endif
 
@@ -441,25 +447,25 @@ bool RsCollection::checkFile(const QString& fileName, RsCollectionErrorCode& err
 #ifdef TO_REMOVE
 bool RsCollection::load(QWidget *parent)
 {
-	QString fileName;
-	if (!misc::getOpenFileName(parent, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-		return false;
+    QString fileName;
+    if (!misc::getOpenFileName(parent, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
+        return false;
 
-	std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
+    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
 
-	return load(fileName, true);
+    return load(fileName, true);
 }
 #endif
 
 bool RsCollection::save(const QString& fileName) const
 {
-	QFile file(fileName);
+    QFile file(fileName);
 
-	if (!file.open(QIODevice::WriteOnly))
-	{
-		std::cerr << "Cannot write to file " << fileName.toStdString() << " !!" << std::endl;
-		return false;
-	}
+    if (!file.open(QIODevice::WriteOnly))
+    {
+        std::cerr << "Cannot write to file " << fileName.toStdString() << " !!" << std::endl;
+        return false;
+    }
 
     QDomDocument xml_doc ;
     QDomElement root = xml_doc.createElement("RsCollection");
@@ -472,12 +478,12 @@ bool RsCollection::save(const QString& fileName) const
     xml_doc.appendChild(root);
 
     QTextStream stream(&file) ;
-	stream.setCodec("UTF-8") ;
+    stream.setCodec("UTF-8") ;
 
     stream << xml_doc.toString() ;
-	file.close();
+    file.close();
 
-	return true;
+    return true;
 }
 
 bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFileTree::DirIndex parent)
@@ -545,6 +551,10 @@ bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFi
 
         n = n.nextSibling() ;
     }
+    mHashes.clear();
+    for(uint64_t i=0;i<mFileTree->numFiles();++i)
+        mHashes.insert(std::make_pair(mFileTree->fileData(i).hash,i ));
+
     return true;
 }
 bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const
@@ -581,16 +591,16 @@ bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFi
 #ifdef TO_REMOVE
 bool RsCollection::save(QWidget *parent) const
 {
-	QString fileName;
-	if(!misc::getSaveFileName(parent, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Create collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-		return false;
+    QString fileName;
+    if(!misc::getSaveFileName(parent, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Create collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
+        return false;
 
-	if (!fileName.endsWith("." + RsCollection::ExtensionString))
-		fileName += "." + RsCollection::ExtensionString ;
+    if (!fileName.endsWith("." + RsCollection::ExtensionString))
+        fileName += "." + RsCollection::ExtensionString ;
 
-	std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
+    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
 
-	return save(fileName);
+    return save(fileName);
 }
 
 
@@ -606,38 +616,59 @@ qulonglong RsCollection::size()
     return mFileTree->totalFileSize();
 
 #ifdef TO_REMOVE
-	QDomElement docElem = _xml_doc.documentElement();
+    QDomElement docElem = _xml_doc.documentElement();
 
-	std::vector<ColFileInfo> colFileInfos;
-	recursCollectColFileInfos(docElem, colFileInfos, QString(),false);
+    std::vector<ColFileInfo> colFileInfos;
+    recursCollectColFileInfos(docElem, colFileInfos, QString(),false);
 
-	uint64_t size = 0;
+    uint64_t size = 0;
 
-	for (uint32_t i = 0; i < colFileInfos.size(); ++i) {
-		size += colFileInfos[i].size;
-	}
+    for (uint32_t i = 0; i < colFileInfos.size(); ++i) {
+        size += colFileInfos[i].size;
+    }
 
-	return size;
+    return size;
 #endif
 }
 
 bool RsCollection::isCollectionFile(const QString &fileName)
 {
-	QString ext = QFileInfo(fileName).suffix().toLower();
+    QString ext = QFileInfo(fileName).suffix().toLower();
 
-	return (ext == RsCollection::ExtensionString);
+    return (ext == RsCollection::ExtensionString);
 }
 
+void RsCollection::updateHashes(const std::map<RsFileHash,RsFileHash>& old_to_new_hashes)
+{
+    for(auto it:old_to_new_hashes)
+    {
+        auto fit = mHashes.find(it.first);
+
+        if(fit == mHashes.end())
+        {
+            RsErr() << "Could not find hash " << it.first << " in RsCollection list of hashes. This is a bug." ;
+            return ;
+        }
+        const auto& fd(mFileTree->fileData(fit->second));
+
+        if(fd.hash != it.first)
+        {
+            RsErr() << "Mismatch hash for file " << fd.name << " (found " << fd.hash << " instead of " << it.first << ") in RsCollection list of hashes. This is a bug." ;
+            return ;
+        }
+        mFileTree->updateFile(fit->second,fd.name,it.second,fd.size);
+    }
+}
 #ifdef TO_REMOVE
 void RsCollection::saveColl(std::vector<ColFileInfo> colFileInfos, const QString &fileName)
 {
 
-	QDomElement root = _xml_doc.elementsByTagName("RsCollection").at(0).toElement();
-	while (root.childNodes().count()>0) root.removeChild(root.firstChild());
-	for(uint32_t i = 0;i<colFileInfos.size();++i)
-		recursAddElements(_xml_doc,colFileInfos[i],root) ;
+    QDomElement root = _xml_doc.elementsByTagName("RsCollection").at(0).toElement();
+    while (root.childNodes().count()>0) root.removeChild(root.firstChild());
+    for(uint32_t i = 0;i<colFileInfos.size();++i)
+        recursAddElements(_xml_doc,colFileInfos[i],root) ;
 
-	_saved=save(fileName);
+    _saved=save(fileName);
 
 }
 #endif
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 745a4c764..bc9ff2a28 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -103,6 +103,7 @@ public:
 
 	static bool isCollectionFile(const QString& fileName);
 
+    void updateHashes(const std::map<RsFileHash,RsFileHash>& old_to_new_hashes);
 private:
 
     bool recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const;
@@ -130,6 +131,8 @@ private:
 	void autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const ;
 
     std::unique_ptr<RsFileTree> mFileTree;
+    std::map<RsFileHash,RsFileTree::FileIndex> mHashes;	// used to efficiently update files being hashed
+
 #ifdef TO_REMOVE
 	QDomDocument _xml_doc ;
 	QString _fileName ;
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 71e1c2c75..d6ec70f22 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -23,6 +23,7 @@
 
 #include "RsCollection.h"
 #include "util/misc.h"
+#include "util/rsdir.h"
 
 #include <QCheckBox>
 #include <QDateTime>
@@ -738,7 +739,7 @@ void RsCollectionDialog::addSelectionRecursive()
     addSelection(true);
 }
 
-static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree::DirIndex dir_index,bool recursive)
+static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree::DirIndex dir_index,bool recursive,QSet<QString>& paths_to_hash)
 {
     QFileInfo fileInfo = path;
 
@@ -746,17 +747,28 @@ static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree:
     {
         auto di = tree.addDirectory(dir_index,fileInfo.fileName().toUtf8().constData());
 
-        QDir dirParent = fileInfo.absoluteFilePath();
-        dirParent.setFilter(QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot);
-        QFileInfoList childrenList = dirParent.entryInfoList();
+        if(recursive)
+        {
+            QDir dirParent = fileInfo.absoluteFilePath();
+            dirParent.setFilter(QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot);
+            QFileInfoList childrenList = dirParent.entryInfoList();
 
-        for(QFileInfo f:childrenList)
-            recursBuildFileTree(f.absoluteFilePath(),tree,di,recursive);
+            for(QFileInfo f:childrenList)
+                recursBuildFileTree(f.absoluteFilePath(),tree,di,recursive,paths_to_hash);
+        }
     }
     else
     {
-#warning TODO: compute the hash
-        tree.addFile(dir_index,fileInfo.fileName().toUtf8().constData(),RsFileHash(),fileInfo.size());
+        // Here we use a temporary hash that serves two purposes:
+        // 1 - identify the file in the RsFileTree of the collection so that we can update its hash when calculated
+        // 2 - mark the file as being processed
+        // The hash s is computed to be the hash of the path of the file. The collection must take care of multiple instances.
+
+        Sha1CheckSum s = RsDirUtil::sha1sum((uint8_t*)(fileInfo.filePath().toUtf8().constData()),fileInfo.filePath().toUtf8().size());
+
+        tree.addFile(dir_index,fileInfo.fileName().toUtf8().constData(),s,fileInfo.size());
+
+        paths_to_hash.insert(fileInfo.filePath().toUtf8().constData());
     }
 }
 /**
@@ -768,7 +780,6 @@ static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree:
  */
 void RsCollectionDialog::addSelection(bool recursive)
 {
-	QStringList fileToHash;
 	QMap<QString, QString > dirToAdd;
     int count=0;//to not scan all items on list .count()
 
@@ -776,11 +787,13 @@ void RsCollectionDialog::addSelection(bool recursive)
 
     mCollectionModel->preMods();
 
+    QSet<QString> paths_to_hash;	// sha1sum of the paths to hash
+
 	foreach (QModelIndex index, milSelectionList)
         if(index.column()==0)    //Get only FileName
         {
             RsFileTree tree;
-            recursBuildFileTree(_dirModel->filePath(_tree_proxyModel->mapToSource(index)),tree,tree.root(),recursive);
+            recursBuildFileTree(_dirModel->filePath(_tree_proxyModel->mapToSource(index)),tree,tree.root(),recursive,paths_to_hash);
 
             mCollection->merge_in(tree);
 
@@ -852,9 +865,18 @@ void RsCollectionDialog::addSelection(bool recursive)
 	// Process Files once all done
 	ui._hashBox->addAttachments(fileToHash,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
 #endif
+//    std::map<Sha1CheckSum,QString> paths_and_hashes;
+//    for(auto path:paths_to_hash)
+//        paths_and_hashes.insert(std::make_pair(RsDirUtil::sha1sum((uint8_t*)path.toUtf8().constData(),path.toUtf8().size()),path));
+
+//    mCollectionModel->addFilesToHash(paths_and_hashes);
+
     mCollectionModel->postMods();
+
+    ui._hashBox->addAttachments(QStringList(paths_to_hash.begin(),paths_to_hash.end()),RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
 }
 
+#ifdef TO_REMOVE
 /**
  * @brief RsCollectionDialog::addAllChild: Add children to RsCollection
  * @param fileInfoParent: Parent's QFileInfo to scan
@@ -910,6 +932,7 @@ bool RsCollectionDialog::addAllChild(QFileInfo &fileInfoParent
 	}
 	return true;
 }
+#endif
 
 /**
  * @brief RsCollectionDialog::remove: Remove selected Items in RSCollection
@@ -1186,6 +1209,7 @@ void RsCollectionDialog::makeDir()
  */
 void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
 {
+#ifdef TO_REMOVE
 	std::cerr << "RsCollectionDialog::fileHashingFinished() started." << std::endl;
 
 	QString message;
@@ -1211,8 +1235,26 @@ void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
 		_newColFileInfos.push_back(colFileInfo);
 #endif
 	}
+#endif
+    // build a map of old-hash to new-hash for the hashed files, so that it can be passed to the mCollection for update
 
-	std::cerr << "RsCollectionDialog::fileHashingFinished message : " << message.toStdString() << std::endl;
+    std::map<RsFileHash,RsFileHash> old_to_new_hashes;
+
+    for(auto f:hashedFiles)
+    {
+        auto it = mFilesBeingHashed.find(f.filepath);
+
+        if(it == mFilesBeingHashed.end())
+        {
+            RsErr() << "Could not find hash-ID correspondence for path " << f.filepath.toUtf8().constData() << ". This is a bug." << std::endl;
+            continue;
+        }
+        old_to_new_hashes.insert(std::make_pair(it->second,f.hash));
+        mFilesBeingHashed.erase(it);
+    }
+    mCollectionModel->preMods();
+    mCollection->updateHashes(old_to_new_hashes);
+    mCollectionModel->postMods();
 
 	updateList();
 }
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h
index 71c261cb4..9ba3ac857 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.h
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h
@@ -18,6 +18,7 @@
  *                                                                             *
  *******************************************************************************/
 
+#include <set>
 #include "ui_RsCollectionDialog.h"
 #include "RsCollection.h"
 #include "RsCollectionModel.h"
@@ -90,12 +91,12 @@ private:
     bool addChild(QTreeWidgetItem *parent, const std::vector<ColFileInfo> &child);
 	bool removeItem(QTreeWidgetItem *item, bool &removeOnlyFile) ;
     void saveChild(QTreeWidgetItem *parentItem, ColFileInfo *parentInfo = NULL);
-#endif
-    void addSelection(bool recursive) ;
 	bool addAllChild(QFileInfo &fileInfoParent
 	                 , QMap<QString, QString > &dirToAdd
 	                 , QStringList &fileToHash
 	                 , int &count);
+#endif
+    void addSelection(bool recursive) ;
 
 	Ui::RsCollectionDialog ui;
 	QString _fileName ;
@@ -110,4 +111,6 @@ private:
 
     RsCollectionModel *mCollectionModel;
     RsCollection *mCollection;
+
+    std::map<QString,RsFileHash> mFilesBeingHashed; // map of file path vs. temporary ID used for the file while hashing
 };
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index f05e25231..6e8352339 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -252,9 +252,9 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
 
     if(role==Qt::CheckStateRole && convertInternalIdToIndex(index.internalId(), e))
     {
-//#ifdef DEBUG_COLLECTION_MODEL
+#ifdef DEBUG_COLLECTION_MODEL
         std::cerr << "Setting check state of item " << index << " to " << value.toBool() << std::endl;
-//#endif
+#endif
         RsFileTree::DirIndex dir_index ;
 
         if(e.is_file)
@@ -370,7 +370,6 @@ QVariant RsCollectionModel::checkStateRole(const EntryIndex& i,int col) const
     {
         if(i.is_file)
         {
-            std::cerr<< "entry is file, checkstate = " << (int)mFileInfos[i.index].is_checked << std::endl;
             if(mFileInfos[i.index].is_checked)
                 return QVariant(Qt::Checked);
             else
@@ -378,8 +377,6 @@ QVariant RsCollectionModel::checkStateRole(const EntryIndex& i,int col) const
         }
         else
         {
-            std::cerr<< "entry is dir, checkstate = " << (int)mDirInfos[i.index].check_state << std::endl;
-
             switch(mDirInfos[i.index].check_state)
             {
             case SELECTED: return QVariant::fromValue((int)Qt::Checked);

From 06971162890cf5e8569e7225f789ba70cdefbd07 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 13 Mar 2024 22:20:21 +0100
Subject: [PATCH 474/503] added green color for files being hashed

---
 .../src/gui/common/RsCollection.cpp           |  6 ++-
 .../src/gui/common/RsCollectionDialog.cpp     | 30 ++++++++++-----
 .../src/gui/common/RsCollectionModel.cpp      | 37 ++++++++++++++++---
 .../src/gui/common/RsCollectionModel.h        |  5 +++
 4 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 21079c114..6b83a4bef 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -146,7 +146,7 @@ static QString purifyFileName(const QString& input,bool& bad)
 
 void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash)
 {
-    mFileTree->addFile(mFileTree->root(),fname.toStdString(),hash,size);
+    mHashes[hash]= mFileTree->addFile(mFileTree->root(),fname.toStdString(),hash,size);
 #ifdef TO_REMOVE
     ColFileInfo info ;
     info.type = DIR_TYPE_FILE ;
@@ -167,7 +167,7 @@ void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree&
     for(uint32_t i=0;i<dd.subfiles.size();++i)
     {
         const RsFileTree::FileData& fd(tree.fileData(dd.subfiles[i]));
-        mFileTree->addFile(parent,fd.name,fd.hash,fd.size);
+        mHashes[fd.hash] = mFileTree->addFile(parent,fd.name,fd.hash,fd.size);
     }
     for(uint32_t i=0;i<dd.subdirs.size();++i)
     {
@@ -672,3 +672,5 @@ void RsCollection::saveColl(std::vector<ColFileInfo> colFileInfos, const QString
 
 }
 #endif
+
+
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index d6ec70f22..c38498df0 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -739,7 +739,7 @@ void RsCollectionDialog::addSelectionRecursive()
     addSelection(true);
 }
 
-static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree::DirIndex dir_index,bool recursive,QSet<QString>& paths_to_hash)
+static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree::DirIndex dir_index,bool recursive,std::map<QString,RsFileHash>& paths_to_hash)
 {
     QFileInfo fileInfo = path;
 
@@ -768,7 +768,7 @@ static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree:
 
         tree.addFile(dir_index,fileInfo.fileName().toUtf8().constData(),s,fileInfo.size());
 
-        paths_to_hash.insert(fileInfo.filePath().toUtf8().constData());
+        paths_to_hash.insert(std::make_pair(fileInfo.filePath(),s));
     }
 }
 /**
@@ -787,7 +787,7 @@ void RsCollectionDialog::addSelection(bool recursive)
 
     mCollectionModel->preMods();
 
-    QSet<QString> paths_to_hash;	// sha1sum of the paths to hash
+    std::map<QString,RsFileHash> paths_to_hash;	// sha1sum of the paths to hash.
 
 	foreach (QModelIndex index, milSelectionList)
         if(index.column()==0)    //Get only FileName
@@ -865,15 +865,24 @@ void RsCollectionDialog::addSelection(bool recursive)
 	// Process Files once all done
 	ui._hashBox->addAttachments(fileToHash,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
 #endif
-//    std::map<Sha1CheckSum,QString> paths_and_hashes;
-//    for(auto path:paths_to_hash)
-//        paths_and_hashes.insert(std::make_pair(RsDirUtil::sha1sum((uint8_t*)path.toUtf8().constData(),path.toUtf8().size()),path));
 
-//    mCollectionModel->addFilesToHash(paths_and_hashes);
+    mFilesBeingHashed.insert(paths_to_hash.begin(),paths_to_hash.end());
 
+    QStringList paths;
+    std::list<RsFileHash> hashes;
+
+    for(auto it:paths_to_hash)
+    {
+        paths.push_back(it.first);
+        hashes.push_back(it.second);
+
+        std::cerr << "Setting file has being hased: ID=" << it.second << " - " << it.first.toUtf8().constData() << std::endl;
+    }
+
+    mCollectionModel->notifyFilesBeingHashed(hashes);
     mCollectionModel->postMods();
 
-    ui._hashBox->addAttachments(QStringList(paths_to_hash.begin(),paths_to_hash.end()),RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
+    ui._hashBox->addAttachments(paths,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
 }
 
 #ifdef TO_REMOVE
@@ -1238,6 +1247,7 @@ void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
 #endif
     // build a map of old-hash to new-hash for the hashed files, so that it can be passed to the mCollection for update
 
+    mCollectionModel->preMods();
     std::map<RsFileHash,RsFileHash> old_to_new_hashes;
 
     for(auto f:hashedFiles)
@@ -1249,10 +1259,12 @@ void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
             RsErr() << "Could not find hash-ID correspondence for path " << f.filepath.toUtf8().constData() << ". This is a bug." << std::endl;
             continue;
         }
+        std::cerr << "Will update old hash " << it->second << " to new hash " << f.hash << std::endl;
+
         old_to_new_hashes.insert(std::make_pair(it->second,f.hash));
         mFilesBeingHashed.erase(it);
+        mCollectionModel->fileHashingFinished(it->second);
     }
-    mCollectionModel->preMods();
     mCollection->updateHashes(old_to_new_hashes);
     mCollectionModel->postMods();
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index 6e8352339..870fb88b3 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -1,4 +1,5 @@
 #include <string>
+#include <QBrush>
 
 #include "RsCollectionModel.h"
 
@@ -238,6 +239,7 @@ QVariant RsCollectionModel::data(const QModelIndex& index, int role) const
     case Qt::DisplayRole:    return displayRole(i,index.column());
     case Qt::DecorationRole: return decorationRole(i,index.column());
     case Qt::CheckStateRole: return checkStateRole(i,index.column());
+    case Qt::TextColorRole:  return textColorRole(i,index.column());
     default:
         return QVariant();
     }
@@ -364,6 +366,13 @@ bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,i
         return QAbstractItemModel::setData(index,value,role);
 }
 
+QVariant RsCollectionModel::textColorRole(const EntryIndex& i,int col) const
+{
+    if(i.is_file && mFilesBeingHashed.find(mCollection.fileTree().fileData(i.index).hash) != mFilesBeingHashed.end())
+        return QVariant(QBrush(QColor::fromRgbF(0.1,0.9,0.2)));
+    else
+        return QVariant();
+}
 QVariant RsCollectionModel::checkStateRole(const EntryIndex& i,int col) const
 {
     if(col == COLLECTION_MODEL_FILENAME)
@@ -393,18 +402,25 @@ QVariant RsCollectionModel::displayRole(const EntryIndex& i,int col) const
 {
     switch(col)
     {
-    case COLLECTION_MODEL_FILENAME: return (i.is_file)?
-                    (QString::fromUtf8(mCollection.fileTree().fileData(i.index).name.c_str()))
-                  : (QString::fromUtf8(mCollection.fileTree().directoryData(i.index).name.c_str()));
+    case COLLECTION_MODEL_FILENAME: if(i.is_file)
+            return QString::fromUtf8(mCollection.fileTree().fileData(i.index).name.c_str());
+        else
+            return QString::fromUtf8(mCollection.fileTree().directoryData(i.index).name.c_str());
 
     case COLLECTION_MODEL_SIZE: if(i.is_file)
             return QVariant((qulonglong)mCollection.fileTree().fileData(i.index).size) ;
         else
             return QVariant((qulonglong)mDirInfos[i.index].total_size);
 
-    case COLLECTION_MODEL_HASH: return (i.is_file)?
-                    QString::fromStdString(mCollection.fileTree().fileData(i.index).hash.toStdString())
-                  :QVariant();
+    case COLLECTION_MODEL_HASH: if(i.is_file)
+        {
+            if(mFilesBeingHashed.find(mCollection.fileTree().fileData(i.index).hash)!=mFilesBeingHashed.end())
+                return tr("[File is being hashed]");
+            else
+                return QString::fromStdString(mCollection.fileTree().fileData(i.index).hash.toStdString());
+        }
+        else
+            return QVariant();
 
     case COLLECTION_MODEL_COUNT: if(i.is_file)
             return (qulonglong)mFileInfos[i.index].is_checked;
@@ -422,6 +438,15 @@ QVariant RsCollectionModel::decorationRole(const EntryIndex& i,int col) const
     return QVariant();
 }
 
+void RsCollectionModel::notifyFilesBeingHashed(const std::list<RsFileHash>& files)
+{
+    mFilesBeingHashed.insert(files.begin(),files.end());
+}
+void RsCollectionModel::fileHashingFinished(const RsFileHash& hash)
+{
+    mFilesBeingHashed.erase(hash);
+}
+
 void RsCollectionModel::preMods()
 {
     mUpdating = true;
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index d41b64dd4..3bcc54ded 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -48,6 +48,8 @@ class RsCollectionModel: public QAbstractItemModel
         uint64_t totalSize() const { return mDirInfos[0].total_size; }
         uint64_t totalSelected() const { return mDirInfos[0].total_count; }
 
+        void notifyFilesBeingHashed(const std::list<RsFileHash>& files);
+        void fileHashingFinished(const RsFileHash& hash);
     signals:
         void sizesChanged();	// tells that the total size of the top level dir has changed (due to selection)
 
@@ -61,6 +63,7 @@ class RsCollectionModel: public QAbstractItemModel
         QVariant sortRole(const EntryIndex&,int col) const ;
         QVariant decorationRole(const EntryIndex&,int col) const ;
         QVariant checkStateRole(const EntryIndex& i,int col) const;
+        QVariant textColorRole(const EntryIndex& i,int col) const;
         //QVariant filterRole(const DirDetails& details,int coln) const;
 
         void debugDump();
@@ -96,5 +99,7 @@ class RsCollectionModel: public QAbstractItemModel
         std::vector<ModelFileInfo> mFileInfos;
         std::vector<ModelDirInfo> mDirInfos;
 
+        std::set<RsFileHash> mFilesBeingHashed;
+
         // std::set<void*> mFilteredPointers ;
 };

From 094c80e0460906a524095600bca1503f55fc3f7a Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 13 Mar 2024 22:28:39 +0100
Subject: [PATCH 475/503] disable save button when files are being hashed

---
 retroshare-gui/src/gui/common/RsCollectionDialog.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index c38498df0..6ed6a84e3 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -883,6 +883,12 @@ void RsCollectionDialog::addSelection(bool recursive)
     mCollectionModel->postMods();
 
     ui._hashBox->addAttachments(paths,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
+
+    if(!mFilesBeingHashed.empty())
+    {
+        ui._save_PB->setToolTip(tr("Please wait for all files to be properly processed before saving."));
+        ui._save_PB->setEnabled(false);
+    }
 }
 
 #ifdef TO_REMOVE
@@ -1268,6 +1274,11 @@ void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
     mCollection->updateHashes(old_to_new_hashes);
     mCollectionModel->postMods();
 
+    if(mFilesBeingHashed.empty())
+    {
+        ui._save_PB->setToolTip(tr(""));
+        ui._save_PB->setEnabled(true);
+    }
 	updateList();
 }
 

From 27f0962654de921bc17fd5fe9c5ae3c3531cad4d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 14 Mar 2024 22:12:57 +0100
Subject: [PATCH 476/503] fixed download from RsCollection dialog

---
 .../src/gui/common/RsCollection.cpp           |  9 ++--
 .../src/gui/common/RsCollectionDialog.cpp     | 44 ++++++++++++++++++-
 .../src/gui/common/RsCollectionModel.cpp      |  7 +++
 .../src/gui/common/RsCollectionModel.h        |  1 +
 4 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 6b83a4bef..644d94fc0 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -238,7 +238,7 @@ void RsCollection::recursCollectColFileInfos(const QDomElement& e,std::vector<Co
 void RsCollection::recursAddElements(RsFileTree::DirIndex parent, const DirDetails& dd, FileSearchFlags flags)
 {
     if (dd.type == DIR_TYPE_FILE)
-        mFileTree->addFile(parent,dd.name,dd.hash,dd.size);
+        mHashes[dd.hash] = mFileTree->addFile(parent,dd.name,dd.hash,dd.size);
     else if (dd.type == DIR_TYPE_DIR)
     {
         RsFileTree::DirIndex new_dir_index = mFileTree->addDirectory(parent,dd.name);
@@ -488,6 +488,7 @@ bool RsCollection::save(const QString& fileName) const
 
 bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFileTree::DirIndex parent)
 {
+    mHashes.clear();
     QDomNode n = e.firstChild() ;
 #ifdef COLLECTION_DEBUG
     std::cerr << "Parsing element " << e.tagName().toStdString() << std::endl;
@@ -509,7 +510,7 @@ bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFi
             std::string name = purifyFileName(ee.attribute(QString("name")), bad_chars_detected).toUtf8().constData() ;
             uint64_t size = ee.attribute(QString("size")).toULongLong() ;
 
-            mFileTree->addFile(parent,name,hash,size);
+            mHashes[hash] = mFileTree->addFile(parent,name,hash,size);
 #ifdef TO_REMOVE
             mFileTree.addFile(parent,)
             ColFileInfo newChild ;
@@ -551,10 +552,6 @@ bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFi
 
         n = n.nextSibling() ;
     }
-    mHashes.clear();
-    for(uint64_t i=0;i<mFileTree->numFiles();++i)
-        mHashes.insert(std::make_pair(mFileTree->fileData(i).hash,i ));
-
     return true;
 }
 bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 6ed6a84e3..8b52d6ed7 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -1421,13 +1421,55 @@ void RsCollectionDialog::cancel()
  */
 void RsCollectionDialog::download()
 {
-#ifdef TODO_COLLECTION
 	std::cerr << "Downloading!" << std::endl;
 
 	QString dldir = ui.downloadFolder_LE->text();
 
 	std::cerr << "downloading all these files:" << std::endl;
 
+    std::function<void(RsFileTree::DirIndex,const std::string&)> recursDL = [&](RsFileTree::DirIndex index,const std::string& path)
+    {
+        const auto& dirdata(mCollection->fileTree().directoryData(index));
+        RsCollectionModel::EntryIndex e;
+
+        for(uint32_t i=0;i<dirdata.subdirs.size();++i)
+        {
+            e.index = dirdata.subdirs[i];
+            e.is_file = false;
+
+            if(!mCollectionModel->isChecked(e))
+                continue;
+
+            const auto& sdd = mCollection->fileTree().directoryData(e.index);
+            std::string subpath = RsDirUtil::makePath(path,sdd.name);
+
+            std::cerr << "Creating subdir " << sdd.name << " to directory " << path << std::endl;
+
+            if(!QDir(QApplication::applicationDirPath()).mkpath(QString::fromUtf8(subpath.c_str())))
+                QMessageBox::warning(NULL,tr("Unable to make path"),tr("Unable to make path:")+"<br>  "+QString::fromUtf8(subpath.c_str())) ;
+
+            recursDL(dirdata.subdirs[i],subpath);
+        }
+        for(uint32_t i=0;i<dirdata.subfiles.size();++i)
+        {
+            e.index = dirdata.subfiles[i];
+            e.is_file = true;
+
+            if(!mCollectionModel->isChecked(e))
+                continue;
+
+            std::string subpath = RsDirUtil::makePath(path,dirdata.name);
+            const auto& f(mCollection->fileTree().fileData(dirdata.subfiles[i]));
+
+            std::cerr << "Requesting file " << f.name << " to directory " << path << std::endl;
+
+            rsFiles->FileRequest(f.name,f.hash,f.size,path,RS_FILE_REQ_ANONYMOUS_ROUTING,std::list<RsPeerId>());
+        }
+    };
+
+    recursDL(mCollection->fileTree().root(),dldir.toUtf8().constData());
+    close();
+#ifdef TO_REMOVE
 	while ((item = *itemIterator) != NULL) {
 		++itemIterator;
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index 870fb88b3..8aa83f080 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -438,6 +438,13 @@ QVariant RsCollectionModel::decorationRole(const EntryIndex& i,int col) const
     return QVariant();
 }
 
+bool RsCollectionModel::isChecked(EntryIndex i)
+{
+    if(i.is_file)
+        return mFileInfos[i.index].is_checked;
+    else
+        return mDirInfos[i.index].check_state != DirCheckState::UNSELECTED;
+}
 void RsCollectionModel::notifyFilesBeingHashed(const std::list<RsFileHash>& files)
 {
     mFilesBeingHashed.insert(files.begin(),files.end());
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index 3bcc54ded..f34b0d39e 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -50,6 +50,7 @@ class RsCollectionModel: public QAbstractItemModel
 
         void notifyFilesBeingHashed(const std::list<RsFileHash>& files);
         void fileHashingFinished(const RsFileHash& hash);
+        bool isChecked(EntryIndex);
     signals:
         void sizesChanged();	// tells that the total size of the top level dir has changed (due to selection)
 

From a36f7221e7ed37013faf5890478aa686a23d8946 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 14 Mar 2024 22:44:49 +0100
Subject: [PATCH 477/503] added new folder capability in collection

---
 .../src/gui/common/RsCollection.cpp           |  8 +++---
 retroshare-gui/src/gui/common/RsCollection.h  |  4 +--
 .../src/gui/common/RsCollectionDialog.cpp     | 26 +++++++++++++++++++
 .../src/gui/common/RsCollectionDialog.ui      | 12 ++++-----
 .../src/gui/common/RsCollectionModel.cpp      |  9 +++++++
 .../src/gui/common/RsCollectionModel.h        |  2 ++
 6 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 644d94fc0..e86817d06 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -144,9 +144,9 @@ static QString purifyFileName(const QString& input,bool& bad)
     return output ;
 }
 
-void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash)
+void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash,RsFileTree::DirIndex parent_index)
 {
-    mHashes[hash]= mFileTree->addFile(mFileTree->root(),fname.toStdString(),hash,size);
+    mHashes[hash]= mFileTree->addFile(parent_index,fname.toStdString(),hash,size);
 #ifdef TO_REMOVE
     ColFileInfo info ;
     info.type = DIR_TYPE_FILE ;
@@ -157,9 +157,9 @@ void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash&
     recursAddElements(_xml_doc,info,_root) ;
 #endif
 }
-void RsCollection::merge_in(const RsFileTree& tree)
+void RsCollection::merge_in(const RsFileTree& tree, RsFileTree::DirIndex parent_index)
 {
-    recursMergeTree(mFileTree->root(),tree,tree.directoryData(tree.root())) ;
+    recursMergeTree(mFileTree->root(),tree,tree.directoryData(parent_index)) ;
 }
 
 void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree& tree,const RsFileTree::DirData& dd)
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index bc9ff2a28..5e3180c8c 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -77,8 +77,8 @@ public:
 
     virtual ~RsCollection() ;
 
-	void merge_in(const QString& fname,uint64_t size,const RsFileHash& hash) ;
-	void merge_in(const RsFileTree& tree) ;
+    void merge_in(const QString& fname,uint64_t size,const RsFileHash& hash,RsFileTree::DirIndex parent_index=0) ;
+    void merge_in(const RsFileTree& tree,RsFileTree::DirIndex parent_index=0) ;
 
 	static const QString ExtensionString ;
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 8b52d6ed7..1e5998427 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -1132,6 +1132,32 @@ void RsCollectionDialog::processItem(QMap<QString, QString> &dirToAdd
  */
 void RsCollectionDialog::makeDir()
 {
+    QModelIndexList selected_indices = ui._fileEntriesTW->selectionModel()->selectedIndexes();
+
+    if(selected_indices.size() > 1)
+    {
+        QMessageBox::information(nullptr,tr("Too many places selected"),tr("Please select at most one directory where to create the new folder"));
+        return;
+    }
+
+    QModelIndex place_index;
+
+    if(!selected_indices.empty())
+        place_index = selected_indices.first();
+
+    RsCollectionModel::EntryIndex e = mCollectionModel->getIndex(place_index);
+
+    if(e.is_file)
+    {
+        QMessageBox::information(nullptr,tr("Selected place cannot be a file"),tr("Please select at most one directory where to create the new folder"));
+        return;
+    }
+    QString childName = QInputDialog::getText(this, tr("New Directory"), tr("Enter the new directory's name"), QLineEdit::Normal);
+
+    mCollectionModel->preMods();
+    mCollection->merge_in(*RsFileTree::fromDirectory(childName.toUtf8().constData()),e.index);
+    mCollectionModel->postMods();
+
 #ifdef TODO_COLLECTION
 	QString childName="";
 	bool ok, badChar, nameOK = false;
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
index 7d4de185b..96fe8b399 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>671</width>
-    <height>400</height>
+    <width>761</width>
+    <height>434</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
@@ -283,7 +283,7 @@
                      </property>
                      <property name="icon">
                       <iconset resource="../images.qrc">
-                       <normaloff>:/images/feedback_arrow.png</normaloff>:/images/feedback_arrow.png</iconset>
+                       <normaloff>:/images/start.png</normaloff>:/images/start.png</iconset>
                      </property>
                     </widget>
                    </item>
@@ -309,7 +309,7 @@
                      </property>
                      <property name="icon">
                       <iconset resource="../images.qrc">
-                       <normaloff>:/images/update.png</normaloff>:/images/update.png</iconset>
+                       <normaloff>:/images/startall.png</normaloff>:/images/startall.png</iconset>
                      </property>
                     </widget>
                    </item>
@@ -334,8 +334,8 @@
                       <string notr="true"/>
                      </property>
                      <property name="icon">
-                      <iconset>
-                       <normaloff>:/images/deletemail24.png</normaloff>:/images/deletemail24.png</iconset>
+                      <iconset resource="../images.qrc">
+                       <normaloff>:/images/delete.png</normaloff>:/images/delete.png</iconset>
                      </property>
                     </widget>
                    </item>
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index 8aa83f080..16a2e473d 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -438,6 +438,15 @@ QVariant RsCollectionModel::decorationRole(const EntryIndex& i,int col) const
     return QVariant();
 }
 
+RsCollectionModel::EntryIndex RsCollectionModel::getIndex(const QModelIndex& i) const
+{
+    EntryIndex res;
+    res.is_file = false;
+    res.index = 0;
+
+    convertInternalIdToIndex(i.internalId(),res);
+    return res;
+}
 bool RsCollectionModel::isChecked(EntryIndex i)
 {
     if(i.is_file)
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
index f34b0d39e..705c3fc3b 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.h
@@ -51,6 +51,8 @@ class RsCollectionModel: public QAbstractItemModel
         void notifyFilesBeingHashed(const std::list<RsFileHash>& files);
         void fileHashingFinished(const RsFileHash& hash);
         bool isChecked(EntryIndex);
+
+        EntryIndex getIndex(const QModelIndex& i) const;
     signals:
         void sizesChanged();	// tells that the total size of the top level dir has changed (due to selection)
 

From 21c23129525cea3910d925d16c339c63996a0a6a Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 15 Mar 2024 20:10:20 +0100
Subject: [PATCH 478/503] Added export Friendslist to Profile Page

---
 retroshare-gui/src/gui/common/NewFriendList.h |   4 +-
 .../src/gui/settings/CryptoPage.cpp           |  11 +-
 retroshare-gui/src/gui/settings/CryptoPage.h  |   1 +
 retroshare-gui/src/gui/settings/CryptoPage.ui | 656 +++++++++---------
 4 files changed, 347 insertions(+), 325 deletions(-)

diff --git a/retroshare-gui/src/gui/common/NewFriendList.h b/retroshare-gui/src/gui/common/NewFriendList.h
index cf2e892b3..2b5cd1738 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.h
+++ b/retroshare-gui/src/gui/common/NewFriendList.h
@@ -87,7 +87,8 @@ public slots:
 	void setShowGroups(bool show);
 	void setShowUnconnected(bool hidden);
 	void setShowState(bool show);
-    void headerContextMenuRequested(QPoint);
+	void headerContextMenuRequested(QPoint);
+	void exportFriendlistClicked();
 
 private slots:
 	void sortColumn(int col,Qt::SortOrder so);
@@ -164,6 +165,5 @@ private slots:
 	void editGroup();
 	void removeGroup();
 
-	void exportFriendlistClicked();
 	void importFriendlistClicked();
 };
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 26d7cecea..296f6aec3 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -34,6 +34,7 @@
 #include <gui/connect/ConfCertDialog.h>
 #include <gui/profile/ProfileManager.h>
 #include <gui/statistics/StatisticsWindow.h>
+#include <gui/common/NewFriendList.h>
 
 #include <retroshare/rspeers.h> //for rsPeers variable
 #include <retroshare/rsdisc.h> //for rsPeers variable
@@ -58,8 +59,9 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags)
 	// hide profile manager as it causes bugs when generating a new profile.
 	//ui.profile_Button->hide() ;
 
-    //connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager()));
-    connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(exportProfile()));
+	//connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager()));
+	connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(exportProfile()));
+	connect(ui.exportfriendslist,SIGNAL(clicked()), this, SLOT(exportFriendsList()) );
 
     // Remove this because it duplicates functionality of the HomePage.
     ui.retroshareId_LB->hide();
@@ -229,3 +231,8 @@ void CryptoPage::showStats()
 {
     StatisticsWindow::showYourself();
 }
+
+void CryptoPage::exportFriendsList()
+{
+	NewFriendList().exportFriendlistClicked();
+}
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h
index e595c63c4..e10cbb97a 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.h
+++ b/retroshare-gui/src/gui/settings/CryptoPage.h
@@ -51,6 +51,7 @@ class CryptoPage : public ConfigPage
       bool fileSave();
       bool fileSaveAs();
       void showStats();
+      void exportFriendsList();
 
   private:
       QString fileName;
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui
index 29a336721..770526b66 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.ui
+++ b/retroshare-gui/src/gui/settings/CryptoPage.ui
@@ -13,25 +13,11 @@
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <widget class="QStackedWidget" name="stackedWidget">
-     <widget class="QWidget" name="stackPageNodeInfo" native="true">
+     <widget class="QWidget" name="stackPageNodeInfo">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QGroupBox" name="groupBox_1">
          <layout class="QGridLayout" name="gridLayout_4">
-          <item row="6" column="0">
-           <widget class="QLabel" name="retroshareId_LB">
-            <property name="text">
-             <string>Retroshare ID:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="11" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Statistics:</string>
-            </property>
-           </widget>
-          </item>
           <item row="3" column="1" colspan="3">
            <widget class="QLabel" name="peerid">
             <property name="sizePolicy">
@@ -51,13 +37,6 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>PGP fingerprint:</string>
-            </property>
-           </widget>
-          </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_6">
             <property name="sizePolicy">
@@ -77,99 +56,6 @@
             </property>
            </widget>
           </item>
-          <item row="14" column="2">
-           <spacer name="horizontalSpacer_4">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="8" column="1" colspan="2">
-           <widget class="QLabel" name="friendsEdit">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string notr="true">TextLabel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="14" column="0">
-           <widget class="QLabel" name="label_11">
-            <property name="text">
-             <string>Export Profile:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1" colspan="3">
-           <widget class="QLabel" name="pgpfingerprint">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>TextLabel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1" colspan="3">
-           <widget class="QLabel" name="pgpid">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string notr="true">TextLabel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="10" column="0">
-           <widget class="QLabel" name="label_16">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Online since:</string>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_8">
             <property name="sizePolicy">
@@ -189,184 +75,10 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0" colspan="4">
-           <layout class="QGridLayout" name="gridLayout_3">
-            <item row="0" column="0">
-             <widget class="QLabel" name="publicIcon">
-              <property name="maximumSize">
-               <size>
-                <width>16</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="publicLabel">
-              <property name="font">
-               <font>
-                <pointsize>12</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Public Information</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="2" column="1" colspan="3">
-           <widget class="QLabel" name="country">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
+          <item row="6" column="0">
+           <widget class="QLabel" name="retroshareId_LB">
             <property name="text">
-             <string notr="true">TextLabel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="14" column="1">
-           <widget class="QPushButton" name="exportprofile">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Export</string>
-            </property>
-           </widget>
-          </item>
-          <item row="9" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Software Version:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="11" column="1">
-           <widget class="QPushButton" name="showStats_PB">
-            <property name="text">
-             <string>Show statistics</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0" colspan="4">
-           <layout class="QGridLayout" name="gridLayout">
-            <property name="topMargin">
-             <number>6</number>
-            </property>
-            <item row="0" column="0">
-             <widget class="QLabel" name="otherIcon">
-              <property name="maximumSize">
-               <size>
-                <width>16</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="otherLabel">
-              <property name="font">
-               <font>
-                <pointsize>12</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Other Information</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="11" column="2">
-           <spacer name="horizontalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="13" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>Profile path:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="8" column="0">
-           <widget class="QLabel" name="label_9">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Friend nodes:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" colspan="3">
-           <widget class="QLabel" name="name">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string notr="true">TextLabel</string>
+             <string>Retroshare ID:</string>
             </property>
            </widget>
           </item>
@@ -407,22 +119,80 @@
             </item>
            </layout>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_10">
+          <item row="2" column="1" colspan="3">
+           <widget class="QLabel" name="country">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
             </property>
             <property name="text">
-             <string>Name:</string>
+             <string notr="true">TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>PGP fingerprint:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0" colspan="4">
+           <layout class="QGridLayout" name="gridLayout">
+            <property name="topMargin">
+             <number>6</number>
+            </property>
+            <item row="0" column="0">
+             <widget class="QLabel" name="otherIcon">
+              <property name="maximumSize">
+               <size>
+                <width>16</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="otherLabel">
+              <property name="font">
+               <font>
+                <pointsize>12</pointsize>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Other Information</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="11" column="1">
+           <widget class="QPushButton" name="showStats_PB">
+            <property name="text">
+             <string>Show statistics</string>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>Export Profile:</string>
             </property>
            </widget>
           </item>
@@ -448,8 +218,8 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_7">
+          <item row="8" column="0">
+           <widget class="QLabel" name="label_9">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -463,23 +233,7 @@
              </size>
             </property>
             <property name="text">
-             <string>PGP Id :</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1" colspan="3">
-           <widget class="QLabel" name="retroshareId_content_LB">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>TextLabel</string>
-            </property>
-            <property name="textInteractionFlags">
-             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+             <string>Friend nodes:</string>
             </property>
            </widget>
           </item>
@@ -502,6 +256,100 @@
             </property>
            </widget>
           </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>PGP Id :</string>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="1">
+           <widget class="QPushButton" name="exportprofile">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Export</string>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Statistics:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" colspan="3">
+           <widget class="QLabel" name="name">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="10" column="0">
+           <widget class="QLabel" name="label_16">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Online since:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="13" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Profile path:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="2">
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
           <item row="13" column="1" colspan="2">
            <widget class="QLabel" name="labelpath">
             <property name="font">
@@ -515,6 +363,172 @@
             </property>
            </widget>
           </item>
+          <item row="8" column="1" colspan="2">
+           <widget class="QLabel" name="friendsEdit">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Software Version:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1" colspan="3">
+           <widget class="QLabel" name="retroshareId_content_LB">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>TextLabel</string>
+            </property>
+            <property name="textInteractionFlags">
+             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" colspan="3">
+           <widget class="QLabel" name="pgpid">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1" colspan="3">
+           <widget class="QLabel" name="pgpfingerprint">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Name:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" colspan="4">
+           <layout class="QGridLayout" name="gridLayout_3">
+            <item row="0" column="0">
+             <widget class="QLabel" name="publicIcon">
+              <property name="maximumSize">
+               <size>
+                <width>16</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="publicLabel">
+              <property name="font">
+               <font>
+                <pointsize>12</pointsize>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Public Information</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="15" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Export Friendslist:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="15" column="1">
+           <widget class="QPushButton" name="exportfriendslist">
+            <property name="text">
+             <string>Export</string>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="2" rowspan="2">
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Expanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
@@ -533,7 +547,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="stackPageCertificate" native="true">
+     <widget class="QWidget" name="stackPageCertificate">
       <layout class="QGridLayout" name="gridLayout_7">
        <item row="0" column="0">
         <widget class="QPlainTextEdit" name="certplainTextEdit">

From 5f748b3131a9e8c1944077eab08f88e977ddd715 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 16 Mar 2024 20:23:28 +0100
Subject: [PATCH 479/503] renaming button text

---
 retroshare-gui/src/gui/settings/CryptoPage.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui
index 770526b66..c0d602368 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.ui
+++ b/retroshare-gui/src/gui/settings/CryptoPage.ui
@@ -281,7 +281,7 @@
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>Export</string>
+             <string>Export profile</string>
             </property>
            </widget>
           </item>
@@ -509,7 +509,7 @@
           <item row="15" column="1">
            <widget class="QPushButton" name="exportfriendslist">
             <property name="text">
-             <string>Export</string>
+             <string>Export friends list</string>
             </property>
            </widget>
           </item>

From 5aa80f2f681b4723c680ca9bd78e95ff29dce60c Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 18 Mar 2024 22:52:46 +0100
Subject: [PATCH 480/503] updated master of Retroshare/ to master of
 libretroshare

---
 libretroshare | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libretroshare b/libretroshare
index ac1c5f301..526cdfb9c 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit ac1c5f3019ff17c695758dabec0ee8e540d401e0
+Subproject commit 526cdfb9c1e9f91fa7ef17dcaf447a353eb0caed

From 2ebd7617fc4a8d061c1202abb5ad59cae2523ee9 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 19 Mar 2024 23:22:46 +0100
Subject: [PATCH 481/503] added proper remove for files/dirs

---
 .../src/gui/common/RsCollection.cpp           | 12 ++++++++++
 retroshare-gui/src/gui/common/RsCollection.h  |  5 ++++
 .../src/gui/common/RsCollectionDialog.cpp     | 23 +++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index e86817d06..2624dd246 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -670,4 +670,16 @@ void RsCollection::saveColl(std::vector<ColFileInfo> colFileInfos, const QString
 }
 #endif
 
+bool RsCollection::removeFile(RsFileTree::FileIndex index_to_remove,RsFileTree::DirIndex parent_index)
+{
+    mFileTree->removeFile(index_to_remove,parent_index);
+}
+bool RsCollection::removeDirectory(RsFileTree::DirIndex index_to_remove,RsFileTree::DirIndex parent_index)
+{
+    mFileTree->removeDirectory(index_to_remove,parent_index);
+}
 
+void RsCollection::cleanup()
+{
+    mFileTree = RsFileTree::fromTreeCleaned(*mFileTree);
+}
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 5e3180c8c..7a01fc4b6 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -80,6 +80,11 @@ public:
     void merge_in(const QString& fname,uint64_t size,const RsFileHash& hash,RsFileTree::DirIndex parent_index=0) ;
     void merge_in(const RsFileTree& tree,RsFileTree::DirIndex parent_index=0) ;
 
+    bool removeFile(RsFileTree::FileIndex index_to_remove,RsFileTree::DirIndex parent_index);
+    bool removeDirectory(RsFileTree::DirIndex index_to_remove,RsFileTree::DirIndex parent_index);
+
+    void cleanup(); // cleans up the collection, which may contain unreferenced files/dirs after lazy editing.
+
 	static const QString ExtensionString ;
 
 #ifdef TO_REMOVE
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 1e5998427..5269cb988 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -954,6 +954,27 @@ bool RsCollectionDialog::addAllChild(QFileInfo &fileInfoParent
  */
 void RsCollectionDialog::remove()
 {
+    QMap<QString, QString > dirToRemove;
+    int count=0;//to not scan all items on list .count()
+
+    QModelIndexList milSelectionList =	ui._fileEntriesTW->selectionModel()->selectedIndexes();
+
+    mCollectionModel->preMods();
+
+    foreach (QModelIndex index, milSelectionList)
+        if(index.column()==0)    //Get only FileName
+        {
+            auto indx = mCollectionModel->getIndex(index);
+            auto parent_indx = mCollectionModel->getIndex(index.parent());
+
+            if(indx.is_file)
+                mCollection->removeFile(indx.index,parent_indx.index);
+            else
+                mCollection->removeDirectory(indx.index,parent_indx.index);
+        }
+
+    mCollectionModel->postMods();
+
 #ifdef TODO_COLLECTION
 	bool removeOnlyFile=false;
 	QString listDir;
@@ -1538,6 +1559,8 @@ void RsCollectionDialog::download()
  */
 void RsCollectionDialog::save()
 {
+    mCollectionModel->preMods();
+    mCollection->cleanup();
     mCollection->save(_fileName);
     close();
 #ifdef TO_REMOVE

From a02d2e63e2ed7f2e3d0c56fd5a6e14fd2c71ed9b Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Wed, 20 Mar 2024 21:00:42 +0100
Subject: [PATCH 482/503] fixed updating save filename, removal of files/dirs,
 and cleaning before save

---
 retroshare-gui/src/gui/common/RsCollection.cpp     |  4 ++++
 .../src/gui/common/RsCollectionDialog.cpp          | 14 ++++++++++----
 .../src/gui/common/RsCollectionDialog.ui           |  7 ++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 2624dd246..01d6f7dc1 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -681,5 +681,9 @@ bool RsCollection::removeDirectory(RsFileTree::DirIndex index_to_remove,RsFileTr
 
 void RsCollection::cleanup()
 {
+    RsDbg() << "Cleaning up RsCollection with " << mFileTree->numDirs() << " dirs and " << mFileTree->numFiles() << " files." ;
+
     mFileTree = RsFileTree::fromTreeCleaned(*mFileTree);
+
+    RsDbg() << "Simplified to " << mFileTree->numDirs() << " dirs and " << mFileTree->numFiles() << " files.";
 }
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 5269cb988..ba4d5a118 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -125,7 +125,7 @@ protected:
  * @param readOnly: Open dialog for RsColl as ReadOnly
  */
 RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsCollectionDialogMode mode)
-  : _fileName(collectionFileName), _mode(mode)
+  : _mode(mode)
 {
     RsCollection::RsCollectionErrorCode err_code;
     mCollection = new RsCollection(collectionFileName,err_code);
@@ -137,6 +137,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
     }
 
 	ui.setupUi(this) ;
+    ui._filename_TL->setText(collectionFileName);
 
 //	uint32_t size = colFileInfos.size();
 //	for(uint32_t i=0;i<size;++i)
@@ -148,7 +149,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
 	setWindowFlags(Qt::Window); // for maximize button
 	setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint);
 
-	setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName()));
+    setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(collectionFileName).completeBaseName()));
 	
 	
     ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/collections.png"));
@@ -719,7 +720,7 @@ void RsCollectionDialog::changeFileName()
 		file.remove();
 	}
 
-	_fileName = fileName;
+    ui._filename_TL->setText(fileName);
 
 	updateList();
 }
@@ -1559,9 +1560,14 @@ void RsCollectionDialog::download()
  */
 void RsCollectionDialog::save()
 {
+    if(ui._filename_TL->text().isNull())
+        changeFileName();
+    if(ui._filename_TL->text().isNull())
+        return;
+
     mCollectionModel->preMods();
     mCollection->cleanup();
-    mCollection->save(_fileName);
+    mCollection->save(ui._filename_TL->text());
     close();
 #ifdef TO_REMOVE
 	std::cerr << "Saving!" << std::endl;
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
index 96fe8b399..8871536a2 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
@@ -157,7 +157,7 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QPushButton" name="_changeFile">
+                  <widget class="QToolButton" name="_changeFile">
                    <property name="maximumSize">
                     <size>
                      <width>21</width>
@@ -170,6 +170,10 @@
                    <property name="text">
                     <string>...</string>
                    </property>
+                   <property name="icon">
+                    <iconset resource="../icons.qrc">
+                     <normaloff>:/icons/browsable_blue_128.png</normaloff>:/icons/browsable_blue_128.png</iconset>
+                   </property>
                   </widget>
                  </item>
                 </layout>
@@ -512,6 +516,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>

From 8366cbca597180c3223f3d98660c5f45435d3c03 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 28 Mar 2024 21:26:09 +0100
Subject: [PATCH 483/503] removed dead code, and added check for incorrect file
 names when saving

---
 .../gui/FileTransfer/SharedFilesDialog.cpp    |  10 -
 .../src/gui/common/RsCollection.cpp           | 215 ----
 .../src/gui/common/RsCollectionDialog.cpp     | 980 +-----------------
 .../src/gui/common/RsCollectionDialog.h       |  22 -
 .../src/gui/common/RsCollectionDialog.ui      |  20 -
 5 files changed, 44 insertions(+), 1203 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index a26f13728..8ce8ac3d4 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -840,16 +840,6 @@ void SharedFilesDialog::collOpen()
                 if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
 
                     RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(),true);
-#ifdef TO_REMOVE
-                    RsCollection::RsCollectionErrorCode err;
-                    RsCollection collection(qinfo.absoluteFilePath(),err);
-
-                    if(err == RsCollection::RsCollectionErrorCode::NO_ERROR)
-                    {
-                        collection.downloadFiles();
-                        return;
-                    }
-#endif
                 }
             }
         }
diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index cbc763024..8f1853cc9 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -147,15 +147,6 @@ static QString purifyFileName(const QString& input,bool& bad)
 void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash,RsFileTree::DirIndex parent_index)
 {
     mHashes[hash]= mFileTree->addFile(parent_index,fname.toStdString(),hash,size);
-#ifdef TO_REMOVE
-    ColFileInfo info ;
-    info.type = DIR_TYPE_FILE ;
-    info.name = fname ;
-    info.size = size ;
-    info.hash = QString::fromStdString(hash.toStdString()) ;
-
-    recursAddElements(_xml_doc,info,_root) ;
-#endif
 }
 void RsCollection::merge_in(const RsFileTree& tree, RsFileTree::DirIndex parent_index)
 {
@@ -178,63 +169,6 @@ void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree&
     }
 }
 
-#ifdef TO_REMOVE
-void RsCollection::recursCollectColFileInfos(const QDomElement& e,std::vector<ColFileInfo>& colFileInfos,const QString& current_path, bool bad_chars_in_parent) const
-{
-    QDomNode n = e.firstChild() ;
-#ifdef COLLECTION_DEBUG
-    std::cerr << "Parsing element " << e.tagName().toStdString() << std::endl;
-#endif
-
-    while(!n.isNull())
-    {
-        QDomElement ee = n.toElement(); // try to convert the node to an element.
-
-#ifdef COLLECTION_DEBUG
-        std::cerr << "  Seeing child " << ee.tagName().toStdString() << std::endl;
-#endif
-
-        if(ee.tagName() == QString("File"))
-        {
-            ColFileInfo newChild ;
-            newChild.hash = ee.attribute(QString("sha1")) ;
-            bool bad_chars_detected = false ;
-            newChild.name = purifyFileName(ee.attribute(QString("name")), bad_chars_detected) ;
-            newChild.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
-            newChild.size = ee.attribute(QString("size")).toULongLong() ;
-            newChild.path = current_path ;
-            newChild.type = DIR_TYPE_FILE ;
-
-            colFileInfos.push_back(newChild) ;
-        }
-        else if(ee.tagName() == QString("Directory"))
-        {
-            ColFileInfo newParent ;
-            bool bad_chars_detected = false ;
-            QString cleanDirName = purifyFileName(ee.attribute(QString("name")),bad_chars_detected) ;
-            newParent.name=cleanDirName;
-            newParent.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
-            newParent.size = 0;
-            newParent.path = current_path ;
-            newParent.type = DIR_TYPE_DIR ;
-
-            recursCollectColFileInfos(ee,newParent.children,current_path + "/" + cleanDirName, bad_chars_in_parent || bad_chars_detected) ;
-            uint32_t size = newParent.children.size();
-            for(uint32_t i=0;i<size;++i)
-            {
-                const ColFileInfo &colFileInfo = newParent.children[i];
-                newParent.size +=colFileInfo.size ;
-            }
-
-            colFileInfos.push_back(newParent) ;
-        }
-
-        n = n.nextSibling() ;
-    }
-}
-#endif
-
-
 void RsCollection::recursAddElements(RsFileTree::DirIndex parent, const DirDetails& dd, FileSearchFlags flags)
 {
     if (dd.type == DIR_TYPE_FILE)
@@ -258,67 +192,6 @@ void RsCollection::recursAddElements(RsFileTree::DirIndex parent, const DirDetai
     }
 }
 
-#ifdef TO_REMOVE
-void RsCollection::recursAddElements(QDomDocument& doc,const ColFileInfo& colFileInfo,QDomElement& e) const
-{
-    if (colFileInfo.type == DIR_TYPE_FILE)
-    {
-        QDomElement f = doc.createElement("File") ;
-
-        f.setAttribute(QString("name"),colFileInfo.name) ;
-        f.setAttribute(QString("sha1"),colFileInfo.hash) ;
-        f.setAttribute(QString("size"),QString::number(colFileInfo.size)) ;
-
-        e.appendChild(f) ;
-    }
-    else if (colFileInfo.type == DIR_TYPE_DIR)
-    {
-        QDomElement d = doc.createElement("Directory") ;
-
-        d.setAttribute(QString("name"),colFileInfo.name) ;
-
-        for (std::vector<ColFileInfo>::const_iterator it = colFileInfo.children.begin(); it != colFileInfo.children.end(); ++it)
-            recursAddElements(doc,(*it),d) ;
-
-        e.appendChild(d) ;
-    }
-}
-
-void RsCollection::recursAddElements(
-        QDomDocument& doc, const RsFileTree& ft, uint32_t index,
-        QDomElement& e ) const
-{
-    std::vector<uint64_t> subdirs;
-    std::vector<RsFileTree::FileData> subfiles ;
-    std::string name;
-    if(!ft.getDirectoryContent(name, subdirs, subfiles, index)) return;
-
-    QDomElement d = doc.createElement("Directory") ;
-    d.setAttribute(QString("name"),QString::fromUtf8(name.c_str())) ;
-    e.appendChild(d) ;
-
-    for (uint32_t i=0;i<subdirs.size();++i)
-        recursAddElements(doc,ft,subdirs[i],d) ;
-
-    for(uint32_t i=0;i<subfiles.size();++i)
-    {
-        QDomElement f = doc.createElement("File") ;
-
-        f.setAttribute(QString("name"),QString::fromUtf8(subfiles[i].name.c_str())) ;
-        f.setAttribute(QString("sha1"),QString::fromStdString(subfiles[i].hash.toStdString())) ;
-        f.setAttribute(QString("size"),QString::number(subfiles[i].size)) ;
-
-        d.appendChild(f) ;
-    }
-}
-
-static void showErrorBox(const QString& fileName, const QString& error)
-{
-    QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok);
-    mb.exec();
-}
-#endif
-
 QString RsCollection::errorString(RsCollectionErrorCode code)
 {
     switch(code)
@@ -446,19 +319,6 @@ bool RsCollection::checkFile(const QString& fileName, RsCollectionErrorCode& err
     return false;
 }
 
-#ifdef TO_REMOVE
-bool RsCollection::load(QWidget *parent)
-{
-    QString fileName;
-    if (!misc::getOpenFileName(parent, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-        return false;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    return load(fileName, true);
-}
-#endif
-
 bool RsCollection::save(const QString& fileName) const
 {
     QFile file(fileName);
@@ -513,17 +373,6 @@ bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFi
             uint64_t size = ee.attribute(QString("size")).toULongLong() ;
 
             mHashes[hash] = mFileTree->addFile(parent,name,hash,size);
-#ifdef TO_REMOVE
-            mFileTree.addFile(parent,)
-            ColFileInfo newChild ;
-            bool bad_chars_detected = false ;
-            newChild.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
-            newChild.size = ee.attribute(QString("size")).toULongLong() ;
-            newChild.path = current_path ;
-            newChild.type = DIR_TYPE_FILE ;
-
-            colFileInfos.push_back(newChild) ;
-#endif
         }
         else if(ee.tagName() == QString("Directory"))
         {
@@ -533,23 +382,6 @@ bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFi
             RsFileTree::DirIndex new_dir_index = mFileTree->addDirectory(parent,cleanDirName);
 
             recursParseXml(doc,ee,new_dir_index);
-#ifdef TO_REMOVE
-            newParent.name=cleanDirName;
-            newParent.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
-            newParent.size = 0;
-            newParent.path = current_path ;
-            newParent.type = DIR_TYPE_DIR ;
-
-            recursCollectColFileInfos(ee,newParent.children,current_path + "/" + cleanDirName, bad_chars_in_parent || bad_chars_detected) ;
-            uint32_t size = newParent.children.size();
-            for(uint32_t i=0;i<size;++i)
-            {
-                const ColFileInfo &colFileInfo = newParent.children[i];
-                newParent.size +=colFileInfo.size ;
-            }
-
-            colFileInfos.push_back(newParent) ;
-#endif
         }
 
         n = n.nextSibling() ;
@@ -587,25 +419,6 @@ bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFi
     return true;
 }
 
-#ifdef TO_REMOVE
-bool RsCollection::save(QWidget *parent) const
-{
-    QString fileName;
-    if(!misc::getSaveFileName(parent, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Create collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-        return false;
-
-    if (!fileName.endsWith("." + RsCollection::ExtensionString))
-        fileName += "." + RsCollection::ExtensionString ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    return save(fileName);
-}
-
-
-
-#endif
-
 qulonglong RsCollection::count() const
 {
     return mFileTree->numFiles();
@@ -613,21 +426,6 @@ qulonglong RsCollection::count() const
 qulonglong RsCollection::size()
 {
     return mFileTree->totalFileSize();
-
-#ifdef TO_REMOVE
-    QDomElement docElem = _xml_doc.documentElement();
-
-    std::vector<ColFileInfo> colFileInfos;
-    recursCollectColFileInfos(docElem, colFileInfos, QString(),false);
-
-    uint64_t size = 0;
-
-    for (uint32_t i = 0; i < colFileInfos.size(); ++i) {
-        size += colFileInfos[i].size;
-    }
-
-    return size;
-#endif
 }
 
 bool RsCollection::isCollectionFile(const QString &fileName)
@@ -658,19 +456,6 @@ void RsCollection::updateHashes(const std::map<RsFileHash,RsFileHash>& old_to_ne
         mFileTree->updateFile(fit->second,fd.name,it.second,fd.size);
     }
 }
-#ifdef TO_REMOVE
-void RsCollection::saveColl(std::vector<ColFileInfo> colFileInfos, const QString &fileName)
-{
-
-    QDomElement root = _xml_doc.elementsByTagName("RsCollection").at(0).toElement();
-    while (root.childNodes().count()>0) root.removeChild(root.firstChild());
-    for(uint32_t i = 0;i<colFileInfos.size();++i)
-        recursAddElements(_xml_doc,colFileInfos[i],root) ;
-
-    _saved=save(fileName);
-
-}
-#endif
 
 bool RsCollection::removeFile(RsFileTree::FileIndex index_to_remove,RsFileTree::DirIndex parent_index)
 {
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index ba4d5a118..16f265a03 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -186,8 +186,6 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
     connect(mCollectionModel,SIGNAL(sizesChanged()),this,SLOT(updateSizes()));
     updateSizes(); // forced because it's only called when the collection is changed, or when the model is created.
 
-	bool wrong_chars = !updateList();
-
 	// 2 - connect necessary signals/slots
 
 	connect(ui._changeFile, SIGNAL(clicked()), this, SLOT(changeFileName()));
@@ -195,14 +193,10 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
     connect(ui._addRecur_PB, SIGNAL(clicked()), this, SLOT(addSelectionRecursive()));
 	connect(ui._remove_PB, SIGNAL(clicked()), this, SLOT(remove()));
 	connect(ui._makeDir_PB, SIGNAL(clicked()), this, SLOT(makeDir()));
-	connect(ui._removeDuplicate_CB, SIGNAL(clicked(bool)), this, SLOT(updateRemoveDuplicate(bool)));
 	connect(ui._cancel_PB, SIGNAL(clicked()), this, SLOT(cancel()));
 	connect(ui._save_PB, SIGNAL(clicked()), this, SLOT(save()));
 	connect(ui._download_PB, SIGNAL(clicked()), this, SLOT(download()));
 	connect(ui._hashBox, SIGNAL(fileHashingFinished(QList<HashedFile>)), this, SLOT(fileHashingFinished(QList<HashedFile>)));
-#ifdef TO_REMOVE
-    connect(ui._fileEntriesTW, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*,int)));
-#endif
 
 	// 3 Initialize List
 	_dirModel = new QFileSystemModel(this);
@@ -227,14 +221,10 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
 	// 5 Activate button follow creationMode
     ui._changeFile->setVisible(_mode == EDIT);
     ui._makeDir_PB->setVisible(_mode == EDIT);
-    ui._removeDuplicate_CB->setVisible(_mode == EDIT);
     ui._save_PB->setVisible(_mode == EDIT);
     ui._treeViewFrame->setVisible(_mode == EDIT);
     ui._download_PB->setVisible(_mode == DOWNLOAD);
 
-#ifdef TO_REMOVE
-    ui._fileEntriesTW->installEventFilter(this);
-#endif
 	ui._systemFileTW->installEventFilter(this);
 
 	// 6 Add HashBox
@@ -242,9 +232,6 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
 	ui._hashBox->setDropWidget(this);
 	ui._hashBox->setAutoHide(true);
 	ui._hashBox->setDefaultTransferRequestFlags(RS_FILE_REQ_ANONYMOUS_ROUTING) ;
-
-	if(wrong_chars)
-		QMessageBox::warning(NULL,tr("Bad filenames have been cleaned"),tr("Some filenames or directory names contained forbidden characters.\nCharacters <b>\",|,/,\\,&lt;,&gt;,*,?</b> will be replaced by '_'.\n Concerned files are listed in red.")) ;
 }
 
 void RsCollectionDialog::openDestinationDirectoryMenu()
@@ -296,75 +283,6 @@ RsCollectionDialog::~RsCollectionDialog()
 	processSettings(false);
 }
 
-/**
- * @brief RsCollectionDialog::eventFilter: Proccess event in object
- * @param obj: object where event occured
- * @param event: event occured
- * @return If we don't have to process event in parent.
- */
-#ifdef TODO_COLLECTION
-bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
-{
-	if (obj == ui._fileEntriesTW) {
-		if (event->type() == QEvent::KeyPress) {
-			QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
-			if (keyEvent && (keyEvent->key() == Qt::Key_Space)) {
-				// Space pressed
-
-				// get state of current item
-				QTreeWidgetItem *item = ui._fileEntriesTW->currentItem();
-				if (item) {
-					Qt::CheckState checkState = (item->checkState(COLUMN_FILE) == Qt::Checked) ? Qt::Unchecked : Qt::Checked;
-
-					// set state of all selected items
-					QList<QTreeWidgetItem*> selectedItems = ui._fileEntriesTW->selectedItems();
-					QList<QTreeWidgetItem*>::iterator it;
-					for (it = selectedItems.begin(); it != selectedItems.end(); ++it) {
-						if ((*it)->checkState(COLUMN_FILE) != checkState)
-							(*it)->setCheckState(COLUMN_FILE, checkState);
-					}
-				}
-
-				return true; // eat event
-			}
-
-			if (keyEvent && (keyEvent->key() == Qt::Key_Delete)) {
-				// Delete pressed
-				remove();
-				return true; // eat event
-			}
-
-			if (keyEvent && (keyEvent->key() == Qt::Key_Plus)) {
-				// Plus pressed
-				makeDir();
-				return true; // eat event
-			}
-
-		}
-	}
-
-	if (obj == ui._systemFileTW) {
-		if (event->type() == QEvent::KeyPress) {
-			QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
-			if (keyEvent && ((keyEvent->key() == Qt::Key_Enter)
-			                 || keyEvent->key() == Qt::Key_Return)) {
-				// Enter pressed
-				if (keyEvent->modifiers() == Qt::ShiftModifier)
-					addRecursive();
-				else if(keyEvent->modifiers() == Qt::NoModifier) {
-					add();
-				}
-
-				return true; // eat event
-			}
-		}
-	}
-
-	// pass the event on to the parent class
-	return QDialog::eventFilter(obj, event);
-}
-#endif
-
 /**
  * @brief RsCollectionDialog::processSettings
  * @param bLoad: Load or Save dialog's settings
@@ -424,162 +342,6 @@ void RsCollectionDialog::processSettings(bool bLoad)
 	Settings->endGroup();
 }
 
-#ifdef TO_REMOVE
-/**
- * @brief RsCollectionDialog::getRootItem: Create the root Item if not existing
- * @return: the root item
- */
-QTreeWidgetItem* RsCollectionDialog::getRootItem()
-{
-	return ui._fileEntriesTW->invisibleRootItem();
-}
-#endif
-
-/**
- * @brief RsCollectionDialog::updateList: Update list of item in RsCollection
- * @return If at least one item have a Wrong Char
- */
-bool RsCollectionDialog::updateList()
-{
-#ifdef TODO_COLLECTION
-	bool wrong_chars = false ;
-	wrong_chars = addChild(getRootItem(), _newColFileInfos);
-
-	_newColFileInfos.clear();
-
-	ui._filename_TL->setText(_fileName) ;
-	for (int column = 0; column < ui._fileEntriesTW->columnCount(); ++column) {
-		ui._fileEntriesTW->resizeColumnToContents(column);
-	}
-
-	updateSizes() ;
-
-	return !wrong_chars;
-#endif
-    return true;
-}
-
-#ifdef TO_REMOVE
-/**
- * @brief RsCollectionDialog::addChild: Add Child Item in list
- * @param parent: Parent Item
- * @param child: Child ColFileInfo item to add
- * @param total_size: Saved total size of children to save in parent
- * @param total_files: Saved total file of children to save in parent
- * @return If at least one item have a Wrong Char
- */
-bool RsCollectionDialog::addChild(QTreeWidgetItem* parent, const std::vector<ColFileInfo>& child)
-{
-	bool wrong_chars = false ;
-
-	uint32_t childCount = child.size();
-	for(uint32_t i=0; i<childCount; ++i)
-	{
-		const ColFileInfo &colFileInfo = child[i];
-
-		QList<QTreeWidgetItem*> founds;
-		QList<QTreeWidgetItem*> parentsFounds;
-		parentsFounds = ui._fileEntriesTW->findItems(colFileInfo.path , Qt::MatchExactly | Qt::MatchRecursive, COLUMN_FILEPATH);
-		if (colFileInfo.type == DIR_TYPE_DIR){
-			founds = ui._fileEntriesTW->findItems(colFileInfo.path + "/" +colFileInfo.name, Qt::MatchExactly | Qt::MatchRecursive, COLUMN_FILEPATH);
-		} else {
-			founds = ui._fileEntriesTW->findItems(colFileInfo.path + "/" +colFileInfo.name, Qt::MatchExactly | Qt::MatchRecursive, COLUMN_FILEPATH);
-			if (ui._removeDuplicate_CB->isChecked()) {
-				founds << ui._fileEntriesTW->findItems(colFileInfo.hash, Qt::MatchExactly | Qt::MatchRecursive, COLUMN_HASH);
-			}
-		}
-		if (founds.empty()) {
-			QTreeWidgetItem *item = new QTreeWidgetItem;
-
-			//item->setFlags(Qt::ItemIsUserCheckable | item->flags());
-			item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate);
-			item->setCheckState(COLUMN_FILE, Qt::Checked);
-			item->setText(COLUMN_FILE, colFileInfo.name);
-			item->setText(COLUMN_FILEPATH, colFileInfo.path + "/" + colFileInfo.name);
-			item->setText(COLUMN_HASH, colFileInfo.hash);
-			item->setData(COLUMN_HASH, ROLE_NAME, colFileInfo.name);
-			item->setData(COLUMN_HASH, ROLE_PATH, colFileInfo.path);
-			item->setData(COLUMN_HASH, ROLE_TYPE, colFileInfo.type);
-			QFont font = item->font(COLUMN_FILE);
-			if (colFileInfo.type==DIR_TYPE_DIR) {
-				item->setToolTip(COLUMN_FILE,tr("This is a directory. Double-click to expand it."));
-				font.setBold(true);
-				//Size calculated after for added child after init
-				item->setText(COLUMN_SIZE, misc::friendlyUnit(0));
-				item->setToolTip(COLUMN_SIZE,tr("Real Size: Waiting child..."));
-				item->setData(COLUMN_SIZE, ROLE_SIZE, 0);
-				item->setData(COLUMN_SIZE, ROLE_SELSIZE, 0);
-
-				item->setText(COLUMN_FILEC, "");
-				item->setToolTip(COLUMN_FILEC, tr("Real File Count: Waiting child..."));
-				item->setData(COLUMN_FILEC, ROLE_FILEC, 0);
-				item->setData(COLUMN_FILEC, ROLE_SELFILEC, 0);
-			} else {
-				font.setBold(false);
-				item->setText(COLUMN_SIZE, misc::friendlyUnit(colFileInfo.size));
-				item->setToolTip(COLUMN_SIZE, tr("Real Size=%1").arg(misc::friendlyUnit(colFileInfo.size)));
-				item->setData(COLUMN_SIZE, ROLE_SIZE, colFileInfo.size);
-				item->setData(COLUMN_SIZE, ROLE_SELSIZE, colFileInfo.size);
-
-				item->setText(COLUMN_FILEC, "1");
-				item->setToolTip(COLUMN_FILEC, tr("Real File Count=%1").arg(1));
-				item->setData(COLUMN_FILEC, ROLE_FILEC, 1);
-				item->setData(COLUMN_FILEC, ROLE_SELFILEC, 1);
-			}
-			item->setFont(COLUMN_FILE, font);
-			item->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
-
-			if (colFileInfo.filename_has_wrong_characters)
-			{
-				//TODO (Phenom): Add qproperty for these text colors in stylesheets
-				wrong_chars = true ;
-				item->setData(COLUMN_FILE, Qt::ForegroundRole, QColor(255,80,120)) ;
-			}
-
-			if (parentsFounds.empty()) {
-				parent->addChild(item);
-			} else {
-				parentsFounds.at(0)->addChild(item);
-			}
-
-			if (colFileInfo.type == DIR_TYPE_FILE) {
-				//update parents size only for file children
-				QTreeWidgetItem *itemParent = item->parent();
-				if (itemParent) {
-					while (itemParent) {
-						qulonglong parentSize = itemParent->data(COLUMN_SIZE, ROLE_SIZE).toULongLong() + colFileInfo.size;
-						itemParent->setData(COLUMN_SIZE, ROLE_SIZE, parentSize);
-						itemParent->setToolTip(COLUMN_SIZE, tr("Real Size=%1").arg(misc::friendlyUnit(parentSize)));
-						qulonglong parentSelSize = itemParent->data(COLUMN_SIZE, ROLE_SELSIZE).toULongLong() + colFileInfo.size;
-						itemParent->setData(COLUMN_SIZE, ROLE_SELSIZE, parentSelSize);
-						itemParent->setText(COLUMN_SIZE, misc::friendlyUnit(parentSelSize));
-
-						qulonglong parentFileCount = itemParent->data(COLUMN_FILEC, ROLE_FILEC).toULongLong() + 1;
-						itemParent->setData(COLUMN_FILEC, ROLE_FILEC, parentFileCount);
-						itemParent->setToolTip(COLUMN_FILEC, tr("Real File Count=%1").arg(parentFileCount));
-						qulonglong parentSelFileCount = itemParent->data(COLUMN_FILEC, ROLE_SELFILEC).toULongLong() + 1;
-						itemParent->setData(COLUMN_FILEC, ROLE_SELFILEC, parentSelFileCount);
-						itemParent->setText(COLUMN_FILEC, QString("%1").arg(parentSelFileCount));
-
-						itemParent = itemParent->parent();
-					}
-				}
-			}
-
-			founds.push_back(item);
-		}
-
-		if (!founds.empty()) {
-
-			if (colFileInfo.type == DIR_TYPE_DIR) {
-				wrong_chars |= addChild(founds.at(0), colFileInfo.children);
-			}
-		}
-	}
-	return wrong_chars;
-}
-#endif
-
 /**
  * @brief RsCollectionDialog::directoryLoaded: called when ui._treeView have load an directory as QFileSystemModel don't load all in one time
  * @param dirLoaded: Name of directory just loaded
@@ -642,21 +404,21 @@ void RsCollectionDialog::updateSizes()
  * @param bad
  * @return
  */
-static QString purifyFileName(const QString& input, bool& bad)
+static bool checkFileName(const std::string& input, std::string& corrected)
 {
-	static const QString bad_chars = "/\\\"*:?<>|" ;
-	bad = false ;
-	QString output = input ;
+    static const std::string bad_chars ( "/\\\"*:?<>|" );
+    bool ok = true ;
+    corrected = input ;
 
-	for(int i=0;i<output.length();++i)
-		for(int j=0;j<bad_chars.length();++j)
-			if(output[i] == bad_chars[j])
+    for(uint32_t i=0;i<input.length();++i)
+        for(uint32_t j=0;j<bad_chars.length();++j)
+            if(input[i] == bad_chars[j])
 			{
-				output[i] = '_' ;
-				bad = true ;
+                corrected[i] = '_' ;
+                ok = false ;
 			}
 
-	return output ;
+    return ok ;
 }
 
 /**
@@ -721,8 +483,6 @@ void RsCollectionDialog::changeFileName()
 	}
 
     ui._filename_TL->setText(fileName);
-
-	updateList();
 }
 
 /**
@@ -782,8 +542,6 @@ static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree:
 void RsCollectionDialog::addSelection(bool recursive)
 {
 	QMap<QString, QString > dirToAdd;
-    int count=0;//to not scan all items on list .count()
-
 	QModelIndexList milSelectionList =	ui._systemFileTW->selectionModel()->selectedIndexes();
 
     mCollectionModel->preMods();
@@ -797,76 +555,8 @@ void RsCollectionDialog::addSelection(bool recursive)
             recursBuildFileTree(_dirModel->filePath(_tree_proxyModel->mapToSource(index)),tree,tree.root(),recursive,paths_to_hash);
 
             mCollection->merge_in(tree);
-
-#ifdef TO_REMOVE
-			QFileInfo fileInfo = filePath;
-			if (fileInfo.isDir()) {
-				dirToAdd.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
-				++count;
-				if (recursive) {
-					if (!addAllChild(fileInfo, dirToAdd, fileToHash, count)) return;
-				} else {
-					continue;
-				}
-			}
-			if (fileInfo.isFile()){
-				fileToHash.append(fileInfo.absoluteFilePath());
-				++count;
-				if (dirToAdd.contains(fileInfo.absolutePath()))
-					_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
-				else
-					_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),"");
-			}
-#endif
 		}
 
-#ifdef TO_REMOVE
-	// Process Dirs
-	QTreeWidgetItem *item = NULL;
-	if (!ui._fileEntriesTW->selectedItems().empty())
-		item= ui._fileEntriesTW->selectedItems().at(0);
-	if (item) {
-		while (item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR) {
-			item = item->parent();//Only Dir as Parent
-		}
-	}
-
-	int index = 0;
-	while (index < dirToAdd.count())
-	{
-		ColFileInfo root;
-		if (item && (item != getRootItem())) {
-			root.name = "";
-			root.path = item->text(COLUMN_FILEPATH);
-		} else {
-			root.name = "";
-			root.path = "";
-		}
-		//QMap is ordered, so we get parent before child
-		//Iterator is moved inside this function
-		processItem(dirToAdd, index, root);
-	}
-
-	//Update liste before attach files to be sure when file is hashed, parent directory exists.
-	updateList();
-
-	for (QHash<QString,QString>::Iterator it = _listOfFilesAddedInDir.begin(); it != _listOfFilesAddedInDir.end() ; ++it)
-	{
-		QString path = it.value();
-		//it.value() = "";//Don't reset value, could be an older attachment not terminated.
-		if (dirToAdd.contains(path)){
-			it.value() = dirToAdd.value(path);
-		} else if(item) {
-			if (item->data(COLUMN_HASH, ROLE_NAME) != "") {
-				it.value() = item->text(COLUMN_FILEPATH);
-			}
-		}
-	}
-
-	// Process Files once all done
-	ui._hashBox->addAttachments(fileToHash,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
-#endif
-
     mFilesBeingHashed.insert(paths_to_hash.begin(),paths_to_hash.end());
 
     QStringList paths;
@@ -892,64 +582,6 @@ void RsCollectionDialog::addSelection(bool recursive)
     }
 }
 
-#ifdef TO_REMOVE
-/**
- * @brief RsCollectionDialog::addAllChild: Add children to RsCollection
- * @param fileInfoParent: Parent's QFileInfo to scan
- * @param dirToAdd: QMap where directories are added
- * @param fileToHash: QStringList where files are added
- * @return false if too many items is selected and aborted
- */
-bool RsCollectionDialog::addAllChild(QFileInfo &fileInfoParent
-                                     , QMap<QString, QString > &dirToAdd
-                                     , QStringList &fileToHash
-                                     , int &count)
-{
-	//Save count only first time to not scan all items on list .count()
-	if (count == 0) count = (dirToAdd.count() + fileToHash.count());
-	QDir dirParent = fileInfoParent.absoluteFilePath();
-	dirParent.setFilter(QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot);
-	QFileInfoList childrenList = dirParent.entryInfoList();
-	foreach (QFileInfo fileInfo, childrenList)
-	{
-		if (count == MAX_FILE_ADDED_BEFORE_ASK)
-		{
-			QMessageBox msgBox;
-			msgBox.setText(tr("Warning, selection contains more than %1 items.").arg(MAX_FILE_ADDED_BEFORE_ASK));
-			msgBox.setInformativeText("Do you want to continue?");
-			msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-			msgBox.setDefaultButton(QMessageBox::No);
-			int ret = msgBox.exec();
-			switch (ret) {
-				case QMessageBox::Yes:
-				break;
-				case QMessageBox::No:
-					return false;
-				break;
-				break;
-				default:
-					// should never be reached
-				break;
-			}
-		}
-		if (fileInfo.isDir()) {
-			dirToAdd.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
-			++count;
-			if (!addAllChild(fileInfo, dirToAdd, fileToHash, count)) return false;
-		}
-		if (fileInfo.isFile()){
-			fileToHash.append(fileInfo.absoluteFilePath());
-			++count;
-			if (dirToAdd.contains(fileInfo.absolutePath()))
-				_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
-			else
-				_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),"");
-		}
-	}
-	return true;
-}
-#endif
-
 /**
  * @brief RsCollectionDialog::remove: Remove selected Items in RSCollection
  */
@@ -975,180 +607,8 @@ void RsCollectionDialog::remove()
         }
 
     mCollectionModel->postMods();
-
-#ifdef TODO_COLLECTION
-	bool removeOnlyFile=false;
-	QString listDir;
-	// First, check if selection contains directories
-	for (int curs = 0; curs < ui._fileEntriesTW->selectedItems().count(); ++curs)
-	{// Have to call ui._fileEntriesTW->selectedItems().count() each time as selected could change
-		QTreeWidgetItem *item = NULL;
-		item= ui._fileEntriesTW->selectedItems().at(curs);
-
-		//Uncheck child directory item if parent is checked
-		if (item != getRootItem()){
-			if (item->data(COLUMN_HASH, ROLE_TYPE).toUInt() == DIR_TYPE_DIR) {
-				QString path = item->data(COLUMN_HASH, ROLE_PATH).toString();
-				if (listDir.contains(path) && !path.isEmpty()) {
-					item->setSelected(false);
-				} else {
-					listDir += item->data(COLUMN_HASH, ROLE_NAME).toString() +"<br>";
-				}
-			}
-		}
-	}
-
-	//If directories, ask to remove them or not
-	if (!listDir.isEmpty()){
-		QMessageBox* msgBox = new QMessageBox(QMessageBox::Information, "", "");
-		msgBox->setText("Warning, selection contains directories.");
-		//msgBox->setInformativeText(); If text too long, no scroll, so I add an text edit
-		QGridLayout* layout = qobject_cast<QGridLayout*>(msgBox->layout());
-		if (layout) {
-			int newRow = 1;
-			for (int row = layout->count()-1; row >= 0; --row) {
-				for (int col = layout->columnCount()-1; col >= 0; --col) {
-					QLayoutItem *item = layout->itemAtPosition(row, col);
-					if (item) {
-						int index = layout->indexOf(item->widget());
-						int r=0, c=0, rSpan=0, cSpan=0;
-						layout->getItemPosition(index, &r, &c, &rSpan, &cSpan);
-						if (r>0) {
-							layout->removeItem(item);
-							layout->addItem(item, r+3, c, rSpan, cSpan);
-						} else if (rSpan>1) {
-							newRow = rSpan + 1;
-						}
-					}
-				}
-			}
-			QLabel *label = new QLabel(tr("Do you want to remove them and all their children, too?"));
-			layout->addWidget(label,newRow, 0, 1, layout->columnCount(), Qt::AlignHCenter );
-			QTextEdit *edit = new QTextEdit(listDir);
-			edit->setReadOnly(true);
-			edit->setWordWrapMode(QTextOption::NoWrap);
-			layout->addWidget(edit,newRow+1, 0, 1, layout->columnCount(), Qt::AlignHCenter );
-		}
-
-		msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-		msgBox->setDefaultButton(QMessageBox::Yes);
-		int ret = msgBox->exec();
-		switch (ret) {
-			case QMessageBox::Yes:
-			break;
-			case QMessageBox::No:
-				removeOnlyFile = true;
-			break;
-			case QMessageBox::Cancel: {
-				delete msgBox;
-				return;
-			}
-			break;
-			default:
-				// should never be reached
-			break;
-		}
-		delete msgBox;
-	}
-
-	//Remove wanted items
-	int leftItem = 0;
-	// Have to call ui._fileEntriesTW->selectedItems().count() each time as selected change
-	while (ui._fileEntriesTW->selectedItems().count() > leftItem) {
-		QTreeWidgetItem *item = ui._fileEntriesTW->selectedItems().at(leftItem);
-
-		if (item != getRootItem()){
-			if (!removeItem(item, removeOnlyFile)) {
-				++leftItem;
-			}
-		} else {
-			//Get Root change index
-			++leftItem;
-		}
-	}
-
-	updateSizes() ;
-#endif
 }
 
-#ifdef TODO_COLLECTION
-bool RsCollectionDialog::removeItem(QTreeWidgetItem *item, bool &removeOnlyFile)
-{
-	if (item){
-		if ((item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR) || !removeOnlyFile) {
-			int leftItem = 0;
-			while (item->childCount() > leftItem) {
-				if (!removeItem(item->child(0), removeOnlyFile)) {
-					++leftItem;
-				}
-			}
-			if (leftItem == 0) {
-				//First uncheck item to update parent informations
-				item->setCheckState(COLUMN_FILE,Qt::Unchecked);
-				QTreeWidgetItem *parent = item->parent();
-				if (parent) {
-					parent->removeChild(item);
-				} else {
-					getRootItem()->removeChild(item);
-				}
-				return true;
-			} else {
-				if (!removeOnlyFile) {
-					std::cerr << "(EE) RsCollectionDialog::removeItem This could never happen." << std::endl;
-				}
-			}
-		}
-	}
-	return false;
-}
-#endif
-
-#ifdef TO_REMOVE
-/** Process each item to make a new RsCollection item */
-void RsCollectionDialog::processItem(QMap<QString, QString> &dirToAdd
-                                     , int &index
-                                     , ColFileInfo &parent
-                                     )
-{
-	ColFileInfo newChild;
-	int count = dirToAdd.count();
-	if (index < count) {
-		QString key=dirToAdd.keys().at(index);
-		bool bad_chars_detected = false;
-		QFileInfo fileInfo=key;
-		QString cleanDirName = purifyFileName(fileInfo.fileName(),bad_chars_detected);
-		newChild.name = cleanDirName;
-		newChild.filename_has_wrong_characters = bad_chars_detected;
-		newChild.size = fileInfo.isDir()? 0: fileInfo.size();
-		newChild.type = fileInfo.isDir()? DIR_TYPE_DIR: DIR_TYPE_FILE ;
-		if (parent.name != "") {
-			newChild.path = parent.path + "/" + parent.name;
-		} else {
-			newChild.path = parent.path;
-		}
-		dirToAdd[key] = newChild.path + "/" + newChild.name;
-		//Move to next item
-		++index;
-		if (index < count){
-			QString newKey = dirToAdd.keys().at(index);
-			while ((dirToAdd.value(newKey) == key)
-			       && (index < count)) {
-				processItem(dirToAdd, index, newChild);
-				if (index < count)newKey = dirToAdd.keys().at(index);
-			}
-		}
-
-		//Save parent when child are processed
-		if (parent.name != "") {
-			parent.children.push_back(newChild);
-			parent.size += newChild.size;
-		} else {
-			_newColFileInfos.push_back(newChild);
-		}
-	}
-}
-#endif
-
 /**
  * @brief RsCollectionDialog::addDir: Add new empty dir to list
  */
@@ -1179,90 +639,6 @@ void RsCollectionDialog::makeDir()
     mCollectionModel->preMods();
     mCollection->merge_in(*RsFileTree::fromDirectory(childName.toUtf8().constData()),e.index);
     mCollectionModel->postMods();
-
-#ifdef TODO_COLLECTION
-	QString childName="";
-	bool ok, badChar, nameOK = false;
-	// Ask for name
-	while (!nameOK)
-	{
-		childName = QInputDialog::getText(this, tr("New Directory")
-		                                  , tr("Enter the new directory's name")
-		                                  , QLineEdit::Normal, childName, &ok);
-		if (ok && !childName.isEmpty())
-		{
-			childName = purifyFileName(childName, badChar);
-			nameOK = !badChar;
-			if (badChar)
-			{
-				QMessageBox msgBox;
-				msgBox.setText("The name contains bad characters.");
-				msgBox.setInformativeText("Do you want to use the corrected one?\n" + childName);
-				msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Retry | QMessageBox::Cancel);
-				msgBox.setDefaultButton(QMessageBox::Ok);
-				int ret = msgBox.exec();
-				switch (ret) {
-					case QMessageBox::Ok:
-						nameOK = true;
-					break;
-					case QMessageBox::Retry:
-					break;
-					case QMessageBox::Cancel:
-						return;
-					break;
-					default:
-						// should never be reached
-					break;
-				}
-			}
-		} else {//if (ok && !childName.isEmpty())
-			return;
-		}
-
-	}
-
-
-	QList<QTreeWidgetItem*> selected = ui._fileEntriesTW->selectedItems();
-
-	if(selected.empty())
-	{
-		QTreeWidgetItem *item = getRootItem();
-
-		ColFileInfo newChild;
-		newChild.name = childName;
-		newChild.filename_has_wrong_characters = false;
-		newChild.size = 0;
-		newChild.type = DIR_TYPE_DIR;
-		newChild.path = item->data(COLUMN_HASH, ROLE_PATH).toString()
-		        + "/" + item->data(COLUMN_HASH, ROLE_NAME).toString();
-		if (item == getRootItem()) newChild.path = "";
-
-		_newColFileInfos.push_back(newChild);
-	}
-	else
-		for(auto it(selected.begin());it!=selected.end();++it)
-		{
-			QTreeWidgetItem *item = *it;
-
-			while(item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR)
-				item = item->parent();//Only Dir as Parent
-
-			ColFileInfo newChild;
-			newChild.name = childName;
-			newChild.filename_has_wrong_characters = false;
-			newChild.size = 0;
-			newChild.type = DIR_TYPE_DIR;
-
-			if (item == getRootItem())
-				newChild.path = "";
-			else
-				newChild.path = item->data(COLUMN_HASH, ROLE_PATH).toString() + "/" + item->data(COLUMN_HASH, ROLE_NAME).toString();
-
-			_newColFileInfos.push_back(newChild);
-		}
-
-	updateList();
-#endif
 }
 
 /**
@@ -1272,33 +648,6 @@ void RsCollectionDialog::makeDir()
  */
 void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
 {
-#ifdef TO_REMOVE
-	std::cerr << "RsCollectionDialog::fileHashingFinished() started." << std::endl;
-
-	QString message;
-
-	QList<HashedFile>::iterator it;
-	for (it = hashedFiles.begin(); it != hashedFiles.end(); ++it) {
-		HashedFile& hashedFile = *it;
-
-		ColFileInfo colFileInfo;
-		colFileInfo.name=hashedFile.filename;
-		colFileInfo.path="";
-		colFileInfo.size=hashedFile.size;
-		colFileInfo.hash=QString::fromStdString(hashedFile.hash.toStdString());
-		colFileInfo.filename_has_wrong_characters=false;
-		colFileInfo.type=DIR_TYPE_FILE;
-
-		if(_listOfFilesAddedInDir.value(hashedFile.filepath,"")!="") {
-			//File Added in directory, find its parent
-			colFileInfo.path = _listOfFilesAddedInDir.value(hashedFile.filepath,"");
-			_listOfFilesAddedInDir.remove(hashedFile.filepath);
-		}
-#ifdef TODO_COLLECTION
-		_newColFileInfos.push_back(colFileInfo);
-#endif
-	}
-#endif
     // build a map of old-hash to new-hash for the hashed files, so that it can be passed to the mCollection for update
 
     mCollectionModel->preMods();
@@ -1327,132 +676,6 @@ void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
         ui._save_PB->setToolTip(tr(""));
         ui._save_PB->setEnabled(true);
     }
-	updateList();
-}
-
-#ifdef TO_REMOVE
-void RsCollectionDialog::itemChanged(QTreeWidgetItem *item, int col)
-{
-	if (col != COLUMN_FILE) return;
-
-	if (item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_FILE) return;
-
-	//In COLUMN_FILE, normaly, only checkState could change...
-	qulonglong size = item->data(COLUMN_SIZE, ROLE_SIZE).toULongLong();
-	bool unchecked = (item->checkState(COLUMN_FILE) == Qt::Unchecked);
-	item->setData(COLUMN_SIZE, ROLE_SELSIZE, unchecked?0:size);
-	item->setText(COLUMN_SIZE, misc::friendlyUnit(unchecked?0:size));
-	item->setData(COLUMN_FILEC, ROLE_SELFILEC, unchecked?0:1);
-	item->setText(COLUMN_FILEC, QString("%1").arg(unchecked?0:1));
-
-	//update parents size
-	QTreeWidgetItem *itemParent = item->parent();
-	while (itemParent) {
-		//When unchecked only remove selected size
-		qulonglong parentSize = itemParent->data(COLUMN_SIZE, ROLE_SELSIZE).toULongLong() + (unchecked?0-size:size);
-		itemParent->setData(COLUMN_SIZE, ROLE_SELSIZE, parentSize);
-		itemParent->setText(COLUMN_SIZE, misc::friendlyUnit(parentSize));
-
-		qulonglong parentFileCount = itemParent->data(COLUMN_FILEC, ROLE_SELFILEC).toULongLong() + (unchecked?0-1:1);
-		itemParent->setData(COLUMN_FILEC, ROLE_SELFILEC, parentFileCount);
-		itemParent->setText(COLUMN_FILEC, QString("%1").arg(parentFileCount));
-
-		itemParent = itemParent->parent();
-	}
-
-	updateSizes() ;
-
-}
-#endif
-
-/**
- * @brief RsCollectionDialog::updateRemoveDuplicate Remove all duplicate file when checked.
- * @param checked
- */
-void RsCollectionDialog::updateRemoveDuplicate(bool checked)
-{
-#ifdef TODO_COLLECTION
-	if (checked) {
-		bool bRemoveAll = false;
-		QTreeWidgetItemIterator it(ui._fileEntriesTW);
-		QTreeWidgetItem *item;
-		while ((item = *it) != NULL) {
-			++it;
-			if (item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR) {
-				QList<QTreeWidgetItem*> founds;
-				founds << ui._fileEntriesTW->findItems(item->text(COLUMN_HASH), Qt::MatchExactly | Qt::MatchRecursive, COLUMN_HASH);
-				if (founds.count() > 1) {
-					bool bRemove = false;
-					if (!bRemoveAll) {
-						QMessageBox* msgBox = new QMessageBox(QMessageBox::Information, "", "");
-						msgBox->setText("Warning, duplicate file found.");
-						//msgBox->setInformativeText(); If text too long, no scroll, so I add an text edit
-						msgBox->setStandardButtons(QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-						msgBox->setDefaultButton(QMessageBox::Yes);
-
-						QGridLayout* layout = qobject_cast<QGridLayout*>(msgBox->layout());
-						if (layout) {
-							int newRow = 1;
-							for (int row = layout->count()-1; row >= 0; --row) {
-								for (int col = layout->columnCount()-1; col >= 0; --col) {
-									QLayoutItem *item = layout->itemAtPosition(row, col);
-									if (item) {
-										int index = layout->indexOf(item->widget());
-										int r=0, c=0, rSpan=0, cSpan=0;
-										layout->getItemPosition(index, &r, &c, &rSpan, &cSpan);
-										if (r>0) {
-											layout->removeItem(item);
-											layout->addItem(item, r+3, c, rSpan, cSpan);
-										} else if (rSpan>1) {
-											newRow = rSpan + 1;
-										}
-									}
-								}
-							}
-							QLabel *label = new QLabel(tr("Do you want to remove this file from the list?"));
-							layout->addWidget(label,newRow, 0, 1, layout->columnCount(), Qt::AlignHCenter );
-							QTextEdit *edit = new QTextEdit(item->text(COLUMN_FILEPATH));
-							edit->setReadOnly(true);
-							edit->setWordWrapMode(QTextOption::NoWrap);
-							layout->addWidget(edit,newRow+1, 0, 1, layout->columnCount(), Qt::AlignHCenter );
-						}
-
-						int ret = msgBox->exec();
-						switch (ret) {
-							case QMessageBox::YesToAll: {
-								bRemoveAll = true;
-							}
-							break;
-							case QMessageBox::Yes: {
-								bRemove = true;
-							}
-							break;
-							case QMessageBox::No:
-							break;
-							case QMessageBox::Cancel: {
-								delete msgBox;
-								ui._removeDuplicate_CB->setChecked(false);
-								return;
-							}
-							break;
-							default:
-								// should never be reached
-							break;
-						}
-						delete msgBox;
-					}
-
-					if (bRemove || bRemoveAll) {
-							//First uncheck item to update parent informations
-							item->setCheckState(COLUMN_FILE,Qt::Unchecked);
-							item->parent()->removeChild(item);
-					}
-
-				}
-			}
-		}
-	}
-#endif
 }
 
 /**
@@ -1470,6 +693,8 @@ void RsCollectionDialog::cancel()
 void RsCollectionDialog::download()
 {
 	std::cerr << "Downloading!" << std::endl;
+    bool auto_correct = false;
+    bool auto_skip = false;
 
 	QString dldir = ui.downloadFolder_LE->text();
 
@@ -1509,50 +734,44 @@ void RsCollectionDialog::download()
             std::string subpath = RsDirUtil::makePath(path,dirdata.name);
             const auto& f(mCollection->fileTree().fileData(dirdata.subfiles[i]));
 
-            std::cerr << "Requesting file " << f.name << " to directory " << path << std::endl;
+            std::string corrected_name;
 
-            rsFiles->FileRequest(f.name,f.hash,f.size,path,RS_FILE_REQ_ANONYMOUS_ROUTING,std::list<RsPeerId>());
+            if(!checkFileName(f.name,corrected_name) && !auto_correct)
+            {
+                if(auto_skip)
+                    continue;
+
+                QMessageBox mb;
+                mb.setText(tr("Incompatible filename."));
+                mb.setInformativeText(tr("This filename is not usable on your system.")+"\n"+tr("Retroshare can replace every problematic chars by '_'.")
+                                      +"\n"+tr("What do you want to do?"));
+                QAbstractButton *btnCorrect = mb.addButton(tr("Correct filename"), QMessageBox::ResetRole);
+                QAbstractButton *btnCorrectAll = mb.addButton(tr("Correct all"), QMessageBox::YesRole);
+                QAbstractButton *btnSkip = mb.addButton(tr("Skip this file"), QMessageBox::ApplyRole);
+                QAbstractButton *btnSkipAll = mb.addButton(tr("Skip all"), QMessageBox::AcceptRole);
+                mb.setIcon(QMessageBox::Question);
+                mb.exec();
+
+                if(mb.clickedButton() == btnSkipAll)
+                {
+                    auto_skip = true;
+                    continue;
+                }
+                if(mb.clickedButton() == btnSkip)
+                    continue;
+
+                if(mb.clickedButton() == btnCorrectAll)
+                    auto_correct = true;
+            }
+
+            std::cerr << "Requesting file " << corrected_name << " to directory " << path << std::endl;
+
+            rsFiles->FileRequest(corrected_name,f.hash,f.size,path,RS_FILE_REQ_ANONYMOUS_ROUTING,std::list<RsPeerId>());
         }
     };
 
     recursDL(mCollection->fileTree().root(),dldir.toUtf8().constData());
     close();
-#ifdef TO_REMOVE
-	while ((item = *itemIterator) != NULL) {
-		++itemIterator;
-
-		if (item->checkState(COLUMN_FILE) == Qt::Checked) {
-			std::cerr << item->data(COLUMN_HASH,ROLE_NAME).toString().toStdString()
-			          << " " << item->text(COLUMN_HASH).toStdString()
-			          << " " << item->text(COLUMN_SIZE).toStdString()
-			          << " " << item->data(COLUMN_HASH,ROLE_PATH).toString().toStdString() << std::endl;
-			ColFileInfo colFileInfo;
-			colFileInfo.hash = item->text(COLUMN_HASH);
-			colFileInfo.name = item->data(COLUMN_HASH,ROLE_NAME).toString();
-			colFileInfo.path = item->data(COLUMN_HASH,ROLE_PATH).toString();
-			colFileInfo.type = item->data(COLUMN_HASH,ROLE_TYPE).toUInt();
-			colFileInfo.size = item->data(COLUMN_SIZE,ROLE_SELSIZE).toULongLong();
-
-			QString cleanPath = dldir + colFileInfo.path ;
-			std::cerr << "making directory " << cleanPath.toStdString() << std::endl;
-
-			if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath))
-				QMessageBox::warning(NULL,QObject::tr("Unable to make path"),QObject::tr("Unable to make path:")+"<br>  "+cleanPath) ;
-
-			if (colFileInfo.type==DIR_TYPE_FILE)
-				rsFiles->FileRequest(colFileInfo.name.toUtf8().constData(),
-				                     RsFileHash(colFileInfo.hash.toStdString()),
-				                     colFileInfo.size,
-				                     cleanPath.toUtf8().constData(),
-				                     RS_FILE_REQ_ANONYMOUS_ROUTING,
-				                     std::list<RsPeerId>());
-		} else {//if (item->checkState(COLUMN_FILE) == Qt::Checked)
-			std::cerr<<"Skipping file : " << item->data(COLUMN_HASH,ROLE_NAME).toString().toStdString() << std::endl;
-		}
-	}
-
-	close();
-#endif
 }
 
 /**
@@ -1569,47 +788,8 @@ void RsCollectionDialog::save()
     mCollection->cleanup();
     mCollection->save(ui._filename_TL->text());
     close();
-#ifdef TO_REMOVE
-	std::cerr << "Saving!" << std::endl;
-	_newColFileInfos.clear();
-	QTreeWidgetItem* root = getRootItem();
-	if (root) {
-		saveChild(root);
-		emit saveColl(_newColFileInfos, _fileName);
-	}
-	close();
-#endif
 }
 
-#ifdef TO_REMOVE
-/**
- * @brief RsCollectionDialog::saveChild: Save each child in _newColFileInfos
- * @param parent
- */
-void RsCollectionDialog::saveChild(QTreeWidgetItem *parentItem, ColFileInfo *parentInfo)
-{
-	ColFileInfo parent;
-	if (!parentInfo) parentInfo = &parent;
-
-	parentInfo->checked = (parentItem->checkState(COLUMN_FILE)==Qt::Checked);
-	parentInfo->hash = parentItem->text(COLUMN_HASH);
-	parentInfo->name = parentItem->data(COLUMN_HASH,ROLE_NAME).toString();
-	parentInfo->path = parentItem->data(COLUMN_HASH,ROLE_PATH).toString();
-	parentInfo->type = parentItem->data(COLUMN_HASH,ROLE_TYPE).toUInt();
-	parentInfo->size = parentItem->data(COLUMN_SIZE,ROLE_SELSIZE).toULongLong();
-
-	for (int i=0; i<parentItem->childCount(); ++i) {
-		ColFileInfo child;
-		saveChild(parentItem->child(i), &child);
-		if (parentInfo->name != "") {
-			parentInfo->children.push_back(child);
-		} else {
-			_newColFileInfos.push_back(child);
-		}
-	}
-}
-#endif
-
 bool RsCollectionDialog::editExistingCollection(const QString& fileName, bool showError /* = true*/)
 {
     return RsCollectionDialog(fileName,EDIT).exec();
@@ -1651,77 +831,5 @@ bool RsCollectionDialog::openNewCollection(const RsFileTree& tree)
         return false;
 
     return RsCollectionDialog(fileName,EDIT).exec();
-
-#ifdef TODO_COLLECTION
-    QString fileName = proposed_file_name;
-
-    if(!misc::getSaveFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE
-                                                        , QApplication::translate("RsCollectionFile", "Create collection file")
-                                                        , QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")"
-                                                        , fileName,0, QFileDialog::DontConfirmOverwrite))
-        return false;
-
-    if (!fileName.endsWith("." + RsCollection::ExtensionString))
-        fileName += "." + RsCollection::ExtensionString ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    QFile file(fileName) ;
-
-    if(file.exists())
-    {
-        RsCollection::RsCollectionErrorCode err;
-        if (!RsCollection::checkFile(fileName,err))
-        {
-            QMessageBox::information(nullptr,tr("Error openning collection"),RsCollection::errorString(err));
-            return false;
-        }
-
-        QMessageBox mb;
-        mb.setText(tr("Save Collection File."));
-        mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
-        QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
-        QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
-        QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
-        mb.setIcon(QMessageBox::Question);
-        mb.exec();
-
-        if (mb.clickedButton()==btnOwerWrite) {
-            //Nothing to do _xml_doc already up to date
-        } else if (mb.clickedButton()==btnMerge) {
-            //Open old file to merge it with _xml_doc
-            QDomDocument qddOldFile("RsCollection");
-            if (qddOldFile.setContent(&file)) {
-                QDomElement docOldElem = qddOldFile.elementsByTagName("RsCollection").at(0).toElement();
-                std::vector<ColFileInfo> colOldFileInfos;
-                recursCollectColFileInfos(docOldElem,colOldFileInfos,QString(),false);
-
-                QDomElement root = _xml_doc.elementsByTagName("RsCollection").at(0).toElement();
-                for(uint32_t i = 0;i<colOldFileInfos.size();++i){
-                    recursAddElements(_xml_doc,colOldFileInfos[i],root) ;
-                }
-            }
-
-        } else if (mb.clickedButton()==btnCancel) {
-            return false;
-        } else {
-            return false;
-        }
-
-    }//if(file.exists())
-
-    _fileName=fileName;
-    std::vector<ColFileInfo> colFileInfos ;
-
-    recursCollectColFileInfos(_xml_doc.documentElement(),colFileInfos,QString(),false) ;
-
-    RsCollectionDialog* rcd = new RsCollectionDialog(fileName, colFileInfos,true);
-    connect(rcd,SIGNAL(saveColl(std::vector<ColFileInfo>, QString)),this,SLOT(saveColl(std::vector<ColFileInfo>, QString))) ;
-    _saved=false;
-    rcd->exec() ;
-    delete rcd;
-
-#endif
-    return true;
 }
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h
index 9ba3ac857..4b4fe5ffd 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.h
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h
@@ -64,18 +64,8 @@ private slots:
 	void chooseDestinationDirectory();
 	void setDestinationDirectory();
 	void openDestinationDirectoryMenu();
-#ifdef TO_REMOVE
-	void processItem(QMap<QString, QString> &dirToAdd
-	                 , int &index
-                   , ColFileInfo &parent
-                   ) ;
-#endif
 	void makeDir() ;
 	void fileHashingFinished(QList<HashedFile> hashedFiles) ;
-#ifdef TO_REMOVE
-    void itemChanged(QTreeWidgetItem* item,int col) ;
-#endif
-	void updateRemoveDuplicate(bool checked);
 	void cancel() ;
 	void download() ;
 	void save() ;
@@ -85,21 +75,9 @@ signals:
 
 private:
 	void processSettings(bool bLoad) ;
-	bool updateList();
-#ifdef TO_REMOVE
-    QTreeWidgetItem*  getRootItem();
-    bool addChild(QTreeWidgetItem *parent, const std::vector<ColFileInfo> &child);
-	bool removeItem(QTreeWidgetItem *item, bool &removeOnlyFile) ;
-    void saveChild(QTreeWidgetItem *parentItem, ColFileInfo *parentInfo = NULL);
-	bool addAllChild(QFileInfo &fileInfoParent
-	                 , QMap<QString, QString > &dirToAdd
-	                 , QStringList &fileToHash
-	                 , int &count);
-#endif
     void addSelection(bool recursive) ;
 
 	Ui::RsCollectionDialog ui;
-	QString _fileName ;
 
     RsCollectionDialogMode _mode;
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
index 8871536a2..6f3bee40d 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
@@ -410,26 +410,6 @@
           </item>
           <item>
            <layout class="QHBoxLayout" name="buttons_HL">
-            <item>
-             <widget class="QCheckBox" name="_removeDuplicate_CB">
-              <property name="text">
-               <string>Remove Duplicate</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="buttons_HSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
             <item>
              <widget class="QLabel" name="downloadFolder_LB">
               <property name="text">

From 0551f4f819c9092221492ddd39880f0c05e62b93 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 28 Mar 2024 22:14:46 +0100
Subject: [PATCH 484/503] fixed compilation after removal of
 RsCollection::downloadFiles

---
 .../src/gui/FileTransfer/SearchDialog.cpp     |  4 +-
 .../gui/FileTransfer/SharedFilesDialog.cpp    |  2 +-
 .../src/gui/FileTransfer/TransfersDialog.cpp  |  8 +--
 retroshare-gui/src/gui/RemoteDirModel.cpp     |  4 +-
 retroshare-gui/src/gui/RetroShareLink.cpp     | 11 ++--
 .../src/gui/common/RsCollection.cpp           | 59 +++++--------------
 retroshare-gui/src/gui/common/RsCollection.h  | 36 ++---------
 .../src/gui/common/RsCollectionDialog.cpp     | 17 ++++++
 .../src/gui/common/RsCollectionDialog.h       |  7 ++-
 9 files changed, 56 insertions(+), 92 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 387b3427a..8c4b3f31d 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -598,7 +598,7 @@ void SearchDialog::collOpen()
                 RsCollection::RsCollectionErrorCode err;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
                 if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                    RsCollection(qinfo.absoluteFilePath(),err).downloadFiles();
+                    RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),err));
 			}
 		}
 	}
@@ -613,7 +613,7 @@ void SearchDialog::collOpen()
     RsCollection collection(fileName, err);
 
     if(err == RsCollection::RsCollectionErrorCode::NO_ERROR)
-        collection.downloadFiles();
+        RsCollectionDialog::downloadFiles(collection);
     else
         QMessageBox::information(nullptr,tr("Error open RsCollection file"),RsCollection::errorString(err));
 }
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 8ce8ac3d4..b1dd7fcff 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -855,7 +855,7 @@ void SharedFilesDialog::collOpen()
     RsCollection collection(fileName,err);
 
     if(err == RsCollection::RsCollectionErrorCode::NO_ERROR)
-        collection.downloadFiles();
+        RsCollectionDialog::downloadFiles(collection);
 }
 
 void LocalSharedFilesDialog::playselectedfiles()
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 44c0260bd..d3ffc698d 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -1975,7 +1975,7 @@ void TransfersDialog::pasteLink()
 	for(auto &it : links)
 		col.merge_in(it.name(),it.size(),RsFileHash(it.hash().toStdString())) ;
 
-	col.downloadFiles();
+    RsCollectionDialog::downloadFiles(col);
 }
 
 void TransfersDialog::getDLSelectedItems(std::set<RsFileHash> *ids, std::set<int> *rows)
@@ -2555,7 +2555,7 @@ void TransfersDialog::collOpen()
                 if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
                 {
                         RsCollection::RsCollectionErrorCode code;
-                        RsCollection(qinfo.absoluteFilePath(),code).downloadFiles();
+                        RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),code));
                         return;
                 }
 			}
@@ -2572,7 +2572,7 @@ void TransfersDialog::collOpen()
     RsCollection collection(fileName,code);
 
     if(code == RsCollection::RsCollectionErrorCode::NO_ERROR)
-		collection.downloadFiles();
+        RsCollectionDialog::downloadFiles(collection);
     else
         QMessageBox::information(nullptr,tr("Error openning collection file"),RsCollection::errorString(code));
 }
@@ -2597,7 +2597,7 @@ void TransfersDialog::collAutoOpen(const QString &fileHash)
                 RsCollection::RsCollectionErrorCode err;
 
                 if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                    RsCollection(qinfo.absoluteFilePath(),err).autoDownloadFiles();
+                    RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),err));
 			}
 		}
 	}
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index 87f70c06c..962001a76 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -24,7 +24,7 @@
 
 #include "gui/common/FilesDefs.h"
 #include "gui/common/GroupDefs.h"
-#include "gui/common/RsCollection.h"
+#include "gui/common/RsCollectionDialog.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "retroshare/rsfiles.h"
@@ -1253,7 +1253,7 @@ void RetroshareDirModel::downloadSelected(const QModelIndexList &list,bool inter
    FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
 
    if(interactive)
-	   RsCollection(dirVec,f).downloadFiles() ;
+       RsCollectionDialog::downloadFiles(RsCollection(dirVec,f)) ;
    else /* Fire off requests */
 	   for (int i = 0, n = dirVec.size(); i < n; ++i)
 	   {
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index f87c72760..4271c40ef 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -25,7 +25,7 @@
 #include "HomePage.h"
 #include "chat/ChatDialog.h"
 #include "common/PeerDefs.h"
-#include "common/RsCollection.h"
+#include "common/RsCollectionDialog.h"
 #include "common/RsUrlHandler.h"
 #include "connect/ConfCertDialog.h"
 #include "connect/ConnectFriendWizard.h"
@@ -1724,10 +1724,9 @@ static void processList(const QStringList &list, const QString &textSingular, co
 
 		case TYPE_FILE_TREE:
 		{
-			auto ft = RsFileTree::fromRadix64(
-			            link.radix().toStdString() );
-			RsCollection(*ft).downloadFiles();
-			break;
+            auto ft = RsFileTree::fromRadix64(link.radix().toStdString() );
+            RsCollectionDialog::downloadFiles(RsCollection(*ft));
+            break;
 		}
 
 			case TYPE_CHAT_ROOM:
@@ -1778,7 +1777,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
 
 	// were single file links found?
 	if (fileLinkFound)
-		col.downloadFiles();
+        RsCollectionDialog::downloadFiles(col);
 
 	int countProcessed = 0;
 	int countError = 0;
diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 8f1853cc9..673099a50 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -37,11 +37,10 @@
 
 const QString RsCollection::ExtensionString = QString("rscollection") ;
 
-RsCollection::RsCollection(QObject *parent)
-    : QObject(parent), mFileTree(new RsFileTree)
+RsCollection::RsCollection()
 {
+    mFileTree = std::unique_ptr<RsFileTree>(new RsFileTree());
 }
-
 RsCollection::RsCollection(const RsFileTree& ft)
 {
     mFileTree = std::unique_ptr<RsFileTree>(new RsFileTree(ft));
@@ -50,8 +49,8 @@ RsCollection::RsCollection(const RsFileTree& ft)
         mHashes.insert(std::make_pair(mFileTree->fileData(i).hash,i ));
 }
 
-RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchFlags flags, QObject *parent)
-    : QObject(parent), mFileTree(new RsFileTree)
+RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchFlags flags)
+    : mFileTree(new RsFileTree)
 {
     if(! ( (flags & RS_FILE_HINTS_LOCAL) || (flags & RS_FILE_HINTS_REMOTE)))
     {
@@ -70,39 +69,6 @@ RsCollection::~RsCollection()
 {
 }
 
-void RsCollection::downloadFiles() const
-{
-#ifdef TODO_COLLECTION
-    // print out the element names of all elements that are direct children
-    // of the outermost element.
-    QDomElement docElem = _xml_doc.documentElement();
-
-    std::vector<ColFileInfo> colFileInfos ;
-
-    recursCollectColFileInfos(docElem,colFileInfos,QString(),false) ;
-
-    RsCollectionDialog(_fileName, colFileInfos, false).exec() ;
-#endif
-}
-
-void RsCollection::autoDownloadFiles() const
-{
-#ifdef TODO_COLLECTION
-    QDomElement docElem = _xml_doc.documentElement();
-
-    std::vector<ColFileInfo> colFileInfos;
-
-    recursCollectColFileInfos(docElem,colFileInfos,QString(),false);
-
-    QString dlDir = QString::fromUtf8(rsFiles->getDownloadDirectory().c_str());
-
-    foreach(ColFileInfo colFileInfo, colFileInfos)
-    {
-        autoDownloadFiles(colFileInfo, dlDir);
-    }
-#endif
-}
-
 void RsCollection::autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const
 {
     if (!colFileInfo.filename_has_wrong_characters)
@@ -197,15 +163,20 @@ QString RsCollection::errorString(RsCollectionErrorCode code)
     switch(code)
     {
     default: [[fallthrough]] ;
-    case RsCollectionErrorCode::UNKNOWN_ERROR:                 return tr("Unknown error");
-    case RsCollectionErrorCode::NO_ERROR:                      return tr("No error");
-    case RsCollectionErrorCode::FILE_READ_ERROR:               return tr("Error while openning file");
-    case RsCollectionErrorCode::FILE_CONTAINS_HARMFUL_STRINGS: return tr("Collection file contains potentially harmful code");
-    case RsCollectionErrorCode::INVALID_ROOT_NODE:             return tr("Invalid root node. RsCollection node was expected.");
-    case RsCollectionErrorCode::XML_PARSING_ERROR:             return tr("XML parsing error in collection file");
+    case RsCollectionErrorCode::UNKNOWN_ERROR:                 return QObject::tr("Unknown error");
+    case RsCollectionErrorCode::NO_ERROR:                      return QObject::tr("No error");
+    case RsCollectionErrorCode::FILE_READ_ERROR:               return QObject::tr("Error while openning file");
+    case RsCollectionErrorCode::FILE_CONTAINS_HARMFUL_STRINGS: return QObject::tr("Collection file contains potentially harmful code");
+    case RsCollectionErrorCode::INVALID_ROOT_NODE:             return QObject::tr("Invalid root node. RsCollection node was expected.");
+    case RsCollectionErrorCode::XML_PARSING_ERROR:             return QObject::tr("XML parsing error in collection file");
     }
 }
 
+RsCollection::RsCollection(const RsCollection& col)
+    : mFileTree(new RsFileTree(*col.mFileTree)),mHashes(col.mHashes)
+{
+}
+
 RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error)
     : mFileTree(new RsFileTree)
 {
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 7a01fc4b6..7be48804a 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -26,7 +26,6 @@
 
 #pragma once
 
-#include <QObject>
 #include <QString>
 #include <QDomDocument>
 #include <QFile>
@@ -53,10 +52,8 @@ public:
 };
 Q_DECLARE_METATYPE(ColFileInfo)
 
-class RsCollection : public QObject
+class RsCollection
 {
-	Q_OBJECT
-
 public:
     enum class RsCollectionErrorCode:uint8_t {
         NO_ERROR                      = 0x00,
@@ -67,9 +64,9 @@ public:
         XML_PARSING_ERROR             = 0x05,
     };
 
-	RsCollection(QObject *parent = 0) ;
-	// create from list of files and directories
-	RsCollection(const std::vector<DirDetails>& file_entries, FileSearchFlags flags, QObject *parent = 0) ;
+    RsCollection();
+    RsCollection(const RsCollection&);
+    RsCollection(const std::vector<DirDetails>& file_entries, FileSearchFlags flags) ;
     RsCollection(const RsFileTree& ft);
     RsCollection(const QString& filename,RsCollectionErrorCode& error_code);
 
@@ -87,10 +84,6 @@ public:
 
 	static const QString ExtensionString ;
 
-#ifdef TO_REMOVE
-	bool load(QWidget *parent);
-    bool save(QWidget *parent) const ;
-#endif
 	// Save to disk
 	bool save(const QString& fileName) const ;
 
@@ -101,11 +94,6 @@ public:
     // total number of files in the collection
     qulonglong count() const;
 
-	// Download the content.
-	void downloadFiles() const ;
-	// Auto Download all the content.
-	void autoDownloadFiles() const ;
-
 	static bool isCollectionFile(const QString& fileName);
 
     void updateHashes(const std::map<RsFileHash,RsFileHash>& old_to_new_hashes);
@@ -120,15 +108,6 @@ private:
     // This function is used to merge an existing RsFileTree into the RsCollection
     void recursMergeTree(RsFileTree::DirIndex parent, const RsFileTree& tree, const RsFileTree::DirData &dd);
 
-#ifdef TO_REMOVE
-	void recursAddElements(QDomDocument&,const ColFileInfo&,QDomElement&) const;
-	void recursAddElements(
-	        QDomDocument& doc, const RsFileTree& ft, uint32_t index,
-	        QDomElement& e ) const;
-
-	void recursCollectColFileInfos(const QDomElement&,std::vector<ColFileInfo>& colFileInfos,const QString& current_dir,bool bad_chars_in_parent) const ;
-#endif
-
     // check that the file is a valid rscollection file, and not a lol bomb or some shit like this
     static bool checkFile(const QString &fileName, RsCollectionErrorCode &error);
 
@@ -138,13 +117,6 @@ private:
     std::unique_ptr<RsFileTree> mFileTree;
     std::map<RsFileHash,RsFileTree::FileIndex> mHashes;	// used to efficiently update files being hashed
 
-#ifdef TO_REMOVE
-	QDomDocument _xml_doc ;
-	QString _fileName ;
-	bool _saved;
-	QDomElement _root ;
-#endif
-
 	friend class RsCollectionDialog ;
 };
 
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 16f265a03..258c80649 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -136,6 +136,17 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
         close();
     }
 
+    init(collectionFileName);
+}
+
+RsCollectionDialog::RsCollectionDialog(const RsCollection& coll, RsCollectionDialogMode mode)
+  : _mode(mode)
+{
+    mCollection = new RsCollection(coll);
+    init(QString());
+}
+void RsCollectionDialog::init(const QString& collectionFileName)
+{
 	ui.setupUi(this) ;
     ui._filename_TL->setText(collectionFileName);
 
@@ -800,6 +811,12 @@ bool RsCollectionDialog::openExistingCollection(const QString& fileName, bool sh
     return RsCollectionDialog(fileName,DOWNLOAD).exec();
 }
 
+bool RsCollectionDialog::downloadFiles(const RsCollection &collection)
+{
+    return RsCollectionDialog(collection,DOWNLOAD).exec();
+}
+
+
 bool RsCollectionDialog::openNewCollection(const RsFileTree& tree)
 {
     RsCollection collection(tree);
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h
index 4b4fe5ffd..3c1f5c29a 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.h
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h
@@ -43,8 +43,12 @@ public:
     // Open existing collection for download
     static bool openExistingCollection(const QString& fileName, bool showError = true);
 
+    // Open existing collection for download
+    static bool downloadFiles(const RsCollection& collection);
 protected:
-    //bool eventFilter(QObject *obj, QEvent *ev);
+    static QString errorString(RsCollection::RsCollectionErrorCode code);
+
+    void init(const QString& collectionFileName);
 
     enum RsCollectionDialogMode {
         UNKNOWN       = 0x00,
@@ -53,6 +57,7 @@ protected:
     };
 
     RsCollectionDialog(const QString& filename, RsCollectionDialogMode mode) ;
+    RsCollectionDialog(const RsCollection& coll, RsCollectionDialogMode mode) ;
 
 private slots:
 	void directoryLoaded(QString dirLoaded);

From 3f9d49921d19708f8862e77b75081134b0d5d026 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 30 Mar 2024 18:37:20 +0100
Subject: [PATCH 485/503] fixed bug asking for overwriting a non existant file

---
 .../src/gui/common/RsCollectionDialog.cpp     | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 258c80649..66a6c6d8c 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -756,10 +756,10 @@ void RsCollectionDialog::download()
                 mb.setText(tr("Incompatible filename."));
                 mb.setInformativeText(tr("This filename is not usable on your system.")+"\n"+tr("Retroshare can replace every problematic chars by '_'.")
                                       +"\n"+tr("What do you want to do?"));
-                QAbstractButton *btnCorrect = mb.addButton(tr("Correct filename"), QMessageBox::ResetRole);
-                QAbstractButton *btnCorrectAll = mb.addButton(tr("Correct all"), QMessageBox::YesRole);
-                QAbstractButton *btnSkip = mb.addButton(tr("Skip this file"), QMessageBox::ApplyRole);
-                QAbstractButton *btnSkipAll = mb.addButton(tr("Skip all"), QMessageBox::AcceptRole);
+                QAbstractButton *btnCorrect = mb.addButton(tr("Correct filename"), QMessageBox::YesRole);
+                QAbstractButton *btnCorrectAll = mb.addButton(tr("Correct all"), QMessageBox::AcceptRole);
+                QAbstractButton *btnSkip = mb.addButton(tr("Skip this file"), QMessageBox::NoRole);
+                QAbstractButton *btnSkipAll = mb.addButton(tr("Skip all"), QMessageBox::RejectRole);
                 mb.setIcon(QMessageBox::Question);
                 mb.exec();
 
@@ -833,16 +833,19 @@ bool RsCollectionDialog::openNewCollection(const RsFileTree& tree)
 
     std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
 
-    QMessageBox mb;
-    mb.setText(tr("Save Collection File."));
-    mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
-    QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
-    QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
-    mb.setIcon(QMessageBox::Question);
-    mb.exec();
+    if(QFile(fileName).exists())
+    {
+        QMessageBox mb;
+        mb.setText(tr("Save Collection File."));
+        mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
+        QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
+        QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
+        mb.setIcon(QMessageBox::Question);
+        mb.exec();
 
-    if (mb.clickedButton()==btnCancel)
-        return false;
+        if (mb.clickedButton()==btnCancel)
+            return false;
+    }
 
     if(!collection.save(fileName))
         return false;

From 0b75abaa0436d8d2467cdd437ef6a0fa58f52abc Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Mon, 1 Apr 2024 18:25:49 +0200
Subject: [PATCH 486/503] minor fixes to rscollection PR

---
 .../src/gui/common/RsCollectionDialog.ui      | 19 +++++++++++++++++++
 .../src/gui/common/RsCollectionModel.cpp      |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
index 6f3bee40d..5ceadb647 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
@@ -430,6 +430,12 @@
             </item>
             <item>
              <widget class="QLineEdit" name="downloadFolder_LE">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="contextMenuPolicy">
                <enum>Qt::CustomContextMenu</enum>
               </property>
@@ -441,6 +447,19 @@
               </property>
              </widget>
             </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
             <item>
              <widget class="QPushButton" name="_cancel_PB">
               <property name="text">
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
index 16a2e473d..8c7fa9283 100644
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
@@ -489,7 +489,7 @@ void RsCollectionModel::postMods()
     emit layoutChanged();
     emit sizesChanged();
 
-    debugDump();
+//    debugDump();
 }
 
 void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,int depth)

From 16d6d4d597123caf37dbfa8863c91bdc80f3012e Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 2 Apr 2024 17:55:11 +0200
Subject: [PATCH 487/503] updated master to all submodules

---
 build_scripts/OBS   | 2 +-
 libbitdht           | 2 +-
 libretroshare       | 2 +-
 retroshare-webui    | 2 +-
 supportlibs/libsam3 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build_scripts/OBS b/build_scripts/OBS
index 9dd9d7f94..0a3997cc1 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 9dd9d7f94a600e8c8478887a4f7784fdc3294034
+Subproject commit 0a3997cc1355b2c848161dca015b7e2df039707b
diff --git a/libbitdht b/libbitdht
index 659423769..2ddc86fb5 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 659423769541169457c41f71c8a038e2d64ba079
+Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
diff --git a/libretroshare b/libretroshare
index 0c16c4a07..402f32eda 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit 0c16c4a07eea82a5946bf49ebccb41d7c1e82368
+Subproject commit 402f32eda026c3ec3e429b5fb842e87ebd985d73
diff --git a/retroshare-webui b/retroshare-webui
index 542a8c07b..edfc638a6 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit 542a8c07bd02f9bb9082f7aba5aaaed54e643fc1
+Subproject commit edfc638a6af87d0f60489632416105e1fa13fc4e
diff --git a/supportlibs/libsam3 b/supportlibs/libsam3
index 8623304b6..ea52a3251 160000
--- a/supportlibs/libsam3
+++ b/supportlibs/libsam3
@@ -1 +1 @@
-Subproject commit 8623304b62294dafbe477573f321a464fef721dd
+Subproject commit ea52a3251d60906d67f9a1031a6ed7642753f94f

From 5a24fad354b41f4f574fa896de169bef46f282a9 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 2 Apr 2024 14:44:34 +0200
Subject: [PATCH 488/503] Renamed RsCollectionErrorCode::NO_ERROR to
 COLLECTION_NO_ERROR because of double define of NO_ERROR in winerror.h

---
 libbitdht                                                 | 2 +-
 retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp      | 2 +-
 retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp | 2 +-
 retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp   | 2 +-
 retroshare-gui/src/gui/RetroShareLink.cpp                 | 2 +-
 retroshare-gui/src/gui/common/RsCollection.cpp            | 6 +++---
 retroshare-gui/src/gui/common/RsCollection.h              | 4 ++--
 retroshare-gui/src/gui/common/RsCollectionDialog.cpp      | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libbitdht b/libbitdht
index 2ddc86fb5..a5a0f472d 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4
+Subproject commit a5a0f472d39c03d7442208b0d1c07cb429188341
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 8c4b3f31d..b3d74d6c4 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -612,7 +612,7 @@ void SearchDialog::collOpen()
     RsCollection::RsCollectionErrorCode err;
     RsCollection collection(fileName, err);
 
-    if(err == RsCollection::RsCollectionErrorCode::NO_ERROR)
+    if(err == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
         RsCollectionDialog::downloadFiles(collection);
     else
         QMessageBox::information(nullptr,tr("Error open RsCollection file"),RsCollection::errorString(err));
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index b1dd7fcff..8978ccf71 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -854,7 +854,7 @@ void SharedFilesDialog::collOpen()
     RsCollection::RsCollectionErrorCode err;
     RsCollection collection(fileName,err);
 
-    if(err == RsCollection::RsCollectionErrorCode::NO_ERROR)
+    if(err == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
         RsCollectionDialog::downloadFiles(collection);
 }
 
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index d3ffc698d..3ee120162 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -2571,7 +2571,7 @@ void TransfersDialog::collOpen()
     RsCollection::RsCollectionErrorCode code;
     RsCollection collection(fileName,code);
 
-    if(code == RsCollection::RsCollectionErrorCode::NO_ERROR)
+    if(code == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
         RsCollectionDialog::downloadFiles(collection);
     else
         QMessageBox::information(nullptr,tr("Error openning collection file"),RsCollection::errorString(code));
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 4271c40ef..fd3571e7e 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -1148,7 +1148,7 @@ QString RetroShareLink::toHtmlSize() const
             RsCollection::RsCollectionErrorCode code;
             RsCollection collection(QString::fromUtf8(finfo.path.c_str()), code) ;
 
-            if(code == RsCollection::RsCollectionErrorCode::NO_ERROR)
+            if(code == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
 				size += QString(" [%1]").arg(misc::friendlyUnit(collection.size()));
 		}
 	}
diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index 673099a50..e13452038 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -164,7 +164,7 @@ QString RsCollection::errorString(RsCollectionErrorCode code)
     {
     default: [[fallthrough]] ;
     case RsCollectionErrorCode::UNKNOWN_ERROR:                 return QObject::tr("Unknown error");
-    case RsCollectionErrorCode::NO_ERROR:                      return QObject::tr("No error");
+    case RsCollectionErrorCode::COLLECTION_NO_ERROR:           return QObject::tr("No error");
     case RsCollectionErrorCode::FILE_READ_ERROR:               return QObject::tr("Error while openning file");
     case RsCollectionErrorCode::FILE_CONTAINS_HARMFUL_STRINGS: return QObject::tr("Collection file contains potentially harmful code");
     case RsCollectionErrorCode::INVALID_ROOT_NODE:             return QObject::tr("Invalid root node. RsCollection node was expected.");
@@ -214,7 +214,7 @@ RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error
     if(!recursParseXml(xml_doc,root,0))
         error = RsCollectionErrorCode::XML_PARSING_ERROR;
     else
-        error = RsCollectionErrorCode::NO_ERROR;
+        error = RsCollectionErrorCode::COLLECTION_NO_ERROR;
 }
 
 // check that the file is a valid rscollection file, and not a lol bomb or some shit like this
@@ -222,7 +222,7 @@ RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error
 bool RsCollection::checkFile(const QString& fileName, RsCollectionErrorCode& error)
 {
     QFile file(fileName);
-    error = RsCollectionErrorCode::NO_ERROR;
+    error = RsCollectionErrorCode::COLLECTION_NO_ERROR;
 
     if (!file.open(QIODevice::ReadOnly))
     {
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index 7be48804a..f68423f85 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -56,12 +56,12 @@ class RsCollection
 {
 public:
     enum class RsCollectionErrorCode:uint8_t {
-        NO_ERROR                      = 0x00,
+        COLLECTION_NO_ERROR           = 0x00,
         UNKNOWN_ERROR                 = 0x01,
         FILE_READ_ERROR               = 0x02,
         FILE_CONTAINS_HARMFUL_STRINGS = 0x03,
         INVALID_ROOT_NODE             = 0x04,
-        XML_PARSING_ERROR             = 0x05,
+        XML_PARSING_ERROR             = 0x05
     };
 
     RsCollection();
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 66a6c6d8c..b71616678 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -130,7 +130,7 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsColl
     RsCollection::RsCollectionErrorCode err_code;
     mCollection = new RsCollection(collectionFileName,err_code);
 
-    if(err_code != RsCollection::RsCollectionErrorCode::NO_ERROR)
+    if(err_code != RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
     {
         QMessageBox::information(nullptr,tr("Could not load collection file"),tr("Could not load collection file"));
         close();
@@ -472,7 +472,7 @@ void RsCollectionDialog::changeFileName()
 
             RsCollection qddOldFileCollection(fileName,err);
 
-            if(err != RsCollection::RsCollectionErrorCode::NO_ERROR)
+            if(err != RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
             {
                 mCollectionModel->preMods();
                 mCollection->merge_in(qddOldFileCollection.fileTree());

From 83b433a2e235ef33170061cc994bc4b3717fe5a6 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Thu, 4 Apr 2024 00:57:52 +0200
Subject: [PATCH 489/503] Revert changes in libbitdht of "Merge pull request
 #2852 from thunder2/fix_rscollection"

---
 libbitdht | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libbitdht b/libbitdht
index a5a0f472d..2ddc86fb5 160000
--- a/libbitdht
+++ b/libbitdht
@@ -1 +1 @@
-Subproject commit a5a0f472d39c03d7442208b0d1c07cb429188341
+Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4

From a60f3f44f773d9093c123b65f5377207fa8478d7 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Tue, 16 Apr 2024 19:25:04 +0200
Subject: [PATCH 490/503] FeedReader: Don't add items as new item when pubDate
 less than storage time

---
 .../FeedReader/services/p3FeedReaderThread.cc | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 845b5c82b..110d051cf 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -848,6 +848,22 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
 
 	RsFeedReaderErrorState result = RS_FEED_ERRORSTATE_OK;
 
+	time_t minimumPubDate = 0;
+	if (feed.lastUpdate == 0) {
+		// Get all items on first scan
+	} else {
+		// Get storage time
+		uint32_t storageTime = 0;
+		if (feed.flag & RS_FEED_FLAG_STANDARD_STORAGE_TIME) {
+			storageTime = mFeedReader->getStandardStorageTime();
+		} else {
+			storageTime = feed.storageTime;
+		}
+		if (storageTime > 0) {
+			minimumPubDate = time(NULL) - storageTime;
+		}
+	}
+
 	XMLWrapper xml;
 	if (xml.readXML(feed.content.c_str())) {
 		xmlNodePtr root = xml.getRootElement();
@@ -1006,6 +1022,13 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
 							}
 						}
 
+						if (minimumPubDate) {
+							if (item->pubDate < minimumPubDate) {
+								// pubDate is less than storage time, don't add as new item
+								continue;
+							}
+						}
+
 						entries.push_back(item);
 					}
 				} else {
@@ -1097,7 +1120,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 	std::string url;
 	if (feed.flag & RS_FEED_FLAG_SAVE_COMPLETE_PAGE) {
 #ifdef FEEDREADER_DEBUG
-		std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") download page " << msg->link << std::endl;
+		std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") download page " << msg->link << std::endl;
 #endif
 		std::string content;
 		CURLWrapper CURL(proxy);
@@ -1134,7 +1157,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 
 		if (result != RS_FEED_ERRORSTATE_OK) {
 #ifdef FEEDREADER_DEBUG
-			std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot download page, CURLCode = " << code << ", error = " << errorString << std::endl;
+			std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot download page, CURLCode = " << code << ", error = " << errorString << std::endl;
 #endif
 			return result;
 		}
@@ -1280,7 +1303,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 										if (!src.empty()) {
 											/* download image */
 #ifdef FEEDREADER_DEBUG
-											std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") download image " << src << std::endl;
+											std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") download image " << src << std::endl;
 #endif
 											std::vector<unsigned char> data;
 											CURLWrapper CURL(proxy);
@@ -1348,7 +1371,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 								if (!html.saveHTML(msg->postedDescriptionWithoutFirstImage)) {
 									errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-									std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
+									std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
 									std::cerr << "  Error: " << errorString << std::endl;
 #endif
 									result = RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR;
@@ -1357,7 +1380,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 						} else {
 							errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-							std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
+							std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
 							std::cerr << "  Error: " << errorString << std::endl;
 #endif
 							result = RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR;
@@ -1366,14 +1389,14 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 				}
 			} else {
 #ifdef FEEDREADER_DEBUG
-				std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") no root element" << std::endl;
+				std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") no root element" << std::endl;
 #endif
 				result = RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR;
 			}
 		} else {
 			errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-			std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot read html" << std::endl;
+			std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot read html" << std::endl;
 			std::cerr << "  Error: " << errorString << std::endl;
 #endif
 			result = RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR;

From 7dfd6de15f8913f4721497d8635d9380ceef4cf4 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Fri, 7 Jun 2024 11:26:35 +0200
Subject: [PATCH 491/503] fixed bug showing peers offline when status service
 is remotely disabled

---
 retroshare-gui/src/gui/common/FriendListModel.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index cc6fd9c43..6f01b72d4 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -585,13 +585,10 @@ QVariant RsFriendListModel::onlineRole(const EntryIndex& e, int /*col*/) const
 		{
 			const HierarchicalNodeInformation *node = getNodeInfo(e);
 
-			if(node)
-			{
-				StatusInfo status;
-				rsStatus->getStatus(node->node_info.id, status);
-
-				return QVariant(status.status);
-			}
+            if(node && bool(node->node_info.state & RS_PEER_STATE_CONNECTED))
+                return QVariant(RS_STATUS_ONLINE);
+            else
+                return QVariant(RS_STATUS_OFFLINE);
 		}
 	}
 	return QVariant(RS_STATUS_OFFLINE);

From 1b4886715df63606bdeb5d9d22c246945f3a5013 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sun, 9 Jun 2024 21:25:43 +0200
Subject: [PATCH 492/503] fixed usage of statusRole in FriendListModel

---
 .../src/gui/common/FriendListModel.cpp        | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index 6f01b72d4..7f05b8221 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -413,17 +413,28 @@ QVariant RsFriendListModel::textColorRole(const EntryIndex& fmpe,int column) con
 {
 	switch(fmpe.type)
 	{
-		case ENTRY_TYPE_GROUP: return QVariant(QBrush(mTextColorGroup));
-		case ENTRY_TYPE_PROFILE:
-		case ENTRY_TYPE_NODE:  return QVariant(QBrush(mTextColorStatus[onlineRole(fmpe,column).toInt()]));
+        case ENTRY_TYPE_GROUP: 		return QVariant(QBrush(mTextColorGroup));
+        case ENTRY_TYPE_PROFILE:	return QVariant(QBrush(mTextColorStatus[onlineRole(fmpe,column).toInt()]));
+        case ENTRY_TYPE_NODE:  		return QVariant(QBrush(mTextColorStatus[statusRole(fmpe,column).toInt()]));
 		default:
 		return QVariant();
 	}
 }
 
-QVariant RsFriendListModel::statusRole(const EntryIndex& /*fmpe*/,int /*column*/) const
+// statusRole returns the status (e.g. RS_STATUS_BUSY). It is used only to change the font color
+
+QVariant RsFriendListModel::statusRole(const EntryIndex& fmpe,int /*column*/) const
 {
-    return QVariant();//fmpe.mMsgStatus);
+    const HierarchicalNodeInformation *node = getNodeInfo(fmpe);
+
+    if(node)
+    {
+        StatusInfo status;
+        rsStatus->getStatus(node->node_info.id, status);
+
+        return QVariant(status.status);
+    }
+    return QVariant();
 }
 
 bool RsFriendListModel::passesFilter(const EntryIndex& e,int /*column*/) const
@@ -548,6 +559,9 @@ QVariant RsFriendListModel::sortRole(const EntryIndex& entry,int column) const
     }
 }
 
+// Only returns two values: RS_STATUS_ONLINE, or RS_STATUS_OFFLINE. This is used to decide on text font (bold)
+// and whether profiles have children or not when offline nodes are shown.
+
 QVariant RsFriendListModel::onlineRole(const EntryIndex& e, int /*col*/) const
 {
 	switch(e.type)
@@ -623,12 +637,6 @@ QVariant RsFriendListModel::fontRole(const EntryIndex& e, int col) const
 	}
 }
 
-class AutoEndel
-{
-public:
-    ~AutoEndel() { std::cerr << std::endl;}
-};
-
 QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
 {
 #ifdef DEBUG_MODEL_INDEX

From 794ec3576ccc7a9ac8d7ff2c60e0a10bf3c63101 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Thu, 13 Jun 2024 11:08:28 +0200
Subject: [PATCH 493/503] using statusRole instead of onlineRole to decide on
 node string

---
 retroshare-gui/src/gui/common/FriendListModel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index 7f05b8221..d4c5e74b6 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -755,7 +755,7 @@ QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
 						else
 						{
 							return QVariant(QString::fromUtf8(node->node_info.location.c_str())+"\n"
-						                + "(" + StatusDefs::name(onlineRole(e,col).toInt()) + ")");
+                                        + "(" + StatusDefs::name(statusRole(e,col).toInt()) + ")");
 						}
 					else
 						return QVariant(QString::fromUtf8(node->node_info.location.c_str()));

From 332939c3f52caa284d985a82a86b4d5eafc9c261 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 17 Jun 2024 22:07:18 +0200
Subject: [PATCH 494/503] Fixed status colors

---
 retroshare-gui/src/gui/qss/stylesheet/default.qss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss
index d1730bfef..e913a7143 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/default.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss
@@ -352,9 +352,9 @@ NewFriendList
 {
 	qproperty-textColorStatusOffline: black;
 	qproperty-textColorStatusAway: gray;
-	qproperty-textColorStatusBusy: gray;
+	qproperty-textColorStatusBusy: darkred;
 	qproperty-textColorStatusOnline: darkGreen;
-	qproperty-textColorStatusInactive: gray;
+	qproperty-textColorStatusInactive: #A0A040;
 	qproperty-textColorGroup: rgb(123, 123, 123);
 }
 

From 56b6b0cb5a05c8fe2a2c37d2f53c7c667826f9e6 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 24 Jun 2024 23:36:45 +0200
Subject: [PATCH 495/503] Added optional display status icon from friendslist
 context menu

---
 .../src/gui/common/FriendListModel.cpp        | 48 +++++++++++++++++--
 .../src/gui/common/FriendListModel.h          |  5 ++
 .../src/gui/common/NewFriendList.cpp          | 13 +++++
 retroshare-gui/src/gui/common/NewFriendList.h |  1 +
 .../src/gui/common/NewFriendList.ui           |  8 ++++
 5 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index d4c5e74b6..da2addfcc 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -65,7 +65,7 @@ static const uint32_t NODE_DETAILS_UPDATE_DELAY = 5;	// update each node every 5
 
 RsFriendListModel::RsFriendListModel(QObject *parent)
     : QAbstractItemModel(parent)
-    , mDisplayGroups(true), mDisplayStatusString(true)
+    , mDisplayGroups(true), mDisplayStatusString(true), mDisplayStatusIcon (false)
     , mLastInternalDataUpdate(0), mLastNodeUpdate(0)
 {
 	mFilterStrings.clear();
@@ -141,6 +141,24 @@ template<> bool RsFriendListModel::convertInternalIdToIndex<8>(quintptr ref,Entr
 	return true;
 }
 
+static QIcon createAvatar(const QPixmap &avatar, const QPixmap &overlay)
+{
+	int avatarWidth = avatar.width();
+	int avatarHeight = avatar.height();
+
+	QPixmap pixmap(avatar);
+
+	int overlaySize = (avatarWidth > avatarHeight) ? (avatarWidth/2.5) :  (avatarHeight/2.5);
+	int overlayX = avatarWidth - overlaySize;
+	int overlayY = avatarHeight - overlaySize;
+
+	QPainter painter(&pixmap);
+	painter.drawPixmap(overlayX, overlayY, overlaySize, overlaySize, overlay);
+
+	QIcon icon;
+	icon.addPixmap(pixmap);
+	return icon;
+}
 
 void RsFriendListModel::setDisplayStatusString(bool b)
 {
@@ -148,6 +166,12 @@ void RsFriendListModel::setDisplayStatusString(bool b)
 	postMods();
 }
 
+void RsFriendListModel::setDisplayStatusIcon(bool b)
+{
+	mDisplayStatusIcon = b;
+	postMods();
+}
+
 void RsFriendListModel::setDisplayGroups(bool b)
 {
     mDisplayGroups = b;
@@ -908,14 +932,23 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
         if(!isProfileExpanded(entry))
 		{
 			QPixmap sslAvatar = FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE);
+			QPixmap sslOverlayIcon;
+			sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(onlineRole(entry,col).toInt()));
+
 
         	const HierarchicalProfileInformation *hn = getProfileInfo(entry);
 
 			for(uint32_t i=0;i<hn->child_node_indices.size();++i)
 				if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar))
-					return QVariant(QIcon(sslAvatar));
+							if (mDisplayStatusIcon)
+								return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
+							else
+								return QVariant(QIcon(sslAvatar));
 
-            return QVariant(QIcon(sslAvatar));
+			if (mDisplayStatusIcon)
+				return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
+			else
+				return QVariant(QIcon(sslAvatar));
 		}
 
         return QVariant();
@@ -929,9 +962,14 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
             return QVariant();
 
 		QPixmap sslAvatar;
-		AvatarDefs::getAvatarFromSslId(RsPeerId(hn->node_info.id.toStdString()), sslAvatar);
+		QPixmap sslOverlayIcon;
+		sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(statusRole(entry,col).toInt()));
 
-        return QVariant(QIcon(sslAvatar));
+		AvatarDefs::getAvatarFromSslId(RsPeerId(hn->node_info.id.toStdString()), sslAvatar);
+		if (mDisplayStatusIcon)
+			return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
+		else
+			return QVariant(QIcon(sslAvatar));
     }
     default: return QVariant();
     }
diff --git a/retroshare-gui/src/gui/common/FriendListModel.h b/retroshare-gui/src/gui/common/FriendListModel.h
index 646159377..ea4137085 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.h
+++ b/retroshare-gui/src/gui/common/FriendListModel.h
@@ -129,6 +129,10 @@ public:
 
 	void setDisplayStatusString(bool b);
     bool getDisplayStatusString() const { return mDisplayStatusString; }
+	void setDisplayStatusIcon(bool b);
+	bool getDisplayStatusIcon() const { return mDisplayStatusIcon; }
+
+
 
     EntryType getType(const QModelIndex&) const;
 
@@ -224,6 +228,7 @@ private:
 
     bool mDisplayGroups ;
     bool mDisplayStatusString ;
+    bool mDisplayStatusIcon ;
     rstime_t mLastInternalDataUpdate;
     rstime_t mLastNodeUpdate;;
 
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index bd6faec41..838e6ed40 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -261,6 +261,7 @@ NewFriendList::NewFriendList(QWidget */*parent*/) : /* RsAutoUpdatePage(5000,par
 
     connect(ui->actionShowOfflineFriends, SIGNAL(triggered(bool)), this, SLOT(setShowUnconnected(bool)));
     connect(ui->actionShowState,          SIGNAL(triggered(bool)), this, SLOT(setShowState(bool))      );
+    connect(ui->actionShowStateIcon,      SIGNAL(triggered(bool)), this, SLOT(setShowStateIcon(bool))      );
     connect(ui->actionShowGroups,         SIGNAL(triggered(bool)), this, SLOT(setShowGroups(bool))     );
     connect(ui->actionExportFriendlist,   SIGNAL(triggered())    , this, SLOT(exportFriendlistClicked()));
     connect(ui->actionImportFriendlist,   SIGNAL(triggered())    , this, SLOT(importFriendlistClicked()));
@@ -341,10 +342,12 @@ void NewFriendList::headerContextMenuRequested(QPoint /*p*/)
 
     displayMenu.addAction(ui->actionShowOfflineFriends);
     displayMenu.addAction(ui->actionShowState);
+    displayMenu.addAction(ui->actionShowStateIcon);
     displayMenu.addAction(ui->actionShowGroups);
 
     ui->actionShowOfflineFriends->setChecked(mProxyModel->showOfflineNodes());
     ui->actionShowState->setChecked(mModel->getDisplayStatusString());
+    ui->actionShowStateIcon->setChecked(mModel->getDisplayStatusIcon());
     ui->actionShowGroups->setChecked(mModel->getDisplayGroups());
 
     QHeaderView *header = ui->peerTreeWidget->header();
@@ -505,6 +508,8 @@ void NewFriendList::processSettings(bool load)
 
         mModel->setDisplayStatusString(Settings->value("showState", mModel->getDisplayStatusString()).toBool());
         mModel->setDisplayGroups(Settings->value("showGroups", mModel->getDisplayGroups()).toBool());
+        mModel->setDisplayStatusIcon(Settings->value("showStateIcon", mModel->getDisplayStatusIcon()).toBool());
+
 
         setColumnVisible(RsFriendListModel::COLUMN_THREAD_IP,Settings->value("showIP", isColumnVisible(RsFriendListModel::COLUMN_THREAD_IP)).toBool());
         setColumnVisible(RsFriendListModel::COLUMN_THREAD_ID,Settings->value("showID", isColumnVisible(RsFriendListModel::COLUMN_THREAD_ID)).toBool());
@@ -528,6 +533,8 @@ void NewFriendList::processSettings(bool load)
         Settings->setValue("hideUnconnected", !mProxyModel->showOfflineNodes());
         Settings->setValue("showState", mModel->getDisplayStatusString());
         Settings->setValue("showGroups", mModel->getDisplayGroups());
+        Settings->setValue("showStateIcon", mModel->getDisplayStatusIcon());
+
 
         Settings->setValue("showIP",isColumnVisible(RsFriendListModel::COLUMN_THREAD_IP));
         Settings->setValue("showID",isColumnVisible(RsFriendListModel::COLUMN_THREAD_ID));
@@ -1643,6 +1650,12 @@ void NewFriendList::setShowState(bool show)
     processSettings(false);
 }
 
+void NewFriendList::setShowStateIcon(bool show)
+{
+    applyWhileKeepingTree([show,this]() { mModel->setDisplayStatusIcon(show) ; });
+    processSettings(false);
+}
+
 void NewFriendList::setShowGroups(bool show)
 {
     applyWhileKeepingTree([show,this]() { mModel->setDisplayGroups(show) ; });
diff --git a/retroshare-gui/src/gui/common/NewFriendList.h b/retroshare-gui/src/gui/common/NewFriendList.h
index 2b5cd1738..7424bcfcf 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.h
+++ b/retroshare-gui/src/gui/common/NewFriendList.h
@@ -87,6 +87,7 @@ public slots:
 	void setShowGroups(bool show);
 	void setShowUnconnected(bool hidden);
 	void setShowState(bool show);
+	void setShowStateIcon(bool show);
 	void headerContextMenuRequested(QPoint);
 	void exportFriendlistClicked();
 
diff --git a/retroshare-gui/src/gui/common/NewFriendList.ui b/retroshare-gui/src/gui/common/NewFriendList.ui
index 20ae02eb2..3ed98fe6b 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.ui
+++ b/retroshare-gui/src/gui/common/NewFriendList.ui
@@ -124,6 +124,14 @@
     <string>import your friendlist including groups</string>
    </property>
   </action>
+  <action name="actionShowStateIcon">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show status icon</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

From 19d613edcc8700381cd5106e1d2befe823f1e07c Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 25 Jun 2024 19:09:03 +0200
Subject: [PATCH 496/503] fix naming

---
 retroshare-gui/src/gui/common/NewFriendList.ui | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/common/NewFriendList.ui b/retroshare-gui/src/gui/common/NewFriendList.ui
index 3ed98fe6b..f41d88a8b 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.ui
+++ b/retroshare-gui/src/gui/common/NewFriendList.ui
@@ -129,7 +129,10 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Show status icon</string>
+    <string>Status icons</string>
+   </property>
+   <property name="toolTip">
+    <string>Show status icons</string>
    </property>
   </action>
  </widget>

From c8975bb2e9ee797e4978febd9258883065f109d4 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 1 Jul 2024 16:20:11 +0200
Subject: [PATCH 497/503] Optimized avatar loading in RsFriendListModel

---
 retroshare-gui/src/gui/common/AvatarDefs.cpp  |  4 +-
 .../src/gui/common/FriendListModel.cpp        | 39 ++++++++++---------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/retroshare-gui/src/gui/common/AvatarDefs.cpp b/retroshare-gui/src/gui/common/AvatarDefs.cpp
index ccca08707..3255501aa 100644
--- a/retroshare-gui/src/gui/common/AvatarDefs.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDefs.cpp
@@ -54,7 +54,9 @@ bool AvatarDefs::getAvatarFromSslId(const RsPeerId& sslId, QPixmap &avatar, cons
     /* get avatar */
     rsMsgs->getAvatarData(RsPeerId(sslId), data, size);
     if (size == 0) {
-        avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
+        if (!defaultImage.isEmpty()) {
+            avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
+        }
         return false;
     }
 
diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index da2addfcc..d706ac5f2 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -931,24 +931,26 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
     {
         if(!isProfileExpanded(entry))
 		{
-			QPixmap sslAvatar = FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE);
-			QPixmap sslOverlayIcon;
-			sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(onlineRole(entry,col).toInt()));
-
+			QPixmap sslAvatar;
 
         	const HierarchicalProfileInformation *hn = getProfileInfo(entry);
 
-			for(uint32_t i=0;i<hn->child_node_indices.size();++i)
-				if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar))
-							if (mDisplayStatusIcon)
-								return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
-							else
-								return QVariant(QIcon(sslAvatar));
+			for(uint32_t i=0;i<hn->child_node_indices.size();++i) {
+				if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar, "")) {
+					break;
+				}
+			}
 
-			if (mDisplayStatusIcon)
+			if (sslAvatar.isNull()) {
+				sslAvatar = FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE);
+			}
+
+			if (mDisplayStatusIcon) {
+				QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(onlineRole(entry, col).toInt()));
 				return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
-			else
-				return QVariant(QIcon(sslAvatar));
+			}
+
+            return QVariant(QIcon(sslAvatar));
 		}
 
         return QVariant();
@@ -962,14 +964,13 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
             return QVariant();
 
 		QPixmap sslAvatar;
-		QPixmap sslOverlayIcon;
-		sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(statusRole(entry,col).toInt()));
-
 		AvatarDefs::getAvatarFromSslId(RsPeerId(hn->node_info.id.toStdString()), sslAvatar);
-		if (mDisplayStatusIcon)
+		if (mDisplayStatusIcon) {
+			QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(statusRole(entry, col).toInt()));
 			return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
-		else
-			return QVariant(QIcon(sslAvatar));
+		}
+
+        return QVariant(QIcon(sslAvatar));
     }
     default: return QVariant();
     }

From 2c3b0a1c44741ff7f8d8a48d8aaf0e6aa8f3e7cf Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 1 Jul 2024 23:17:39 +0200
Subject: [PATCH 498/503] Fixed show best status icon for profile

---
 .../src/gui/common/FriendListModel.cpp        | 62 ++++++++++++++++++-
 .../src/gui/common/FriendListModel.h          |  2 +
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index d706ac5f2..7bb836c56 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -898,6 +898,61 @@ bool RsFriendListModel::getPeerOnlineStatus(const EntryIndex& e) const
     return (noded && (noded->node_info.state & RS_PEER_STATE_CONNECTED));
 }
 
+bool RsFriendListModel::getProfileStatus(const HierarchicalProfileInformation *profileInfo, uint32_t &status) const
+{
+	status = RS_STATUS_OFFLINE;
+
+	if (!profileInfo) {
+		return false;
+	}
+
+	int bestStatusIndex = 0;
+
+	/* Find the best status */
+	for (uint32_t i = 0; i < profileInfo->child_node_indices.size(); ++i) {
+		StatusInfo statusInfo;
+		rsStatus->getStatus(mLocations[profileInfo->child_node_indices[i]].node_info.id, statusInfo);
+
+		int statusIndex = 0;
+		switch (statusInfo.status) {
+		case RS_STATUS_OFFLINE:
+			statusIndex = 1;
+			break;
+
+		case RS_STATUS_INACTIVE:
+			statusIndex = 2;
+			break;
+
+		case RS_STATUS_AWAY:
+			statusIndex = 3;
+			break;
+
+		case RS_STATUS_BUSY:
+			statusIndex = 4;
+			break;
+
+		case RS_STATUS_ONLINE:
+			statusIndex = 5;
+			break;
+
+		default:
+			std::cerr << "FriendListModel: Unknown status " << statusInfo.status << std::endl;
+		}
+
+		if (bestStatusIndex == 0 || statusIndex > bestStatusIndex) {
+			/* first status or better status */
+			bestStatusIndex = statusIndex;
+			status = statusInfo.status;
+		}
+	}
+
+	if (bestStatusIndex == 0) {
+		return false;
+	}
+
+	return true;
+}
+
 QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) const
 {
     if(col > 0)
@@ -946,8 +1001,11 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
 			}
 
 			if (mDisplayStatusIcon) {
-				QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(onlineRole(entry, col).toInt()));
-				return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
+				uint32_t status;
+				if (getProfileStatus(hn, status)) {
+					QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(status));
+					return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
+				}
 			}
 
             return QVariant(QIcon(sslAvatar));
diff --git a/retroshare-gui/src/gui/common/FriendListModel.h b/retroshare-gui/src/gui/common/FriendListModel.h
index ea4137085..c5a8e9705 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.h
+++ b/retroshare-gui/src/gui/common/FriendListModel.h
@@ -223,6 +223,8 @@ private:
 
 	uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings);
 
+	bool getProfileStatus(const HierarchicalProfileInformation *profileInfo, uint32_t &status) const;
+
     QStringList mFilterStrings;
     FilterType  mFilterType;
 

From b5b2e77a7e54e5162beeb1673f4293687a89ae78 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Tue, 2 Jul 2024 23:52:31 +0200
Subject: [PATCH 499/503] set default idle color which has better contrast

---
 retroshare-gui/src/gui/qss/stylesheet/default.qss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss
index e913a7143..defcc82f8 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/default.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss
@@ -354,7 +354,7 @@ NewFriendList
 	qproperty-textColorStatusAway: gray;
 	qproperty-textColorStatusBusy: darkred;
 	qproperty-textColorStatusOnline: darkGreen;
-	qproperty-textColorStatusInactive: #A0A040;
+	qproperty-textColorStatusInactive: orange;
 	qproperty-textColorGroup: rgb(123, 123, 123);
 }
 

From 874748e7da9506806c50ddd98e2e92dfbba52411 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 3 Jul 2024 13:59:50 +0200
Subject: [PATCH 500/503] Use avatar for profile in RsFriendListModel of best
 node

---
 .../src/gui/common/FriendListModel.cpp        | 55 +++++++++++++------
 .../src/gui/common/FriendListModel.h          |  2 +-
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index 7bb836c56..35cefa7ac 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -898,20 +898,24 @@ bool RsFriendListModel::getPeerOnlineStatus(const EntryIndex& e) const
     return (noded && (noded->node_info.state & RS_PEER_STATE_CONNECTED));
 }
 
-bool RsFriendListModel::getProfileStatus(const HierarchicalProfileInformation *profileInfo, uint32_t &status) const
+const RsFriendListModel::HierarchicalNodeInformation *RsFriendListModel::getBestNodeInformation(const HierarchicalProfileInformation *profileInfo, uint32_t *status) const
 {
-	status = RS_STATUS_OFFLINE;
-
-	if (!profileInfo) {
-		return false;
+	if (status) {
+		*status = RS_STATUS_OFFLINE;
 	}
 
+	if (!profileInfo) {
+		return NULL;
+	}
+
+	const RsFriendListModel::HierarchicalNodeInformation *bestNodeInformation = NULL;
 	int bestStatusIndex = 0;
 
 	/* Find the best status */
 	for (uint32_t i = 0; i < profileInfo->child_node_indices.size(); ++i) {
+		const RsFriendListModel::HierarchicalNodeInformation &nodeInformation = mLocations[profileInfo->child_node_indices[i]];
 		StatusInfo statusInfo;
-		rsStatus->getStatus(mLocations[profileInfo->child_node_indices[i]].node_info.id, statusInfo);
+		rsStatus->getStatus(nodeInformation.node_info.id, statusInfo);
 
 		int statusIndex = 0;
 		switch (statusInfo.status) {
@@ -942,15 +946,19 @@ bool RsFriendListModel::getProfileStatus(const HierarchicalProfileInformation *p
 		if (bestStatusIndex == 0 || statusIndex > bestStatusIndex) {
 			/* first status or better status */
 			bestStatusIndex = statusIndex;
-			status = statusInfo.status;
+			bestNodeInformation = &nodeInformation;
+
+			if (status) {
+				*status = statusInfo.status;
+			}
 		}
 	}
 
 	if (bestStatusIndex == 0) {
-		return false;
+		return NULL;
 	}
 
-	return true;
+	return bestNodeInformation;
 }
 
 QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) const
@@ -987,22 +995,37 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
         if(!isProfileExpanded(entry))
 		{
 			QPixmap sslAvatar;
-
+			bool foundAvatar = false;
         	const HierarchicalProfileInformation *hn = getProfileInfo(entry);
+			uint32_t status = RS_STATUS_OFFLINE;
+			const HierarchicalNodeInformation *bestNodeInformation = NULL;
 
-			for(uint32_t i=0;i<hn->child_node_indices.size();++i) {
-				if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar, "")) {
-					break;
+			if (mDisplayStatusIcon) {
+				bestNodeInformation = getBestNodeInformation(hn, &status);
+				if (bestNodeInformation) {
+					if (AvatarDefs::getAvatarFromSslId(RsPeerId(bestNodeInformation->node_info.id.toStdString()), sslAvatar, "")) {
+						/* Use avatar from best node */
+						foundAvatar = true;
+					}
 				}
 			}
 
-			if (sslAvatar.isNull()) {
+			if (!foundAvatar) {
+				/* Use first available avatar */
+				for(uint32_t i=0;i<hn->child_node_indices.size();++i) {
+					if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar, "")) {
+						foundAvatar = true;
+						break;
+					}
+				}
+			}
+
+			if (!foundAvatar || sslAvatar.isNull()) {
 				sslAvatar = FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE);
 			}
 
 			if (mDisplayStatusIcon) {
-				uint32_t status;
-				if (getProfileStatus(hn, status)) {
+				if (bestNodeInformation) {
 					QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(status));
 					return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
 				}
diff --git a/retroshare-gui/src/gui/common/FriendListModel.h b/retroshare-gui/src/gui/common/FriendListModel.h
index c5a8e9705..e19a84f04 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.h
+++ b/retroshare-gui/src/gui/common/FriendListModel.h
@@ -223,7 +223,7 @@ private:
 
 	uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings);
 
-	bool getProfileStatus(const HierarchicalProfileInformation *profileInfo, uint32_t &status) const;
+	const HierarchicalNodeInformation *getBestNodeInformation(const HierarchicalProfileInformation *profileInfo, uint32_t *status = NULL) const;
 
     QStringList mFilterStrings;
     FilterType  mFilterType;

From d72e46cfda6f669c2416479db5bb375f77e1785e Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Wed, 3 Jul 2024 14:40:51 +0200
Subject: [PATCH 501/503] Update NewFriendList on avatar and status change

---
 retroshare-gui/src/gui/common/NewFriendList.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 838e6ed40..6acb8da9a 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -54,6 +54,7 @@
 #include "gui/chat/ChatUserNotify.h"
 #include "gui/connect/ConnectProgressDialog.h"
 #include "gui/common/ElidedLabel.h"
+#include "gui/notifyqt.h"
 
 #include "NewFriendList.h"
 #include "ui_NewFriendList.h"
@@ -202,6 +203,9 @@ NewFriendList::NewFriendList(QWidget */*parent*/) : /* RsAutoUpdatePage(5000,par
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e) { handleEvent(e); }, mEventHandlerId_peer, RsEventType::PEER_CONNECTION );
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e) { handleEvent(e); }, mEventHandlerId_gssp, RsEventType::GOSSIP_DISCOVERY );
 
+    connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(QString)), this, SLOT(forceUpdateDisplay()));
+    connect(NotifyQt::getInstance(), SIGNAL(peerStatusChanged(QString,int)), this, SLOT(forceUpdateDisplay()));
+
     mModel = new RsFriendListModel(ui->peerTreeWidget);
 	mProxyModel = new FriendListSortFilterProxyModel(ui->peerTreeWidget->header(),this);
 

From bb4b8f0bc5a9a1f9fc1867f6857960beb84f1490 Mon Sep 17 00:00:00 2001
From: David Gerber <dg@zapek.com>
Date: Sun, 1 Sep 2024 22:51:22 +0200
Subject: [PATCH 502/503] Fix image data URI

Make JPEG images use the image/jpeg mimetype instead of the wrong image/png one.
---
 retroshare-gui/src/util/imageutil.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index 612387724..690872bdb 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -274,7 +274,9 @@ bool ImageUtil::optimizeSizeHtml(QString &html, const QImage& original, QImage &
     if(optimizeSizeBytes(bytearray, original, optimized,has_transparency?"PNG":"JPG",maxPixels, maxBytes))
 	{
 		QByteArray encodedByteArray = bytearray.toBase64();
-		html = "<img src=\"data:image/png;base64,";
+		html = "<img src=\"data:image/";
+		html.append(has_transparency ? "png" : "jpeg");
+		html.append(";base64,");
 		html.append(encodedByteArray);
 		html.append("\">");
 		return true;

From 9fefbb3b13a93616756502c6455a401524b3321c Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:00:28 +0100
Subject: [PATCH 503/503] Improved People view

* Improved People View
* Update translations
---
 retroshare-gui/src/gui/Identity/IdDialog.cpp |    8 +-
 retroshare-gui/src/gui/Identity/IdDialog.ui  | 1024 ++++++++----------
 retroshare-gui/src/lang/retroshare_es.qm     |  Bin 701163 -> 558472 bytes
 retroshare-gui/src/lang/retroshare_es.ts     |   26 +-
 retroshare-gui/src/lang/retroshare_ru.qm     |  Bin 711024 -> 569509 bytes
 retroshare-gui/src/lang/retroshare_ru.ts     |  158 +--
 6 files changed, 573 insertions(+), 643 deletions(-)

diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 5397f6300..4793ff613 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -479,9 +479,9 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
 
 void IdDialog::clearPerson()
 {
-	QFontMetricsF f(ui->avLabel_Person->font()) ;
+	//QFontMetricsF f(ui->avLabel_Person->font()) ;
 
-	ui->avLabel_Person->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/people.png").scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+	//ui->avLabel_Person->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/people.png").scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
 	ui->headerTextLabel_Person->setText(tr("People"));
 
 	ui->info_Frame_Invite->hide();
@@ -1701,8 +1701,8 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
 
 	//ui->avLabel_Person->setPixmap(pixmap);
 	//ui->avatarLabel->setPixmap(pixmap);
-	QFontMetricsF f(ui->avLabel_Person->font()) ;
-	ui->avLabel_Person->setPixmap(pixmap.scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+	//QFontMetricsF f(ui->avLabel_Person->font()) ;
+	//ui->avLabel_Person->setPixmap(pixmap.scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
 
 	ui->avatarLabel->setPixmap(pixmap.scaled(ui->inviteButton->width(),ui->inviteButton->width(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
 	ui->avatarLabel->setScaledContents(true);
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index 7687c321d..1c504f8fc 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>800</width>
+    <width>878</width>
     <height>584</height>
    </rect>
   </property>
@@ -301,209 +301,349 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>466</width>
-             <height>738</height>
+             <width>505</width>
+             <height>716</height>
             </rect>
            </property>
-           <layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">
-            <item>
-             <widget class="QFrame" name="headerBFramePerson">
+           <layout class="QGridLayout" name="gridLayout_3">
+            <item row="1" column="0">
+             <layout class="QVBoxLayout" name="verticalLayout">
+              <property name="spacing">
+               <number>0</number>
+              </property>
+              <item>
+               <layout class="QGridLayout" name="gridLayout_2">
+                <item row="1" column="0">
+                 <widget class="QLabel" name="avatarLabel">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="minimumSize">
+                   <size>
+                    <width>128</width>
+                    <height>128</height>
+                   </size>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>128</width>
+                    <height>128</height>
+                   </size>
+                  </property>
+                  <property name="frameShape">
+                   <enum>QFrame::Box</enum>
+                  </property>
+                  <property name="frameShadow">
+                   <enum>QFrame::Sunken</enum>
+                  </property>
+                  <property name="text">
+                   <string extracomment="Click here to change your avatar">Your Avatar</string>
+                  </property>
+                  <property name="scaledContents">
+                   <bool>true</bool>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="0">
+                 <widget class="QPushButton" name="editButton">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="text">
+                   <string>Edit Identity</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="2" column="0">
+                 <widget class="QPushButton" name="inviteButton">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="text">
+                   <string>Send Invite</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="avatarOpinionHLayout">
+                <property name="spacing">
+                 <number>6</number>
+                </property>
+                <property name="topMargin">
+                 <number>2</number>
+                </property>
+                <item>
+                 <widget class="QLabel" name="label_PosIcon">
+                  <property name="maximumSize">
+                   <size>
+                    <width>34</width>
+                    <height>34</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string/>
+                  </property>
+                  <property name="pixmap">
+                   <pixmap resource="../icons.qrc">:/icons/png/thumbs-up.png</pixmap>
+                  </property>
+                  <property name="scaledContents">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="label_positive">
+                  <property name="font">
+                   <font>
+                    <pointsize>16</pointsize>
+                   </font>
+                  </property>
+                  <property name="toolTip">
+                   <string>Positive votes</string>
+                  </property>
+                  <property name="text">
+                   <string>0</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="Line" name="line_Opinion">
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="label_NegIcon">
+                  <property name="maximumSize">
+                   <size>
+                    <width>34</width>
+                    <height>34</height>
+                   </size>
+                  </property>
+                  <property name="text">
+                   <string/>
+                  </property>
+                  <property name="pixmap">
+                   <pixmap resource="../icons.qrc">:/icons/png/thumbs-down.png</pixmap>
+                  </property>
+                  <property name="scaledContents">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="label_negative">
+                  <property name="font">
+                   <font>
+                    <pointsize>16</pointsize>
+                   </font>
+                  </property>
+                  <property name="toolTip">
+                   <string>Negative votes</string>
+                  </property>
+                  <property name="text">
+                   <string>0</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <spacer name="avatarVSpacer">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>118</width>
+                  <height>17</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+            <item row="2" column="0" colspan="2">
+             <widget class="QFrame" name="info_Frame_Invite">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="palette">
+               <palette>
+                <active>
+                 <colorrole role="WindowText">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>0</red>
+                    <green>0</green>
+                    <blue>0</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Base">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>255</red>
+                    <green>255</green>
+                    <blue>255</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Window">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>255</red>
+                    <green>255</green>
+                    <blue>178</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                </active>
+                <inactive>
+                 <colorrole role="WindowText">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>0</red>
+                    <green>0</green>
+                    <blue>0</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Base">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>255</red>
+                    <green>255</green>
+                    <blue>255</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Window">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>255</red>
+                    <green>255</green>
+                    <blue>178</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                </inactive>
+                <disabled>
+                 <colorrole role="WindowText">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>154</red>
+                    <green>154</green>
+                    <blue>154</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Base">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>255</red>
+                    <green>255</green>
+                    <blue>178</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                 <colorrole role="Window">
+                  <brush brushstyle="SolidPattern">
+                   <color alpha="255">
+                    <red>255</red>
+                    <green>255</green>
+                    <blue>178</blue>
+                   </color>
+                  </brush>
+                 </colorrole>
+                </disabled>
+               </palette>
+              </property>
+              <property name="autoFillBackground">
+               <bool>true</bool>
+              </property>
+              <property name="styleSheet">
+               <string notr="true"/>
+              </property>
               <property name="frameShape">
-               <enum>QFrame::StyledPanel</enum>
+               <enum>QFrame::Box</enum>
               </property>
-              <property name="frameShadow">
-               <enum>QFrame::Raised</enum>
-              </property>
-              <layout class="QGridLayout" name="headerBFramePersonGLayout">
-               <property name="horizontalSpacing">
-                <number>12</number>
+              <layout class="QHBoxLayout" name="info_Frame_Invite_HL">
+               <property name="leftMargin">
+                <number>6</number>
                </property>
-               <item row="0" column="3">
-                <layout class="QVBoxLayout" name="headerFramePersonVLayout">
-                 <item>
-                  <widget class="ElidedLabel" name="headerTextLabel_Person">
-                   <property name="font">
-                    <font>
-                     <pointsize>22</pointsize>
-                    </font>
-                   </property>
-                   <property name="text">
-                    <string>People</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QFrame" name="info_Frame_Invite">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="palette">
-                    <palette>
-                     <active>
-                      <colorrole role="WindowText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>0</red>
-                         <green>0</green>
-                         <blue>0</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Base">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Window">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>178</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                     </active>
-                     <inactive>
-                      <colorrole role="WindowText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>0</red>
-                         <green>0</green>
-                         <blue>0</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Base">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>255</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Window">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>178</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                     </inactive>
-                     <disabled>
-                      <colorrole role="WindowText">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>154</red>
-                         <green>154</green>
-                         <blue>154</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Base">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>178</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                      <colorrole role="Window">
-                       <brush brushstyle="SolidPattern">
-                        <color alpha="255">
-                         <red>255</red>
-                         <green>255</green>
-                         <blue>178</blue>
-                        </color>
-                       </brush>
-                      </colorrole>
-                     </disabled>
-                    </palette>
-                   </property>
-                   <property name="autoFillBackground">
-                    <bool>true</bool>
-                   </property>
-                   <property name="styleSheet">
-                    <string notr="true"/>
-                   </property>
-                   <property name="frameShape">
-                    <enum>QFrame::Box</enum>
-                   </property>
-                   <layout class="QHBoxLayout" name="info_Frame_Invite_HL">
-                    <property name="leftMargin">
-                     <number>6</number>
-                    </property>
-                    <property name="topMargin">
-                     <number>6</number>
-                    </property>
-                    <property name="rightMargin">
-                     <number>6</number>
-                    </property>
-                    <property name="bottomMargin">
-                     <number>6</number>
-                    </property>
-                    <item>
-                     <widget class="QLabel" name="infoPixmap_Invite">
-                      <property name="maximumSize">
-                       <size>
-                        <width>16</width>
-                        <height>16</height>
-                       </size>
-                      </property>
-                      <property name="text">
-                       <string/>
-                      </property>
-                      <property name="pixmap">
-                       <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
-                      </property>
-                      <property name="alignment">
-                       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QLabel" name="infoLabel_Invite">
-                      <property name="text">
-                       <string notr="true">Invite messages stay into your Outbox until an acknowledgement of receipt has been received.</string>
-                      </property>
-                      <property name="wordWrap">
-                       <bool>true</bool>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QToolButton" name="closeInfoFrameButton_Invite">
-                      <property name="maximumSize">
-                       <size>
-                        <width>16</width>
-                        <height>16</height>
-                       </size>
-                      </property>
-                      <property name="focusPolicy">
-                       <enum>Qt::NoFocus</enum>
-                      </property>
-                      <property name="toolTip">
-                       <string>Close</string>
-                      </property>
-                      <property name="styleSheet">
-                       <string notr="true">QToolButton
+               <property name="topMargin">
+                <number>6</number>
+               </property>
+               <property name="rightMargin">
+                <number>6</number>
+               </property>
+               <property name="bottomMargin">
+                <number>6</number>
+               </property>
+               <item>
+                <widget class="QLabel" name="infoPixmap_Invite">
+                 <property name="maximumSize">
+                  <size>
+                   <width>16</width>
+                   <height>16</height>
+                  </size>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="pixmap">
+                  <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
+                 </property>
+                 <property name="alignment">
+                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="infoLabel_Invite">
+                 <property name="text">
+                  <string notr="true">Invite messages stay into your Outbox until an acknowledgement of receipt has been received.</string>
+                 </property>
+                 <property name="wordWrap">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QToolButton" name="closeInfoFrameButton_Invite">
+                 <property name="maximumSize">
+                  <size>
+                   <width>16</width>
+                   <height>16</height>
+                  </size>
+                 </property>
+                 <property name="focusPolicy">
+                  <enum>Qt::NoFocus</enum>
+                 </property>
+                 <property name="toolTip">
+                  <string>Close</string>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true">QToolButton
 {
  border-image: url(:/images/closenormal.png) 
 }
@@ -516,44 +656,8 @@ border-image: url(:/images/closehover.png)
 QToolButton:pressed  {
 border-image: url(:/images/closepressed.png) 
 }</string>
-                      </property>
-                      <property name="autoRaise">
-                       <bool>true</bool>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-               <item row="0" column="0" rowspan="2">
-                <widget class="QLabel" name="avLabel_Person">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
                  </property>
-                 <property name="minimumSize">
-                  <size>
-                   <width>64</width>
-                   <height>64</height>
-                  </size>
-                 </property>
-                 <property name="maximumSize">
-                  <size>
-                   <width>1000</width>
-                   <height>1000</height>
-                  </size>
-                 </property>
-                 <property name="styleSheet">
-                  <string notr="true"/>
-                 </property>
-                 <property name="text">
-                  <string/>
-                 </property>
-                 <property name="scaledContents">
+                 <property name="autoRaise">
                   <bool>true</bool>
                  </property>
                 </widget>
@@ -561,8 +665,39 @@ border-image: url(:/images/closepressed.png)
               </layout>
              </widget>
             </item>
-            <item>
+            <item row="3" column="0" colspan="2">
+             <widget class="QGroupBox" name="usageStatisticsGBox">
+              <property name="title">
+               <string>Usage statistics</string>
+              </property>
+              <layout class="QHBoxLayout" name="usageStatisticsGBoxHLayout">
+               <item>
+                <widget class="RSTextBrowser" name="usageStatistics_TB"/>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <spacer name="scrollAreaWidgetContentsVSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="1" column="1">
              <widget class="QGroupBox" name="detailsGroupBox">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="minimumSize">
                <size>
                 <width>0</width>
@@ -573,32 +708,8 @@ border-image: url(:/images/closepressed.png)
                <string>Identity info</string>
               </property>
               <layout class="QGridLayout" name="gridLayout">
-               <item row="13" column="0">
-                <widget class="QLabel" name="neighborNodesOpinion_LB">
-                 <property name="text">
-                  <string>Friend votes:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="9" column="0" colspan="2">
-                <widget class="Line" name="line_IdInfo">
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
-                 </property>
-                </widget>
-               </item>
-               <item row="4" column="1">
-                <widget class="QLineEdit" name="lineEdit_GpgName">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QLineEdit" name="lineEdit_KeyId">
+               <item row="3" column="1">
+                <widget class="QLineEdit" name="lineEdit_GpgId">
                  <property name="enabled">
                   <bool>true</bool>
                  </property>
@@ -614,7 +725,31 @@ border-image: url(:/images/closepressed.png)
                  </property>
                 </widget>
                </item>
-               <item row="12" column="1">
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_Nickname">
+                 <property name="text">
+                  <string>Identity name :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="0">
+                <widget class="QLabel" name="label_GpgName">
+                 <property name="text">
+                  <string>Owner node name :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QLineEdit" name="lineEdit_Nickname">
+                 <property name="enabled">
+                  <bool>true</bool>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="10" column="1">
                 <widget class="QCheckBox" name="autoBanIdentities_CB">
                  <property name="toolTip">
                   <string>Auto-Ban all identities signed by the same node</string>
@@ -631,44 +766,28 @@ border-image: url(:/images/closepressed.png)
                  </property>
                 </widget>
                </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="lineEdit_Nickname">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="3" column="1">
-                <widget class="QLineEdit" name="lineEdit_GpgId">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="14" column="1">
-                <widget class="QLineEdit" name="overallOpinion_TF">
-                 <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends'.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="10" column="0" rowspan="2">
+               <item row="8" column="0" rowspan="2">
                 <widget class="QLabel" name="label_YourOpinion">
                  <property name="text">
                   <string>Your opinion:</string>
                  </property>
                 </widget>
                </item>
-               <item row="14" column="0">
+               <item row="2" column="1">
+                <widget class="QLineEdit" name="lineEdit_Type">
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="1">
+                <widget class="QLineEdit" name="lineEdit_LastUsed">
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="12" column="0">
                 <widget class="QLabel" name="overallOpinion_LB">
                  <property name="font">
                   <font>
@@ -688,21 +807,21 @@ border-image: url(:/images/closepressed.png)
                  </property>
                 </widget>
                </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_Nickname">
+               <item row="3" column="0">
+                <widget class="QLabel" name="label_GpgId">
                  <property name="text">
-                  <string>Identity name :</string>
+                  <string>Owner node ID :</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_KeyId">
+               <item row="10" column="0">
+                <widget class="QLabel" name="banoption_label">
                  <property name="text">
-                  <string>Identity ID :</string>
+                  <string>Ban-option:</string>
                  </property>
                 </widget>
                </item>
-               <item row="13" column="1">
+               <item row="11" column="1">
                 <widget class="QLineEdit" name="neighborNodesOpinion_TF">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -712,28 +831,7 @@ border-image: url(:/images/closepressed.png)
                  </property>
                 </widget>
                </item>
-               <item row="2" column="1">
-                <widget class="QLineEdit" name="lineEdit_Type">
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="2" column="0">
-                <widget class="QLabel" name="label_Type">
-                 <property name="text">
-                  <string>Type:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="6" column="1">
-                <widget class="QLineEdit" name="lineEdit_LastUsed">
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="15" column="0" colspan="2">
+               <item row="13" column="0" colspan="2">
                 <spacer name="verticalSpacer">
                  <property name="orientation">
                   <enum>Qt::Vertical</enum>
@@ -746,28 +844,38 @@ border-image: url(:/images/closepressed.png)
                  </property>
                 </spacer>
                </item>
-               <item row="3" column="0">
-                <widget class="QLabel" name="label_GpgId">
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_KeyId">
                  <property name="text">
-                  <string>Owner node ID :</string>
+                  <string>Identity ID :</string>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="0">
-                <widget class="QLabel" name="label_GpgName">
-                 <property name="text">
-                  <string>Owner node name :</string>
+               <item row="7" column="0" colspan="2">
+                <widget class="Line" name="line_IdInfo">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="0">
-                <widget class="QLabel" name="banoption_label">
-                 <property name="text">
-                  <string>Ban-option:</string>
+               <item row="1" column="1">
+                <widget class="QLineEdit" name="lineEdit_KeyId">
+                 <property name="enabled">
+                  <bool>true</bool>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="1" rowspan="2">
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_Type">
+                 <property name="text">
+                  <string>Type:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="8" column="1" rowspan="2">
                 <widget class="RSComboBox" name="ownOpinion_CB">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend's positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -807,230 +915,52 @@ border-image: url(:/images/closepressed.png)
                  </item>
                 </widget>
                </item>
-               <item row="0" column="2" rowspan="15">
-                <layout class="QVBoxLayout" name="verticalLayout">
-                 <property name="spacing">
-                  <number>0</number>
+               <item row="4" column="1">
+                <widget class="QLineEdit" name="lineEdit_GpgName">
+                 <property name="enabled">
+                  <bool>true</bool>
                  </property>
-                 <item>
-                  <layout class="QGridLayout" name="gridLayout_2">
-                   <item row="0" column="1">
-                    <widget class="QLabel" name="avatarLabel">
-                     <property name="sizePolicy">
-                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
-                     </property>
-                     <property name="minimumSize">
-                      <size>
-                       <width>128</width>
-                       <height>128</height>
-                      </size>
-                     </property>
-                     <property name="maximumSize">
-                      <size>
-                       <width>128</width>
-                       <height>128</height>
-                      </size>
-                     </property>
-                     <property name="frameShape">
-                      <enum>QFrame::Box</enum>
-                     </property>
-                     <property name="frameShadow">
-                      <enum>QFrame::Sunken</enum>
-                     </property>
-                     <property name="text">
-                      <string extracomment="Click here to change your avatar">Your Avatar</string>
-                     </property>
-                     <property name="scaledContents">
-                      <bool>true</bool>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="2" column="1">
-                    <widget class="QPushButton" name="editButton">
-                     <property name="text">
-                      <string>Edit Identity</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="1">
-                    <widget class="QPushButton" name="inviteButton">
-                     <property name="text">
-                      <string>Send Invite</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="0" column="2" rowspan="3">
-                    <spacer name="horizontalSpacer">
-                     <property name="orientation">
-                      <enum>Qt::Horizontal</enum>
-                     </property>
-                     <property name="sizeType">
-                      <enum>QSizePolicy::Minimum</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>6</width>
-                       <height>128</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item row="0" column="0" rowspan="3">
-                    <spacer name="horizontalSpacer_2">
-                     <property name="orientation">
-                      <enum>Qt::Horizontal</enum>
-                     </property>
-                     <property name="sizeType">
-                      <enum>QSizePolicy::Minimum</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>6</width>
-                       <height>128</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                  </layout>
-                 </item>
-                 <item>
-                  <layout class="QHBoxLayout" name="avatarOpinionHLayout">
-                   <property name="spacing">
-                    <number>6</number>
-                   </property>
-                   <property name="topMargin">
-                    <number>2</number>
-                   </property>
-                   <item>
-                    <widget class="QLabel" name="label_PosIcon">
-                     <property name="maximumSize">
-                      <size>
-                       <width>34</width>
-                       <height>34</height>
-                      </size>
-                     </property>
-                     <property name="text">
-                      <string/>
-                     </property>
-                     <property name="pixmap">
-                      <pixmap resource="../icons.qrc">:/icons/png/thumbs-up.png</pixmap>
-                     </property>
-                     <property name="scaledContents">
-                      <bool>true</bool>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QLabel" name="label_positive">
-                     <property name="font">
-                      <font>
-                       <pointsize>16</pointsize>
-                      </font>
-                     </property>
-                     <property name="toolTip">
-                      <string>Positive votes</string>
-                     </property>
-                     <property name="text">
-                      <string>0</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="Line" name="line_Opinion">
-                     <property name="orientation">
-                      <enum>Qt::Vertical</enum>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QLabel" name="label_NegIcon">
-                     <property name="maximumSize">
-                      <size>
-                       <width>34</width>
-                       <height>34</height>
-                      </size>
-                     </property>
-                     <property name="text">
-                      <string/>
-                     </property>
-                     <property name="pixmap">
-                      <pixmap resource="../icons.qrc">:/icons/png/thumbs-down.png</pixmap>
-                     </property>
-                     <property name="scaledContents">
-                      <bool>true</bool>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QLabel" name="label_negative">
-                     <property name="font">
-                      <font>
-                       <pointsize>16</pointsize>
-                      </font>
-                     </property>
-                     <property name="toolTip">
-                      <string>Negative votes</string>
-                     </property>
-                     <property name="text">
-                      <string>0</string>
-                     </property>
-                    </widget>
-                   </item>
-                  </layout>
-                 </item>
-                 <item>
-                  <spacer name="avatarVSpacer">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>118</width>
-                     <height>17</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                </layout>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="12" column="1">
+                <widget class="QLineEdit" name="overallOpinion_TF">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends'.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="11" column="0">
+                <widget class="QLabel" name="neighborNodesOpinion_LB">
+                 <property name="text">
+                  <string>Friend votes:</string>
+                 </property>
+                 <property name="wordWrap">
+                  <bool>true</bool>
+                 </property>
+                </widget>
                </item>
               </layout>
              </widget>
             </item>
-            <item>
-             <widget class="QGroupBox" name="usageStatisticsGBox">
-              <property name="title">
-               <string>Usage statistics</string>
+            <item row="0" column="0" colspan="2">
+             <widget class="ElidedLabel" name="headerTextLabel_Person">
+              <property name="font">
+               <font>
+                <pointsize>22</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>People</string>
               </property>
-              <layout class="QHBoxLayout" name="usageStatisticsGBoxHLayout">
-               <item>
-                <widget class="RSTextBrowser" name="usageStatistics_TB"/>
-               </item>
-              </layout>
              </widget>
             </item>
-            <item>
-             <spacer name="scrollAreaWidgetContentsVSpacer">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>40</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
-           <zorder>detailsGroupBox</zorder>
-           <zorder>usageStatisticsGBox</zorder>
-           <zorder>headerBFramePerson</zorder>
           </widget>
          </widget>
         </item>
diff --git a/retroshare-gui/src/lang/retroshare_es.qm b/retroshare-gui/src/lang/retroshare_es.qm
index c0d639a4cfbb5fa5136c853e145bfd10bd3e4576..782b9d443bbef1e672c495e25e64406e434711e6 100644
GIT binary patch
delta 42034
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

delta 98006
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

diff --git a/retroshare-gui/src/lang/retroshare_es.ts b/retroshare-gui/src/lang/retroshare_es.ts
index dc0d23800..358668fc3 100644
--- a/retroshare-gui/src/lang/retroshare_es.ts
+++ b/retroshare-gui/src/lang/retroshare_es.ts
@@ -11022,32 +11022,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copia tu ID de RetroShare al portapapeles&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+165"/>
         <source>Add friend</source>
-        <translation type="unfinished"></translation>
+        <translation>Agregar amigo</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Recibiste una identificación de Retroshare de una amiga?</translation>
     </message>
     <message>
         <location line="+85"/>
         <source>Do you need help with Retroshare?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Necesitas ayuda con Retroshare?</translation>
     </message>
     <message>
         <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Comparte tu ID de RetroShare&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="-63"/>
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
-        <translation type="unfinished"></translation>
+        <translation>Este es tu ID de Retroshare. ¡Cópialo y compártelo con tus amigos!</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11096,7 +11096,7 @@ de código abierto, multi-sistema, privada y segura.</translation>
     <message>
         <location line="+6"/>
         <source>Copy your Retroshare ID to Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia tu ID de Retroshare al portapapeles</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -11173,7 +11173,7 @@ new short format</source>
     <message>
         <location filename="../gui/HomePage.h" line="+46"/>
         <source>Home</source>
-        <translation>Página principal</translation>
+        <translation>Casa</translation>
     </message>
 </context>
 <context>
@@ -11516,12 +11516,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-291"/>
         <source>Created on :</source>
-        <translation type="unfinished"></translation>
+        <translation>Creado el :</translation>
     </message>
     <message>
         <location line="-64"/>
         <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Perfil de prohibición automática</translation>
     </message>
     <message>
         <location line="+150"/>
@@ -11531,7 +11531,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+84"/>
         <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar identidad</translation>
     </message>
     <message>
         <location line="+151"/>
@@ -11591,12 +11591,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-407"/>
         <source>Owner node ID :</source>
-        <translation>Identificación del nodo propietario :</translation>
+        <translation>Identificación del nodo:</translation>
     </message>
     <message>
         <location line="-58"/>
         <source>Identity name :</source>
-        <translation>Nombre de la identidad :</translation>
+        <translation>Nombre de identidad:</translation>
     </message>
     <message>
         <location line="-587"/>
diff --git a/retroshare-gui/src/lang/retroshare_ru.qm b/retroshare-gui/src/lang/retroshare_ru.qm
index c60f6f4977f281c7876167170b34e6233c9ab641..cfa22ad5ca452cf7b14da014c249e0dee6cdbbb9 100644
GIT binary patch
delta 42958
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
AVgLXD

delta 102364
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
KCYHZCT*3gS>z~U2

diff --git a/retroshare-gui/src/lang/retroshare_ru.ts b/retroshare-gui/src/lang/retroshare_ru.ts
index 30239b1a6..197a77c4f 100644
--- a/retroshare-gui/src/lang/retroshare_ru.ts
+++ b/retroshare-gui/src/lang/retroshare_ru.ts
@@ -1527,12 +1527,12 @@ into the image, so as to
     <message>
         <location line="+75"/>
         <source>Redock to Main window</source>
-        <translation type="unfinished"></translation>
+        <translation>Перезакрепить в главном окне</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Undock to a new window</source>
-        <translation type="unfinished"></translation>
+        <translation>Открепить в новом окне</translation>
     </message>
 </context>
 <context>
@@ -10717,17 +10717,17 @@ This message is missing. You should receive it later.</source>
     <message>
         <location filename="../gui/statusbar/hashingstatus.cpp" line="+78"/>
         <source>Examining shared files...</source>
-        <translation type="unfinished">Проверка файлов, открытых к доступу...</translation>
+        <translation>Проверка файлов, открытых к доступу...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hashing file</source>
-        <translation type="unfinished">Хеширование файла</translation>
+        <translation>Хеширование файла</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Saving file index...</source>
-        <translation type="unfinished">Сохранение списка файлов...</translation>
+        <translation>Сохранение списка файлов...</translation>
     </message>
 </context>
 <context>
@@ -11025,32 +11025,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+123"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Скопируйте свой идентификатор RetroShare в буфер обмена&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+165"/>
         <source>Add friend</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить узел</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы получили идентификатор Retroshare от друга?</translation>
     </message>
     <message>
         <location line="+85"/>
         <source>Do you need help with Retroshare?</source>
-        <translation type="unfinished"></translation>
+        <translation>Вам нужна помощь с Retroshare?</translation>
     </message>
     <message>
         <location line="-254"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Поделитесь своим идентификатором RetroShare&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="-63"/>
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
-        <translation type="unfinished"></translation>
+        <translation>Это ваш Retroshare ID. Скопируйте и поделитесь с друзьями!</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11120,7 +11120,7 @@ private and secure decentralized communication platform.
     <message>
         <location line="+6"/>
         <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
+        <translation>Включить историю всех IP-адресов</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -11130,12 +11130,12 @@ private and secure decentralized communication platform.
     <message>
         <location line="+70"/>
         <source>Include all your known IPs</source>
-        <translation type="unfinished"></translation>
+        <translation>Включите все ваши известные IP-адреса</translation>
     </message>
     <message>
         <location line="-109"/>
         <source>Use old certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать старый формат сертификата</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11147,7 +11147,7 @@ new short format</source>
     <message>
         <location line="+99"/>
         <source>Use new (short) certificate format</source>
-        <translation type="unfinished"></translation>
+        <translation>Использовать (короткий) формат сертификата</translation>
     </message>
     <message>
         <location line="+143"/>
@@ -11499,7 +11499,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-41"/>
         <source>Friend votes:</source>
-        <translation>Рейтинг согласно мнению участников из окружения:</translation>
+        <translation>Голоса друзей:</translation>
     </message>
     <message>
         <location line="+358"/>
@@ -11520,12 +11520,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-291"/>
         <source>Created on :</source>
-        <translation type="unfinished"></translation>
+        <translation>Создано:</translation>
     </message>
     <message>
         <location line="-64"/>
         <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Профиль автобана</translation>
     </message>
     <message>
         <location line="+150"/>
@@ -11535,7 +11535,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+84"/>
         <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Изменить личность</translation>
     </message>
     <message>
         <location line="+151"/>
@@ -11595,7 +11595,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-407"/>
         <source>Owner node ID :</source>
-        <translation>Идентификатор владельца узла:</translation>
+        <translation>Идентификатор узла:</translation>
     </message>
     <message>
         <location line="-58"/>
@@ -11630,7 +11630,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+58"/>
         <source>Owner node name :</source>
-        <translation>Имя владельца узла:</translation>
+        <translation>Имя узла:</translation>
     </message>
     <message>
         <location line="-569"/>
@@ -11660,19 +11660,19 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+116"/>
         <source>Negative</source>
-        <translation>Отрицательное мнение</translation>
+        <translation>Отрицательно</translation>
     </message>
     <message>
         <location line="+9"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
         <source>Neutral</source>
-        <translation>Нейтральное мнение</translation>
+        <translation>Нейтральный</translation>
     </message>
     <message>
         <location line="+9"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-11"/>
         <source>Positive</source>
-        <translation>Положительное мнение</translation>
+        <translation>Положительный</translation>
     </message>
     <message>
         <location line="-144"/>
@@ -11799,7 +11799,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+4"/>
         <source>unsubscribed (Only receive invite list). Last seen: %1 days ago.</source>
-        <translation type="unfinished"></translation>
+        <translation>отписался (Только получать список приглашений). Последний раз был в сети: %1 дней назад.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11829,7 +11829,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Status: </source>
-        <translation>Статус:</translation>
+        <translation>Статус: </translation>
     </message>
     <message>
         <location line="+3"/>
@@ -12011,7 +12011,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+2"/>
         <source>Message</source>
-        <translation type="unfinished">Сообщение</translation>
+        <translation>Сообщение</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12281,7 +12281,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
         <source>Last used:</source>
-        <translation>Последний раз появлялся: </translation>
+        <translation>Последний раз появлялся:</translation>
     </message>
     <message>
         <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
@@ -12321,7 +12321,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+607"/>
         <source>Really delete?</source>
-        <translation>Действительно удалить? </translation>
+        <translation>Действительно удалить?</translation>
     </message>
 </context>
 <context>
@@ -14916,105 +14916,105 @@ Reported error:</source>
     <message>
         <location filename="../gui/common/NewFriendList.ui" line="+83"/>
         <source>Offline Friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Друзья офлайн</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Offline Friends</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать друзей офлайн</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Status</source>
-        <translation type="unfinished">Статус</translation>
+        <translation>Статус</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show status</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать статус</translation>
     </message>
     <message>
         <location line="+8"/>
         <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
         <source>Groups</source>
-        <translation type="unfinished">Группы</translation>
+        <translation>Группы</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Показать группы</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>export friendlist</source>
-        <translation type="unfinished">Экспорт списка контактов</translation>
+        <translation>Экспорт списка контактов</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>export your friendlist including groups</source>
-        <translation type="unfinished">Экспорт списка контактов, включая информацию о группах</translation>
+        <translation>Экспорт списка контактов, включая информацию о группах</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>import friendlist</source>
-        <translation type="unfinished">Импорт списка контактов</translation>
+        <translation>Импорт списка контактов</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>import your friendlist including groups</source>
-        <translation type="unfinished">Импорт списка контактов, включая информацию о группах</translation>
+        <translation>Импорт списка контактов, включая информацию о группах</translation>
     </message>
     <message>
         <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
         <location line="+28"/>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Поиск</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+144"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location line="-144"/>
         <source>Search ID</source>
-        <translation type="unfinished">Поиск идентификатора</translation>
+        <translation>Поиск идентификатора</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Online friends on top</source>
-        <translation type="unfinished"></translation>
+        <translation>Онлайн-друзья наверху</translation>
     </message>
     <message>
         <location line="+82"/>
         <source>Show Items</source>
-        <translation type="unfinished">Показать...</translation>
+        <translation>Показать...</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Last contact</source>
-        <translation type="unfinished"></translation>
+        <translation>Последний контакт</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>IP</source>
-        <translation type="unfinished">IP</translation>
+        <translation>IP</translation>
     </message>
     <message>
         <location line="+251"/>
         <source>Group</source>
-        <translation type="unfinished">Группа</translation>
+        <translation>Группа</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Friend</source>
-        <translation type="unfinished"></translation>
+        <translation>Друг</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Node</source>
-        <translation type="unfinished"></translation>
+        <translation>Узел</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -15024,126 +15024,126 @@ Reported error:</source>
     <message>
         <location line="+12"/>
         <source>Edit Group</source>
-        <translation type="unfinished">Редактировать группу</translation>
+        <translation>Редактировать группу</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove Group</source>
-        <translation type="unfinished">Удалить группу</translation>
+        <translation>Удалить группу</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Profile details</source>
-        <translation type="unfinished">Сведения об узле</translation>
+        <translation>Сведения об узле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Deny connections</source>
-        <translation type="unfinished"></translation>
+        <translation>Запретить соединения</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Add to group</source>
-        <translation type="unfinished">добавить в группу</translation>
+        <translation>добавить в группу</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Move to group</source>
-        <translation type="unfinished">Переместить в группу</translation>
+        <translation>Переместить в группу</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Create new group</source>
-        <translation type="unfinished">Создать новую группу</translation>
+        <translation>Создать новую группу</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Remove from group </source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить из группы </translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove from all groups</source>
-        <translation type="unfinished">Удалить из всех групп</translation>
+        <translation>Удалить из всех групп</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Чат</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Send message to this node</source>
-        <translation type="unfinished">Послать сообщение этому узлу</translation>
+        <translation>Послать сообщение этому узлу</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Node details</source>
-        <translation type="unfinished">Сведения об узле</translation>
+        <translation>Сведения об узле</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Recommend this node to...</source>
-        <translation type="unfinished">Рекомендовать этого участника...</translation>
+        <translation>Рекомендовать этого участника...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Attempt to connect</source>
-        <translation type="unfinished">Соединиться</translation>
+        <translation>Соединиться</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy certificate link</source>
-        <translation type="unfinished">Скопировать ссылку сертификата</translation>
+        <translation>Скопировать ссылку сертификата</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Remove Friend Node</source>
-        <translation type="unfinished">Удалить этого участника</translation>
+        <translation>Удалить этого участника</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Paste certificate link</source>
-        <translation type="unfinished">Вставить ссылку на сертификат</translation>
+        <translation>Вставить ссылку на сертификат</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Expand all</source>
-        <translation type="unfinished">Раскрыть всё</translation>
+        <translation>Раскрыть всё</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Collapse all</source>
-        <translation type="unfinished">Свернуть всё</translation>
+        <translation>Свернуть всё</translation>
     </message>
     <message>
         <location line="+236"/>
         <source>Do you want to remove this node?</source>
-        <translation type="unfinished">Вы хотите удалить этот узел?</translation>
+        <translation>Вы хотите удалить этот узел?</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Do you want to remove this Friend?</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы хотите удалить этот контакт?</translation>
     </message>
     <message>
         <location line="+235"/>
         <location line="+18"/>
         <source>Done!</source>
-        <translation type="unfinished">Готово!</translation>
+        <translation>Готово!</translation>
     </message>
     <message>
         <location line="-17"/>
         <source>Your friendlist is stored at:
 </source>
-        <translation type="unfinished">Ваш список список контактов сохранён в:
+        <translation>Ваш список список контактов сохранён в:
 </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 (keep in mind that the file is unencrypted!)</source>
-        <translation type="unfinished">
+        <translation>
 (помните, что файл не зашифрован!)</translation>
     </message>
     <message>
@@ -15151,32 +15151,32 @@ Reported error:</source>
         <location line="+7"/>
         <source>Your friendlist was imported from:
 </source>
-        <translation type="unfinished">Ваш список контактов импортирован из:
+        <translation>Ваш список контактов импортирован из:
 </translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Done - but errors happened!</source>
-        <translation type="unfinished">Выполнено, но с ошибками!</translation>
+        <translation>Выполнено, но с ошибками!</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>
 at least one peer was not added</source>
-        <translation type="unfinished">
+        <translation>
 как минимум один участник не добавлен</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 at least one peer was not added to a group</source>
-        <translation type="unfinished">
+        <translation>
 как минимум один участник не добавлен в группу</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Select file for importing your friendlist from</source>
-        <translation type="unfinished">Выберите файл, в котором хранится список ваших контактов</translation>
+        <translation>Выберите файл, в котором хранится список ваших контактов</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -15193,7 +15193,7 @@ at least one peer was not added to a group</source>
         <location line="+30"/>
         <location line="+116"/>
         <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
+        <translation>Ошибка</translation>
     </message>
     <message>
         <location line="-115"/>